diff --git a/.gitignore b/.gitignore index 14dcdbd1..a8e80e08 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ bin/ */log */out .idea -!.idea/copyright/bisq_Affero_GPLv3.xml +!.idea/copyright/haveno_Affero_GPLv3.xml !.idea/copyright/profiles_settings.xml !.idea/codeStyleSettings.xml *.iml diff --git a/apitest/scripts/editf2faccountform.py b/apitest/scripts/editf2faccountform.py index f9849a75..08726344 100644 --- a/apitest/scripts/editf2faccountform.py +++ b/apitest/scripts/editf2faccountform.py @@ -1,6 +1,6 @@ import sys, os, json -# Writes a Bisq json F2F payment account form for the given country_code to the current working directory. +# Writes a Haveno json F2F payment account form for the given country_code to the current working directory. if len(sys.argv) < 2: print("usage: editf2faccountform.py country_code") diff --git a/apitest/scripts/get-bisq-pid.sh b/apitest/scripts/get-haveno-pid.sh similarity index 100% rename from apitest/scripts/get-bisq-pid.sh rename to apitest/scripts/get-haveno-pid.sh diff --git a/apitest/scripts/limit-order-simulation.sh b/apitest/scripts/limit-order-simulation.sh index d47404f6..fe56858d 100755 --- a/apitest/scripts/limit-order-simulation.sh +++ b/apitest/scripts/limit-order-simulation.sh @@ -8,14 +8,14 @@ # # - Linux or OSX with bash, Java 11-15 (JDK language compatibility 11), and bitcoin-core (v0.19 - v22). # -# - Bisq must be fully built with apitest dao setup files installed. +# - Haveno must be fully built with apitest dao setup files installed. # Build command: `./gradlew clean build :apitest:installDaoSetup` # # - All supporting nodes must be run locally, in dev/dao/regtest mode: # bitcoind, seednode, arbdaemon, alicedaemon, bobdaemon # # These should be run using the apitest harness. From the root project dir, run: -# `$ ./bisq-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` +# `$ ./haveno-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` # # - Only regtest btc can be bought or sold with the test payment account. # diff --git a/apitest/scripts/mainnet-test.sh b/apitest/scripts/mainnet-test.sh index 9edf53f1..acfcc0a9 100755 --- a/apitest/scripts/mainnet-test.sh +++ b/apitest/scripts/mainnet-test.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bats # -# Smoke tests for bisq-cli running against a live bisq-daemon (on mainnet) +# Smoke tests for haveno-cli running against a live haveno-daemon (on mainnet) # # Prerequisites: # # - bats-core 1.2.0+ must be installed (brew install bats-core on macOS) # see https://github.com/bats-core/bats-core # -# - Run `./bisq-daemon --apiPassword=xyz --appDataDir=$TESTDIR` where $TESTDIR +# - Run `./haveno-daemon --apiPassword=xyz --appDataDir=$TESTDIR` where $TESTDIR # is empty or otherwise contains an unencrypted wallet with a 0 BTC balance # # Usage: @@ -17,28 +17,28 @@ # bats apitest/scripts/mainnet-test.sh @test "test unsupported method error" { - run ./bisq-cli --password=xyz bogus + run ./haveno-cli --password=xyz bogus [ "$status" -eq 1 ] echo "actual output: $output" >&2 # printed only on test failure [ "$output" = "Error: 'bogus' is not a supported method" ] } @test "test unrecognized option error" { - run ./bisq-cli --bogus getversion + run ./haveno-cli --bogus getversion [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: missing required 'password' option" ] } @test "test missing required password option error" { - run ./bisq-cli getversion + run ./haveno-cli getversion [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: missing required 'password' option" ] } @test "test incorrect password error" { - run ./bisq-cli --password=bogus getversion + run ./haveno-cli --password=bogus getversion [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: incorrect 'password' rpc header value" ] @@ -46,7 +46,7 @@ @test "test getversion call with quoted password" { load 'version-parser' - run ./bisq-cli --password="xyz" getversion + run ./haveno-cli --password="xyz" getversion [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "$CURRENT_VERSION" ] @@ -56,14 +56,14 @@ # Wait 1 second before calling getversion again. sleep 1 load 'version-parser' - run ./bisq-cli --password=xyz getversion + run ./haveno-cli --password=xyz getversion [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "$CURRENT_VERSION" ] } @test "test setwalletpassword \"a b c\"" { - run ./bisq-cli --password=xyz setwalletpassword --wallet-password="a b c" + run ./haveno-cli --password=xyz setwalletpassword --wallet-password="a b c" [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "wallet encrypted" ] @@ -71,14 +71,14 @@ } @test "test unlockwallet without password & timeout args" { - run ./bisq-cli --password=xyz unlockwallet + run ./haveno-cli --password=xyz unlockwallet [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: no password specified" ] } @test "test unlockwallet without timeout arg" { - run ./bisq-cli --password=xyz unlockwallet --wallet-password="a b c" + run ./haveno-cli --password=xyz unlockwallet --wallet-password="a b c" [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: no unlock timeout specified" ] @@ -86,34 +86,34 @@ @test "test unlockwallet \"a b c\" 8" { - run ./bisq-cli --password=xyz unlockwallet --wallet-password="a b c" --timeout=8 + run ./haveno-cli --password=xyz unlockwallet --wallet-password="a b c" --timeout=8 [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "wallet unlocked" ] } @test "test getbalance while wallet unlocked for 8s" { - run ./bisq-cli --password=xyz getbalance + run ./haveno-cli --password=xyz getbalance [ "$status" -eq 0 ] sleep 8 } @test "test unlockwallet \"a b c\" 6" { - run ./bisq-cli --password=xyz unlockwallet --wallet-password="a b c" --timeout=6 + run ./haveno-cli --password=xyz unlockwallet --wallet-password="a b c" --timeout=6 [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "wallet unlocked" ] } @test "test lockwallet before unlockwallet timeout=6s expires" { - run ./bisq-cli --password=xyz lockwallet + run ./haveno-cli --password=xyz lockwallet [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "wallet locked" ] } @test "test setwalletpassword incorrect old pwd error" { - run ./bisq-cli --password=xyz setwalletpassword --wallet-password="z z z" --new-wallet-password="d e f" + run ./haveno-cli --password=xyz setwalletpassword --wallet-password="z z z" --new-wallet-password="d e f" [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: incorrect old password" ] @@ -122,7 +122,7 @@ @test "test setwalletpassword oldpwd newpwd" { # Wait 5 seconds before calling setwalletpassword again. sleep 5 - run ./bisq-cli --password=xyz setwalletpassword --wallet-password="a b c" --new-wallet-password="d e f" + run ./haveno-cli --password=xyz setwalletpassword --wallet-password="a b c" --new-wallet-password="d e f" [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "wallet encrypted with new password" ] @@ -130,14 +130,14 @@ } @test "test getbalance wallet locked error" { - run ./bisq-cli --password=xyz getbalance + run ./haveno-cli --password=xyz getbalance [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: wallet is locked" ] } @test "test removewalletpassword" { - run ./bisq-cli --password=xyz removewalletpassword --wallet-password="d e f" + run ./haveno-cli --password=xyz removewalletpassword --wallet-password="d e f" [ "$status" -eq 0 ] echo "actual output: $output" >&2 [ "$output" = "wallet decrypted" ] @@ -145,17 +145,17 @@ } @test "test getbalance when wallet available & unlocked with 0 btc balance" { - run ./bisq-cli --password=xyz getbalance + run ./haveno-cli --password=xyz getbalance [ "$status" -eq 0 ] } @test "test getfundingaddresses" { - run ./bisq-cli --password=xyz getfundingaddresses + run ./haveno-cli --password=xyz getfundingaddresses [ "$status" -eq 0 ] } @test "test getaddressbalance missing address argument" { - run ./bisq-cli --password=xyz getaddressbalance + run ./haveno-cli --password=xyz getaddressbalance [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: no address specified" ] @@ -164,24 +164,24 @@ @test "test getaddressbalance bogus address argument" { # Wait 1 second before calling getaddressbalance again. sleep 1 - run ./bisq-cli --password=xyz getaddressbalance --address=bogus + run ./haveno-cli --password=xyz getaddressbalance --address=bogus [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: address bogus not found in wallet" ] } @test "test getpaymentmethods" { - run ./bisq-cli --password=xyz getpaymentmethods + run ./haveno-cli --password=xyz getpaymentmethods [ "$status" -eq 0 ] } @test "test getpaymentaccts" { - run ./bisq-cli --password=xyz getpaymentaccts + run ./haveno-cli --password=xyz getpaymentaccts [ "$status" -eq 0 ] } @test "test getoffers missing direction argument" { - run ./bisq-cli --password=xyz getoffers + run ./haveno-cli --password=xyz getoffers [ "$status" -eq 1 ] echo "actual output: $output" >&2 [ "$output" = "Error: no direction (buy|sell) specified" ] @@ -190,42 +190,42 @@ @test "test getoffers sell eur check return status" { # Wait 1 second before calling getoffers again. sleep 1 - run ./bisq-cli --password=xyz getoffers --direction=sell --currency-code=eur + run ./haveno-cli --password=xyz getoffers --direction=sell --currency-code=eur [ "$status" -eq 0 ] } @test "test getoffers buy eur check return status" { # Wait 1 second before calling getoffers again. sleep 1 - run ./bisq-cli --password=xyz getoffers --direction=buy --currency-code=eur + run ./haveno-cli --password=xyz getoffers --direction=buy --currency-code=eur [ "$status" -eq 0 ] } @test "test getoffers sell gbp check return status" { # Wait 1 second before calling getoffers again. sleep 1 - run ./bisq-cli --password=xyz getoffers --direction=sell --currency-code=gbp + run ./haveno-cli --password=xyz getoffers --direction=sell --currency-code=gbp [ "$status" -eq 0 ] } @test "test help displayed on stderr if no options or arguments" { - run ./bisq-cli + run ./haveno-cli [ "$status" -eq 1 ] - [ "${lines[0]}" = "Bisq RPC Client" ] - [ "${lines[1]}" = "Usage: bisq-cli [options] [params]" ] + [ "${lines[0]}" = "Haveno RPC Client" ] + [ "${lines[1]}" = "Usage: haveno-cli [options] [params]" ] # TODO add asserts after help text is modified for new endpoints } @test "test --help option" { - run ./bisq-cli --help + run ./haveno-cli --help [ "$status" -eq 0 ] - [ "${lines[0]}" = "Bisq RPC Client" ] - [ "${lines[1]}" = "Usage: bisq-cli [options] [params]" ] + [ "${lines[0]}" = "Haveno RPC Client" ] + [ "${lines[1]}" = "Usage: haveno-cli [options] [params]" ] # TODO add asserts after help text is modified for new endpoints } @test "test takeoffer method --help" { - run ./bisq-cli --password=xyz takeoffer --help + run ./haveno-cli --password=xyz takeoffer --help [ "$status" -eq 0 ] [ "${lines[0]}" = "takeoffer" ] } diff --git a/apitest/scripts/rolling-offer-simulation.sh b/apitest/scripts/rolling-offer-simulation.sh index 48fc431f..64ba64dd 100755 --- a/apitest/scripts/rolling-offer-simulation.sh +++ b/apitest/scripts/rolling-offer-simulation.sh @@ -12,14 +12,14 @@ # # - Linux or OSX with bash, Java 11-15 (JDK language compatibility 11), and bitcoin-core (v0.19 - v22). # -# - Bisq must be fully built with apitest dao setup files installed. +# - Haveno must be fully built with apitest dao setup files installed. # Build command: `./gradlew clean build :apitest:installDaoSetup` # # - All supporting nodes must be run locally, in dev/dao/regtest mode: # bitcoind, seednode, arbdaemon, alicedaemon, bobdaemon # # These should be run using the apitest harness. From the root project dir, run: -# `$ ./bisq-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` +# `$ ./haveno-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` # # - Only regtest btc can be bought or sold with the test payment account. # diff --git a/apitest/scripts/trade-simulation-env.sh b/apitest/scripts/trade-simulation-env.sh index 4bcbf8b1..f6e66687 100755 --- a/apitest/scripts/trade-simulation-env.sh +++ b/apitest/scripts/trade-simulation-env.sh @@ -2,7 +2,7 @@ # This file must be sourced by the main driver. -export CLI_BASE="./bisq-cli --password=xyz" +export CLI_BASE="./haveno-cli --password=xyz" export ARBITRATOR_PORT=9997 export ALICE_PORT=9998 export BOB_PORT=9999 @@ -38,7 +38,7 @@ checksetup() { echo "Bob & Alice daemons, and bitcoin-core's bitcoin-cli must be in the system PATH." echo "" echo "From the project's root dir, start all supporting nodes from a terminal:" - echo "./bisq-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false" + echo "./haveno-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false" exit 1; } printdate "Checking $APP_HOME for some expected directories and files." @@ -48,16 +48,16 @@ checksetup() { printdate "Error: Subproject apitest not found, maybe because you are not running the script from the project root dir." exit 1 fi - if [ -f "$APP_HOME/bisq-cli" ]; then - printdate "The bisq-cli script exists."; + if [ -f "$APP_HOME/haveno-cli" ]; then + printdate "The haveno-cli script exists."; else - printdate "Error: The bisq-cli script not found, maybe because you are not running the script from the project root dir." + printdate "Error: The haveno-cli script not found, maybe because you are not running the script from the project root dir." exit 1 fi printdate "Checking to see local bitcoind is running, and bitcoin-cli is in PATH." checkbitcoindrunning checkbitcoincliinpath - printdate "Checking to see bisq servers are running." + printdate "Checking to see haveno servers are running." checkseednoderunning checkarbnoderunning checkalicenoderunning @@ -205,7 +205,7 @@ checkbitcoincliinpath() { checkseednoderunning() { if [[ "$LINUX" == "TRUE" ]]; then - if pgrep -f "bisq.seednode.SeedNodeMain" > /dev/null ; then + if pgrep -f "haveno.seednode.SeedNodeMain" > /dev/null ; then printdate "The seed node is running on host." else printdate "Error: seed node is not running on host, exiting." @@ -226,14 +226,14 @@ checkseednoderunning() { checkarbnoderunning() { if [[ "$LINUX" == "TRUE" ]]; then - if pgrep -f "bisq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Arb" > /dev/null ; then + if pgrep -f "haveno.daemon.app.HavenoDaemonMain --appName=haveno-XMR_STAGENET_Arb" > /dev/null ; then printdate "The arbitration node is running on host." else printdate "Error: arbitration node is not running on host, exiting." apitestusage fi elif [[ "$DARWIN" == "TRUE" ]]; then - if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Arb/ {print $1}' > /dev/null ; then + if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=haveno-XMR_STAGENET_Arb/ {print $1}' > /dev/null ; then printdate "The arbitration node is running on host." else printdate "Error: arbitration node is not running on host, exiting." @@ -247,14 +247,14 @@ checkarbnoderunning() { checkalicenoderunning() { if [[ "$LINUX" == "TRUE" ]]; then - if pgrep -f "bisq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice" > /dev/null ; then + if pgrep -f "haveno.daemon.app.HavenoDaemonMain --appName=haveno-XMR_STAGENET_Alice" > /dev/null ; then printdate "Alice's node is running on host." else printdate "Error: Alice's node is not running on host, exiting." apitestusage fi elif [[ "$DARWIN" == "TRUE" ]]; then - if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then + if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=haveno-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then printdate "Alice's node node is running on host." else printdate "Error: Alice's node is not running on host, exiting." @@ -268,14 +268,14 @@ checkalicenoderunning() { checkbobnoderunning() { if [[ "$LINUX" == "TRUE" ]]; then - if pgrep -f "bisq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice" > /dev/null ; then + if pgrep -f "haveno.daemon.app.HavenoDaemonMain --appName=haveno-XMR_STAGENET_Alice" > /dev/null ; then printdate "Bob's node is running on host." else printdate "Error: Bob's node is not running on host, exiting." apitestusage fi elif [[ "$DARWIN" == "TRUE" ]]; then - if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then + if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=haveno-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then printdate "Bob's node node is running on host." else printdate "Error: Bob's node is not running on host, exiting." diff --git a/apitest/scripts/trade-simulation-utils.sh b/apitest/scripts/trade-simulation-utils.sh index 80490026..579c4736 100755 --- a/apitest/scripts/trade-simulation-utils.sh +++ b/apitest/scripts/trade-simulation-utils.sh @@ -535,7 +535,7 @@ executetrade() { printbreak # Complete the trade on both sides - printdate "BOB $BOB_ROLE: Closing trade and keeping funds in Bisq wallet." + printdate "BOB $BOB_ROLE: Closing trade and keeping funds in Haveno wallet." CMD="$CLI_BASE --port=$BOB_PORT closetrade --trade-id=$OFFER_ID" printdate "BOB CLI: $CMD" KEEP_FUNDS_MSG=$($CMD) @@ -545,7 +545,7 @@ executetrade() { sleeptraced 3 printbreak - printdate "ALICE (taker): Closing trade and keeping funds in Bisq wallet." + printdate "ALICE (taker): Closing trade and keeping funds in Haveno wallet." CMD="$CLI_BASE --port=$ALICE_PORT closetrade --trade-id=$OFFER_ID" printdate "ALICE CLI: $CMD" KEEP_FUNDS_MSG=$($CMD) diff --git a/apitest/scripts/trade-simulation.sh b/apitest/scripts/trade-simulation.sh index 5be7659c..2c3f21fb 100755 --- a/apitest/scripts/trade-simulation.sh +++ b/apitest/scripts/trade-simulation.sh @@ -9,14 +9,14 @@ # # - Linux or OSX with bash, Java 11-15 (JDK language compatibility 11), and bitcoin-core (v0.19 - v22). # -# - Bisq must be fully built with apitest dao setup files installed. +# - Haveno must be fully built with apitest dao setup files installed. # Build command: `./gradlew clean build :apitest:installDaoSetup` # # - All supporting nodes must be run locally, in dev/dao/regtest mode: # bitcoind, seednode, arbdaemon, alicedaemon, bobdaemon # # These should be run using the apitest harness. From the root project dir, run: -# `$ ./bisq-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` +# `$ ./haveno-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` # # - Only regtest btc can be bought or sold with the test payment account. # diff --git a/apitest/scripts/trade-xmr-simulation.sh b/apitest/scripts/trade-xmr-simulation.sh index e361353d..dec6f6ed 100755 --- a/apitest/scripts/trade-xmr-simulation.sh +++ b/apitest/scripts/trade-xmr-simulation.sh @@ -6,14 +6,14 @@ # # - Linux or OSX with bash, Java 11-15 (JDK language compatibility 11), and bitcoin-core (v0.19 - v22). # -# - Bisq must be fully built with apitest dao setup files installed. +# - Haveno must be fully built with apitest dao setup files installed. # Build command: `./gradlew clean build :apitest:installDaoSetup` # # - All supporting nodes must be run locally, in dev/dao/regtest mode: # bitcoind, seednode, arbdaemon, alicedaemon, bobdaemon # # These should be run using the apitest harness. From the root project dir, run: -# `$ ./bisq-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` +# `$ ./haveno-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false` # # Usage: # diff --git a/apitest/scripts/version-parser.bash b/apitest/scripts/version-parser.bash index ba7f2c2d..e95cd0ce 100755 --- a/apitest/scripts/version-parser.bash +++ b/apitest/scripts/version-parser.bash @@ -2,4 +2,4 @@ # Bats helper script for parsing current version from Version.java. -export CURRENT_VERSION=$(grep "String VERSION =" common/src/main/java/bisq/common/app/Version.java | sed 's/[^0-9.]*//g') +export CURRENT_VERSION=$(grep "String VERSION =" common/src/main/java/haveno/common/app/Version.java | sed 's/[^0-9.]*//g') diff --git a/apitest/src/main/java/bisq/apitest/ApiTestMain.java b/apitest/src/main/java/haveno/apitest/ApiTestMain.java similarity index 77% rename from apitest/src/main/java/bisq/apitest/ApiTestMain.java rename to apitest/src/main/java/haveno/apitest/ApiTestMain.java index f627e96a..541a5548 100644 --- a/apitest/src/main/java/bisq/apitest/ApiTestMain.java +++ b/apitest/src/main/java/haveno/apitest/ApiTestMain.java @@ -15,23 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.apitest; +package haveno.apitest; import java.io.File; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.Scaffold.EXIT_FAILURE; -import static bisq.apitest.Scaffold.EXIT_SUCCESS; -import static bisq.apitest.config.ApiTestRateMeterInterceptorConfig.appendCallRateMeteringConfigPathOpt; -import static bisq.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; -import static bisq.apitest.config.ApiTestRateMeterInterceptorConfig.hasCallRateMeteringConfigPathOpt; +import static haveno.apitest.Scaffold.EXIT_FAILURE; +import static haveno.apitest.Scaffold.EXIT_SUCCESS; +import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.appendCallRateMeteringConfigPathOpt; +import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; +import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.hasCallRateMeteringConfigPathOpt; import static java.lang.System.err; import static java.lang.System.exit; - - -import bisq.apitest.config.ApiTestConfig; +import haveno.apitest.config.ApiTestConfig; /** * ApiTestMain is a placeholder for the gradle build file, which requires a valid @@ -39,12 +37,12 @@ import bisq.apitest.config.ApiTestConfig; * * It has some uses: * - * It can be used to print test scaffolding options: bisq-apitest --help. + * It can be used to print test scaffolding options: haveno-apitest --help. * - * It can be used to smoke test your bitcoind environment: bisq-apitest. + * It can be used to smoke test your bitcoind environment: haveno-apitest. * * It can be used to run the regtest environment for release testing: - * bisq-test --shutdownAfterTests=false + * haveno-test --shutdownAfterTests=false * * All method, scenario and end-to-end tests are found in the test sources folder. * @@ -81,7 +79,7 @@ public class ApiTestMain { } catch (Throwable ex) { err.println("Fault: An unexpected error occurred. " + - "Please file a report at https://bisq.network/issues"); + "Please file a report at https://haveno.network/issues"); ex.printStackTrace(err); exit(EXIT_FAILURE); } diff --git a/apitest/src/main/java/bisq/apitest/Scaffold.java b/apitest/src/main/java/haveno/apitest/Scaffold.java similarity index 89% rename from apitest/src/main/java/bisq/apitest/Scaffold.java rename to apitest/src/main/java/haveno/apitest/Scaffold.java index 39c62753..94ee04ed 100644 --- a/apitest/src/main/java/bisq/apitest/Scaffold.java +++ b/apitest/src/main/java/haveno/apitest/Scaffold.java @@ -15,11 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.apitest; - -import bisq.common.config.HavenoHelpFormatter; -import bisq.common.util.Utilities; +package haveno.apitest; +import haveno.apitest.config.ApiTestConfig; +import haveno.apitest.config.HavenoAppConfig; +import haveno.apitest.linux.BashCommand; +import haveno.apitest.linux.BitcoinDaemon; +import haveno.apitest.linux.HavenoProcess; +import haveno.apitest.linux.LinuxProcess; +import haveno.cli.GrpcClient; +import haveno.common.config.HavenoHelpFormatter; +import haveno.common.util.Utilities; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -41,11 +47,11 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.ApiTestConfig.MEDIATOR; -import static bisq.apitest.config.ApiTestConfig.REFUND_AGENT; -import static bisq.apitest.config.HavenoAppConfig.*; -import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.ApiTestConfig.MEDIATOR; +import static haveno.apitest.config.ApiTestConfig.REFUND_AGENT; +import static haveno.apitest.config.HavenoAppConfig.*; +import static haveno.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; import static java.lang.String.format; import static java.lang.System.exit; import static java.lang.System.out; @@ -54,16 +60,6 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.config.HavenoAppConfig; -import bisq.apitest.linux.BashCommand; -import bisq.apitest.linux.HavenoProcess; -import bisq.apitest.linux.BitcoinDaemon; -import bisq.apitest.linux.LinuxProcess; -import bisq.cli.GrpcClient; - @Slf4j public class Scaffold { @@ -130,8 +126,8 @@ public class Scaffold { if (config.helpRequested) { config.printHelp(out, new HavenoHelpFormatter( - "Bisq ApiTest", - "bisq-apitest", + "Haveno ApiTest", + "haveno-apitest", "0.1.0")); exit(EXIT_SUCCESS); } @@ -249,7 +245,7 @@ public class Scaffold { Runtime.getRuntime().addShutdownHook(new Thread(this::tearDown)); } - // Starts bitcoind and bisq apps (seednode, arbnode, etc...) + // Starts bitcoind and haveno apps (seednode, arbnode, etc...) private void startBackgroundProcesses(ExecutorService executor, CountDownLatch countdownLatch) throws InterruptedException, IOException { @@ -261,7 +257,7 @@ public class Scaffold { bitcoinDaemon.verifyBitcoinPathsExist(true); bitcoindTask = new SetupTask(bitcoinDaemon, countdownLatch); bitcoindTaskFuture = executor.submit(bitcoindTask); - MILLISECONDS.sleep(config.bisqAppInitTime); + MILLISECONDS.sleep(config.havenoAppInitTime); LinuxProcess bitcoindProcess = bitcoindTask.getLinuxProcess(); if (bitcoindProcess.hasStartupExceptions()) { @@ -272,28 +268,28 @@ public class Scaffold { bitcoinDaemon.verifyBitcoindRunning(); } - // Start Bisq apps defined by the supportingApps option, in the in proper order. + // Start Haveno apps defined by the supportingApps option, in the in proper order. if (config.hasSupportingApp(seednode.name())) - startBisqApp(seednode, executor, countdownLatch); + startHavenoApp(seednode, executor, countdownLatch); if (config.hasSupportingApp(arbdaemon.name())) - startBisqApp(arbdaemon, executor, countdownLatch); + startHavenoApp(arbdaemon, executor, countdownLatch); else if (config.hasSupportingApp(arbdesktop.name())) - startBisqApp(arbdesktop, executor, countdownLatch); + startHavenoApp(arbdesktop, executor, countdownLatch); if (config.hasSupportingApp(alicedaemon.name())) - startBisqApp(alicedaemon, executor, countdownLatch); + startHavenoApp(alicedaemon, executor, countdownLatch); else if (config.hasSupportingApp(alicedesktop.name())) - startBisqApp(alicedesktop, executor, countdownLatch); + startHavenoApp(alicedesktop, executor, countdownLatch); if (config.hasSupportingApp(bobdaemon.name())) - startBisqApp(bobdaemon, executor, countdownLatch); + startHavenoApp(bobdaemon, executor, countdownLatch); else if (config.hasSupportingApp(bobdesktop.name())) - startBisqApp(bobdesktop, executor, countdownLatch); + startHavenoApp(bobdesktop, executor, countdownLatch); } - private void startBisqApp(HavenoAppConfig HavenoAppConfig, + private void startHavenoApp(HavenoAppConfig HavenoAppConfig, ExecutorService executor, CountDownLatch countdownLatch) throws IOException, InterruptedException { @@ -322,8 +318,8 @@ public class Scaffold { default: throw new IllegalStateException("Unknown HavenoAppConfig " + HavenoAppConfig.name()); } - log.info("Giving {} ms for {} to initialize ...", config.bisqAppInitTime, HavenoAppConfig.appName); - MILLISECONDS.sleep(config.bisqAppInitTime); + log.info("Giving {} ms for {} to initialize ...", config.havenoAppInitTime, HavenoAppConfig.appName); + MILLISECONDS.sleep(config.havenoAppInitTime); if (HavenoProcess.hasStartupExceptions()) { HavenoProcess.logExceptions(HavenoProcess.getStartupExceptions(), log); throw new IllegalStateException(HavenoProcess.getStartupExceptions().get(0)); diff --git a/apitest/src/main/java/bisq/apitest/SetupTask.java b/apitest/src/main/java/haveno/apitest/SetupTask.java similarity index 97% rename from apitest/src/main/java/bisq/apitest/SetupTask.java rename to apitest/src/main/java/haveno/apitest/SetupTask.java index 2868351b..b8883bfb 100644 --- a/apitest/src/main/java/bisq/apitest/SetupTask.java +++ b/apitest/src/main/java/haveno/apitest/SetupTask.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest; +package haveno.apitest; import java.time.LocalDateTime; @@ -28,9 +28,7 @@ import lombok.extern.slf4j.Slf4j; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MILLISECONDS; - - -import bisq.apitest.linux.LinuxProcess; +import haveno.apitest.linux.LinuxProcess; @Slf4j public class SetupTask implements Callable { diff --git a/apitest/src/main/java/bisq/apitest/SmokeTestBashCommand.java b/apitest/src/main/java/haveno/apitest/SmokeTestBashCommand.java similarity index 95% rename from apitest/src/main/java/bisq/apitest/SmokeTestBashCommand.java rename to apitest/src/main/java/haveno/apitest/SmokeTestBashCommand.java index 32b3c924..439f01af 100644 --- a/apitest/src/main/java/bisq/apitest/SmokeTestBashCommand.java +++ b/apitest/src/main/java/haveno/apitest/SmokeTestBashCommand.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.apitest; +package haveno.apitest; +import haveno.apitest.linux.BashCommand; import java.io.IOException; import lombok.extern.slf4j.Slf4j; - - -import bisq.apitest.linux.BashCommand; - @Slf4j class SmokeTestBashCommand { diff --git a/apitest/src/main/java/bisq/apitest/SmokeTestBitcoind.java b/apitest/src/main/java/haveno/apitest/SmokeTestBitcoind.java similarity index 96% rename from apitest/src/main/java/bisq/apitest/SmokeTestBitcoind.java rename to apitest/src/main/java/haveno/apitest/SmokeTestBitcoind.java index 88fd1394..047c66a8 100644 --- a/apitest/src/main/java/bisq/apitest/SmokeTestBitcoind.java +++ b/apitest/src/main/java/haveno/apitest/SmokeTestBitcoind.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest; +package haveno.apitest; import java.io.IOException; @@ -23,10 +23,8 @@ import lombok.extern.slf4j.Slf4j; import static java.lang.String.format; - - -import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.linux.BitcoinCli; +import haveno.apitest.config.ApiTestConfig; +import haveno.apitest.linux.BitcoinCli; @Slf4j class SmokeTestBitcoind { diff --git a/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java b/apitest/src/main/java/haveno/apitest/config/ApiTestConfig.java similarity index 95% rename from apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java rename to apitest/src/main/java/haveno/apitest/config/ApiTestConfig.java index 0c7675d1..fb9294f2 100644 --- a/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java +++ b/apitest/src/main/java/haveno/apitest/config/ApiTestConfig.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.config; - -import bisq.common.config.CompositeOptionSet; +package haveno.apitest.config; import joptsimple.AbstractOptionSpec; import joptsimple.ArgumentAcceptingOptionSpec; @@ -51,6 +49,8 @@ import static java.util.Arrays.asList; import static java.util.Arrays.stream; import static joptsimple.internal.Strings.EMPTY; +import haveno.common.config.CompositeOptionSet; + @Slf4j public class ApiTestConfig { @@ -76,12 +76,12 @@ public class ApiTestConfig { static final String ROOT_APP_DATA_DIR = "rootAppDataDir"; static final String API_PASSWORD = "apiPassword"; static final String RUN_SUBPROJECT_JARS = "runSubprojectJars"; - static final String BISQ_APP_INIT_TIME = "bisqAppInitTime"; + static final String HAVENO_APP_INIT_TIME = "havenoAppInitTime"; static final String SKIP_TESTS = "skipTests"; static final String SHUTDOWN_AFTER_TESTS = "shutdownAfterTests"; static final String SUPPORTING_APPS = "supportingApps"; static final String CALL_RATE_METERING_CONFIG_PATH = "callRateMeteringConfigPath"; - static final String ENABLE_BISQ_DEBUGGING = "enableBisqDebugging"; + static final String ENABLE_HAVENO_DEBUGGING = "enableHavenoDebugging"; static final String REGISTER_DISPUTE_AGENTS = "registerDisputeAgents"; // Default values for certain options @@ -109,12 +109,12 @@ public class ApiTestConfig { // Daemon instances can use same gRPC password, but each needs a different apiPort. public final String apiPassword; public final boolean runSubprojectJars; - public final long bisqAppInitTime; + public final long havenoAppInitTime; public final boolean skipTests; public final boolean shutdownAfterTests; public final List supportingApps; public final String callRateMeteringConfigPath; - public final boolean enableBisqDebugging; + public final boolean enableHavenoDebugging; public final boolean registerDisputeAgents; // Immutable system configurations set in the constructor. @@ -132,7 +132,7 @@ public class ApiTestConfig { this.userDir = getProperty("user.dir"); // If running a @Test, the current working directory is the :apitest subproject // folder. If running ApiTestMain, the current working directory is the - // bisq root project folder. + // haveno root project folder. this.isRunningTest = Paths.get(userDir).getFileName().toString().equals("apitest"); this.rootProjectDir = isRunningTest ? Paths.get(userDir).getParent().toFile().getAbsolutePath() @@ -213,9 +213,9 @@ public class ApiTestConfig { .ofType(Boolean.class) .defaultsTo(false); - ArgumentAcceptingOptionSpec bisqAppInitTimeOpt = - parser.accepts(BISQ_APP_INIT_TIME, - "Amount of time (ms) to wait on a Bisq instance's initialization") + ArgumentAcceptingOptionSpec havenoAppInitTimeOpt = + parser.accepts(HAVENO_APP_INIT_TIME, + "Amount of time (ms) to wait on a Haveno instance's initialization") .withRequiredArg() .ofType(Long.class) .defaultsTo(5000L); @@ -247,9 +247,9 @@ public class ApiTestConfig { .withRequiredArg() .defaultsTo(EMPTY); - ArgumentAcceptingOptionSpec enableBisqDebuggingOpt = - parser.accepts(ENABLE_BISQ_DEBUGGING, - "Start Bisq apps with remote debug options") + ArgumentAcceptingOptionSpec enableHavenoDebuggingOpt = + parser.accepts(ENABLE_HAVENO_DEBUGGING, + "Start Haveno apps with remote debug options") .withRequiredArg() .ofType(Boolean.class) .defaultsTo(false); @@ -311,12 +311,12 @@ public class ApiTestConfig { this.bitcoinRpcPassword = options.valueOf(bitcoinRpcPasswordOpt); this.apiPassword = options.valueOf(apiPasswordOpt); this.runSubprojectJars = options.valueOf(runSubprojectJarsOpt); - this.bisqAppInitTime = options.valueOf(bisqAppInitTimeOpt); + this.havenoAppInitTime = options.valueOf(havenoAppInitTimeOpt); this.skipTests = options.valueOf(skipTestsOpt); this.shutdownAfterTests = options.valueOf(shutdownAfterTestsOpt); this.supportingApps = asList(options.valueOf(supportingAppsOpt).split(",")); this.callRateMeteringConfigPath = options.valueOf(callRateMeteringConfigPathOpt); - this.enableBisqDebugging = options.valueOf(enableBisqDebuggingOpt); + this.enableHavenoDebugging = options.valueOf(enableHavenoDebuggingOpt); this.registerDisputeAgents = options.valueOf(registerDisputeAgentsOpt); // Assign values to special-case static fields. diff --git a/apitest/src/main/java/bisq/apitest/config/ApiTestRateMeterInterceptorConfig.java b/apitest/src/main/java/haveno/apitest/config/ApiTestRateMeterInterceptorConfig.java similarity index 87% rename from apitest/src/main/java/bisq/apitest/config/ApiTestRateMeterInterceptorConfig.java rename to apitest/src/main/java/haveno/apitest/config/ApiTestRateMeterInterceptorConfig.java index 9655f21d..c25efe14 100644 --- a/apitest/src/main/java/bisq/apitest/config/ApiTestRateMeterInterceptorConfig.java +++ b/apitest/src/main/java/haveno/apitest/config/ApiTestRateMeterInterceptorConfig.java @@ -1,19 +1,17 @@ -package bisq.apitest.config; +package haveno.apitest.config; import java.io.File; -import static bisq.apitest.config.ApiTestConfig.CALL_RATE_METERING_CONFIG_PATH; -import static bisq.proto.grpc.DisputeAgentsGrpc.getRegisterDisputeAgentMethod; -import static bisq.proto.grpc.GetVersionGrpc.getGetVersionMethod; +import static haveno.proto.grpc.DisputeAgentsGrpc.getRegisterDisputeAgentMethod; +import static haveno.proto.grpc.GetVersionGrpc.getGetVersionMethod; +import static haveno.apitest.config.ApiTestConfig.CALL_RATE_METERING_CONFIG_PATH; import static java.lang.System.arraycopy; import static java.util.Arrays.stream; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.GrpcVersionService; -import bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig; +import haveno.daemon.grpc.GrpcVersionService; +import haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig; public class ApiTestRateMeterInterceptorConfig { diff --git a/apitest/src/main/java/bisq/apitest/config/HavenoAppConfig.java b/apitest/src/main/java/haveno/apitest/config/HavenoAppConfig.java similarity index 84% rename from apitest/src/main/java/bisq/apitest/config/HavenoAppConfig.java rename to apitest/src/main/java/haveno/apitest/config/HavenoAppConfig.java index 3411aff7..40565a0d 100644 --- a/apitest/src/main/java/bisq/apitest/config/HavenoAppConfig.java +++ b/apitest/src/main/java/haveno/apitest/config/HavenoAppConfig.java @@ -15,72 +15,68 @@ * along with Haveno. If not, see . */ -package bisq.apitest.config; +package haveno.apitest.config; -import bisq.seednode.SeedNodeMain; - -import bisq.desktop.app.HavenoAppMain; - - - -import bisq.daemon.app.HavenoDaemonMain; +import haveno.daemon.app.HavenoDaemonMain; +import haveno.desktop.app.HavenoAppMain; +import haveno.seednode.SeedNodeMain; /** - Some non user configurable Bisq seednode, arb node, bob and alice daemon option values. + Some non user configurable Haveno seednode, arb node, bob and alice daemon option values. @see dev-setup.md */ public enum HavenoAppConfig { - seednode("bisq-XMR_STAGENET_Seed_2002", - "bisq-seednode", + seednode("haveno-XMR_STAGENET_Seed_2002", + "haveno-seednode", "-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", SeedNodeMain.class.getName(), 2002, 5120, -1, 49996), - arbdaemon("bisq-XMR_STAGENET_Arb", - "bisq-daemon", + arbdaemon("haveno-XMR_STAGENET_Arb", + "haveno-daemon", "-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", HavenoDaemonMain.class.getName(), 4444, 5121, 9997, 49997), - arbdesktop("bisq-XMR_STAGENET_Arb", - "bisq-desktop", + arbdesktop("haveno-XMR_STAGENET_Arb", + "haveno-desktop", "-XX:MaxRAM=3g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", HavenoAppMain.class.getName(), 4444, 5121, -1, 49997), - alicedaemon("bisq-XMR_STAGENET_Alice", - "bisq-daemon", + alicedaemon("haveno-XMR_STAGENET_Alice", + "haveno-daemon", "-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", HavenoDaemonMain.class.getName(), 7777, 5122, 9998, 49998), - alicedesktop("bisq-XMR_STAGENET_Alice", - "bisq-desktop", + alicedesktop("haveno-XMR_STAGENET_Alice", + "haveno-desktop", "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", HavenoAppMain.class.getName(), 7777, 5122, -1, 49998), - bobdaemon("bisq-XMR_STAGENET_Bob", - "bisq-daemon", + bobdaemon("haveno-XMR_STAGENET_Bob", + "haveno-daemon", "-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", HavenoDaemonMain.class.getName(), 8888, 5123, 9999, 49999), - bobdesktop("bisq-XMR_STAGENET_Bob", - "bisq-desktop", + bobdesktop("haveno-XMR_STAGENET_Bob", + "haveno-desktop", "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", HavenoAppMain.class.getName(), 8888, diff --git a/apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java b/apitest/src/main/java/haveno/apitest/linux/AbstractLinuxProcess.java similarity index 97% rename from apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java rename to apitest/src/main/java/haveno/apitest/linux/AbstractLinuxProcess.java index f8be98ce..561b14e2 100644 --- a/apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java +++ b/apitest/src/main/java/haveno/apitest/linux/AbstractLinuxProcess.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; import java.nio.file.Paths; @@ -27,13 +27,11 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.linux.BashCommand.isAlive; +import static haveno.apitest.linux.BashCommand.isAlive; import static java.lang.String.format; import static joptsimple.internal.Strings.EMPTY; - - -import bisq.apitest.config.ApiTestConfig; +import haveno.apitest.config.ApiTestConfig; @Slf4j abstract class AbstractLinuxProcess implements LinuxProcess { diff --git a/apitest/src/main/java/bisq/apitest/linux/BashCommand.java b/apitest/src/main/java/haveno/apitest/linux/BashCommand.java similarity index 98% rename from apitest/src/main/java/bisq/apitest/linux/BashCommand.java rename to apitest/src/main/java/haveno/apitest/linux/BashCommand.java index 4c3f6b27..63771458 100644 --- a/apitest/src/main/java/bisq/apitest/linux/BashCommand.java +++ b/apitest/src/main/java/haveno/apitest/linux/BashCommand.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; import java.io.IOException; @@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.apitest.config.ApiTestConfig.BASH_PATH_VALUE; +import static haveno.apitest.config.ApiTestConfig.BASH_PATH_VALUE; import static java.lang.management.ManagementFactory.getRuntimeMXBean; @Slf4j diff --git a/apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java b/apitest/src/main/java/haveno/apitest/linux/BitcoinCli.java similarity index 98% rename from apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java rename to apitest/src/main/java/haveno/apitest/linux/BitcoinCli.java index f9cd0ebd..2a62f99a 100644 --- a/apitest/src/main/java/bisq/apitest/linux/BitcoinCli.java +++ b/apitest/src/main/java/haveno/apitest/linux/BitcoinCli.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; +import haveno.apitest.config.ApiTestConfig; import java.io.IOException; import lombok.extern.slf4j.Slf4j; - - -import bisq.apitest.config.ApiTestConfig; - @Slf4j public class BitcoinCli extends AbstractLinuxProcess implements LinuxProcess { diff --git a/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java b/apitest/src/main/java/haveno/apitest/linux/BitcoinDaemon.java similarity index 96% rename from apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java rename to apitest/src/main/java/haveno/apitest/linux/BitcoinDaemon.java index 4887fec9..bb742dd0 100644 --- a/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java +++ b/apitest/src/main/java/haveno/apitest/linux/BitcoinDaemon.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; import java.io.IOException; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.linux.BashCommand.isAlive; +import static haveno.apitest.linux.BashCommand.isAlive; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static joptsimple.internal.Strings.EMPTY; - - -import bisq.apitest.config.ApiTestConfig; +import haveno.apitest.config.ApiTestConfig; @Slf4j public class BitcoinDaemon extends AbstractLinuxProcess implements LinuxProcess { diff --git a/apitest/src/main/java/bisq/apitest/linux/HavenoProcess.java b/apitest/src/main/java/haveno/apitest/linux/HavenoProcess.java similarity index 84% rename from apitest/src/main/java/bisq/apitest/linux/HavenoProcess.java rename to apitest/src/main/java/haveno/apitest/linux/HavenoProcess.java index a08c66f5..f099c63e 100644 --- a/apitest/src/main/java/bisq/apitest/linux/HavenoProcess.java +++ b/apitest/src/main/java/haveno/apitest/linux/HavenoProcess.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; import java.nio.file.Paths; @@ -27,18 +27,16 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.linux.BashCommand.isAlive; +import static haveno.apitest.linux.BashCommand.isAlive; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MILLISECONDS; - - -import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.config.HavenoAppConfig; -import bisq.daemon.app.HavenoDaemonMain; +import haveno.apitest.config.ApiTestConfig; +import haveno.apitest.config.HavenoAppConfig; +import haveno.daemon.app.HavenoDaemonMain; /** - * Runs a regtest/dao Bisq application instance in the background. + * Runs a regtest/dao Haveno application instance in the background. */ @Slf4j public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess { @@ -50,7 +48,7 @@ public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess private final String seedNodes; private final boolean useLocalhostForP2P; public final boolean useDevPrivilegeKeys; - private final String findBisqPidScript; + private final String findHavenoPidScript; private final String debugOpts; public HavenoProcess(HavenoAppConfig havenoAppConfig, ApiTestConfig config) { @@ -62,9 +60,9 @@ public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess this.seedNodes = "localhost:2002"; this.useLocalhostForP2P = true; this.useDevPrivilegeKeys = true; - this.findBisqPidScript = (config.isRunningTest ? "." : "./apitest") - + "/scripts/get-bisq-pid.sh"; - this.debugOpts = config.enableBisqDebugging + this.findHavenoPidScript = (config.isRunningTest ? "." : "./apitest") + + "/scripts/get-haveno-pid.sh"; + this.debugOpts = config.enableHavenoDebugging ? " -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:" + havenoAppConfig.remoteDebugPort : ""; } @@ -75,7 +73,7 @@ public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess if (config.runSubprojectJars) runJar(); // run subproject/build/lib/*.jar (not full build) else - runStartupScript(); // run bisq-* script for end to end test (default) + runStartupScript(); // run haveno-* script for end to end test (default) } catch (Throwable t) { startupExceptions.add(t); } @@ -120,7 +118,7 @@ public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess } public void verifyAppNotRunning() throws IOException, InterruptedException { - long pid = findBisqAppPid(); + long pid = findHavenoAppPid(); if (pid >= 0) throw new IllegalStateException(format("%s %s already running with pid %d", havenoAppConfig.mainClassName, havenoAppConfig.appName, pid)); @@ -134,8 +132,8 @@ public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess case alicedesktop: case bobdaemon: case bobdesktop: - File bisqDataDir = new File(config.rootAppDataDir, havenoAppConfig.appName); - if (!bisqDataDir.exists()) + File havenoDataDir = new File(config.rootAppDataDir, havenoAppConfig.appName); + if (!havenoDataDir.exists()) throw new IllegalStateException(format("Application dataDir %s/%s not found", config.rootAppDataDir, havenoAppConfig.appName)); break; @@ -144,50 +142,50 @@ public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess } } - // This is the non-default way of running a Bisq app (--runSubprojectJars=true). - // It runs a java cmd, and does not depend on a full build. Bisq jars are loaded + // This is the non-default way of running a Haveno app (--runSubprojectJars=true). + // It runs a java cmd, and does not depend on a full build. Haveno jars are loaded // from the :subproject/build/libs directories. private void runJar() throws IOException, InterruptedException { String java = getJavaExecutable().getAbsolutePath(); String classpath = System.getProperty("java.class.path"); - String bisqCmd = getJavaOptsSpec() + String havenoCmd = getJavaOptsSpec() + " " + java + " -cp " + classpath + " " + havenoAppConfig.mainClassName + " " + String.join(" ", getOptsList()) + " &"; // run in background without nohup - runBashCommand(bisqCmd); + runBashCommand(havenoCmd); } - // This is the default way of running a Bisq app (--runSubprojectJars=false). - // It runs a bisq-* startup script, and depends on a full build. Bisq jars + // This is the default way of running a Haveno app (--runSubprojectJars=false). + // It runs a haveno-* startup script, and depends on a full build. Haveno jars // are loaded from the root project's lib directory. private void runStartupScript() throws IOException, InterruptedException { String startupScriptPath = config.rootProjectDir + "/" + havenoAppConfig.startupScript; - String bisqCmd = getJavaOptsSpec() + String havenoCmd = getJavaOptsSpec() + " " + startupScriptPath + " " + String.join(" ", getOptsList()) + " &"; // run in background without nohup - runBashCommand(bisqCmd); + runBashCommand(havenoCmd); } - private void runBashCommand(String bisqCmd) throws IOException, InterruptedException { + private void runBashCommand(String havenoCmd) throws IOException, InterruptedException { String cmdDescription = config.runSubprojectJars ? "java -> " + havenoAppConfig.mainClassName + " -> " + havenoAppConfig.appName : havenoAppConfig.startupScript + " -> " + havenoAppConfig.appName; - BashCommand bashCommand = new BashCommand(bisqCmd); + BashCommand bashCommand = new BashCommand(havenoCmd); log.info("Starting {} ...\n$ {}", cmdDescription, bashCommand.getCommand()); bashCommand.runInBackground(); if (bashCommand.getExitStatus() != 0) - throw new IllegalStateException(format("Error starting BisqApp%n%s%nError: %s", + throw new IllegalStateException(format("Error starting HavenoApp%n%s%nError: %s", havenoAppConfig.appName, bashCommand.getError())); // Sometimes it takes a little extra time to find the linux process id. // Wait up to two seconds before giving up and throwing an Exception. for (int i = 0; i < 4; i++) { - pid = findBisqAppPid(); + pid = findHavenoAppPid(); if (pid != -1) break; @@ -197,12 +195,12 @@ public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess throw new IllegalStateException(format("Error finding pid for %s", this.name)); log.info("{} running with pid {}", cmdDescription, pid); - log.info("Log {}", config.rootAppDataDir + "/" + havenoAppConfig.appName + "/bisq.log"); + log.info("Log {}", config.rootAppDataDir + "/" + havenoAppConfig.appName + "/haveno.log"); } - private long findBisqAppPid() throws IOException, InterruptedException { + private long findHavenoAppPid() throws IOException, InterruptedException { // Find the pid of the java process by grepping for the mainClassName and appName. - String findPidCmd = findBisqPidScript + " " + havenoAppConfig.mainClassName + " " + havenoAppConfig.appName; + String findPidCmd = findHavenoPidScript + " " + havenoAppConfig.mainClassName + " " + havenoAppConfig.appName; String psCmdOutput = new BashCommand(findPidCmd).run().getOutput(); return (psCmdOutput == null || psCmdOutput.isEmpty()) ? -1 : Long.parseLong(psCmdOutput); } diff --git a/apitest/src/main/java/bisq/apitest/linux/LinuxProcess.java b/apitest/src/main/java/haveno/apitest/linux/LinuxProcess.java similarity index 97% rename from apitest/src/main/java/bisq/apitest/linux/LinuxProcess.java rename to apitest/src/main/java/haveno/apitest/linux/LinuxProcess.java index 61a64471..fccb03f1 100644 --- a/apitest/src/main/java/bisq/apitest/linux/LinuxProcess.java +++ b/apitest/src/main/java/haveno/apitest/linux/LinuxProcess.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; import java.io.IOException; diff --git a/apitest/src/main/java/bisq/apitest/linux/SystemCommandExecutor.java b/apitest/src/main/java/haveno/apitest/linux/SystemCommandExecutor.java similarity index 99% rename from apitest/src/main/java/bisq/apitest/linux/SystemCommandExecutor.java rename to apitest/src/main/java/haveno/apitest/linux/SystemCommandExecutor.java index 597b59cb..4a91830b 100644 --- a/apitest/src/main/java/bisq/apitest/linux/SystemCommandExecutor.java +++ b/apitest/src/main/java/haveno/apitest/linux/SystemCommandExecutor.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; import java.io.IOException; import java.io.InputStream; diff --git a/apitest/src/main/java/bisq/apitest/linux/ThreadedStreamHandler.java b/apitest/src/main/java/haveno/apitest/linux/ThreadedStreamHandler.java similarity index 99% rename from apitest/src/main/java/bisq/apitest/linux/ThreadedStreamHandler.java rename to apitest/src/main/java/haveno/apitest/linux/ThreadedStreamHandler.java index 7b036af6..29328400 100644 --- a/apitest/src/main/java/bisq/apitest/linux/ThreadedStreamHandler.java +++ b/apitest/src/main/java/haveno/apitest/linux/ThreadedStreamHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.linux; +package haveno.apitest.linux; import java.io.BufferedReader; import java.io.InputStream; diff --git a/apitest/src/main/resources/blocknotify b/apitest/src/main/resources/blocknotify index 210d23f1..552a7e43 100755 --- a/apitest/src/main/resources/blocknotify +++ b/apitest/src/main/resources/blocknotify @@ -2,7 +2,7 @@ # Regtest ports start with 512* -# To avoid pesky bitcoind io errors, do not specify ports Bisq is not listening to. +# To avoid pesky bitcoind io errors, do not specify ports Haveno is not listening to. # SeedNode listens on port 5120 echo $1 | nc -w 1 127.0.0.1 5120 diff --git a/apitest/src/main/resources/logback.xml b/apitest/src/main/resources/logback.xml index 28279faa..3eb9b5ad 100644 --- a/apitest/src/main/resources/logback.xml +++ b/apitest/src/main/resources/logback.xml @@ -4,7 +4,7 @@ The :daemon & :cli jars contain their own logback.xml config files, which causes chatty logback startup. To avoid chatty logback msgs during its configuration, pass logback.configurationFile as a system property: -Dlogback.configurationFile=apitest/build/resources/main/logback.xml - The gradle build file takes care of adding this system property to the bisq-apitest script. + The gradle build file takes care of adding this system property to the haveno-apitest script. --> diff --git a/apitest/src/test/java/bisq/apitest/ApiTestCase.java b/apitest/src/test/java/haveno/apitest/ApiTestCase.java similarity index 86% rename from apitest/src/test/java/bisq/apitest/ApiTestCase.java rename to apitest/src/test/java/haveno/apitest/ApiTestCase.java index 6a1bbc6c..4e73a636 100644 --- a/apitest/src/test/java/bisq/apitest/ApiTestCase.java +++ b/apitest/src/test/java/haveno/apitest/ApiTestCase.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest; +package haveno.apitest; import java.time.Duration; @@ -30,32 +30,31 @@ import javax.annotation.Nullable; import org.junit.jupiter.api.TestInfo; -import static bisq.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.apitest.config.HavenoAppConfig.arbdaemon; -import static bisq.apitest.config.HavenoAppConfig.bobdaemon; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.arbdaemon; +import static haveno.apitest.config.HavenoAppConfig.bobdaemon; import static java.net.InetAddress.getLoopbackAddress; import static java.util.Arrays.stream; - - -import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.method.BitcoinCliHelper; -import bisq.cli.GrpcClient; +import haveno.apitest.Scaffold; +import haveno.apitest.config.ApiTestConfig; +import haveno.apitest.method.BitcoinCliHelper; +import haveno.cli.GrpcClient; /** * Base class for all test types: 'method', 'scenario' and 'e2e'. *

- * During scaffold setup, various combinations of bitcoind and bisq instances + * During scaffold setup, various combinations of bitcoind and haveno instances * can be started in the background before test cases are run. Currently, this test - * harness supports only the "Bisq DAO development environment running against a + * harness supports only the "Haveno DAO development environment running against a * local Bitcoin regtest network" as described in * dev-setup.md * and dao-setup.md. *

* Those documents contain information about the configurations used by this test harness: - * bitcoin-core's bitcoin.conf and blocknotify values, bisq instance options, the DAO genesis + * bitcoin-core's bitcoin.conf and blocknotify values, haveno instance options, the DAO genesis * transaction id, initial BTC balances for Bob & Alice accounts, and Bob and * Alice's default payment accounts. *

@@ -88,7 +87,7 @@ public class ApiTestCase { String[] params = new String[]{ "--supportingApps", stream(supportingApps).map(Enum::name).collect(Collectors.joining(",")), "--callRateMeteringConfigPath", getTestRateMeterInterceptorConfig().getAbsolutePath(), - "--enableBisqDebugging", "false" + "--enableHavenoDebugging", "false" }; setUpScaffold(params); } diff --git a/apitest/src/test/java/bisq/apitest/JUnitHelper.java b/apitest/src/test/java/haveno/apitest/JUnitHelper.java similarity index 98% rename from apitest/src/test/java/bisq/apitest/JUnitHelper.java rename to apitest/src/test/java/haveno/apitest/JUnitHelper.java index 8ea80ad0..eb11607d 100644 --- a/apitest/src/test/java/bisq/apitest/JUnitHelper.java +++ b/apitest/src/test/java/haveno/apitest/JUnitHelper.java @@ -1,4 +1,4 @@ -package bisq.apitest; +package haveno.apitest; import lombok.extern.slf4j.Slf4j; diff --git a/apitest/src/test/java/bisq/apitest/method/BitcoinCliHelper.java b/apitest/src/test/java/haveno/apitest/method/BitcoinCliHelper.java similarity index 96% rename from apitest/src/test/java/bisq/apitest/method/BitcoinCliHelper.java rename to apitest/src/test/java/haveno/apitest/method/BitcoinCliHelper.java index 113793a3..03b247fd 100644 --- a/apitest/src/test/java/bisq/apitest/method/BitcoinCliHelper.java +++ b/apitest/src/test/java/haveno/apitest/method/BitcoinCliHelper.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method; +package haveno.apitest.method; import java.io.IOException; import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.fail; - - -import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.linux.BitcoinCli; +import haveno.apitest.config.ApiTestConfig; +import haveno.apitest.linux.BitcoinCli; public final class BitcoinCliHelper { diff --git a/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java b/apitest/src/test/java/haveno/apitest/method/CallRateMeteringInterceptorTest.java similarity index 94% rename from apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java rename to apitest/src/test/java/haveno/apitest/method/CallRateMeteringInterceptorTest.java index 8fe432f7..d701486a 100644 --- a/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java +++ b/apitest/src/test/java/haveno/apitest/method/CallRateMeteringInterceptorTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method; +package haveno.apitest.method; import io.grpc.StatusRuntimeException; @@ -30,8 +30,8 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java b/apitest/src/test/java/haveno/apitest/method/GetMethodHelpTest.java similarity index 92% rename from apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java rename to apitest/src/test/java/haveno/apitest/method/GetMethodHelpTest.java index 86f872e4..51b6bb7c 100644 --- a/apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java +++ b/apitest/src/test/java/haveno/apitest/method/GetMethodHelpTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method; +package haveno.apitest.method; import lombok.extern.slf4j.Slf4j; @@ -26,8 +26,8 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.cli.Method.createoffer; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.cli.Method.createoffer; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation; diff --git a/apitest/src/test/java/bisq/apitest/method/GetVersionTest.java b/apitest/src/test/java/haveno/apitest/method/GetVersionTest.java similarity index 91% rename from apitest/src/test/java/bisq/apitest/method/GetVersionTest.java rename to apitest/src/test/java/haveno/apitest/method/GetVersionTest.java index 552db18c..5c66fb9c 100644 --- a/apitest/src/test/java/bisq/apitest/method/GetVersionTest.java +++ b/apitest/src/test/java/haveno/apitest/method/GetVersionTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method; +package haveno.apitest.method; import lombok.extern.slf4j.Slf4j; @@ -26,8 +26,8 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.common.app.Version.VERSION; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.common.app.Version.VERSION; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation; diff --git a/apitest/src/test/java/bisq/apitest/method/MethodTest.java b/apitest/src/test/java/haveno/apitest/method/MethodTest.java similarity index 84% rename from apitest/src/test/java/bisq/apitest/method/MethodTest.java rename to apitest/src/test/java/haveno/apitest/method/MethodTest.java index fa1d09f9..1de511e5 100644 --- a/apitest/src/test/java/bisq/apitest/method/MethodTest.java +++ b/apitest/src/test/java/haveno/apitest/method/MethodTest.java @@ -15,17 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method; - -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.payment.F2FAccount; -import bisq.core.payment.NationalBankAccount; -import bisq.core.proto.CoreProtoResolver; - -import bisq.common.util.Utilities; - -import bisq.proto.grpc.BalancesInfo; +package haveno.apitest.method; +import haveno.proto.grpc.BalancesInfo; +import haveno.apitest.ApiTestCase; +import haveno.apitest.linux.BashCommand; +import haveno.cli.GrpcClient; +import haveno.cli.table.builder.TableBuilder; +import haveno.common.util.Utilities; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.payment.F2FAccount; +import haveno.core.payment.NationalBankAccount; +import haveno.core.proto.CoreProtoResolver; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -43,22 +44,15 @@ import org.slf4j.Logger; import javax.annotation.Nullable; -import static bisq.apitest.config.ApiTestConfig.BTC; -import static bisq.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; -import static bisq.cli.table.builder.TableType.BTC_BALANCE_TBL; -import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent; +import static haveno.apitest.config.ApiTestConfig.BTC; +import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; +import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL; +import static haveno.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.stream; import static org.junit.jupiter.api.Assertions.fail; - - -import bisq.apitest.ApiTestCase; -import bisq.apitest.linux.BashCommand; -import bisq.cli.GrpcClient; -import bisq.cli.table.builder.TableBuilder; - public class MethodTest extends ApiTestCase { protected static final CoreProtoResolver CORE_PROTO_RESOLVER = new CoreProtoResolver(); @@ -74,7 +68,7 @@ public class MethodTest extends ApiTestCase { setUpScaffold(new String[]{ "--supportingApps", toNameList.apply(supportingApps), "--callRateMeteringConfigPath", callRateMeteringConfigFile.getAbsolutePath(), - "--enableBisqDebugging", startSupportingAppsInDebugMode ? "true" : "false" + "--enableHavenoDebugging", startSupportingAppsInDebugMode ? "true" : "false" }); doPostStartup(generateBtcBlock); } catch (Exception ex) { @@ -91,7 +85,7 @@ public class MethodTest extends ApiTestCase { setUpScaffold(new String[]{ "--supportingApps", toNameList.apply(supportingApps), "--callRateMeteringConfigPath", callRateMeteringConfigFile.getAbsolutePath(), - "--enableBisqDebugging", startSupportingAppsInDebugMode ? "true" : "false" + "--enableHavenoDebugging", startSupportingAppsInDebugMode ? "true" : "false" }); doPostStartup(generateBtcBlock); } catch (Exception ex) { @@ -108,7 +102,7 @@ public class MethodTest extends ApiTestCase { protected final File getPaymentAccountForm(GrpcClient grpcClient, String paymentMethodId) { // We take seemingly unnecessary steps to get a File object, but the point is to - // test the API, and we do not directly ask bisq.core.api.model.PaymentAccountForm + // test the API, and we do not directly ask haveno.core.api.model.PaymentAccountForm // for an empty json form (file). String jsonString = grpcClient.getPaymentAcctFormAsJson(paymentMethodId); // Write the json string to a file here in the test case. @@ -122,7 +116,7 @@ public class MethodTest extends ApiTestCase { } - protected bisq.core.payment.PaymentAccount createDummyF2FAccount(GrpcClient grpcClient, + protected haveno.core.payment.PaymentAccount createDummyF2FAccount(GrpcClient grpcClient, String countryCode) { String f2fAccountJsonString = "{\n" + " \"_COMMENTS_\": \"This is a dummy account.\",\n" + @@ -138,7 +132,7 @@ public class MethodTest extends ApiTestCase { } - protected bisq.core.payment.PaymentAccount createDummyBRLAccount(GrpcClient grpcClient, + protected haveno.core.payment.PaymentAccount createDummyBRLAccount(GrpcClient grpcClient, String holderName, String nationalAccountId, String holderTaxId) { @@ -159,12 +153,12 @@ public class MethodTest extends ApiTestCase { return nationalBankAccount; } - protected final bisq.core.payment.PaymentAccount createPaymentAccount(GrpcClient grpcClient, String jsonString) { + protected final haveno.core.payment.PaymentAccount createPaymentAccount(GrpcClient grpcClient, String jsonString) { // Normally, we do asserts on the protos from the gRPC service, but in this - // case we need a bisq.core.payment.PaymentAccount so it can be cast to its + // case we need a haveno.core.payment.PaymentAccount so it can be cast to its // sub-type. var paymentAccount = grpcClient.createPaymentAccount(jsonString); - return bisq.core.payment.PaymentAccount.fromProto(paymentAccount, CORE_PROTO_RESOLVER); + return haveno.core.payment.PaymentAccount.fromProto(paymentAccount, CORE_PROTO_RESOLVER); } public static final Supplier defaultBuyerSecurityDepositPct = () -> { @@ -214,7 +208,7 @@ public class MethodTest extends ApiTestCase { @Nullable protected static String getNodeExceptionMessages() { - var nodeLogsSpec = config.rootAppDataDir.getAbsolutePath() + "/bisq-BTC_REGTEST_*_dao/bisq.log"; + var nodeLogsSpec = config.rootAppDataDir.getAbsolutePath() + "/haveno-BTC_REGTEST_*_dao/haveno.log"; var grep = "grep Exception " + nodeLogsSpec; var bashCommand = new BashCommand(grep); try { diff --git a/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java b/apitest/src/test/java/haveno/apitest/method/RegisterDisputeAgentsTest.java similarity index 86% rename from apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java rename to apitest/src/test/java/haveno/apitest/method/RegisterDisputeAgentsTest.java index 71e012e3..8d63d995 100644 --- a/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java +++ b/apitest/src/test/java/haveno/apitest/method/RegisterDisputeAgentsTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method; +package haveno.apitest.method; import io.grpc.StatusRuntimeException; @@ -28,13 +28,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.ApiTestConfig.ARBITRATOR; -import static bisq.apitest.config.ApiTestConfig.MEDIATOR; -import static bisq.apitest.config.ApiTestConfig.REFUND_AGENT; -import static bisq.apitest.config.HavenoAppConfig.arbdaemon; -import static bisq.apitest.config.HavenoAppConfig.seednode; -import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.ApiTestConfig.ARBITRATOR; +import static haveno.apitest.config.ApiTestConfig.MEDIATOR; +import static haveno.apitest.config.ApiTestConfig.REFUND_AGENT; +import static haveno.apitest.config.HavenoAppConfig.arbdaemon; +import static haveno.apitest.config.HavenoAppConfig.seednode; +import static haveno.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; @@ -61,7 +61,7 @@ public class RegisterDisputeAgentsTest extends MethodTest { public void testRegisterArbitratorShouldThrowException() { Throwable exception = assertThrows(StatusRuntimeException.class, () -> arbClient.registerDisputeAgent(ARBITRATOR, DEV_PRIVILEGE_PRIV_KEY)); - assertEquals("UNIMPLEMENTED: arbitrators must be registered in a Bisq UI", + assertEquals("UNIMPLEMENTED: arbitrators must be registered in a Haveno UI", exception.getMessage()); } diff --git a/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java b/apitest/src/test/java/haveno/apitest/method/offer/AbstractOfferTest.java similarity index 86% rename from apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java rename to apitest/src/test/java/haveno/apitest/method/offer/AbstractOfferTest.java index dbc11f9b..70f6f302 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java +++ b/apitest/src/test/java/haveno/apitest/method/offer/AbstractOfferTest.java @@ -15,10 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.offer; - -import bisq.proto.grpc.OfferInfo; +package haveno.apitest.method.offer; +import haveno.proto.grpc.OfferInfo; +import haveno.apitest.method.MethodTest; +import haveno.cli.CliMain; +import haveno.cli.table.builder.TableBuilder; import protobuf.PaymentAccount; import java.math.BigDecimal; @@ -33,22 +35,16 @@ import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.ApiTestConfig.XMR; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.apitest.config.HavenoAppConfig.arbdaemon; -import static bisq.apitest.config.HavenoAppConfig.bobdaemon; -import static bisq.apitest.config.HavenoAppConfig.seednode; -import static bisq.cli.table.builder.TableType.OFFER_TBL; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.ApiTestConfig.XMR; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.arbdaemon; +import static haveno.apitest.config.HavenoAppConfig.bobdaemon; +import static haveno.apitest.config.HavenoAppConfig.seednode; +import static haveno.cli.table.builder.TableType.OFFER_TBL; import static java.lang.String.format; import static java.lang.System.out; - - -import bisq.apitest.method.MethodTest; -import bisq.cli.CliMain; -import bisq.cli.table.builder.TableBuilder; - @Slf4j public abstract class AbstractOfferTest extends MethodTest { diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CancelOfferTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java similarity index 96% rename from apitest/src/test/java/bisq/apitest/method/offer/CancelOfferTest.java rename to apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java index 72a3dade..aa33a126 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CancelOfferTest.java +++ b/apitest/src/test/java/haveno/apitest/method/offer/CancelOfferTest.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.offer; - -import bisq.core.payment.PaymentAccount; - -import bisq.proto.grpc.OfferInfo; +package haveno.apitest.method.offer; +import haveno.proto.grpc.OfferInfo; +import haveno.core.payment.PaymentAccount; import java.util.List; import java.util.function.Consumer; diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java similarity index 97% rename from apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java rename to apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java index 8d751c0f..604aa82b 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java +++ b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingFixedPriceTest.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.offer; - -import bisq.core.payment.PaymentAccount; +package haveno.apitest.method.offer; import lombok.extern.slf4j.Slf4j; @@ -27,9 +25,9 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.XMR; -import static bisq.apitest.config.ApiTestConfig.EUR; -import static bisq.apitest.config.ApiTestConfig.USD; +import static haveno.apitest.config.ApiTestConfig.EUR; +import static haveno.apitest.config.ApiTestConfig.USD; +import static haveno.apitest.config.ApiTestConfig.XMR; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -37,6 +35,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static protobuf.OfferDirection.BUY; import static protobuf.OfferDirection.SELL; +import haveno.core.payment.PaymentAccount; + @Disabled @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java similarity index 97% rename from apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java rename to apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java index 0505492e..1c95cd9d 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java +++ b/apitest/src/test/java/haveno/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.offer; - -import bisq.core.payment.PaymentAccount; - -import bisq.proto.grpc.OfferInfo; +package haveno.apitest.method.offer; +import haveno.proto.grpc.OfferInfo; +import haveno.core.payment.PaymentAccount; import java.text.DecimalFormat; import java.math.BigDecimal; @@ -33,11 +31,11 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.BTC; -import static bisq.apitest.config.ApiTestConfig.USD; -import static bisq.common.util.MathUtils.roundDouble; -import static bisq.common.util.MathUtils.scaleDownByPowerOf10; -import static bisq.common.util.MathUtils.scaleUpByPowerOf10; +import static haveno.apitest.config.ApiTestConfig.BTC; +import static haveno.apitest.config.ApiTestConfig.USD; +import static haveno.common.util.MathUtils.roundDouble; +import static haveno.common.util.MathUtils.scaleDownByPowerOf10; +import static haveno.common.util.MathUtils.scaleUpByPowerOf10; import static java.lang.Math.abs; import static java.lang.String.format; import static java.math.RoundingMode.HALF_UP; diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateXMROffersTest.java b/apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java similarity index 98% rename from apitest/src/test/java/bisq/apitest/method/offer/CreateXMROffersTest.java rename to apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java index e4dddb7a..49769692 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateXMROffersTest.java +++ b/apitest/src/test/java/haveno/apitest/method/offer/CreateXMROffersTest.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.offer; +package haveno.apitest.method.offer; -import bisq.proto.grpc.OfferInfo; +import haveno.proto.grpc.OfferInfo; import java.util.List; @@ -30,8 +30,8 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.BTC; -import static bisq.apitest.config.ApiTestConfig.XMR; +import static haveno.apitest.config.ApiTestConfig.BTC; +import static haveno.apitest.config.ApiTestConfig.XMR; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/apitest/src/test/java/bisq/apitest/method/offer/ValidateCreateOfferTest.java b/apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java similarity index 96% rename from apitest/src/test/java/bisq/apitest/method/offer/ValidateCreateOfferTest.java rename to apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java index 1409da28..513aa957 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/ValidateCreateOfferTest.java +++ b/apitest/src/test/java/haveno/apitest/method/offer/ValidateCreateOfferTest.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.offer; - -import bisq.core.payment.PaymentAccount; +package haveno.apitest.method.offer; import io.grpc.StatusRuntimeException; @@ -29,12 +27,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.BTC; +import static haveno.apitest.config.ApiTestConfig.BTC; import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static protobuf.OfferDirection.BUY; +import haveno.core.payment.PaymentAccount; + @Disabled @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java b/apitest/src/test/java/haveno/apitest/method/payment/AbstractPaymentAccountTest.java similarity index 97% rename from apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java rename to apitest/src/test/java/haveno/apitest/method/payment/AbstractPaymentAccountTest.java index 544ac930..80fff914 100644 --- a/apitest/src/test/java/bisq/apitest/method/payment/AbstractPaymentAccountTest.java +++ b/apitest/src/test/java/haveno/apitest/method/payment/AbstractPaymentAccountTest.java @@ -1,15 +1,15 @@ -package bisq.apitest.method.payment; - -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; +package haveno.apitest.method.payment; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.stream.JsonWriter; - +import haveno.apitest.method.MethodTest; +import haveno.cli.GrpcClient; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; import java.nio.file.Paths; import java.io.File; @@ -36,11 +36,6 @@ import static java.lang.System.getProperty; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.*; - - -import bisq.apitest.method.MethodTest; -import bisq.cli.GrpcClient; - @Slf4j public class AbstractPaymentAccountTest extends MethodTest { diff --git a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java b/apitest/src/test/java/haveno/apitest/method/payment/CreatePaymentAccountTest.java similarity index 96% rename from apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java rename to apitest/src/test/java/haveno/apitest/method/payment/CreatePaymentAccountTest.java index 6bfffaa0..3e7afe9c 100644 --- a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java +++ b/apitest/src/test/java/haveno/apitest/method/payment/CreatePaymentAccountTest.java @@ -15,48 +15,48 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.payment; - -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.AdvancedCashAccount; -import bisq.core.payment.AliPayAccount; -import bisq.core.payment.AustraliaPayidAccount; -import bisq.core.payment.CapitualAccount; -import bisq.core.payment.CashDepositAccount; -import bisq.core.payment.ClearXchangeAccount; -import bisq.core.payment.F2FAccount; -import bisq.core.payment.FasterPaymentsAccount; -import bisq.core.payment.HalCashAccount; -import bisq.core.payment.InteracETransferAccount; -import bisq.core.payment.JapanBankAccount; -import bisq.core.payment.MoneyBeamAccount; -import bisq.core.payment.MoneyGramAccount; -import bisq.core.payment.NationalBankAccount; -import bisq.core.payment.PaxumAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PayseraAccount; -import bisq.core.payment.PerfectMoneyAccount; -import bisq.core.payment.PopmoneyAccount; -import bisq.core.payment.PromptPayAccount; -import bisq.core.payment.RevolutAccount; -import bisq.core.payment.SameBankAccount; -import bisq.core.payment.SepaAccount; -import bisq.core.payment.SepaInstantAccount; -import bisq.core.payment.SpecificBanksAccount; -import bisq.core.payment.SwiftAccount; -import bisq.core.payment.SwishAccount; -import bisq.core.payment.TransferwiseAccount; -import bisq.core.payment.USPostalMoneyOrderAccount; -import bisq.core.payment.UpholdAccount; -import bisq.core.payment.WeChatPayAccount; -import bisq.core.payment.WesternUnionAccount; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.CashDepositAccountPayload; -import bisq.core.payment.payload.SameBankAccountPayload; -import bisq.core.payment.payload.SpecificBanksAccountPayload; -import bisq.core.payment.payload.SwiftAccountPayload; +package haveno.apitest.method.payment; +import haveno.cli.table.builder.TableBuilder; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.AdvancedCashAccount; +import haveno.core.payment.AliPayAccount; +import haveno.core.payment.AustraliaPayidAccount; +import haveno.core.payment.CapitualAccount; +import haveno.core.payment.CashDepositAccount; +import haveno.core.payment.ClearXchangeAccount; +import haveno.core.payment.F2FAccount; +import haveno.core.payment.FasterPaymentsAccount; +import haveno.core.payment.HalCashAccount; +import haveno.core.payment.InteracETransferAccount; +import haveno.core.payment.JapanBankAccount; +import haveno.core.payment.MoneyBeamAccount; +import haveno.core.payment.MoneyGramAccount; +import haveno.core.payment.NationalBankAccount; +import haveno.core.payment.PaxumAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PayseraAccount; +import haveno.core.payment.PerfectMoneyAccount; +import haveno.core.payment.PopmoneyAccount; +import haveno.core.payment.PromptPayAccount; +import haveno.core.payment.RevolutAccount; +import haveno.core.payment.SameBankAccount; +import haveno.core.payment.SepaAccount; +import haveno.core.payment.SepaInstantAccount; +import haveno.core.payment.SpecificBanksAccount; +import haveno.core.payment.SwiftAccount; +import haveno.core.payment.SwishAccount; +import haveno.core.payment.TransferwiseAccount; +import haveno.core.payment.USPostalMoneyOrderAccount; +import haveno.core.payment.UpholdAccount; +import haveno.core.payment.WeChatPayAccount; +import haveno.core.payment.WesternUnionAccount; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.CashDepositAccountPayload; +import haveno.core.payment.payload.SameBankAccountPayload; +import haveno.core.payment.payload.SpecificBanksAccountPayload; +import haveno.core.payment.payload.SwiftAccountPayload; import io.grpc.StatusRuntimeException; import java.io.File; @@ -76,24 +76,20 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.ApiTestConfig.EUR; -import static bisq.apitest.config.ApiTestConfig.USD; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL; -import static bisq.core.locale.CurrencyUtil.getAllSortedFiatCurrencies; -import static bisq.core.locale.CurrencyUtil.getTradeCurrency; -import static bisq.core.payment.payload.PaymentMethod.*; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.ApiTestConfig.EUR; +import static haveno.apitest.config.ApiTestConfig.USD; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL; +import static haveno.core.locale.CurrencyUtil.getAllSortedFiatCurrencies; +import static haveno.core.locale.CurrencyUtil.getTradeCurrency; +import static haveno.core.payment.payload.PaymentMethod.*; import static java.util.Comparator.comparing; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation; - - -import bisq.cli.table.builder.TableBuilder; - @SuppressWarnings({"OptionalGetWithoutIsPresent", "ConstantConditions"}) @Disabled @Slf4j diff --git a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java b/apitest/src/test/java/haveno/apitest/method/payment/GetPaymentMethodsTest.java similarity index 85% rename from apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java rename to apitest/src/test/java/haveno/apitest/method/payment/GetPaymentMethodsTest.java index f73175e0..77bb3373 100644 --- a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java +++ b/apitest/src/test/java/haveno/apitest/method/payment/GetPaymentMethodsTest.java @@ -1,4 +1,4 @@ -package bisq.apitest.method.payment; +package haveno.apitest.method.payment; import protobuf.PaymentMethod; @@ -15,14 +15,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; - - -import bisq.apitest.method.MethodTest; +import haveno.apitest.method.MethodTest; @Disabled @Slf4j diff --git a/apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java b/apitest/src/test/java/haveno/apitest/method/trade/AbstractTradeTest.java similarity index 93% rename from apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java rename to apitest/src/test/java/haveno/apitest/method/trade/AbstractTradeTest.java index b966eb83..720b6fc7 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java +++ b/apitest/src/test/java/haveno/apitest/method/trade/AbstractTradeTest.java @@ -1,7 +1,10 @@ -package bisq.apitest.method.trade; - -import bisq.proto.grpc.TradeInfo; +package haveno.apitest.method.trade; +import haveno.proto.grpc.TradeInfo; +import haveno.apitest.method.offer.AbstractOfferTest; +import haveno.cli.CliMain; +import haveno.cli.GrpcClient; +import haveno.cli.table.builder.TableBuilder; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; @@ -13,24 +16,17 @@ import lombok.Getter; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.TestInfo; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; -import static bisq.core.trade.Trade.Phase.DEPOSITS_UNLOCKED; -import static bisq.core.trade.Trade.Phase.PAYMENT_SENT; -import static bisq.core.trade.Trade.Phase.PAYMENT_RECEIVED; -import static bisq.core.trade.Trade.State.BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG; -import static bisq.core.trade.Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN; -import static bisq.core.trade.Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; +import static haveno.core.trade.Trade.Phase.DEPOSITS_UNLOCKED; +import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED; +import static haveno.core.trade.Trade.Phase.PAYMENT_SENT; +import static haveno.core.trade.Trade.State.BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG; +import static haveno.core.trade.Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN; +import static haveno.core.trade.Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG; import static java.lang.String.format; import static java.lang.System.out; import static org.junit.jupiter.api.Assertions.*; - - -import bisq.apitest.method.offer.AbstractOfferTest; -import bisq.cli.CliMain; -import bisq.cli.GrpcClient; -import bisq.cli.table.builder.TableBuilder; - public class AbstractTradeTest extends AbstractOfferTest { public static final ExpectedProtocolStatus EXPECTED_PROTOCOL_STATUS = new ExpectedProtocolStatus(); diff --git a/apitest/src/test/java/bisq/apitest/method/trade/ExpectedProtocolStatus.java b/apitest/src/test/java/haveno/apitest/method/trade/ExpectedProtocolStatus.java similarity index 96% rename from apitest/src/test/java/bisq/apitest/method/trade/ExpectedProtocolStatus.java rename to apitest/src/test/java/haveno/apitest/method/trade/ExpectedProtocolStatus.java index 44fb1ad8..aeab6f8e 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/ExpectedProtocolStatus.java +++ b/apitest/src/test/java/haveno/apitest/method/trade/ExpectedProtocolStatus.java @@ -1,6 +1,6 @@ -package bisq.apitest.method.trade; +package haveno.apitest.method.trade; -import bisq.core.trade.Trade; +import haveno.core.trade.Trade; /** * A test fixture encapsulating expected trade protocol status. diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java similarity index 94% rename from apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java rename to apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java index ab02303d..f5e0c1d6 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java +++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferTest.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.trade; - -import bisq.core.payment.PaymentAccount; +package haveno.apitest.method.trade; import io.grpc.StatusRuntimeException; @@ -30,14 +28,16 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.USD; -import static bisq.core.trade.Trade.Phase.PAYMENT_RECEIVED; -import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; +import static haveno.apitest.config.ApiTestConfig.USD; +import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED; +import static haveno.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static protobuf.OfferDirection.BUY; import static protobuf.OpenOffer.State.AVAILABLE; +import haveno.core.payment.PaymentAccount; + @Disabled @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java similarity index 97% rename from apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java rename to apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java index 067e6fff..50e5dd03 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java +++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java @@ -32,10 +32,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.trade; - -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.NationalBankAccountPayload; +package haveno.apitest.method.trade; import io.grpc.StatusRuntimeException; @@ -49,14 +46,17 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.BTC; -import static bisq.core.trade.Trade.Phase.PAYMENT_RECEIVED; -import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; +import static haveno.apitest.config.ApiTestConfig.BTC; +import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED; +import static haveno.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; import static org.junit.jupiter.api.Assertions.*; import static protobuf.Offer.State.OFFER_FEE_RESERVED; import static protobuf.OfferDirection.BUY; import static protobuf.OpenOffer.State.AVAILABLE; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.NationalBankAccountPayload; + /** * Test case verifies trade can be made with national bank payment method, * and json contracts exclude bank acct details until deposit tx is confirmed. diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyXMROfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java similarity index 91% rename from apitest/src/test/java/bisq/apitest/method/trade/TakeBuyXMROfferTest.java rename to apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java index 33a9e420..f440691c 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyXMROfferTest.java +++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeBuyXMROfferTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.trade; +package haveno.apitest.method.trade; import io.grpc.StatusRuntimeException; @@ -29,19 +29,17 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.XMR; -import static bisq.cli.table.builder.TableType.OFFER_TBL; -import static bisq.core.trade.Trade.Phase.PAYMENT_RECEIVED; -import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; +import static haveno.apitest.config.ApiTestConfig.XMR; +import static haveno.cli.table.builder.TableType.OFFER_TBL; +import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED; +import static haveno.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static protobuf.Offer.State.OFFER_FEE_RESERVED; import static protobuf.OfferDirection.SELL; - - -import bisq.apitest.method.offer.AbstractOfferTest; -import bisq.cli.table.builder.TableBuilder; +import haveno.apitest.method.offer.AbstractOfferTest; +import haveno.cli.table.builder.TableBuilder; @Disabled @Slf4j @@ -121,8 +119,8 @@ public class TakeBuyXMROfferTest extends AbstractTradeTest { sleep(2_000); var trade = aliceClient.getTrade(tradeId); // If we were trading BSQ, Alice would verify payment has been sent to her - // Bisq wallet, but we can do no such checks for XMR payments. - // All XMR transfers are done outside Bisq. + // Haveno wallet, but we can do no such checks for XMR payments. + // All XMR transfers are done outside Haveno. log.debug("Alice verifies XMR payment was received from Bob, for trade {}", trade.getTradeId()); aliceClient.confirmPaymentReceived(trade.getTradeId()); sleep(3_000); diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java similarity index 91% rename from apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java rename to apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java index 46d938d2..11bcaafe 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java +++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellBTCOfferTest.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.trade; - -import bisq.core.payment.PaymentAccount; +package haveno.apitest.method.trade; import io.grpc.StatusRuntimeException; @@ -30,18 +28,20 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.BTC; -import static bisq.apitest.config.ApiTestConfig.USD; -import static bisq.core.trade.Trade.Phase.PAYMENT_RECEIVED; -import static bisq.core.trade.Trade.Phase.COMPLETED; -import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; -import static bisq.core.trade.Trade.State.TRADE_COMPLETED; +import static haveno.apitest.config.ApiTestConfig.BTC; +import static haveno.apitest.config.ApiTestConfig.USD; +import static haveno.core.trade.Trade.Phase.COMPLETED; +import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED; +import static haveno.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; +import static haveno.core.trade.Trade.State.TRADE_COMPLETED; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static protobuf.Offer.State.OFFER_FEE_RESERVED; import static protobuf.OfferDirection.SELL; +import haveno.core.payment.PaymentAccount; + @Disabled @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java similarity index 90% rename from apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java rename to apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java index a10d9786..2aa996fb 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java +++ b/apitest/src/test/java/haveno/apitest/method/trade/TakeSellXMROfferTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.method.trade; +package haveno.apitest.method.trade; import io.grpc.StatusRuntimeException; @@ -29,19 +29,17 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.BTC; -import static bisq.apitest.config.ApiTestConfig.XMR; -import static bisq.cli.table.builder.TableType.OFFER_TBL; -import static bisq.core.trade.Trade.Phase.PAYMENT_RECEIVED; -import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; +import static haveno.apitest.config.ApiTestConfig.BTC; +import static haveno.apitest.config.ApiTestConfig.XMR; +import static haveno.cli.table.builder.TableType.OFFER_TBL; +import static haveno.core.trade.Trade.Phase.PAYMENT_RECEIVED; +import static haveno.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static protobuf.OfferDirection.BUY; - - -import bisq.apitest.method.offer.AbstractOfferTest; -import bisq.cli.table.builder.TableBuilder; +import haveno.apitest.method.offer.AbstractOfferTest; +import haveno.cli.table.builder.TableBuilder; @Disabled @Slf4j @@ -128,8 +126,8 @@ public class TakeSellXMROfferTest extends AbstractTradeTest { var trade = bobClient.getTrade(tradeId); sleep(2_000); // If we were trading BTC, Bob would verify payment has been sent to his - // Bisq wallet, but we can do no such checks for XMR payments. - // All XMR transfers are done outside Bisq. + // Haveno wallet, but we can do no such checks for XMR payments. + // All XMR transfers are done outside Haveno. log.debug("Bob verifies XMR payment was received from Alice, for trade {}", trade.getTradeId()); bobClient.confirmPaymentReceived(trade.getTradeId()); sleep(3_000); diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java b/apitest/src/test/java/haveno/apitest/method/wallet/BtcWalletTest.java similarity index 75% rename from apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java rename to apitest/src/test/java/haveno/apitest/method/wallet/BtcWalletTest.java index 033c8411..6de7fd3b 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java +++ b/apitest/src/test/java/haveno/apitest/method/wallet/BtcWalletTest.java @@ -1,7 +1,8 @@ -package bisq.apitest.method.wallet; - -import bisq.proto.grpc.BtcBalanceInfo; +package haveno.apitest.method.wallet; +import haveno.proto.grpc.BtcBalanceInfo; +import haveno.apitest.method.MethodTest; +import haveno.cli.table.builder.TableBuilder; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.AfterAll; @@ -12,24 +13,19 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.apitest.config.HavenoAppConfig.bobdaemon; -import static bisq.apitest.config.HavenoAppConfig.seednode; -import static bisq.apitest.method.wallet.WalletTestUtil.INITIAL_BTC_BALANCES; -import static bisq.apitest.method.wallet.WalletTestUtil.verifyBtcBalances; -import static bisq.cli.table.builder.TableType.ADDRESS_BALANCE_TBL; -import static bisq.cli.table.builder.TableType.BTC_BALANCE_TBL; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.bobdaemon; +import static haveno.apitest.config.HavenoAppConfig.seednode; +import static haveno.apitest.method.wallet.WalletTestUtil.INITIAL_BTC_BALANCES; +import static haveno.apitest.method.wallet.WalletTestUtil.verifyBtcBalances; +import static haveno.cli.table.builder.TableType.ADDRESS_BALANCE_TBL; +import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation; - - -import bisq.apitest.method.MethodTest; -import bisq.cli.table.builder.TableBuilder; - @Disabled @Slf4j @TestMethodOrder(OrderAnnotation.class) @@ -50,7 +46,7 @@ public class BtcWalletTest extends MethodTest { @Test @Order(1) public void testInitialBtcBalances(final TestInfo testInfo) { - // Bob & Alice's regtest Bisq wallets were initialized with 10 BTC. + // Bob & Alice's regtest Haveno wallets were initialized with 10 BTC. BtcBalanceInfo alicesBalances = aliceClient.getBtcBalances(); log.debug("{} Alice's BTC Balances:\n{}", @@ -84,8 +80,8 @@ public class BtcWalletTest extends MethodTest { // New balance is 12.5 BTC btcBalanceInfo = aliceClient.getBtcBalances(); - bisq.core.api.model.BtcBalanceInfo alicesExpectedBalances = - bisq.core.api.model.BtcBalanceInfo.valueOf(1250000000, + haveno.core.api.model.BtcBalanceInfo alicesExpectedBalances = + haveno.core.api.model.BtcBalanceInfo.valueOf(1250000000, 0, 1250000000, 0); diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java b/apitest/src/test/java/haveno/apitest/method/wallet/WalletProtectionTest.java similarity index 96% rename from apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java rename to apitest/src/test/java/haveno/apitest/method/wallet/WalletProtectionTest.java index f600480b..b86fde3c 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java +++ b/apitest/src/test/java/haveno/apitest/method/wallet/WalletProtectionTest.java @@ -1,4 +1,4 @@ -package bisq.apitest.method.wallet; +package haveno.apitest.method.wallet; import io.grpc.StatusRuntimeException; @@ -11,16 +11,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.MethodOrderer.OrderAnnotation; - - -import bisq.apitest.method.MethodTest; +import haveno.apitest.method.MethodTest; @SuppressWarnings("ResultOfMethodCallIgnored") @Disabled diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/WalletTestUtil.java b/apitest/src/test/java/haveno/apitest/method/wallet/WalletTestUtil.java similarity index 70% rename from apitest/src/test/java/bisq/apitest/method/wallet/WalletTestUtil.java rename to apitest/src/test/java/haveno/apitest/method/wallet/WalletTestUtil.java index 915607bc..0ea924c1 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/WalletTestUtil.java +++ b/apitest/src/test/java/haveno/apitest/method/wallet/WalletTestUtil.java @@ -1,6 +1,6 @@ -package bisq.apitest.method.wallet; +package haveno.apitest.method.wallet; -import bisq.proto.grpc.BtcBalanceInfo; +import haveno.proto.grpc.BtcBalanceInfo; import lombok.extern.slf4j.Slf4j; @@ -11,13 +11,13 @@ public class WalletTestUtil { // All api tests depend on the DAO / regtest environment, and Bob & Alice's wallets // are initialized with 10 BTC during the scaffolding setup. - public static final bisq.core.api.model.BtcBalanceInfo INITIAL_BTC_BALANCES = - bisq.core.api.model.BtcBalanceInfo.valueOf(1000000000, + public static final haveno.core.api.model.BtcBalanceInfo INITIAL_BTC_BALANCES = + haveno.core.api.model.BtcBalanceInfo.valueOf(1000000000, 0, 1000000000, 0); - public static void verifyBtcBalances(bisq.core.api.model.BtcBalanceInfo expected, + public static void verifyBtcBalances(haveno.core.api.model.BtcBalanceInfo expected, BtcBalanceInfo actual) { assertEquals(expected.getAvailableBalance(), actual.getAvailableBalance()); assertEquals(expected.getReservedBalance(), actual.getReservedBalance()); diff --git a/apitest/src/test/java/bisq/apitest/scenario/LongRunningOfferDeactivationTest.java b/apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java similarity index 97% rename from apitest/src/test/java/bisq/apitest/scenario/LongRunningOfferDeactivationTest.java rename to apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java index 59fbc27b..d8ebd1e9 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/LongRunningOfferDeactivationTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/LongRunningOfferDeactivationTest.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario; - -import bisq.core.payment.PaymentAccount; - -import bisq.proto.grpc.OfferInfo; +package haveno.apitest.scenario; +import haveno.proto.grpc.OfferInfo; +import haveno.apitest.method.offer.AbstractOfferTest; +import haveno.core.payment.PaymentAccount; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.MethodOrderer; @@ -35,10 +34,6 @@ import static org.junit.jupiter.api.Assertions.fail; import static protobuf.OfferDirection.BUY; import static protobuf.OfferDirection.SELL; - - -import bisq.apitest.method.offer.AbstractOfferTest; - /** * Used to verify trigger based, automatic offer deactivation works. * Disabled by default. diff --git a/apitest/src/test/java/bisq/apitest/scenario/LongRunningTradesTest.java b/apitest/src/test/java/haveno/apitest/scenario/LongRunningTradesTest.java similarity index 94% rename from apitest/src/test/java/bisq/apitest/scenario/LongRunningTradesTest.java rename to apitest/src/test/java/haveno/apitest/scenario/LongRunningTradesTest.java index 81273de6..e715fc12 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/LongRunningTradesTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/LongRunningTradesTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario; +package haveno.apitest.scenario; import lombok.extern.slf4j.Slf4j; @@ -28,11 +28,9 @@ import org.junit.jupiter.api.condition.EnabledIf; import static java.lang.System.getenv; - - -import bisq.apitest.method.trade.AbstractTradeTest; -import bisq.apitest.method.trade.TakeBuyBTCOfferTest; -import bisq.apitest.method.trade.TakeSellBTCOfferTest; +import haveno.apitest.method.trade.AbstractTradeTest; +import haveno.apitest.method.trade.TakeBuyBTCOfferTest; +import haveno.apitest.method.trade.TakeSellBTCOfferTest; @EnabledIf("envLongRunningTestEnabled") @Slf4j diff --git a/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java b/apitest/src/test/java/haveno/apitest/scenario/OfferTest.java similarity index 88% rename from apitest/src/test/java/bisq/apitest/scenario/OfferTest.java rename to apitest/src/test/java/haveno/apitest/scenario/OfferTest.java index 5e078455..3b13bca4 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/OfferTest.java @@ -15,9 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario; +package haveno.apitest.scenario; +import haveno.apitest.method.offer.AbstractOfferTest; +import haveno.apitest.method.offer.CancelOfferTest; +import haveno.apitest.method.offer.CreateOfferUsingFixedPriceTest; +import haveno.apitest.method.offer.CreateOfferUsingMarketPriceMarginTest; +import haveno.apitest.method.offer.CreateXMROffersTest; +import haveno.apitest.method.offer.ValidateCreateOfferTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; @@ -26,15 +32,6 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; - - -import bisq.apitest.method.offer.AbstractOfferTest; -import bisq.apitest.method.offer.CancelOfferTest; -import bisq.apitest.method.offer.CreateOfferUsingFixedPriceTest; -import bisq.apitest.method.offer.CreateOfferUsingMarketPriceMarginTest; -import bisq.apitest.method.offer.CreateXMROffersTest; -import bisq.apitest.method.offer.ValidateCreateOfferTest; - @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class OfferTest extends AbstractOfferTest { diff --git a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java b/apitest/src/test/java/haveno/apitest/scenario/PaymentAccountTest.java similarity index 88% rename from apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java rename to apitest/src/test/java/haveno/apitest/scenario/PaymentAccountTest.java index 47d0eb16..75973f1b 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/PaymentAccountTest.java @@ -1,4 +1,4 @@ -package bisq.apitest.scenario; +package haveno.apitest.scenario; import lombok.extern.slf4j.Slf4j; @@ -10,16 +10,14 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.apitest.config.HavenoAppConfig.seednode; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.seednode; import static org.junit.jupiter.api.Assertions.fail; - - -import bisq.apitest.method.payment.AbstractPaymentAccountTest; -import bisq.apitest.method.payment.CreatePaymentAccountTest; -import bisq.apitest.method.payment.GetPaymentMethodsTest; +import haveno.apitest.method.payment.AbstractPaymentAccountTest; +import haveno.apitest.method.payment.CreatePaymentAccountTest; +import haveno.apitest.method.payment.GetPaymentMethodsTest; @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java b/apitest/src/test/java/haveno/apitest/scenario/ScriptedBotTest.java similarity index 82% rename from apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java rename to apitest/src/test/java/haveno/apitest/scenario/ScriptedBotTest.java index 7336e375..6bd35463 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/ScriptedBotTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario; +package haveno.apitest.scenario; import lombok.extern.slf4j.Slf4j; @@ -28,23 +28,21 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.condition.EnabledIf; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.apitest.config.HavenoAppConfig.arbdaemon; -import static bisq.apitest.config.HavenoAppConfig.bobdaemon; -import static bisq.apitest.config.HavenoAppConfig.seednode; -import static bisq.apitest.scenario.bot.shutdown.ManualShutdown.startShutdownTimer; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.arbdaemon; +import static haveno.apitest.config.HavenoAppConfig.bobdaemon; +import static haveno.apitest.config.HavenoAppConfig.seednode; +import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.startShutdownTimer; import static org.junit.jupiter.api.Assertions.fail; - - -import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.method.BitcoinCliHelper; -import bisq.apitest.scenario.bot.AbstractBotTest; -import bisq.apitest.scenario.bot.BotClient; -import bisq.apitest.scenario.bot.RobotBob; -import bisq.apitest.scenario.bot.script.BashScriptGenerator; -import bisq.apitest.scenario.bot.shutdown.ManualBotShutdownException; +import haveno.apitest.config.ApiTestConfig; +import haveno.apitest.method.BitcoinCliHelper; +import haveno.apitest.scenario.bot.AbstractBotTest; +import haveno.apitest.scenario.bot.BotClient; +import haveno.apitest.scenario.bot.RobotBob; +import haveno.apitest.scenario.bot.script.BashScriptGenerator; +import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException; // The test case is enabled if AbstractBotTest#botScriptExists() returns true. @EnabledIf("botScriptExists") diff --git a/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java b/apitest/src/test/java/haveno/apitest/scenario/StartupTest.java similarity index 81% rename from apitest/src/test/java/bisq/apitest/scenario/StartupTest.java rename to apitest/src/test/java/haveno/apitest/scenario/StartupTest.java index 4661dec9..2e7664aa 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/StartupTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario; +package haveno.apitest.scenario; import java.io.File; import java.io.IOException; @@ -29,21 +29,19 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.apitest.config.HavenoAppConfig.arbdaemon; -import static bisq.apitest.config.HavenoAppConfig.seednode; -import static bisq.common.file.FileUtil.deleteFileIfExists; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateMeterInterceptorConfig; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.arbdaemon; +import static haveno.apitest.config.HavenoAppConfig.seednode; +import static haveno.common.file.FileUtil.deleteFileIfExists; import static org.junit.jupiter.api.Assertions.fail; - - -import bisq.apitest.method.CallRateMeteringInterceptorTest; -import bisq.apitest.method.GetMethodHelpTest; -import bisq.apitest.method.GetVersionTest; -import bisq.apitest.method.MethodTest; -import bisq.apitest.method.RegisterDisputeAgentsTest; +import haveno.apitest.method.CallRateMeteringInterceptorTest; +import haveno.apitest.method.GetMethodHelpTest; +import haveno.apitest.method.GetVersionTest; +import haveno.apitest.method.MethodTest; +import haveno.apitest.method.RegisterDisputeAgentsTest; @Slf4j diff --git a/apitest/src/test/java/bisq/apitest/scenario/TradeTest.java b/apitest/src/test/java/haveno/apitest/scenario/TradeTest.java similarity index 88% rename from apitest/src/test/java/bisq/apitest/scenario/TradeTest.java rename to apitest/src/test/java/haveno/apitest/scenario/TradeTest.java index 9be18bea..c4eaa440 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/TradeTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/TradeTest.java @@ -15,8 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario; +package haveno.apitest.scenario; +import haveno.apitest.method.trade.AbstractTradeTest; +import haveno.apitest.method.trade.TakeBuyBTCOfferTest; +import haveno.apitest.method.trade.TakeBuyBTCOfferWithNationalBankAcctTest; +import haveno.apitest.method.trade.TakeBuyXMROfferTest; +import haveno.apitest.method.trade.TakeSellBTCOfferTest; +import haveno.apitest.method.trade.TakeSellXMROfferTest; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; @@ -27,15 +33,6 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; - -import bisq.apitest.method.trade.AbstractTradeTest; -import bisq.apitest.method.trade.TakeBuyBTCOfferTest; -import bisq.apitest.method.trade.TakeBuyBTCOfferWithNationalBankAcctTest; -import bisq.apitest.method.trade.TakeBuyXMROfferTest; -import bisq.apitest.method.trade.TakeSellBTCOfferTest; -import bisq.apitest.method.trade.TakeSellXMROfferTest; - - @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TradeTest extends AbstractTradeTest { diff --git a/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java b/apitest/src/test/java/haveno/apitest/scenario/WalletTest.java similarity index 84% rename from apitest/src/test/java/bisq/apitest/scenario/WalletTest.java rename to apitest/src/test/java/haveno/apitest/scenario/WalletTest.java index ebd8a964..3dccec77 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/WalletTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario; +package haveno.apitest.scenario; import lombok.extern.slf4j.Slf4j; @@ -27,17 +27,15 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.HavenoAppConfig.alicedaemon; -import static bisq.apitest.config.HavenoAppConfig.arbdaemon; -import static bisq.apitest.config.HavenoAppConfig.bobdaemon; -import static bisq.apitest.config.HavenoAppConfig.seednode; +import static haveno.apitest.Scaffold.BitcoinCoreApp.bitcoind; +import static haveno.apitest.config.HavenoAppConfig.alicedaemon; +import static haveno.apitest.config.HavenoAppConfig.arbdaemon; +import static haveno.apitest.config.HavenoAppConfig.bobdaemon; +import static haveno.apitest.config.HavenoAppConfig.seednode; - - -import bisq.apitest.method.MethodTest; -import bisq.apitest.method.wallet.BtcWalletTest; -import bisq.apitest.method.wallet.WalletProtectionTest; +import haveno.apitest.method.MethodTest; +import haveno.apitest.method.wallet.BtcWalletTest; +import haveno.apitest.method.wallet.WalletProtectionTest; @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/AbstractBotTest.java b/apitest/src/test/java/haveno/apitest/scenario/bot/AbstractBotTest.java similarity index 90% rename from apitest/src/test/java/bisq/apitest/scenario/bot/AbstractBotTest.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/AbstractBotTest.java index 0d9e627c..f03cdc44 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/AbstractBotTest.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/AbstractBotTest.java @@ -15,14 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot; - -import bisq.core.locale.Country; +package haveno.apitest.scenario.bot; import protobuf.PaymentAccount; import com.google.gson.GsonBuilder; - +import haveno.apitest.method.MethodTest; +import haveno.apitest.scenario.bot.script.BashScriptGenerator; +import haveno.apitest.scenario.bot.script.BotScript; +import haveno.core.locale.Country; import java.nio.file.Paths; import java.io.File; @@ -30,19 +31,13 @@ import java.io.IOException; import lombok.extern.slf4j.Slf4j; -import static bisq.core.locale.CountryUtil.findCountryByCode; -import static bisq.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID; -import static bisq.core.payment.payload.PaymentMethod.getPaymentMethod; +import static haveno.core.locale.CountryUtil.findCountryByCode; +import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID; +import static haveno.core.payment.payload.PaymentMethod.getPaymentMethod; import static java.lang.String.format; import static java.lang.System.getProperty; import static java.nio.file.Files.readAllBytes; - - -import bisq.apitest.method.MethodTest; -import bisq.apitest.scenario.bot.script.BashScriptGenerator; -import bisq.apitest.scenario.bot.script.BotScript; - @Slf4j public abstract class AbstractBotTest extends MethodTest { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/Bot.java b/apitest/src/test/java/haveno/apitest/scenario/bot/Bot.java similarity index 85% rename from apitest/src/test/java/bisq/apitest/scenario/bot/Bot.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/Bot.java index 1fb46e71..9d86a30a 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/Bot.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/Bot.java @@ -1,23 +1,19 @@ -package bisq.apitest.scenario.bot; - -import bisq.core.locale.Country; +package haveno.apitest.scenario.bot; +import haveno.apitest.method.BitcoinCliHelper; +import haveno.apitest.scenario.bot.script.BashScriptGenerator; +import haveno.apitest.scenario.bot.script.BotScript; +import haveno.core.locale.Country; import protobuf.PaymentAccount; import lombok.extern.slf4j.Slf4j; -import static bisq.core.locale.CountryUtil.findCountryByCode; -import static bisq.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID; -import static bisq.core.payment.payload.PaymentMethod.getPaymentMethod; +import static haveno.core.locale.CountryUtil.findCountryByCode; +import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID; +import static haveno.core.payment.payload.PaymentMethod.getPaymentMethod; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MINUTES; - - -import bisq.apitest.method.BitcoinCliHelper; -import bisq.apitest.scenario.bot.script.BashScriptGenerator; -import bisq.apitest.scenario.bot.script.BotScript; - @Slf4j public class Bot { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/BotClient.java b/apitest/src/test/java/haveno/apitest/scenario/bot/BotClient.java similarity index 97% rename from apitest/src/test/java/bisq/apitest/scenario/bot/BotClient.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/BotClient.java index 472236f1..bc5aed8b 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/BotClient.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/BotClient.java @@ -15,13 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot; - -import bisq.proto.grpc.BalancesInfo; -import bisq.proto.grpc.GetPaymentAccountsRequest; -import bisq.proto.grpc.OfferInfo; -import bisq.proto.grpc.TradeInfo; +package haveno.apitest.scenario.bot; +import haveno.proto.grpc.BalancesInfo; +import haveno.proto.grpc.GetPaymentAccountsRequest; +import haveno.proto.grpc.OfferInfo; +import haveno.proto.grpc.TradeInfo; +import haveno.cli.GrpcClient; +import haveno.core.api.model.PaymentAccountForm; import protobuf.PaymentAccount; import java.text.DecimalFormat; @@ -33,11 +34,6 @@ import lombok.extern.slf4j.Slf4j; import static org.apache.commons.lang3.StringUtils.capitalize; - - -import bisq.cli.GrpcClient; -import bisq.core.api.model.PaymentAccountForm; - /** * Convenience GrpcClient wrapper for bots using gRPC services. */ diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/BotPaymentAccountGenerator.java b/apitest/src/test/java/haveno/apitest/scenario/bot/BotPaymentAccountGenerator.java similarity index 89% rename from apitest/src/test/java/bisq/apitest/scenario/bot/BotPaymentAccountGenerator.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/BotPaymentAccountGenerator.java index f437a141..e6a7af30 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/BotPaymentAccountGenerator.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/BotPaymentAccountGenerator.java @@ -1,22 +1,20 @@ -package bisq.apitest.scenario.bot; - -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.locale.Country; +package haveno.apitest.scenario.bot; import protobuf.PaymentAccount; +import static haveno.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID; +import static haveno.core.payment.payload.PaymentMethod.F2F_ID; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; - +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.locale.Country; import java.io.File; import java.util.Map; import lombok.extern.slf4j.Slf4j; -import static bisq.core.payment.payload.PaymentMethod.CLEAR_X_CHANGE_ID; -import static bisq.core.payment.payload.PaymentMethod.F2F_ID; - @Slf4j public class BotPaymentAccountGenerator { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java b/apitest/src/test/java/haveno/apitest/scenario/bot/InvalidRandomOfferException.java similarity index 93% rename from apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/InvalidRandomOfferException.java index 17841c4a..10d42dc2 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/InvalidRandomOfferException.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot; +package haveno.apitest.scenario.bot; -import bisq.common.HavenoException; +import haveno.common.HavenoException; @SuppressWarnings("unused") public class InvalidRandomOfferException extends HavenoException { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java b/apitest/src/test/java/haveno/apitest/scenario/bot/PaymentAccountNotFoundException.java similarity index 93% rename from apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/PaymentAccountNotFoundException.java index f70f9ec4..a090c149 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/PaymentAccountNotFoundException.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot; +package haveno.apitest.scenario.bot; -import bisq.common.HavenoException; +import haveno.common.HavenoException; @SuppressWarnings("unused") public class PaymentAccountNotFoundException extends HavenoException { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/RandomOffer.java b/apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java similarity index 93% rename from apitest/src/test/java/bisq/apitest/scenario/bot/RandomOffer.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java index b5cd60a7..a31d49ed 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/RandomOffer.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/RandomOffer.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot; +package haveno.apitest.scenario.bot; -import bisq.proto.grpc.OfferInfo; +import haveno.proto.grpc.OfferInfo; import protobuf.PaymentAccount; @@ -33,11 +33,11 @@ import java.util.function.Supplier; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.method.offer.AbstractOfferTest.defaultBuyerSecurityDepositPct; -import static bisq.cli.CurrencyFormat.formatInternalFiatPrice; -import static bisq.cli.CurrencyFormat.formatSatoshis; -import static bisq.common.util.MathUtils.scaleDownByPowerOf10; -import static bisq.core.payment.payload.PaymentMethod.F2F_ID; +import static haveno.apitest.method.offer.AbstractOfferTest.defaultBuyerSecurityDepositPct; +import static haveno.cli.CurrencyFormat.formatInternalFiatPrice; +import static haveno.cli.CurrencyFormat.formatSatoshis; +import static haveno.common.util.MathUtils.scaleDownByPowerOf10; +import static haveno.core.payment.payload.PaymentMethod.F2F_ID; import static java.lang.String.format; import static java.math.RoundingMode.HALF_UP; diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/RobotBob.java b/apitest/src/test/java/haveno/apitest/scenario/bot/RobotBob.java similarity index 86% rename from apitest/src/test/java/bisq/apitest/scenario/bot/RobotBob.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/RobotBob.java index 5b998296..30375c9f 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/RobotBob.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/RobotBob.java @@ -15,26 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot; +package haveno.apitest.scenario.bot; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.scenario.bot.protocol.ProtocolStep.DONE; -import static bisq.apitest.scenario.bot.shutdown.ManualShutdown.isShutdownCalled; -import static bisq.cli.table.builder.TableType.BTC_BALANCE_TBL; +import static haveno.apitest.scenario.bot.protocol.ProtocolStep.DONE; +import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.isShutdownCalled; +import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.apitest.method.BitcoinCliHelper; -import bisq.apitest.scenario.bot.protocol.BotProtocol; -import bisq.apitest.scenario.bot.protocol.MakerBotProtocol; -import bisq.apitest.scenario.bot.protocol.TakerBotProtocol; -import bisq.apitest.scenario.bot.script.BashScriptGenerator; -import bisq.apitest.scenario.bot.script.BotScript; -import bisq.apitest.scenario.bot.shutdown.ManualBotShutdownException; -import bisq.cli.table.builder.TableBuilder; +import haveno.apitest.method.BitcoinCliHelper; +import haveno.apitest.scenario.bot.protocol.BotProtocol; +import haveno.apitest.scenario.bot.protocol.MakerBotProtocol; +import haveno.apitest.scenario.bot.protocol.TakerBotProtocol; +import haveno.apitest.scenario.bot.script.BashScriptGenerator; +import haveno.apitest.scenario.bot.script.BotScript; +import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException; +import haveno.cli.table.builder.TableBuilder; @Slf4j public @@ -113,7 +111,7 @@ class RobotBob extends Bot { log.info("When ready to shutdown the test {}, run '$ touch /tmp/bottest-shutdown'.", harnessOrCase); if (!isUsingTestHarness) { - log.warn("You will have to manually shutdown the bitcoind and Bisq nodes" + log.warn("You will have to manually shutdown the bitcoind and Haveno nodes" + " running outside of the test harness."); } try { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/BotProtocol.java b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/BotProtocol.java similarity index 96% rename from apitest/src/test/java/bisq/apitest/scenario/bot/protocol/BotProtocol.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/protocol/BotProtocol.java index 37135a27..5f5875fe 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/BotProtocol.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/BotProtocol.java @@ -15,11 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot.protocol; +package haveno.apitest.scenario.bot.protocol; -import bisq.proto.grpc.TradeInfo; - +import haveno.proto.grpc.TradeInfo; +import haveno.apitest.method.BitcoinCliHelper; +import haveno.apitest.scenario.bot.BotClient; +import haveno.apitest.scenario.bot.script.BashScriptGenerator; +import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException; +import haveno.cli.table.builder.TableBuilder; import protobuf.PaymentAccount; import java.security.SecureRandom; @@ -37,22 +41,14 @@ import java.util.stream.Collectors; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.scenario.bot.protocol.ProtocolStep.*; -import static bisq.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; +import static haveno.apitest.scenario.bot.protocol.ProtocolStep.*; +import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; import static java.lang.String.format; import static java.lang.System.currentTimeMillis; import static java.util.Arrays.stream; import static java.util.concurrent.TimeUnit.MILLISECONDS; - - -import bisq.apitest.method.BitcoinCliHelper; -import bisq.apitest.scenario.bot.BotClient; -import bisq.apitest.scenario.bot.script.BashScriptGenerator; -import bisq.apitest.scenario.bot.shutdown.ManualBotShutdownException; -import bisq.cli.table.builder.TableBuilder; - @Slf4j public abstract class BotProtocol { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/MakerBotProtocol.java b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/MakerBotProtocol.java similarity index 82% rename from apitest/src/test/java/bisq/apitest/scenario/bot/protocol/MakerBotProtocol.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/protocol/MakerBotProtocol.java index 400ec746..f5d706e6 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/MakerBotProtocol.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/MakerBotProtocol.java @@ -1,8 +1,13 @@ -package bisq.apitest.scenario.bot.protocol; - -import bisq.proto.grpc.OfferInfo; -import bisq.proto.grpc.TradeInfo; +package haveno.apitest.scenario.bot.protocol; +import haveno.proto.grpc.OfferInfo; +import haveno.proto.grpc.TradeInfo; +import haveno.apitest.method.BitcoinCliHelper; +import haveno.apitest.scenario.bot.BotClient; +import haveno.apitest.scenario.bot.RandomOffer; +import haveno.apitest.scenario.bot.script.BashScriptGenerator; +import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException; +import haveno.cli.table.builder.TableBuilder; import protobuf.PaymentAccount; import java.io.File; @@ -13,20 +18,11 @@ import java.util.function.Supplier; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.scenario.bot.protocol.ProtocolStep.DONE; -import static bisq.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_OFFER_TAKER; -import static bisq.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled; -import static bisq.cli.table.builder.TableType.OFFER_TBL; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; - - - -import bisq.apitest.method.BitcoinCliHelper; -import bisq.apitest.scenario.bot.BotClient; -import bisq.apitest.scenario.bot.RandomOffer; -import bisq.apitest.scenario.bot.script.BashScriptGenerator; -import bisq.apitest.scenario.bot.shutdown.ManualBotShutdownException; -import bisq.cli.table.builder.TableBuilder; +import static haveno.apitest.scenario.bot.protocol.ProtocolStep.DONE; +import static haveno.apitest.scenario.bot.protocol.ProtocolStep.WAIT_FOR_OFFER_TAKER; +import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled; +import static haveno.cli.table.builder.TableType.OFFER_TBL; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; @Slf4j public class MakerBotProtocol extends BotProtocol { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/ProtocolStep.java b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/ProtocolStep.java similarity index 89% rename from apitest/src/test/java/bisq/apitest/scenario/bot/protocol/ProtocolStep.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/protocol/ProtocolStep.java index 6d8fd0ee..23a6446f 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/ProtocolStep.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/ProtocolStep.java @@ -1,4 +1,4 @@ -package bisq.apitest.scenario.bot.protocol; +package haveno.apitest.scenario.bot.protocol; public enum ProtocolStep { START, diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/TakerBotProtocol.java b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/TakerBotProtocol.java similarity index 84% rename from apitest/src/test/java/bisq/apitest/scenario/bot/protocol/TakerBotProtocol.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/protocol/TakerBotProtocol.java index 0aafeb29..b774cc08 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/protocol/TakerBotProtocol.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/protocol/TakerBotProtocol.java @@ -1,8 +1,12 @@ -package bisq.apitest.scenario.bot.protocol; - -import bisq.proto.grpc.OfferInfo; -import bisq.proto.grpc.TradeInfo; +package haveno.apitest.scenario.bot.protocol; +import haveno.proto.grpc.OfferInfo; +import haveno.proto.grpc.TradeInfo; +import haveno.apitest.method.BitcoinCliHelper; +import haveno.apitest.scenario.bot.BotClient; +import haveno.apitest.scenario.bot.script.BashScriptGenerator; +import haveno.apitest.scenario.bot.shutdown.ManualBotShutdownException; +import haveno.cli.table.builder.TableBuilder; import protobuf.PaymentAccount; import java.io.File; @@ -13,20 +17,12 @@ import java.util.function.Supplier; import lombok.extern.slf4j.Slf4j; -import static bisq.apitest.scenario.bot.protocol.ProtocolStep.DONE; -import static bisq.apitest.scenario.bot.protocol.ProtocolStep.FIND_OFFER; -import static bisq.apitest.scenario.bot.protocol.ProtocolStep.TAKE_OFFER; -import static bisq.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled; -import static bisq.cli.table.builder.TableType.OFFER_TBL; -import static bisq.core.payment.payload.PaymentMethod.F2F_ID; - - - -import bisq.apitest.method.BitcoinCliHelper; -import bisq.apitest.scenario.bot.BotClient; -import bisq.apitest.scenario.bot.script.BashScriptGenerator; -import bisq.apitest.scenario.bot.shutdown.ManualBotShutdownException; -import bisq.cli.table.builder.TableBuilder; +import static haveno.apitest.scenario.bot.protocol.ProtocolStep.DONE; +import static haveno.apitest.scenario.bot.protocol.ProtocolStep.FIND_OFFER; +import static haveno.apitest.scenario.bot.protocol.ProtocolStep.TAKE_OFFER; +import static haveno.apitest.scenario.bot.shutdown.ManualShutdown.checkIfShutdownCalled; +import static haveno.cli.table.builder.TableType.OFFER_TBL; +import static haveno.core.payment.payload.PaymentMethod.F2F_ID; @Slf4j public class TakerBotProtocol extends BotProtocol { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/script/BashScriptGenerator.java b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BashScriptGenerator.java similarity index 97% rename from apitest/src/test/java/bisq/apitest/scenario/bot/script/BashScriptGenerator.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/script/BashScriptGenerator.java index 98aabd3c..0c72058e 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/script/BashScriptGenerator.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BashScriptGenerator.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot.script; +package haveno.apitest.scenario.bot.script; -import bisq.common.file.FileUtil; - -import bisq.proto.grpc.OfferInfo; -import bisq.proto.grpc.TradeInfo; +import haveno.proto.grpc.OfferInfo; +import haveno.proto.grpc.TradeInfo; import com.google.common.io.Files; - +import haveno.common.file.FileUtil; import java.nio.file.Paths; import java.io.File; @@ -60,7 +58,7 @@ public class BashScriptGenerator { this.apiPort = apiPort; this.paymentAccountId = paymentAccountId; this.printCliScripts = printCliScripts; - this.cliBase = format("./bisq-cli --password=%s --port=%d", apiPassword, apiPort); + this.cliBase = format("./haveno-cli --password=%s --port=%d", apiPassword, apiPort); } public File createMakeMarginPricedOfferScript(String direction, diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/script/BotScript.java b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScript.java similarity index 98% rename from apitest/src/test/java/bisq/apitest/scenario/bot/script/BotScript.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScript.java index 2b4ea0ab..642154d1 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/script/BotScript.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScript.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot.script; +package haveno.apitest.scenario.bot.script; import lombok.Getter; import lombok.Setter; diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/script/BotScriptGenerator.java b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScriptGenerator.java similarity index 99% rename from apitest/src/test/java/bisq/apitest/scenario/bot/script/BotScriptGenerator.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScriptGenerator.java index 501f619c..f6fee1c9 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/script/BotScriptGenerator.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/script/BotScriptGenerator.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot.script; - -import bisq.core.util.JsonUtil; - -import bisq.common.file.JsonFileManager; +package haveno.apitest.scenario.bot.script; +import haveno.common.file.JsonFileManager; +import haveno.core.util.JsonUtil; import joptsimple.BuiltinHelpFormatter; import joptsimple.OptionParser; import joptsimple.OptionSet; diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java b/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualBotShutdownException.java similarity index 92% rename from apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualBotShutdownException.java index 17e49f93..9c51b83a 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualBotShutdownException.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.apitest.scenario.bot.shutdown; +package haveno.apitest.scenario.bot.shutdown; -import bisq.common.HavenoException; +import haveno.common.HavenoException; @SuppressWarnings("unused") public class ManualBotShutdownException extends HavenoException { diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualShutdown.java b/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualShutdown.java similarity index 89% rename from apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualShutdown.java rename to apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualShutdown.java index fc680f1c..833379d8 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualShutdown.java +++ b/apitest/src/test/java/haveno/apitest/scenario/bot/shutdown/ManualShutdown.java @@ -1,6 +1,4 @@ -package bisq.apitest.scenario.bot.shutdown; - -import bisq.common.UserThread; +package haveno.apitest.scenario.bot.shutdown; import java.io.File; import java.io.IOException; @@ -9,9 +7,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import lombok.extern.slf4j.Slf4j; -import static bisq.common.file.FileUtil.deleteFileIfExists; +import static haveno.common.file.FileUtil.deleteFileIfExists; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import haveno.common.UserThread; + @Slf4j public class ManualShutdown { @@ -24,7 +24,7 @@ public class ManualShutdown { * * Running '$ touch /tmp/bottest-shutdown' could be used to trigger a scaffold teardown. * - * This is much easier than manually shutdown down bisq apps & bitcoind. + * This is much easier than manually shutdown down haveno apps & bitcoind. */ public static void startShutdownTimer() { deleteStaleShutdownFile(); diff --git a/apitest/src/test/resources/logback.xml b/apitest/src/test/resources/logback.xml index 28279faa..3eb9b5ad 100644 --- a/apitest/src/test/resources/logback.xml +++ b/apitest/src/test/resources/logback.xml @@ -4,7 +4,7 @@ The :daemon & :cli jars contain their own logback.xml config files, which causes chatty logback startup. To avoid chatty logback msgs during its configuration, pass logback.configurationFile as a system property: -Dlogback.configurationFile=apitest/build/resources/main/logback.xml - The gradle build file takes care of adding this system property to the bisq-apitest script. + The gradle build file takes care of adding this system property to the haveno-apitest script. --> diff --git a/assets/src/main/java/bisq/asset/AbstractAsset.java b/assets/src/main/java/haveno/asset/AbstractAsset.java similarity index 98% rename from assets/src/main/java/bisq/asset/AbstractAsset.java rename to assets/src/main/java/haveno/asset/AbstractAsset.java index 95a6100b..781038e3 100644 --- a/assets/src/main/java/bisq/asset/AbstractAsset.java +++ b/assets/src/main/java/haveno/asset/AbstractAsset.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import static org.apache.commons.lang3.Validate.notBlank; import static org.apache.commons.lang3.Validate.notNull; diff --git a/assets/src/main/java/bisq/asset/AddressValidationResult.java b/assets/src/main/java/haveno/asset/AddressValidationResult.java similarity index 99% rename from assets/src/main/java/bisq/asset/AddressValidationResult.java rename to assets/src/main/java/haveno/asset/AddressValidationResult.java index 55e1fc3f..80574e5b 100644 --- a/assets/src/main/java/bisq/asset/AddressValidationResult.java +++ b/assets/src/main/java/haveno/asset/AddressValidationResult.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Value object representing the result of validating an {@link Asset} address. Various diff --git a/assets/src/main/java/bisq/asset/AddressValidator.java b/assets/src/main/java/haveno/asset/AddressValidator.java similarity index 97% rename from assets/src/main/java/bisq/asset/AddressValidator.java rename to assets/src/main/java/haveno/asset/AddressValidator.java index 20ad6b4a..be5d6235 100644 --- a/assets/src/main/java/bisq/asset/AddressValidator.java +++ b/assets/src/main/java/haveno/asset/AddressValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * An {@link Asset} address validation function. diff --git a/assets/src/main/java/bisq/asset/AltCoinAccountDisclaimer.java b/assets/src/main/java/haveno/asset/AltCoinAccountDisclaimer.java similarity index 97% rename from assets/src/main/java/bisq/asset/AltCoinAccountDisclaimer.java rename to assets/src/main/java/haveno/asset/AltCoinAccountDisclaimer.java index 9497df37..49ffa93d 100644 --- a/assets/src/main/java/bisq/asset/AltCoinAccountDisclaimer.java +++ b/assets/src/main/java/haveno/asset/AltCoinAccountDisclaimer.java @@ -1,4 +1,4 @@ -package bisq.asset; +package haveno.asset; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/assets/src/main/java/bisq/asset/Asset.java b/assets/src/main/java/haveno/asset/Asset.java similarity index 95% rename from assets/src/main/java/bisq/asset/Asset.java rename to assets/src/main/java/haveno/asset/Asset.java index 211876e7..eeed4885 100644 --- a/assets/src/main/java/bisq/asset/Asset.java +++ b/assets/src/main/java/haveno/asset/Asset.java @@ -15,17 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Interface representing a given ("crypto") asset in its most abstract form, having a * {@link #getName() name}, eg "Bitcoin", a {@link #getTickerSymbol() ticker symbol}, * eg "BTC", and an address validation function. Together, these properties represent * the minimum information and functionality required to register and trade an asset on - * the Bisq network. + * the Haveno network. *

* Implementations typically extend either the {@link Coin} or {@link Token} base - * classes, and must be registered in the {@code META-INF/services/bisq.asset.Asset} file + * classes, and must be registered in the {@code META-INF/services/haveno.asset.Asset} file * in order to be available in the {@link AssetRegistry} at runtime. * * @author Chris Beams diff --git a/assets/src/main/java/bisq/asset/AssetRegistry.java b/assets/src/main/java/haveno/asset/AssetRegistry.java similarity index 92% rename from assets/src/main/java/bisq/asset/AssetRegistry.java rename to assets/src/main/java/haveno/asset/AssetRegistry.java index 42bc62ce..c0079804 100644 --- a/assets/src/main/java/bisq/asset/AssetRegistry.java +++ b/assets/src/main/java/haveno/asset/AssetRegistry.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import java.util.ArrayList; import java.util.List; @@ -24,7 +24,7 @@ import java.util.stream.Stream; /** * Provides {@link Stream}-based access to {@link Asset} implementations registered in - * the {@code META-INF/services/bisq.asset.Asset} provider-configuration file. + * the {@code META-INF/services/haveno.asset.Asset} provider-configuration file. * * @author Chris Beams * @since 0.7.0 diff --git a/assets/src/main/java/bisq/asset/Base58AddressValidator.java b/assets/src/main/java/haveno/asset/Base58AddressValidator.java similarity index 98% rename from assets/src/main/java/bisq/asset/Base58AddressValidator.java rename to assets/src/main/java/haveno/asset/Base58AddressValidator.java index 9b198b43..3942e5b7 100644 --- a/assets/src/main/java/bisq/asset/Base58AddressValidator.java +++ b/assets/src/main/java/haveno/asset/Base58AddressValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.LegacyAddress; diff --git a/assets/src/main/java/bisq/asset/BitcoinAddressValidator.java b/assets/src/main/java/haveno/asset/BitcoinAddressValidator.java similarity index 98% rename from assets/src/main/java/bisq/asset/BitcoinAddressValidator.java rename to assets/src/main/java/haveno/asset/BitcoinAddressValidator.java index 4aaf0808..7bcbbcbb 100644 --- a/assets/src/main/java/bisq/asset/BitcoinAddressValidator.java +++ b/assets/src/main/java/haveno/asset/BitcoinAddressValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; diff --git a/assets/src/main/java/bisq/asset/BitcoinCashAddressValidator.java b/assets/src/main/java/haveno/asset/BitcoinCashAddressValidator.java similarity index 98% rename from assets/src/main/java/bisq/asset/BitcoinCashAddressValidator.java rename to assets/src/main/java/haveno/asset/BitcoinCashAddressValidator.java index 7af317bf..9dccb45b 100644 --- a/assets/src/main/java/bisq/asset/BitcoinCashAddressValidator.java +++ b/assets/src/main/java/haveno/asset/BitcoinCashAddressValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Validates a Bitcoin Cash address. diff --git a/assets/src/main/java/bisq/asset/Coin.java b/assets/src/main/java/haveno/asset/Coin.java similarity index 93% rename from assets/src/main/java/bisq/asset/Coin.java rename to assets/src/main/java/haveno/asset/Coin.java index 774c26a7..5d6e48ae 100644 --- a/assets/src/main/java/bisq/asset/Coin.java +++ b/assets/src/main/java/haveno/asset/Coin.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Abstract base class for {@link Asset}s with their own dedicated blockchain, such as - * {@link bisq.asset.coins.Bitcoin}, {@link bisq.asset.coins.Ether}, and {@link bisq.asset.coins.Monero}. + * {@link haveno.asset.coins.Bitcoin}, {@link haveno.asset.coins.Ether}, and {@link haveno.asset.coins.Monero}. *

* In addition to the usual {@code Asset} properties, a {@code Coin} maintains information * about which {@link Network} it may be used on. By default, coins are constructed with diff --git a/assets/src/main/java/bisq/asset/CryptoNoteAddressValidator.java b/assets/src/main/java/haveno/asset/CryptoNoteAddressValidator.java similarity index 98% rename from assets/src/main/java/bisq/asset/CryptoNoteAddressValidator.java rename to assets/src/main/java/haveno/asset/CryptoNoteAddressValidator.java index 5e557273..861b0ecb 100644 --- a/assets/src/main/java/bisq/asset/CryptoNoteAddressValidator.java +++ b/assets/src/main/java/haveno/asset/CryptoNoteAddressValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * {@link AddressValidator} for Base58-encoded Cryptonote addresses. diff --git a/assets/src/main/java/bisq/asset/CryptoNoteUtils.java b/assets/src/main/java/haveno/asset/CryptoNoteUtils.java similarity index 99% rename from assets/src/main/java/bisq/asset/CryptoNoteUtils.java rename to assets/src/main/java/haveno/asset/CryptoNoteUtils.java index c24b966d..3b9bcb74 100644 --- a/assets/src/main/java/bisq/asset/CryptoNoteUtils.java +++ b/assets/src/main/java/haveno/asset/CryptoNoteUtils.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import org.bitcoinj.core.Utils; diff --git a/assets/src/main/java/bisq/asset/Erc20Token.java b/assets/src/main/java/haveno/asset/Erc20Token.java similarity index 98% rename from assets/src/main/java/bisq/asset/Erc20Token.java rename to assets/src/main/java/haveno/asset/Erc20Token.java index dbee6510..89364927 100644 --- a/assets/src/main/java/bisq/asset/Erc20Token.java +++ b/assets/src/main/java/haveno/asset/Erc20Token.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Abstract base class for Ethereum-based {@link Token}s that implement the diff --git a/assets/src/main/java/bisq/asset/EtherAddressValidator.java b/assets/src/main/java/haveno/asset/EtherAddressValidator.java similarity index 93% rename from assets/src/main/java/bisq/asset/EtherAddressValidator.java rename to assets/src/main/java/haveno/asset/EtherAddressValidator.java index 9d966fef..a427dbfc 100644 --- a/assets/src/main/java/bisq/asset/EtherAddressValidator.java +++ b/assets/src/main/java/haveno/asset/EtherAddressValidator.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Validates an Ethereum address using the regular expression on record in the * * ethereum/web3.js project. Note that this implementation is widely used, not just - * for actual {@link bisq.asset.coins.Ether} address validation, but also for + * for actual {@link haveno.asset.coins.Ether} address validation, but also for * {@link Erc20Token} implementations and other Ethereum-based {@link Asset} * implementations. * diff --git a/assets/src/main/java/bisq/asset/GrinAddressValidator.java b/assets/src/main/java/haveno/asset/GrinAddressValidator.java similarity index 99% rename from assets/src/main/java/bisq/asset/GrinAddressValidator.java rename to assets/src/main/java/haveno/asset/GrinAddressValidator.java index 6207dee3..a4ff40bf 100644 --- a/assets/src/main/java/bisq/asset/GrinAddressValidator.java +++ b/assets/src/main/java/haveno/asset/GrinAddressValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * We only support the grinbox format as it is currently the only tool which offers a validation options of sender. diff --git a/assets/src/main/java/bisq/asset/I18n.java b/assets/src/main/java/haveno/asset/I18n.java similarity index 88% rename from assets/src/main/java/bisq/asset/I18n.java rename to assets/src/main/java/haveno/asset/I18n.java index 86bcdecc..c0d3b4bb 100644 --- a/assets/src/main/java/bisq/asset/I18n.java +++ b/assets/src/main/java/haveno/asset/I18n.java @@ -1,4 +1,4 @@ -package bisq.asset; +package haveno.asset; import java.util.ResourceBundle; diff --git a/assets/src/main/java/bisq/asset/LiquidBitcoinAddressValidator.java b/assets/src/main/java/haveno/asset/LiquidBitcoinAddressValidator.java similarity index 94% rename from assets/src/main/java/bisq/asset/LiquidBitcoinAddressValidator.java rename to assets/src/main/java/haveno/asset/LiquidBitcoinAddressValidator.java index 9ae5cf41..48e5b5e2 100644 --- a/assets/src/main/java/bisq/asset/LiquidBitcoinAddressValidator.java +++ b/assets/src/main/java/haveno/asset/LiquidBitcoinAddressValidator.java @@ -1,4 +1,4 @@ -package bisq.asset; +package haveno.asset; public class LiquidBitcoinAddressValidator extends RegexAddressValidator { static private final String REGEX = "^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,87}|[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,87})$"; diff --git a/assets/src/main/java/bisq/asset/NetworkParametersAdapter.java b/assets/src/main/java/haveno/asset/NetworkParametersAdapter.java similarity index 99% rename from assets/src/main/java/bisq/asset/NetworkParametersAdapter.java rename to assets/src/main/java/haveno/asset/NetworkParametersAdapter.java index 27538df1..9e23a123 100644 --- a/assets/src/main/java/bisq/asset/NetworkParametersAdapter.java +++ b/assets/src/main/java/haveno/asset/NetworkParametersAdapter.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import org.bitcoinj.core.BitcoinSerializer; import org.bitcoinj.core.Block; diff --git a/assets/src/main/java/bisq/asset/PrintTool.java b/assets/src/main/java/haveno/asset/PrintTool.java similarity index 98% rename from assets/src/main/java/bisq/asset/PrintTool.java rename to assets/src/main/java/haveno/asset/PrintTool.java index 9e05d92f..1272bf65 100644 --- a/assets/src/main/java/bisq/asset/PrintTool.java +++ b/assets/src/main/java/haveno/asset/PrintTool.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import java.util.Comparator; diff --git a/assets/src/main/java/bisq/asset/RegexAddressValidator.java b/assets/src/main/java/haveno/asset/RegexAddressValidator.java similarity index 98% rename from assets/src/main/java/bisq/asset/RegexAddressValidator.java rename to assets/src/main/java/haveno/asset/RegexAddressValidator.java index 0ab72e92..ed75c769 100644 --- a/assets/src/main/java/bisq/asset/RegexAddressValidator.java +++ b/assets/src/main/java/haveno/asset/RegexAddressValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Validates an {@link Asset} address against a given regular expression. diff --git a/assets/src/main/java/bisq/asset/Token.java b/assets/src/main/java/haveno/asset/Token.java similarity index 98% rename from assets/src/main/java/bisq/asset/Token.java rename to assets/src/main/java/haveno/asset/Token.java index e8b29661..4d45cde9 100644 --- a/assets/src/main/java/bisq/asset/Token.java +++ b/assets/src/main/java/haveno/asset/Token.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; /** * Abstract base class for {@link Asset}s that do not have their own dedicated blockchain, diff --git a/assets/src/main/java/bisq/asset/coins/Bitcoin.java b/assets/src/main/java/haveno/asset/coins/Bitcoin.java similarity index 93% rename from assets/src/main/java/bisq/asset/coins/Bitcoin.java rename to assets/src/main/java/haveno/asset/coins/Bitcoin.java index ec93953f..a5e03eb8 100644 --- a/assets/src/main/java/bisq/asset/coins/Bitcoin.java +++ b/assets/src/main/java/haveno/asset/coins/Bitcoin.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; - -import bisq.asset.BitcoinAddressValidator; -import bisq.asset.Coin; +package haveno.asset.coins; +import haveno.asset.BitcoinAddressValidator; +import haveno.asset.Coin; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.params.MainNetParams; import org.bitcoinj.params.RegTestParams; diff --git a/assets/src/main/java/bisq/asset/coins/BitcoinCash.java b/assets/src/main/java/haveno/asset/coins/BitcoinCash.java similarity index 89% rename from assets/src/main/java/bisq/asset/coins/BitcoinCash.java rename to assets/src/main/java/haveno/asset/coins/BitcoinCash.java index e5237f74..480abcd8 100644 --- a/assets/src/main/java/bisq/asset/coins/BitcoinCash.java +++ b/assets/src/main/java/haveno/asset/coins/BitcoinCash.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; +package haveno.asset.coins; -import bisq.asset.BitcoinCashAddressValidator; -import bisq.asset.Coin; +import haveno.asset.BitcoinCashAddressValidator; +import haveno.asset.Coin; public class BitcoinCash extends Coin { diff --git a/assets/src/main/java/bisq/asset/coins/Ether.java b/assets/src/main/java/haveno/asset/coins/Ether.java similarity index 89% rename from assets/src/main/java/bisq/asset/coins/Ether.java rename to assets/src/main/java/haveno/asset/coins/Ether.java index f7ea3a11..865935f2 100644 --- a/assets/src/main/java/bisq/asset/coins/Ether.java +++ b/assets/src/main/java/haveno/asset/coins/Ether.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; +package haveno.asset.coins; -import bisq.asset.Coin; -import bisq.asset.EtherAddressValidator; +import haveno.asset.Coin; +import haveno.asset.EtherAddressValidator; public class Ether extends Coin { diff --git a/assets/src/main/java/bisq/asset/coins/Litecoin.java b/assets/src/main/java/haveno/asset/coins/Litecoin.java similarity index 88% rename from assets/src/main/java/bisq/asset/coins/Litecoin.java rename to assets/src/main/java/haveno/asset/coins/Litecoin.java index ed76e23b..96f273c8 100644 --- a/assets/src/main/java/bisq/asset/coins/Litecoin.java +++ b/assets/src/main/java/haveno/asset/coins/Litecoin.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; +package haveno.asset.coins; -import bisq.asset.Base58AddressValidator; -import bisq.asset.Coin; -import bisq.asset.NetworkParametersAdapter; +import haveno.asset.Base58AddressValidator; +import haveno.asset.Coin; +import haveno.asset.NetworkParametersAdapter; public class Litecoin extends Coin { public Litecoin() { diff --git a/assets/src/main/java/bisq/asset/coins/Monero.java b/assets/src/main/java/haveno/asset/coins/Monero.java similarity index 85% rename from assets/src/main/java/bisq/asset/coins/Monero.java rename to assets/src/main/java/haveno/asset/coins/Monero.java index dba98ab8..2ff1d7d4 100644 --- a/assets/src/main/java/bisq/asset/coins/Monero.java +++ b/assets/src/main/java/haveno/asset/coins/Monero.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; +package haveno.asset.coins; -import bisq.asset.AltCoinAccountDisclaimer; -import bisq.asset.Coin; -import bisq.asset.CryptoNoteAddressValidator; +import haveno.asset.AltCoinAccountDisclaimer; +import haveno.asset.Coin; +import haveno.asset.CryptoNoteAddressValidator; @AltCoinAccountDisclaimer("account.altcoin.popup.xmr.msg") public class Monero extends Coin { diff --git a/assets/src/main/java/bisq/asset/package-info.java b/assets/src/main/java/haveno/asset/package-info.java similarity index 63% rename from assets/src/main/java/bisq/asset/package-info.java rename to assets/src/main/java/haveno/asset/package-info.java index fa94770b..852ee3b3 100644 --- a/assets/src/main/java/bisq/asset/package-info.java +++ b/assets/src/main/java/haveno/asset/package-info.java @@ -16,22 +16,22 @@ */ /** - * Bisq's family of abstractions representing different ("crypto") - * {@link bisq.asset.Asset} types such as {@link bisq.asset.Coin}, - * {@link bisq.asset.Token} and {@link bisq.asset.Erc20Token}, as well as concrete - * implementations of each, such as {@link bisq.asset.coins.Bitcoin} itself, altcoins like - * {@link bisq.asset.coins.Litecoin} and {@link bisq.asset.coins.Ether} and tokens like - * {@link bisq.asset.tokens.DaiStablecoin}. + * Haveno's family of abstractions representing different ("crypto") + * {@link haveno.asset.Asset} types such as {@link haveno.asset.Coin}, + * {@link haveno.asset.Token} and {@link haveno.asset.Erc20Token}, as well as concrete + * implementations of each, such as {@link haveno.asset.coins.Bitcoin} itself, altcoins like + * {@link haveno.asset.coins.Litecoin} and {@link haveno.asset.coins.Ether} and tokens like + * {@link haveno.asset.tokens.DaiStablecoin}. *

* The purpose of this package is to provide everything necessary for registering - * ("listing") new assets and managing / accessing those assets within, e.g. the Bisq + * ("listing") new assets and managing / accessing those assets within, e.g. the Haveno * Desktop UI. *

* Note that everything within this package is intentionally designed to be simple and - * low-level with no dependencies on any other Bisq packages or components. + * low-level with no dependencies on any other Haveno packages or components. * * @author Chris Beams * @since 0.7.0 */ -package bisq.asset; +package haveno.asset; diff --git a/assets/src/main/java/bisq/asset/tokens/AugmintEuro.java b/assets/src/main/java/haveno/asset/tokens/AugmintEuro.java similarity index 93% rename from assets/src/main/java/bisq/asset/tokens/AugmintEuro.java rename to assets/src/main/java/haveno/asset/tokens/AugmintEuro.java index 51764779..4699c855 100644 --- a/assets/src/main/java/bisq/asset/tokens/AugmintEuro.java +++ b/assets/src/main/java/haveno/asset/tokens/AugmintEuro.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.asset.tokens; +package haveno.asset.tokens; -import bisq.asset.Erc20Token; +import haveno.asset.Erc20Token; public class AugmintEuro extends Erc20Token { diff --git a/assets/src/main/java/bisq/asset/tokens/DaiStablecoin.java b/assets/src/main/java/haveno/asset/tokens/DaiStablecoin.java similarity index 93% rename from assets/src/main/java/bisq/asset/tokens/DaiStablecoin.java rename to assets/src/main/java/haveno/asset/tokens/DaiStablecoin.java index 6f8bea3e..760bd15a 100644 --- a/assets/src/main/java/bisq/asset/tokens/DaiStablecoin.java +++ b/assets/src/main/java/haveno/asset/tokens/DaiStablecoin.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.asset.tokens; +package haveno.asset.tokens; -import bisq.asset.Erc20Token; +import haveno.asset.Erc20Token; public class DaiStablecoin extends Erc20Token { diff --git a/assets/src/main/java/bisq/asset/tokens/EtherStone.java b/assets/src/main/java/haveno/asset/tokens/EtherStone.java similarity index 92% rename from assets/src/main/java/bisq/asset/tokens/EtherStone.java rename to assets/src/main/java/haveno/asset/tokens/EtherStone.java index de13c679..f9d001cb 100644 --- a/assets/src/main/java/bisq/asset/tokens/EtherStone.java +++ b/assets/src/main/java/haveno/asset/tokens/EtherStone.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.asset.tokens; +package haveno.asset.tokens; -import bisq.asset.Erc20Token; +import haveno.asset.Erc20Token; public class EtherStone extends Erc20Token { diff --git a/assets/src/main/java/bisq/asset/tokens/TrueUSD.java b/assets/src/main/java/haveno/asset/tokens/TrueUSD.java similarity index 92% rename from assets/src/main/java/bisq/asset/tokens/TrueUSD.java rename to assets/src/main/java/haveno/asset/tokens/TrueUSD.java index e7608ce8..adb80ce7 100644 --- a/assets/src/main/java/bisq/asset/tokens/TrueUSD.java +++ b/assets/src/main/java/haveno/asset/tokens/TrueUSD.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.asset.tokens; +package haveno.asset.tokens; -import bisq.asset.Erc20Token; +import haveno.asset.Erc20Token; public class TrueUSD extends Erc20Token { diff --git a/assets/src/main/java/bisq/asset/tokens/USDCoin.java b/assets/src/main/java/haveno/asset/tokens/USDCoin.java similarity index 92% rename from assets/src/main/java/bisq/asset/tokens/USDCoin.java rename to assets/src/main/java/haveno/asset/tokens/USDCoin.java index 32e2f0ad..158899b3 100644 --- a/assets/src/main/java/bisq/asset/tokens/USDCoin.java +++ b/assets/src/main/java/haveno/asset/tokens/USDCoin.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.asset.tokens; +package haveno.asset.tokens; -import bisq.asset.Erc20Token; +import haveno.asset.Erc20Token; public class USDCoin extends Erc20Token { diff --git a/assets/src/main/java/bisq/asset/tokens/VectorspaceAI.java b/assets/src/main/java/haveno/asset/tokens/VectorspaceAI.java similarity index 93% rename from assets/src/main/java/bisq/asset/tokens/VectorspaceAI.java rename to assets/src/main/java/haveno/asset/tokens/VectorspaceAI.java index def97cb4..2f659aac 100644 --- a/assets/src/main/java/bisq/asset/tokens/VectorspaceAI.java +++ b/assets/src/main/java/haveno/asset/tokens/VectorspaceAI.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.asset.tokens; +package haveno.asset.tokens; -import bisq.asset.Erc20Token; +import haveno.asset.Erc20Token; public class VectorspaceAI extends Erc20Token { diff --git a/assets/src/main/resources/META-INF/services/bisq.asset.Asset b/assets/src/main/resources/META-INF/services/bisq.asset.Asset deleted file mode 100644 index 1d07a198..00000000 --- a/assets/src/main/resources/META-INF/services/bisq.asset.Asset +++ /dev/null @@ -1,9 +0,0 @@ -# All assets available for trading on the Bisq network. -# Contents are sorted according to the output of `sort --ignore-case --dictionary-order`. -# See bisq.asset.Asset and bisq.asset.AssetRegistry for further details. -# See https://bisq.network/list-asset for complete instructions. -bisq.asset.coins.Bitcoin$Mainnet -bisq.asset.coins.BitcoinCash -bisq.asset.coins.Ether -bisq.asset.coins.Litecoin -bisq.asset.coins.Monero diff --git a/assets/src/main/resources/META-INF/services/haveno.asset.Asset b/assets/src/main/resources/META-INF/services/haveno.asset.Asset new file mode 100644 index 00000000..5628aec4 --- /dev/null +++ b/assets/src/main/resources/META-INF/services/haveno.asset.Asset @@ -0,0 +1,9 @@ +# All assets available for trading on the Haveno network. +# Contents are sorted according to the output of `sort --ignore-case --dictionary-order`. +# See haveno.asset.Asset and haveno.asset.AssetRegistry for further details. +# See https://haveno.network/list-asset for complete instructions. +haveno.asset.coins.Bitcoin$Mainnet +haveno.asset.coins.BitcoinCash +haveno.asset.coins.Ether +haveno.asset.coins.Litecoin +haveno.asset.coins.Monero diff --git a/assets/src/test/java/bisq/asset/AbstractAssetTest.java b/assets/src/test/java/haveno/asset/AbstractAssetTest.java similarity index 95% rename from assets/src/test/java/bisq/asset/AbstractAssetTest.java rename to assets/src/test/java/haveno/asset/AbstractAssetTest.java index b0f72c5f..3e89245e 100644 --- a/assets/src/test/java/bisq/asset/AbstractAssetTest.java +++ b/assets/src/test/java/haveno/asset/AbstractAssetTest.java @@ -15,13 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.asset; +package haveno.asset; import org.junit.Test; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; +import haveno.asset.AddressValidationResult; +import haveno.asset.Asset; +import haveno.asset.AssetRegistry; + /** * Abstract base class for all {@link Asset} unit tests. Subclasses must implement the * {@link #testValidAddresses()} and {@link #testInvalidAddresses()} methods, and are diff --git a/assets/src/test/java/bisq/asset/coins/BitcoinCashTest.java b/assets/src/test/java/haveno/asset/coins/BitcoinCashTest.java similarity index 93% rename from assets/src/test/java/bisq/asset/coins/BitcoinCashTest.java rename to assets/src/test/java/haveno/asset/coins/BitcoinCashTest.java index 2fb96bc1..02013748 100644 --- a/assets/src/test/java/bisq/asset/coins/BitcoinCashTest.java +++ b/assets/src/test/java/haveno/asset/coins/BitcoinCashTest.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; - -import bisq.asset.AbstractAssetTest; +package haveno.asset.coins; +import haveno.asset.AbstractAssetTest; +import haveno.asset.coins.BitcoinCash; import org.junit.Test; public class BitcoinCashTest extends AbstractAssetTest { diff --git a/assets/src/test/java/bisq/asset/coins/BitcoinTest.java b/assets/src/test/java/haveno/asset/coins/BitcoinTest.java similarity index 93% rename from assets/src/test/java/bisq/asset/coins/BitcoinTest.java rename to assets/src/test/java/haveno/asset/coins/BitcoinTest.java index 1d0f321c..dcff5eed 100644 --- a/assets/src/test/java/bisq/asset/coins/BitcoinTest.java +++ b/assets/src/test/java/haveno/asset/coins/BitcoinTest.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; - -import bisq.asset.AbstractAssetTest; +package haveno.asset.coins; +import haveno.asset.AbstractAssetTest; +import haveno.asset.coins.Bitcoin; import org.junit.Test; public class BitcoinTest extends AbstractAssetTest { diff --git a/assets/src/test/java/bisq/asset/coins/LitecoinTest.java b/assets/src/test/java/haveno/asset/coins/LitecoinTest.java similarity index 92% rename from assets/src/test/java/bisq/asset/coins/LitecoinTest.java rename to assets/src/test/java/haveno/asset/coins/LitecoinTest.java index 263cc022..29a7cfd4 100644 --- a/assets/src/test/java/bisq/asset/coins/LitecoinTest.java +++ b/assets/src/test/java/haveno/asset/coins/LitecoinTest.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; - -import bisq.asset.AbstractAssetTest; +package haveno.asset.coins; +import haveno.asset.AbstractAssetTest; +import haveno.asset.coins.Litecoin; import org.junit.Test; public class LitecoinTest extends AbstractAssetTest { diff --git a/assets/src/test/java/bisq/asset/coins/MoneroTest.java b/assets/src/test/java/haveno/asset/coins/MoneroTest.java similarity index 95% rename from assets/src/test/java/bisq/asset/coins/MoneroTest.java rename to assets/src/test/java/haveno/asset/coins/MoneroTest.java index 127d362c..ca165644 100644 --- a/assets/src/test/java/bisq/asset/coins/MoneroTest.java +++ b/assets/src/test/java/haveno/asset/coins/MoneroTest.java @@ -15,9 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.asset.coins; +package haveno.asset.coins; -import bisq.asset.AbstractAssetTest; +import haveno.asset.AbstractAssetTest; +import haveno.asset.coins.Monero; import org.junit.Test; public class MoneroTest extends AbstractAssetTest { diff --git a/build.gradle b/build.gradle index 2abf2e59..d68d95e5 100644 --- a/build.gradle +++ b/build.gradle @@ -514,7 +514,7 @@ configure(project(':core')) { } configure(project(':cli')) { - mainClassName = 'bisq.cli.CliMain' + mainClassName = 'haveno.cli.CliMain' dependencies { implementation project(':proto') @@ -562,7 +562,7 @@ configure(project(':desktop')) { "Implementation-Title": project.name, "Implementation-Version": version) - mainClassName = 'bisq.desktop.app.HavenoAppMain' + mainClassName = 'haveno.desktop.app.HavenoAppMain' tasks.withType(AbstractArchiveTask) { preserveFileTimestamps = false @@ -634,7 +634,7 @@ configure(project(':desktop')) { configure(project(':monitor')) { - mainClassName = 'bisq.monitor.Monitor' + mainClassName = 'haveno.monitor.Monitor' test { useJUnitPlatform() @@ -676,7 +676,7 @@ configure(project(':monitor')) { configure(project(':relay')) { - mainClassName = 'bisq.relay.RelayMain' + mainClassName = 'haveno.relay.RelayMain' dependencies { implementation project(':common') @@ -699,7 +699,7 @@ configure(project(':relay')) { configure(project(':seednode')) { apply plugin: 'com.github.johnrengelman.shadow' - mainClassName = 'bisq.seednode.SeedNodeMain' + mainClassName = 'haveno.seednode.SeedNodeMain' dependencies { implementation project(':common') @@ -718,7 +718,7 @@ configure(project(':seednode')) { configure(project(':statsnode')) { - mainClassName = 'bisq.statistics.StatisticsMain' + mainClassName = 'haveno.statistics.StatisticsMain' dependencies { implementation project(':common') @@ -734,7 +734,7 @@ configure(project(':statsnode')) { } configure(project(':daemon')) { - mainClassName = 'bisq.daemon.app.HavenoDaemonMain' + mainClassName = 'haveno.daemon.app.HavenoDaemonMain' dependencies { implementation project(':proto') @@ -797,7 +797,7 @@ configure(project(':daemon')) { configure(project(':inventory')) { apply plugin: 'com.github.johnrengelman.shadow' - mainClassName = 'bisq.inventory.InventoryMonitorMain' + mainClassName = 'haveno.inventory.InventoryMonitorMain' dependencies { implementation project(':common') @@ -817,7 +817,7 @@ configure(project(':inventory')) { } configure(project(':apitest')) { - mainClassName = 'bisq.apitest.ApiTestMain' + mainClassName = 'haveno.apitest.ApiTestMain' // We have to disable the :apitest 'test' task by default because we do not want // to interfere with normal builds. To run JUnit tests in this subproject: diff --git a/cli/package/create-cli-dist.sh b/cli/package/create-cli-dist.sh index 01283934..6c5127e5 100755 --- a/cli/package/create-cli-dist.sh +++ b/cli/package/create-cli-dist.sh @@ -5,14 +5,14 @@ if [[ -z "$VERSION" ]]; then VERSION="SNAPSHOT" fi -export BISQ_RELEASE_NAME="bisq-cli-$VERSION" -export BISQ_RELEASE_ZIP_NAME="$BISQ_RELEASE_NAME.zip" +export HAVENO_RELEASE_NAME="haveno-cli-$VERSION" +export HAVENO_RELEASE_ZIP_NAME="$HAVENO_RELEASE_NAME.zip" export GRADLE_DIST_NAME="cli.tar" export GRADLE_DIST_PATH="../build/distributions/$GRADLE_DIST_NAME" arrangegradledist() { - # Arrange $BISQ_RELEASE_NAME directory structure to contain a runnable + # Arrange $HAVENO_RELEASE_NAME directory structure to contain a runnable # jar at the top-level, and a lib dir containing dependencies: # . # | @@ -24,22 +24,22 @@ arrangegradledist() { # Copy the build's distribution tarball to this directory. cp -v $GRADLE_DIST_PATH . # Create a clean directory to hold the tarball's content. - rm -rf $BISQ_RELEASE_NAME - mkdir $BISQ_RELEASE_NAME - # Extract the tarball's content into $BISQ_RELEASE_NAME. - tar -xf $GRADLE_DIST_NAME -C $BISQ_RELEASE_NAME - cd $BISQ_RELEASE_NAME - # Rearrange $BISQ_RELEASE_NAME contents: move the lib directory up one level. + rm -rf $HAVENO_RELEASE_NAME + mkdir $HAVENO_RELEASE_NAME + # Extract the tarball's content into $HAVENO_RELEASE_NAME. + tar -xf $GRADLE_DIST_NAME -C $HAVENO_RELEASE_NAME + cd $HAVENO_RELEASE_NAME + # Rearrange $HAVENO_RELEASE_NAME contents: move the lib directory up one level. mv -v cli/lib . - # Rearrange $BISQ_RELEASE_NAME contents: remove the cli/bin and cli directories. + # Rearrange $HAVENO_RELEASE_NAME contents: remove the cli/bin and cli directories. rm -rf cli - # Rearrange $BISQ_RELEASE_NAME contents: move the lib/cli.jar up one level. + # Rearrange $HAVENO_RELEASE_NAME contents: move the lib/cli.jar up one level. mv -v lib/cli.jar . } writemanifest() { # Make the cli.jar runnable, and define its dependencies in a MANIFEST.MF update. - echo "Main-Class: bisq.cli.CliMain" > manifest-update.txt + echo "Main-Class: haveno.cli.CliMain" > manifest-update.txt printf "Class-Path: " >> manifest-update.txt for file in lib/* do @@ -55,12 +55,12 @@ updatemanifest() { ziprelease() { cd .. - zip -r $BISQ_RELEASE_ZIP_NAME $BISQ_RELEASE_NAME/lib $BISQ_RELEASE_NAME/cli.jar + zip -r $HAVENO_RELEASE_ZIP_NAME $HAVENO_RELEASE_NAME/lib $HAVENO_RELEASE_NAME/cli.jar } cleanup() { rm -v ./$GRADLE_DIST_NAME - rm -r ./$BISQ_RELEASE_NAME + rm -r ./$HAVENO_RELEASE_NAME } arrangegradledist diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/haveno/cli/CliMain.java similarity index 94% rename from cli/src/main/java/bisq/cli/CliMain.java rename to cli/src/main/java/haveno/cli/CliMain.java index 8fa77989..fe373bd9 100644 --- a/cli/src/main/java/bisq/cli/CliMain.java +++ b/cli/src/main/java/haveno/cli/CliMain.java @@ -15,11 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.cli; - -import bisq.proto.grpc.OfferInfo; -import bisq.proto.grpc.TradeInfo; +package haveno.cli; +import haveno.proto.grpc.OfferInfo; +import haveno.proto.grpc.TradeInfo; +import haveno.cli.opts.ArgumentList; +import haveno.cli.opts.CancelOfferOptionParser; +import haveno.cli.opts.CreateCryptoCurrencyPaymentAcctOptionParser; +import haveno.cli.opts.CreateOfferOptionParser; +import haveno.cli.opts.CreatePaymentAcctOptionParser; +import haveno.cli.opts.GetAddressBalanceOptionParser; +import haveno.cli.opts.GetBTCMarketPriceOptionParser; +import haveno.cli.opts.GetBalanceOptionParser; +import haveno.cli.opts.GetOffersOptionParser; +import haveno.cli.opts.GetPaymentAcctFormOptionParser; +import haveno.cli.opts.GetTradeOptionParser; +import haveno.cli.opts.GetTradesOptionParser; +import haveno.cli.opts.GetTransactionOptionParser; +import haveno.cli.opts.OfferIdOptionParser; +import haveno.cli.opts.RegisterDisputeAgentOptionParser; +import haveno.cli.opts.RemoveWalletPasswordOptionParser; +import haveno.cli.opts.SendBtcOptionParser; +import haveno.cli.opts.SetTxFeeRateOptionParser; +import haveno.cli.opts.SetWalletPasswordOptionParser; +import haveno.cli.opts.SimpleMethodOptionParser; +import haveno.cli.opts.TakeOfferOptionParser; +import haveno.cli.opts.UnlockWalletOptionParser; +import haveno.cli.opts.WithdrawFundsOptionParser; +import haveno.cli.table.builder.TableBuilder; import io.grpc.StatusRuntimeException; import joptsimple.OptionParser; @@ -40,47 +63,20 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import static bisq.cli.CurrencyFormat.formatInternalFiatPrice; -import static bisq.cli.CurrencyFormat.toSatoshis; -import static bisq.cli.Method.*; -import static bisq.cli.opts.OptLabel.*; -import static bisq.cli.table.builder.TableType.*; -import static bisq.proto.grpc.GetTradesRequest.Category.CLOSED; -import static bisq.proto.grpc.GetTradesRequest.Category.OPEN; +import static haveno.proto.grpc.GetTradesRequest.Category.CLOSED; +import static haveno.proto.grpc.GetTradesRequest.Category.OPEN; +import static haveno.cli.CurrencyFormat.formatInternalFiatPrice; +import static haveno.cli.CurrencyFormat.toSatoshis; +import static haveno.cli.Method.*; +import static haveno.cli.opts.OptLabel.*; +import static haveno.cli.table.builder.TableType.*; import static java.lang.String.format; import static java.lang.System.err; import static java.lang.System.exit; import static java.lang.System.out; - - -import bisq.cli.opts.ArgumentList; -import bisq.cli.opts.CancelOfferOptionParser; -import bisq.cli.opts.CreateCryptoCurrencyPaymentAcctOptionParser; -import bisq.cli.opts.CreateOfferOptionParser; -import bisq.cli.opts.CreatePaymentAcctOptionParser; -import bisq.cli.opts.GetAddressBalanceOptionParser; -import bisq.cli.opts.GetBTCMarketPriceOptionParser; -import bisq.cli.opts.GetBalanceOptionParser; -import bisq.cli.opts.GetOffersOptionParser; -import bisq.cli.opts.GetPaymentAcctFormOptionParser; -import bisq.cli.opts.GetTradeOptionParser; -import bisq.cli.opts.GetTradesOptionParser; -import bisq.cli.opts.GetTransactionOptionParser; -import bisq.cli.opts.OfferIdOptionParser; -import bisq.cli.opts.RegisterDisputeAgentOptionParser; -import bisq.cli.opts.RemoveWalletPasswordOptionParser; -import bisq.cli.opts.SendBtcOptionParser; -import bisq.cli.opts.SetTxFeeRateOptionParser; -import bisq.cli.opts.SetWalletPasswordOptionParser; -import bisq.cli.opts.SimpleMethodOptionParser; -import bisq.cli.opts.TakeOfferOptionParser; -import bisq.cli.opts.UnlockWalletOptionParser; -import bisq.cli.opts.WithdrawFundsOptionParser; -import bisq.cli.table.builder.TableBuilder; - /** - * A command-line client for the Bisq gRPC API. + * A command-line client for the Haveno gRPC API. */ @Slf4j public class CliMain { @@ -627,9 +623,9 @@ public class CliMain { private static void printHelp(OptionParser parser, @SuppressWarnings("SameParameterValue") PrintStream stream) { try { - stream.println("Bisq RPC Client"); + stream.println("Haveno RPC Client"); stream.println(); - stream.println("Usage: bisq-cli [options] [params]"); + stream.println("Usage: haveno-cli [options] [params]"); stream.println(); parser.printHelpOn(stream); stream.println(); @@ -738,7 +734,7 @@ public class CliMain { stream.println(); stream.format(rowFormat, stop.name(), "", "Shut down the server"); stream.println(); - stream.println("Method Help Usage: bisq-cli [options] --help"); + stream.println("Method Help Usage: haveno-cli [options] --help"); stream.println(); } catch (IOException ex) { ex.printStackTrace(stream); diff --git a/cli/src/main/java/bisq/cli/ColumnHeaderConstants.java b/cli/src/main/java/haveno/cli/ColumnHeaderConstants.java similarity index 99% rename from cli/src/main/java/bisq/cli/ColumnHeaderConstants.java rename to cli/src/main/java/haveno/cli/ColumnHeaderConstants.java index fa34ba3f..8a6dcd05 100644 --- a/cli/src/main/java/bisq/cli/ColumnHeaderConstants.java +++ b/cli/src/main/java/haveno/cli/ColumnHeaderConstants.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; import static com.google.common.base.Strings.padEnd; import static com.google.common.base.Strings.padStart; diff --git a/cli/src/main/java/bisq/cli/CryptoCurrencyUtil.java b/cli/src/main/java/haveno/cli/CryptoCurrencyUtil.java similarity index 98% rename from cli/src/main/java/bisq/cli/CryptoCurrencyUtil.java rename to cli/src/main/java/haveno/cli/CryptoCurrencyUtil.java index c5439a3c..cd9b5ef8 100644 --- a/cli/src/main/java/bisq/cli/CryptoCurrencyUtil.java +++ b/cli/src/main/java/haveno/cli/CryptoCurrencyUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; import java.util.ArrayList; import java.util.List; diff --git a/cli/src/main/java/bisq/cli/CurrencyFormat.java b/cli/src/main/java/haveno/cli/CurrencyFormat.java similarity index 99% rename from cli/src/main/java/bisq/cli/CurrencyFormat.java rename to cli/src/main/java/haveno/cli/CurrencyFormat.java index cd01d741..b5a9e2d2 100644 --- a/cli/src/main/java/bisq/cli/CurrencyFormat.java +++ b/cli/src/main/java/haveno/cli/CurrencyFormat.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; import com.google.common.annotations.VisibleForTesting; diff --git a/cli/src/main/java/bisq/cli/DirectionFormat.java b/cli/src/main/java/haveno/cli/DirectionFormat.java similarity index 94% rename from cli/src/main/java/bisq/cli/DirectionFormat.java rename to cli/src/main/java/haveno/cli/DirectionFormat.java index 392fa633..f0d99a67 100644 --- a/cli/src/main/java/bisq/cli/DirectionFormat.java +++ b/cli/src/main/java/haveno/cli/DirectionFormat.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; -import bisq.proto.grpc.OfferInfo; +import haveno.proto.grpc.OfferInfo; import java.util.List; import java.util.function.Function; -import static bisq.cli.ColumnHeaderConstants.COL_HEADER_DIRECTION; +import static haveno.cli.ColumnHeaderConstants.COL_HEADER_DIRECTION; import static java.lang.String.format; import static protobuf.OfferDirection.BUY; import static protobuf.OfferDirection.SELL; diff --git a/cli/src/main/java/bisq/cli/GrpcClient.java b/cli/src/main/java/haveno/cli/GrpcClient.java similarity index 94% rename from cli/src/main/java/bisq/cli/GrpcClient.java rename to cli/src/main/java/haveno/cli/GrpcClient.java index c500869c..ec59b4a6 100644 --- a/cli/src/main/java/bisq/cli/GrpcClient.java +++ b/cli/src/main/java/haveno/cli/GrpcClient.java @@ -15,19 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.cli; - -import bisq.proto.grpc.AddressBalanceInfo; -import bisq.proto.grpc.BalancesInfo; -import bisq.proto.grpc.BtcBalanceInfo; -import bisq.proto.grpc.GetMethodHelpRequest; -import bisq.proto.grpc.GetTradesRequest; -import bisq.proto.grpc.GetVersionRequest; -import bisq.proto.grpc.OfferInfo; -import bisq.proto.grpc.RegisterDisputeAgentRequest; -import bisq.proto.grpc.StopRequest; -import bisq.proto.grpc.TradeInfo; +package haveno.cli; +import haveno.proto.grpc.AddressBalanceInfo; +import haveno.proto.grpc.BalancesInfo; +import haveno.proto.grpc.BtcBalanceInfo; +import haveno.proto.grpc.GetMethodHelpRequest; +import haveno.proto.grpc.GetTradesRequest; +import haveno.proto.grpc.GetVersionRequest; +import haveno.proto.grpc.OfferInfo; +import haveno.proto.grpc.RegisterDisputeAgentRequest; +import haveno.proto.grpc.StopRequest; +import haveno.proto.grpc.TradeInfo; +import haveno.cli.request.OffersServiceRequest; +import haveno.cli.request.PaymentAccountsServiceRequest; +import haveno.cli.request.TradesServiceRequest; +import haveno.cli.request.WalletsServiceRequest; import protobuf.PaymentAccount; import protobuf.PaymentAccountForm; import protobuf.PaymentMethod; @@ -37,12 +40,6 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import bisq.cli.request.OffersServiceRequest; -import bisq.cli.request.PaymentAccountsServiceRequest; -import bisq.cli.request.TradesServiceRequest; -import bisq.cli.request.WalletsServiceRequest; - - @SuppressWarnings("ResultOfMethodCallIgnored") @Slf4j public final class GrpcClient { diff --git a/cli/src/main/java/bisq/cli/GrpcStubs.java b/cli/src/main/java/haveno/cli/GrpcStubs.java similarity index 88% rename from cli/src/main/java/bisq/cli/GrpcStubs.java rename to cli/src/main/java/haveno/cli/GrpcStubs.java index 63984be2..27e2f262 100644 --- a/cli/src/main/java/bisq/cli/GrpcStubs.java +++ b/cli/src/main/java/haveno/cli/GrpcStubs.java @@ -15,17 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; -import bisq.proto.grpc.DisputeAgentsGrpc; -import bisq.proto.grpc.GetVersionGrpc; -import bisq.proto.grpc.HelpGrpc; -import bisq.proto.grpc.OffersGrpc; -import bisq.proto.grpc.PaymentAccountsGrpc; -import bisq.proto.grpc.PriceGrpc; -import bisq.proto.grpc.ShutdownServerGrpc; -import bisq.proto.grpc.TradesGrpc; -import bisq.proto.grpc.WalletsGrpc; +import haveno.proto.grpc.DisputeAgentsGrpc; +import haveno.proto.grpc.GetVersionGrpc; +import haveno.proto.grpc.HelpGrpc; +import haveno.proto.grpc.OffersGrpc; +import haveno.proto.grpc.PaymentAccountsGrpc; +import haveno.proto.grpc.PriceGrpc; +import haveno.proto.grpc.ShutdownServerGrpc; +import haveno.proto.grpc.TradesGrpc; +import haveno.proto.grpc.WalletsGrpc; import io.grpc.CallCredentials; import io.grpc.ManagedChannelBuilder; diff --git a/cli/src/main/java/bisq/cli/Method.java b/cli/src/main/java/haveno/cli/Method.java similarity index 98% rename from cli/src/main/java/bisq/cli/Method.java rename to cli/src/main/java/haveno/cli/Method.java index 676d8967..395da4b2 100644 --- a/cli/src/main/java/bisq/cli/Method.java +++ b/cli/src/main/java/haveno/cli/Method.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; /** * Currently supported api methods. diff --git a/cli/src/main/java/bisq/cli/PasswordCallCredentials.java b/cli/src/main/java/haveno/cli/PasswordCallCredentials.java similarity index 99% rename from cli/src/main/java/bisq/cli/PasswordCallCredentials.java rename to cli/src/main/java/haveno/cli/PasswordCallCredentials.java index 533194b2..fd7289ce 100644 --- a/cli/src/main/java/bisq/cli/PasswordCallCredentials.java +++ b/cli/src/main/java/haveno/cli/PasswordCallCredentials.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; import io.grpc.CallCredentials; import io.grpc.Metadata; diff --git a/cli/src/main/java/bisq/cli/TransactionFormat.java b/cli/src/main/java/haveno/cli/TransactionFormat.java similarity index 97% rename from cli/src/main/java/bisq/cli/TransactionFormat.java rename to cli/src/main/java/haveno/cli/TransactionFormat.java index 207b0221..e8a2cdca 100644 --- a/cli/src/main/java/bisq/cli/TransactionFormat.java +++ b/cli/src/main/java/haveno/cli/TransactionFormat.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli; +package haveno.cli; import com.google.common.annotations.VisibleForTesting; diff --git a/cli/src/main/java/bisq/cli/opts/AbstractMethodOptionParser.java b/cli/src/main/java/haveno/cli/opts/AbstractMethodOptionParser.java similarity index 97% rename from cli/src/main/java/bisq/cli/opts/AbstractMethodOptionParser.java rename to cli/src/main/java/haveno/cli/opts/AbstractMethodOptionParser.java index 5fe50162..abfa821e 100644 --- a/cli/src/main/java/bisq/cli/opts/AbstractMethodOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/AbstractMethodOptionParser.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionException; import joptsimple.OptionParser; @@ -28,7 +28,7 @@ import java.util.function.Predicate; import lombok.Getter; -import static bisq.cli.opts.OptLabel.OPT_HELP; +import static haveno.cli.opts.OptLabel.OPT_HELP; import static java.lang.String.format; @SuppressWarnings("unchecked") diff --git a/cli/src/main/java/bisq/cli/opts/ArgumentList.java b/cli/src/main/java/haveno/cli/opts/ArgumentList.java similarity index 99% rename from cli/src/main/java/bisq/cli/opts/ArgumentList.java rename to cli/src/main/java/haveno/cli/opts/ArgumentList.java index cf1b4efa..0ef04d2c 100644 --- a/cli/src/main/java/bisq/cli/opts/ArgumentList.java +++ b/cli/src/main/java/haveno/cli/opts/ArgumentList.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import java.util.ArrayList; import java.util.List; diff --git a/cli/src/main/java/bisq/cli/opts/CancelOfferOptionParser.java b/cli/src/main/java/haveno/cli/opts/CancelOfferOptionParser.java similarity index 97% rename from cli/src/main/java/bisq/cli/opts/CancelOfferOptionParser.java rename to cli/src/main/java/haveno/cli/opts/CancelOfferOptionParser.java index 83d40046..1588aa83 100644 --- a/cli/src/main/java/bisq/cli/opts/CancelOfferOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/CancelOfferOptionParser.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; public class CancelOfferOptionParser extends OfferIdOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/CreateCryptoCurrencyPaymentAcctOptionParser.java b/cli/src/main/java/haveno/cli/opts/CreateCryptoCurrencyPaymentAcctOptionParser.java similarity index 90% rename from cli/src/main/java/bisq/cli/opts/CreateCryptoCurrencyPaymentAcctOptionParser.java rename to cli/src/main/java/haveno/cli/opts/CreateCryptoCurrencyPaymentAcctOptionParser.java index 2972f5e5..52a25b45 100644 --- a/cli/src/main/java/bisq/cli/opts/CreateCryptoCurrencyPaymentAcctOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/CreateCryptoCurrencyPaymentAcctOptionParser.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionSpec; -import static bisq.cli.CryptoCurrencyUtil.apiDoesSupportCryptoCurrency; -import static bisq.cli.opts.OptLabel.OPT_ACCOUNT_NAME; -import static bisq.cli.opts.OptLabel.OPT_ADDRESS; -import static bisq.cli.opts.OptLabel.OPT_CURRENCY_CODE; -import static bisq.cli.opts.OptLabel.OPT_TRADE_INSTANT; +import static haveno.cli.CryptoCurrencyUtil.apiDoesSupportCryptoCurrency; +import static haveno.cli.opts.OptLabel.OPT_ACCOUNT_NAME; +import static haveno.cli.opts.OptLabel.OPT_ADDRESS; +import static haveno.cli.opts.OptLabel.OPT_CURRENCY_CODE; +import static haveno.cli.opts.OptLabel.OPT_TRADE_INSTANT; import static java.lang.String.format; public class CreateCryptoCurrencyPaymentAcctOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/CreateOfferOptionParser.java b/cli/src/main/java/haveno/cli/opts/CreateOfferOptionParser.java similarity index 98% rename from cli/src/main/java/bisq/cli/opts/CreateOfferOptionParser.java rename to cli/src/main/java/haveno/cli/opts/CreateOfferOptionParser.java index 9d834526..0b495db4 100644 --- a/cli/src/main/java/bisq/cli/opts/CreateOfferOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/CreateOfferOptionParser.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.*; +import static haveno.cli.opts.OptLabel.*; import static joptsimple.internal.Strings.EMPTY; public class CreateOfferOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/CreatePaymentAcctOptionParser.java b/cli/src/main/java/haveno/cli/opts/CreatePaymentAcctOptionParser.java similarity index 95% rename from cli/src/main/java/bisq/cli/opts/CreatePaymentAcctOptionParser.java rename to cli/src/main/java/haveno/cli/opts/CreatePaymentAcctOptionParser.java index 74703e55..3b5cddd7 100644 --- a/cli/src/main/java/bisq/cli/opts/CreatePaymentAcctOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/CreatePaymentAcctOptionParser.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionSpec; @@ -23,7 +23,7 @@ import joptsimple.OptionSpec; import java.nio.file.Path; import java.nio.file.Paths; -import static bisq.cli.opts.OptLabel.OPT_PAYMENT_ACCOUNT_FORM; +import static haveno.cli.opts.OptLabel.OPT_PAYMENT_ACCOUNT_FORM; import static java.lang.String.format; public class CreatePaymentAcctOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/GetAddressBalanceOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetAddressBalanceOptionParser.java similarity index 95% rename from cli/src/main/java/bisq/cli/opts/GetAddressBalanceOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetAddressBalanceOptionParser.java index 18e62fca..829e9042 100644 --- a/cli/src/main/java/bisq/cli/opts/GetAddressBalanceOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetAddressBalanceOptionParser.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_ADDRESS; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_ADDRESS; - public class GetAddressBalanceOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec addressOpt = parser.accepts(OPT_ADDRESS, "wallet btc address") diff --git a/cli/src/main/java/bisq/cli/opts/GetBTCMarketPriceOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetBTCMarketPriceOptionParser.java similarity index 94% rename from cli/src/main/java/bisq/cli/opts/GetBTCMarketPriceOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetBTCMarketPriceOptionParser.java index cf9c6b69..70d8af10 100644 --- a/cli/src/main/java/bisq/cli/opts/GetBTCMarketPriceOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetBTCMarketPriceOptionParser.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_CURRENCY_CODE; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_CURRENCY_CODE; - public class GetBTCMarketPriceOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec currencyCodeOpt = parser.accepts(OPT_CURRENCY_CODE, "currency-code") diff --git a/cli/src/main/java/bisq/cli/opts/GetBalanceOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetBalanceOptionParser.java similarity index 94% rename from cli/src/main/java/bisq/cli/opts/GetBalanceOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetBalanceOptionParser.java index b192492c..671741b3 100644 --- a/cli/src/main/java/bisq/cli/opts/GetBalanceOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetBalanceOptionParser.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_CURRENCY_CODE; +import static haveno.cli.opts.OptLabel.OPT_CURRENCY_CODE; import static joptsimple.internal.Strings.EMPTY; public class GetBalanceOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/GetOfferOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetOfferOptionParser.java similarity index 94% rename from cli/src/main/java/bisq/cli/opts/GetOfferOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetOfferOptionParser.java index 23176218..349affd2 100644 --- a/cli/src/main/java/bisq/cli/opts/GetOfferOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetOfferOptionParser.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_OFFER_ID; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_OFFER_ID; - public class GetOfferOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec offerIdOpt = parser.accepts(OPT_OFFER_ID, "id of offer to get") diff --git a/cli/src/main/java/bisq/cli/opts/GetOffersOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetOffersOptionParser.java similarity index 93% rename from cli/src/main/java/bisq/cli/opts/GetOffersOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetOffersOptionParser.java index a3f0e5b3..b6c68734 100644 --- a/cli/src/main/java/bisq/cli/opts/GetOffersOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetOffersOptionParser.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_CURRENCY_CODE; +import static haveno.cli.opts.OptLabel.OPT_DIRECTION; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_CURRENCY_CODE; -import static bisq.cli.opts.OptLabel.OPT_DIRECTION; - public class GetOffersOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec directionOpt = parser.accepts(OPT_DIRECTION, "offer direction (buy|sell)") diff --git a/cli/src/main/java/bisq/cli/opts/GetPaymentAcctFormOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetPaymentAcctFormOptionParser.java similarity index 94% rename from cli/src/main/java/bisq/cli/opts/GetPaymentAcctFormOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetPaymentAcctFormOptionParser.java index adc33bbb..40b81830 100644 --- a/cli/src/main/java/bisq/cli/opts/GetPaymentAcctFormOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetPaymentAcctFormOptionParser.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_PAYMENT_METHOD_ID; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_PAYMENT_METHOD_ID; - public class GetPaymentAcctFormOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec paymentMethodIdOpt = parser.accepts(OPT_PAYMENT_METHOD_ID, diff --git a/cli/src/main/java/bisq/cli/opts/GetTradeOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetTradeOptionParser.java similarity index 93% rename from cli/src/main/java/bisq/cli/opts/GetTradeOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetTradeOptionParser.java index 25db4b87..9ca8d6e0 100644 --- a/cli/src/main/java/bisq/cli/opts/GetTradeOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetTradeOptionParser.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_SHOW_CONTRACT; +import static haveno.cli.opts.OptLabel.OPT_TRADE_ID; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_SHOW_CONTRACT; -import static bisq.cli.opts.OptLabel.OPT_TRADE_ID; - public class GetTradeOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec tradeIdOpt = parser.accepts(OPT_TRADE_ID, "id of trade") diff --git a/cli/src/main/java/bisq/cli/opts/GetTradesOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetTradesOptionParser.java similarity index 89% rename from cli/src/main/java/bisq/cli/opts/GetTradesOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetTradesOptionParser.java index 8357db65..ff41ff01 100644 --- a/cli/src/main/java/bisq/cli/opts/GetTradesOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetTradesOptionParser.java @@ -15,19 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; -import bisq.proto.grpc.GetTradesRequest; +import haveno.proto.grpc.GetTradesRequest; import joptsimple.OptionSpec; import java.util.function.Predicate; -import static bisq.cli.opts.OptLabel.OPT_CATEGORY; -import static bisq.proto.grpc.GetTradesRequest.Category.CLOSED; -import static bisq.proto.grpc.GetTradesRequest.Category.FAILED; -import static bisq.proto.grpc.GetTradesRequest.Category.OPEN; +import static haveno.proto.grpc.GetTradesRequest.Category.CLOSED; +import static haveno.proto.grpc.GetTradesRequest.Category.FAILED; +import static haveno.proto.grpc.GetTradesRequest.Category.OPEN; +import static haveno.cli.opts.OptLabel.OPT_CATEGORY; import static java.util.Arrays.stream; public class GetTradesOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/GetTransactionOptionParser.java b/cli/src/main/java/haveno/cli/opts/GetTransactionOptionParser.java similarity index 94% rename from cli/src/main/java/bisq/cli/opts/GetTransactionOptionParser.java rename to cli/src/main/java/haveno/cli/opts/GetTransactionOptionParser.java index 32524d89..0531cf92 100644 --- a/cli/src/main/java/bisq/cli/opts/GetTransactionOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/GetTransactionOptionParser.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_TRANSACTION_ID; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_TRANSACTION_ID; - public class GetTransactionOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec txIdOpt = parser.accepts(OPT_TRANSACTION_ID, "id of transaction") diff --git a/cli/src/main/java/bisq/cli/opts/MethodOpts.java b/cli/src/main/java/haveno/cli/opts/MethodOpts.java similarity index 96% rename from cli/src/main/java/bisq/cli/opts/MethodOpts.java rename to cli/src/main/java/haveno/cli/opts/MethodOpts.java index 641b7272..55053a84 100644 --- a/cli/src/main/java/bisq/cli/opts/MethodOpts.java +++ b/cli/src/main/java/haveno/cli/opts/MethodOpts.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; public interface MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/OfferIdOptionParser.java b/cli/src/main/java/haveno/cli/opts/OfferIdOptionParser.java similarity index 95% rename from cli/src/main/java/bisq/cli/opts/OfferIdOptionParser.java rename to cli/src/main/java/haveno/cli/opts/OfferIdOptionParser.java index cd20f30e..9fa3a9e1 100644 --- a/cli/src/main/java/bisq/cli/opts/OfferIdOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/OfferIdOptionParser.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_OFFER_ID; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_OFFER_ID; - /** * Superclass for option parsers requiring an offer-id. Avoids a small amount of * duplicated boilerplate. diff --git a/cli/src/main/java/bisq/cli/opts/OptLabel.java b/cli/src/main/java/haveno/cli/opts/OptLabel.java similarity index 99% rename from cli/src/main/java/bisq/cli/opts/OptLabel.java rename to cli/src/main/java/haveno/cli/opts/OptLabel.java index 5ccc135c..1ec5ad62 100644 --- a/cli/src/main/java/bisq/cli/opts/OptLabel.java +++ b/cli/src/main/java/haveno/cli/opts/OptLabel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; /** * CLI opt label definitions. diff --git a/cli/src/main/java/bisq/cli/opts/RegisterDisputeAgentOptionParser.java b/cli/src/main/java/haveno/cli/opts/RegisterDisputeAgentOptionParser.java similarity index 93% rename from cli/src/main/java/bisq/cli/opts/RegisterDisputeAgentOptionParser.java rename to cli/src/main/java/haveno/cli/opts/RegisterDisputeAgentOptionParser.java index b00e4e14..d9f862e1 100644 --- a/cli/src/main/java/bisq/cli/opts/RegisterDisputeAgentOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/RegisterDisputeAgentOptionParser.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_DISPUTE_AGENT_TYPE; +import static haveno.cli.opts.OptLabel.OPT_REGISTRATION_KEY; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_DISPUTE_AGENT_TYPE; -import static bisq.cli.opts.OptLabel.OPT_REGISTRATION_KEY; - public class RegisterDisputeAgentOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec disputeAgentTypeOpt = parser.accepts(OPT_DISPUTE_AGENT_TYPE, "dispute agent type") diff --git a/cli/src/main/java/bisq/cli/opts/RemoveWalletPasswordOptionParser.java b/cli/src/main/java/haveno/cli/opts/RemoveWalletPasswordOptionParser.java similarity index 92% rename from cli/src/main/java/bisq/cli/opts/RemoveWalletPasswordOptionParser.java rename to cli/src/main/java/haveno/cli/opts/RemoveWalletPasswordOptionParser.java index 61abece6..f999ce57 100644 --- a/cli/src/main/java/bisq/cli/opts/RemoveWalletPasswordOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/RemoveWalletPasswordOptionParser.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_WALLET_PASSWORD; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_WALLET_PASSWORD; - public class RemoveWalletPasswordOptionParser extends AbstractMethodOptionParser implements MethodOpts { - final OptionSpec passwordOpt = parser.accepts(OPT_WALLET_PASSWORD, "bisq wallet password") + final OptionSpec passwordOpt = parser.accepts(OPT_WALLET_PASSWORD, "haveno wallet password") .withRequiredArg(); public RemoveWalletPasswordOptionParser(String[] args) { diff --git a/cli/src/main/java/bisq/cli/opts/SendBtcOptionParser.java b/cli/src/main/java/haveno/cli/opts/SendBtcOptionParser.java similarity index 91% rename from cli/src/main/java/bisq/cli/opts/SendBtcOptionParser.java rename to cli/src/main/java/haveno/cli/opts/SendBtcOptionParser.java index 37709153..6f13d55a 100644 --- a/cli/src/main/java/bisq/cli/opts/SendBtcOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/SendBtcOptionParser.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_ADDRESS; -import static bisq.cli.opts.OptLabel.OPT_AMOUNT; -import static bisq.cli.opts.OptLabel.OPT_MEMO; -import static bisq.cli.opts.OptLabel.OPT_TX_FEE_RATE; +import static haveno.cli.opts.OptLabel.OPT_ADDRESS; +import static haveno.cli.opts.OptLabel.OPT_AMOUNT; +import static haveno.cli.opts.OptLabel.OPT_MEMO; +import static haveno.cli.opts.OptLabel.OPT_TX_FEE_RATE; import static joptsimple.internal.Strings.EMPTY; public class SendBtcOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/SetTxFeeRateOptionParser.java b/cli/src/main/java/haveno/cli/opts/SetTxFeeRateOptionParser.java similarity index 94% rename from cli/src/main/java/bisq/cli/opts/SetTxFeeRateOptionParser.java rename to cli/src/main/java/haveno/cli/opts/SetTxFeeRateOptionParser.java index 3bc0a51b..81964ed2 100644 --- a/cli/src/main/java/bisq/cli/opts/SetTxFeeRateOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/SetTxFeeRateOptionParser.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_TX_FEE_RATE; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_TX_FEE_RATE; - public class SetTxFeeRateOptionParser extends AbstractMethodOptionParser implements MethodOpts { final OptionSpec feeRateOpt = parser.accepts(OPT_TX_FEE_RATE, diff --git a/cli/src/main/java/bisq/cli/opts/SetWalletPasswordOptionParser.java b/cli/src/main/java/haveno/cli/opts/SetWalletPasswordOptionParser.java similarity index 88% rename from cli/src/main/java/bisq/cli/opts/SetWalletPasswordOptionParser.java rename to cli/src/main/java/haveno/cli/opts/SetWalletPasswordOptionParser.java index fe888b63..9e2b0dc5 100644 --- a/cli/src/main/java/bisq/cli/opts/SetWalletPasswordOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/SetWalletPasswordOptionParser.java @@ -15,21 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_NEW_WALLET_PASSWORD; -import static bisq.cli.opts.OptLabel.OPT_WALLET_PASSWORD; +import static haveno.cli.opts.OptLabel.OPT_NEW_WALLET_PASSWORD; +import static haveno.cli.opts.OptLabel.OPT_WALLET_PASSWORD; import static joptsimple.internal.Strings.EMPTY; public class SetWalletPasswordOptionParser extends AbstractMethodOptionParser implements MethodOpts { - final OptionSpec passwordOpt = parser.accepts(OPT_WALLET_PASSWORD, "bisq wallet password") + final OptionSpec passwordOpt = parser.accepts(OPT_WALLET_PASSWORD, "haveno wallet password") .withRequiredArg(); - final OptionSpec newPasswordOpt = parser.accepts(OPT_NEW_WALLET_PASSWORD, "new bisq wallet password") + final OptionSpec newPasswordOpt = parser.accepts(OPT_NEW_WALLET_PASSWORD, "new haveno wallet password") .withOptionalArg() .defaultsTo(EMPTY); diff --git a/cli/src/main/java/bisq/cli/opts/SimpleMethodOptionParser.java b/cli/src/main/java/haveno/cli/opts/SimpleMethodOptionParser.java similarity index 97% rename from cli/src/main/java/bisq/cli/opts/SimpleMethodOptionParser.java rename to cli/src/main/java/haveno/cli/opts/SimpleMethodOptionParser.java index 21043dec..1390a76c 100644 --- a/cli/src/main/java/bisq/cli/opts/SimpleMethodOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/SimpleMethodOptionParser.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; public class SimpleMethodOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/opts/TakeOfferOptionParser.java b/cli/src/main/java/haveno/cli/opts/TakeOfferOptionParser.java similarity index 91% rename from cli/src/main/java/bisq/cli/opts/TakeOfferOptionParser.java rename to cli/src/main/java/haveno/cli/opts/TakeOfferOptionParser.java index d67305f5..5dff7b68 100644 --- a/cli/src/main/java/bisq/cli/opts/TakeOfferOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/TakeOfferOptionParser.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_FEE_CURRENCY; +import static haveno.cli.opts.OptLabel.OPT_PAYMENT_ACCOUNT_ID; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_FEE_CURRENCY; -import static bisq.cli.opts.OptLabel.OPT_PAYMENT_ACCOUNT_ID; - public class TakeOfferOptionParser extends OfferIdOptionParser implements MethodOpts { final OptionSpec paymentAccountIdOpt = parser.accepts(OPT_PAYMENT_ACCOUNT_ID, "id of payment account used for trade") diff --git a/cli/src/main/java/bisq/cli/opts/UnlockWalletOptionParser.java b/cli/src/main/java/haveno/cli/opts/UnlockWalletOptionParser.java similarity index 91% rename from cli/src/main/java/bisq/cli/opts/UnlockWalletOptionParser.java rename to cli/src/main/java/haveno/cli/opts/UnlockWalletOptionParser.java index b18a7ada..a6ac7e3f 100644 --- a/cli/src/main/java/bisq/cli/opts/UnlockWalletOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/UnlockWalletOptionParser.java @@ -15,17 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; +import static haveno.cli.opts.OptLabel.OPT_TIMEOUT; +import static haveno.cli.opts.OptLabel.OPT_WALLET_PASSWORD; + import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_TIMEOUT; -import static bisq.cli.opts.OptLabel.OPT_WALLET_PASSWORD; - public class UnlockWalletOptionParser extends AbstractMethodOptionParser implements MethodOpts { - final OptionSpec passwordOpt = parser.accepts(OPT_WALLET_PASSWORD, "bisq wallet password") + final OptionSpec passwordOpt = parser.accepts(OPT_WALLET_PASSWORD, "haveno wallet password") .withRequiredArg(); final OptionSpec unlockTimeoutOpt = parser.accepts(OPT_TIMEOUT, "wallet unlock timeout (s)") diff --git a/cli/src/main/java/bisq/cli/opts/WithdrawFundsOptionParser.java b/cli/src/main/java/haveno/cli/opts/WithdrawFundsOptionParser.java similarity index 92% rename from cli/src/main/java/bisq/cli/opts/WithdrawFundsOptionParser.java rename to cli/src/main/java/haveno/cli/opts/WithdrawFundsOptionParser.java index f86176de..afe28c8b 100644 --- a/cli/src/main/java/bisq/cli/opts/WithdrawFundsOptionParser.java +++ b/cli/src/main/java/haveno/cli/opts/WithdrawFundsOptionParser.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.cli.opts; +package haveno.cli.opts; import joptsimple.OptionSpec; -import static bisq.cli.opts.OptLabel.OPT_ADDRESS; -import static bisq.cli.opts.OptLabel.OPT_MEMO; -import static bisq.cli.opts.OptLabel.OPT_TRADE_ID; +import static haveno.cli.opts.OptLabel.OPT_ADDRESS; +import static haveno.cli.opts.OptLabel.OPT_MEMO; +import static haveno.cli.opts.OptLabel.OPT_TRADE_ID; import static joptsimple.internal.Strings.EMPTY; public class WithdrawFundsOptionParser extends AbstractMethodOptionParser implements MethodOpts { diff --git a/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java b/cli/src/main/java/haveno/cli/request/OffersServiceRequest.java similarity index 94% rename from cli/src/main/java/bisq/cli/request/OffersServiceRequest.java rename to cli/src/main/java/haveno/cli/request/OffersServiceRequest.java index ac89c53e..79e0033b 100644 --- a/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java +++ b/cli/src/main/java/haveno/cli/request/OffersServiceRequest.java @@ -15,15 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.cli.request; +package haveno.cli.request; -import bisq.proto.grpc.CancelOfferRequest; -import bisq.proto.grpc.PostOfferRequest; -import bisq.proto.grpc.GetMyOfferRequest; -import bisq.proto.grpc.GetMyOffersRequest; -import bisq.proto.grpc.GetOfferRequest; -import bisq.proto.grpc.GetOffersRequest; -import bisq.proto.grpc.OfferInfo; +import haveno.proto.grpc.CancelOfferRequest; +import haveno.proto.grpc.PostOfferRequest; +import haveno.cli.GrpcStubs; +import haveno.proto.grpc.GetMyOfferRequest; +import haveno.proto.grpc.GetMyOffersRequest; +import haveno.proto.grpc.GetOfferRequest; +import haveno.proto.grpc.GetOffersRequest; +import haveno.proto.grpc.OfferInfo; import java.util.ArrayList; import java.util.List; @@ -33,10 +34,6 @@ import static java.util.stream.Collectors.toList; import static protobuf.OfferDirection.BUY; import static protobuf.OfferDirection.SELL; - - -import bisq.cli.GrpcStubs; - public class OffersServiceRequest { private final GrpcStubs grpcStubs; diff --git a/cli/src/main/java/bisq/cli/request/PaymentAccountsServiceRequest.java b/cli/src/main/java/haveno/cli/request/PaymentAccountsServiceRequest.java similarity index 89% rename from cli/src/main/java/bisq/cli/request/PaymentAccountsServiceRequest.java rename to cli/src/main/java/haveno/cli/request/PaymentAccountsServiceRequest.java index 4fab1330..0fbc8de8 100644 --- a/cli/src/main/java/bisq/cli/request/PaymentAccountsServiceRequest.java +++ b/cli/src/main/java/haveno/cli/request/PaymentAccountsServiceRequest.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.cli.request; - -import bisq.proto.grpc.CreateCryptoCurrencyPaymentAccountRequest; -import bisq.proto.grpc.CreatePaymentAccountRequest; -import bisq.proto.grpc.GetCryptoCurrencyPaymentMethodsRequest; -import bisq.proto.grpc.GetPaymentAccountFormAsJsonRequest; -import bisq.proto.grpc.GetPaymentAccountFormRequest; -import bisq.proto.grpc.GetPaymentAccountsRequest; -import bisq.proto.grpc.GetPaymentMethodsRequest; +package haveno.cli.request; +import haveno.proto.grpc.CreateCryptoCurrencyPaymentAccountRequest; +import haveno.proto.grpc.CreatePaymentAccountRequest; +import haveno.proto.grpc.GetCryptoCurrencyPaymentMethodsRequest; +import haveno.proto.grpc.GetPaymentAccountFormAsJsonRequest; +import haveno.proto.grpc.GetPaymentAccountFormRequest; +import haveno.proto.grpc.GetPaymentAccountsRequest; +import haveno.proto.grpc.GetPaymentMethodsRequest; +import haveno.cli.GrpcStubs; import protobuf.PaymentAccount; import protobuf.PaymentAccountForm; import protobuf.PaymentMethod; @@ -33,10 +33,6 @@ import java.util.List; import static java.lang.String.format; - - -import bisq.cli.GrpcStubs; - public class PaymentAccountsServiceRequest { private final GrpcStubs grpcStubs; diff --git a/cli/src/main/java/bisq/cli/request/TradesServiceRequest.java b/cli/src/main/java/haveno/cli/request/TradesServiceRequest.java similarity index 86% rename from cli/src/main/java/bisq/cli/request/TradesServiceRequest.java rename to cli/src/main/java/haveno/cli/request/TradesServiceRequest.java index 3b3ad32f..e575e7fb 100644 --- a/cli/src/main/java/bisq/cli/request/TradesServiceRequest.java +++ b/cli/src/main/java/haveno/cli/request/TradesServiceRequest.java @@ -15,25 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.cli.request; - -import bisq.proto.grpc.ConfirmPaymentReceivedRequest; -import bisq.proto.grpc.ConfirmPaymentSentRequest; -import bisq.proto.grpc.GetTradeRequest; -import bisq.proto.grpc.GetTradesRequest; -import bisq.proto.grpc.TakeOfferReply; -import bisq.proto.grpc.TakeOfferRequest; -import bisq.proto.grpc.TradeInfo; -import bisq.proto.grpc.WithdrawFundsRequest; +package haveno.cli.request; +import haveno.proto.grpc.ConfirmPaymentReceivedRequest; +import haveno.proto.grpc.ConfirmPaymentSentRequest; +import haveno.proto.grpc.GetTradeRequest; +import haveno.proto.grpc.GetTradesRequest; +import haveno.proto.grpc.TakeOfferReply; +import haveno.proto.grpc.TakeOfferRequest; +import haveno.proto.grpc.TradeInfo; +import haveno.proto.grpc.WithdrawFundsRequest; +import haveno.cli.GrpcStubs; import java.util.List; -import static bisq.proto.grpc.GetTradesRequest.Category.CLOSED; -import static bisq.proto.grpc.GetTradesRequest.Category.FAILED; - - - -import bisq.cli.GrpcStubs; +import static haveno.proto.grpc.GetTradesRequest.Category.CLOSED; +import static haveno.proto.grpc.GetTradesRequest.Category.FAILED; public class TradesServiceRequest { diff --git a/cli/src/main/java/bisq/cli/request/WalletsServiceRequest.java b/cli/src/main/java/haveno/cli/request/WalletsServiceRequest.java similarity index 86% rename from cli/src/main/java/bisq/cli/request/WalletsServiceRequest.java rename to cli/src/main/java/haveno/cli/request/WalletsServiceRequest.java index e0f52b57..79bf34a7 100644 --- a/cli/src/main/java/bisq/cli/request/WalletsServiceRequest.java +++ b/cli/src/main/java/haveno/cli/request/WalletsServiceRequest.java @@ -15,27 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.cli.request; - -import bisq.proto.grpc.AddressBalanceInfo; -import bisq.proto.grpc.BalancesInfo; -import bisq.proto.grpc.BtcBalanceInfo; -import bisq.proto.grpc.GetAddressBalanceRequest; -import bisq.proto.grpc.GetBalancesRequest; -import bisq.proto.grpc.GetFundingAddressesRequest; -import bisq.proto.grpc.LockWalletRequest; -import bisq.proto.grpc.MarketPriceRequest; -import bisq.proto.grpc.RemoveWalletPasswordRequest; -import bisq.proto.grpc.SendBtcRequest; -import bisq.proto.grpc.SetWalletPasswordRequest; -import bisq.proto.grpc.UnlockWalletRequest; +package haveno.cli.request; +import haveno.proto.grpc.AddressBalanceInfo; +import haveno.proto.grpc.BalancesInfo; +import haveno.proto.grpc.BtcBalanceInfo; +import haveno.proto.grpc.GetAddressBalanceRequest; +import haveno.proto.grpc.GetBalancesRequest; +import haveno.proto.grpc.GetFundingAddressesRequest; +import haveno.proto.grpc.LockWalletRequest; +import haveno.proto.grpc.MarketPriceRequest; +import haveno.proto.grpc.RemoveWalletPasswordRequest; +import haveno.proto.grpc.SendBtcRequest; +import haveno.proto.grpc.SetWalletPasswordRequest; +import haveno.proto.grpc.UnlockWalletRequest; +import haveno.cli.GrpcStubs; import java.util.List; - - -import bisq.cli.GrpcStubs; - public class WalletsServiceRequest { private final GrpcStubs grpcStubs; diff --git a/cli/src/main/java/bisq/cli/table/Table.java b/cli/src/main/java/haveno/cli/table/Table.java similarity index 97% rename from cli/src/main/java/bisq/cli/table/Table.java rename to cli/src/main/java/haveno/cli/table/Table.java index 52c4f40c..70a1f6ad 100644 --- a/cli/src/main/java/bisq/cli/table/Table.java +++ b/cli/src/main/java/haveno/cli/table/Table.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.cli.table; +package haveno.cli.table; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; import static com.google.common.base.Strings.padStart; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; - - -import bisq.cli.table.column.Column; +import haveno.cli.table.column.Column; /** * A simple table of formatted data for the CLI's output console. A table must be diff --git a/cli/src/main/java/bisq/cli/table/builder/AbstractTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/AbstractTableBuilder.java similarity index 92% rename from cli/src/main/java/bisq/cli/table/builder/AbstractTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/AbstractTableBuilder.java index 46f56ca0..61f623e5 100644 --- a/cli/src/main/java/bisq/cli/table/builder/AbstractTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/AbstractTableBuilder.java @@ -15,17 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; - -import bisq.proto.grpc.OfferInfo; +package haveno.cli.table.builder; +import haveno.proto.grpc.OfferInfo; +import haveno.cli.table.Table; import java.util.List; import java.util.function.Predicate; - - -import bisq.cli.table.Table; - /** * Abstract superclass for TableBuilder implementations. */ diff --git a/cli/src/main/java/bisq/cli/table/builder/AbstractTradeListBuilder.java b/cli/src/main/java/haveno/cli/table/builder/AbstractTradeListBuilder.java similarity index 93% rename from cli/src/main/java/bisq/cli/table/builder/AbstractTradeListBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/AbstractTradeListBuilder.java index 7a4b8c74..62268608 100644 --- a/cli/src/main/java/bisq/cli/table/builder/AbstractTradeListBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/AbstractTradeListBuilder.java @@ -15,11 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; - -import bisq.proto.grpc.ContractInfo; -import bisq.proto.grpc.TradeInfo; +package haveno.cli.table.builder; +import haveno.proto.grpc.ContractInfo; +import haveno.proto.grpc.TradeInfo; +import haveno.cli.table.column.Column; +import haveno.cli.table.column.MixedTradeFeeColumn; import java.math.BigDecimal; import java.util.List; @@ -30,18 +31,13 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import static bisq.cli.CurrencyFormat.formatSatoshis; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_BUYER_DEPOSIT; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_SELLER_DEPOSIT; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; +import static haveno.cli.CurrencyFormat.formatSatoshis; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_BUYER_DEPOSIT; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_SELLER_DEPOSIT; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; import static java.lang.String.format; import static protobuf.OfferDirection.SELL; - - -import bisq.cli.table.column.Column; -import bisq.cli.table.column.MixedTradeFeeColumn; - abstract class AbstractTradeListBuilder extends AbstractTableBuilder { protected final List trades; @@ -88,7 +84,7 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder { @Nullable protected final Column colIsCompleted; @Nullable - protected final Column colBisqTradeFee; + protected final Column colHavenoTradeFee; @Nullable protected final Column colTradeCost; @Nullable @@ -127,7 +123,7 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder { this.colIsDepositConfirmed = colSupplier.depositConfirmedColumn.get(); this.colIsPayoutPublished = colSupplier.payoutPublishedColumn.get(); this.colIsCompleted = colSupplier.fundsWithdrawnColumn.get(); - this.colBisqTradeFee = colSupplier.bisqTradeDetailFeeColumn.get(); + this.colHavenoTradeFee = colSupplier.havenoTradeDetailFeeColumn.get(); this.colTradeCost = colSupplier.tradeCostColumn.get(); this.colIsPaymentSentMessageSent = colSupplier.paymentSentMessageSentColumn.get(); this.colIsPaymentReceivedMessageSent = colSupplier.paymentReceivedMessageSentColumn.get(); diff --git a/cli/src/main/java/bisq/cli/table/builder/AddressBalanceTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/AddressBalanceTableBuilder.java similarity index 73% rename from cli/src/main/java/bisq/cli/table/builder/AddressBalanceTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/AddressBalanceTableBuilder.java index 52b771c7..1c4a718b 100644 --- a/cli/src/main/java/bisq/cli/table/builder/AddressBalanceTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/AddressBalanceTableBuilder.java @@ -15,32 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; - -import bisq.proto.grpc.AddressBalanceInfo; +package haveno.cli.table.builder; +import haveno.proto.grpc.AddressBalanceInfo; +import haveno.cli.table.Table; +import haveno.cli.table.column.BooleanColumn; +import haveno.cli.table.column.Column; +import haveno.cli.table.column.LongColumn; +import haveno.cli.table.column.SatoshiColumn; +import haveno.cli.table.column.StringColumn; import java.util.List; import java.util.stream.Collectors; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_ADDRESS; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_AVAILABLE_BALANCE; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_CONFIRMATIONS; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_IS_USED_ADDRESS; -import static bisq.cli.table.builder.TableType.ADDRESS_BALANCE_TBL; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_ADDRESS; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_AVAILABLE_BALANCE; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_CONFIRMATIONS; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_IS_USED_ADDRESS; +import static haveno.cli.table.builder.TableType.ADDRESS_BALANCE_TBL; import static java.lang.String.format; - - -import bisq.cli.table.Table; -import bisq.cli.table.column.BooleanColumn; -import bisq.cli.table.column.Column; -import bisq.cli.table.column.LongColumn; -import bisq.cli.table.column.SatoshiColumn; -import bisq.cli.table.column.StringColumn; - /** - * Builds a {@code bisq.cli.table.Table} from a List of - * {@code bisq.proto.grpc.AddressBalanceInfo} objects. + * Builds a {@code haveno.cli.table.Table} from a List of + * {@code haveno.proto.grpc.AddressBalanceInfo} objects. */ class AddressBalanceTableBuilder extends AbstractTableBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/BtcBalanceTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/BtcBalanceTableBuilder.java similarity index 75% rename from cli/src/main/java/bisq/cli/table/builder/BtcBalanceTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/BtcBalanceTableBuilder.java index ef3273bc..beb2ecd6 100644 --- a/cli/src/main/java/bisq/cli/table/builder/BtcBalanceTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/BtcBalanceTableBuilder.java @@ -15,27 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; -import bisq.proto.grpc.BtcBalanceInfo; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_AVAILABLE_BALANCE; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_LOCKED_BALANCE; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_RESERVED_BALANCE; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_TOTAL_AVAILABLE_BALANCE; +import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL; +import haveno.proto.grpc.BtcBalanceInfo; +import haveno.cli.table.Table; +import haveno.cli.table.column.Column; +import haveno.cli.table.column.SatoshiColumn; import java.util.List; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_AVAILABLE_BALANCE; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_LOCKED_BALANCE; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_RESERVED_BALANCE; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_TOTAL_AVAILABLE_BALANCE; -import static bisq.cli.table.builder.TableType.BTC_BALANCE_TBL; - - - -import bisq.cli.table.Table; -import bisq.cli.table.column.Column; -import bisq.cli.table.column.SatoshiColumn; - /** - * Builds a {@code bisq.cli.table.Table} from a - * {@code bisq.proto.grpc.BtcBalanceInfo} object. + * Builds a {@code haveno.cli.table.Table} from a + * {@code haveno.proto.grpc.BtcBalanceInfo} object. */ class BtcBalanceTableBuilder extends AbstractTableBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/ClosedTradeTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/ClosedTradeTableBuilder.java similarity index 94% rename from cli/src/main/java/bisq/cli/table/builder/ClosedTradeTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/ClosedTradeTableBuilder.java index 89ddf196..2a26461c 100644 --- a/cli/src/main/java/bisq/cli/table/builder/ClosedTradeTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/ClosedTradeTableBuilder.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; +import static haveno.cli.table.builder.TableType.CLOSED_TRADES_TBL; + +import haveno.cli.table.Table; import java.util.List; -import static bisq.cli.table.builder.TableType.CLOSED_TRADES_TBL; - - - -import bisq.cli.table.Table; - @SuppressWarnings("ConstantConditions") class ClosedTradeTableBuilder extends AbstractTradeListBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/FailedTradeTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/FailedTradeTableBuilder.java similarity index 89% rename from cli/src/main/java/bisq/cli/table/builder/FailedTradeTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/FailedTradeTableBuilder.java index 10348f0e..f9ee47b1 100644 --- a/cli/src/main/java/bisq/cli/table/builder/FailedTradeTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/FailedTradeTableBuilder.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; +import static haveno.cli.table.builder.TableType.FAILED_TRADES_TBL; + +import haveno.cli.table.Table; import java.util.List; -import static bisq.cli.table.builder.TableType.FAILED_TRADES_TBL; - - - -import bisq.cli.table.Table; - /** - * Builds a {@code bisq.cli.table.Table} from a list of {@code bisq.proto.grpc.TradeInfo} objects. + * Builds a {@code haveno.cli.table.Table} from a list of {@code haveno.proto.grpc.TradeInfo} objects. */ @SuppressWarnings("ConstantConditions") class FailedTradeTableBuilder extends AbstractTradeListBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/OfferTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/OfferTableBuilder.java similarity index 92% rename from cli/src/main/java/bisq/cli/table/builder/OfferTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/OfferTableBuilder.java index b1323332..388e28e1 100644 --- a/cli/src/main/java/bisq/cli/table/builder/OfferTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/OfferTableBuilder.java @@ -15,10 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; - -import bisq.proto.grpc.OfferInfo; +package haveno.cli.table.builder; +import haveno.proto.grpc.OfferInfo; +import haveno.cli.table.Table; +import haveno.cli.table.column.Column; +import haveno.cli.table.column.Iso8601DateTimeColumn; +import haveno.cli.table.column.SatoshiColumn; +import haveno.cli.table.column.StringColumn; +import haveno.cli.table.column.ZippedStringColumns; import java.util.List; import java.util.function.Function; import java.util.function.Supplier; @@ -26,28 +31,19 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import static bisq.cli.table.builder.TableBuilderConstants.*; -import static bisq.cli.table.builder.TableType.OFFER_TBL; -import static bisq.cli.table.column.Column.JUSTIFICATION.LEFT; -import static bisq.cli.table.column.Column.JUSTIFICATION.NONE; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; -import static bisq.cli.table.column.ZippedStringColumns.DUPLICATION_MODE.EXCLUDE_DUPLICATES; +import static haveno.cli.table.builder.TableBuilderConstants.*; +import static haveno.cli.table.builder.TableType.OFFER_TBL; +import static haveno.cli.table.column.Column.JUSTIFICATION.LEFT; +import static haveno.cli.table.column.Column.JUSTIFICATION.NONE; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; +import static haveno.cli.table.column.ZippedStringColumns.DUPLICATION_MODE.EXCLUDE_DUPLICATES; import static java.lang.String.format; import static protobuf.OfferDirection.BUY; import static protobuf.OfferDirection.SELL; - - -import bisq.cli.table.Table; -import bisq.cli.table.column.Column; -import bisq.cli.table.column.Iso8601DateTimeColumn; -import bisq.cli.table.column.SatoshiColumn; -import bisq.cli.table.column.StringColumn; -import bisq.cli.table.column.ZippedStringColumns; - /** - * Builds a {@code bisq.cli.table.Table} from a List of - * {@code bisq.proto.grpc.OfferInfo} objects. + * Builds a {@code haveno.cli.table.Table} from a List of + * {@code haveno.proto.grpc.OfferInfo} objects. */ class OfferTableBuilder extends AbstractTableBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/OpenTradeTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/OpenTradeTableBuilder.java similarity index 88% rename from cli/src/main/java/bisq/cli/table/builder/OpenTradeTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/OpenTradeTableBuilder.java index 10770c71..a6d8475d 100644 --- a/cli/src/main/java/bisq/cli/table/builder/OpenTradeTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/OpenTradeTableBuilder.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; +import static haveno.cli.table.builder.TableType.OPEN_TRADES_TBL; + +import haveno.cli.table.Table; import java.util.List; -import static bisq.cli.table.builder.TableType.OPEN_TRADES_TBL; - - - -import bisq.cli.table.Table; - /** - * Builds a {@code bisq.cli.table.Table} from a list of {@code bisq.proto.grpc.TradeInfo} objects. + * Builds a {@code haveno.cli.table.Table} from a list of {@code haveno.proto.grpc.TradeInfo} objects. */ @SuppressWarnings("ConstantConditions") class OpenTradeTableBuilder extends AbstractTradeListBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/PaymentAccountTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/PaymentAccountTableBuilder.java similarity index 78% rename from cli/src/main/java/bisq/cli/table/builder/PaymentAccountTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/PaymentAccountTableBuilder.java index 1dd2c5b8..d977ae5b 100644 --- a/cli/src/main/java/bisq/cli/table/builder/PaymentAccountTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/PaymentAccountTableBuilder.java @@ -15,27 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; import protobuf.PaymentAccount; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_CURRENCY; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_NAME; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_PAYMENT_METHOD; +import static haveno.cli.table.builder.TableBuilderConstants.COL_HEADER_UUID; +import static haveno.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL; + +import haveno.cli.table.Table; +import haveno.cli.table.column.Column; +import haveno.cli.table.column.StringColumn; import java.util.List; import java.util.stream.Collectors; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_CURRENCY; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_NAME; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_PAYMENT_METHOD; -import static bisq.cli.table.builder.TableBuilderConstants.COL_HEADER_UUID; -import static bisq.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL; - - - -import bisq.cli.table.Table; -import bisq.cli.table.column.Column; -import bisq.cli.table.column.StringColumn; - /** - * Builds a {@code bisq.cli.table.Table} from a List of + * Builds a {@code haveno.cli.table.Table} from a List of * {@code protobuf.PaymentAccount} objects. */ class PaymentAccountTableBuilder extends AbstractTableBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/TableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/TableBuilder.java similarity index 93% rename from cli/src/main/java/bisq/cli/table/builder/TableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/TableBuilder.java index 7bfaad2b..f44985e3 100644 --- a/cli/src/main/java/bisq/cli/table/builder/TableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/TableBuilder.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; import java.util.List; import static java.util.Collections.singletonList; - - -import bisq.cli.table.Table; +import haveno.cli.table.Table; /** * Table builder factory. It is not conventionally named TableBuilderFactory because * it has no static factory methods. The number of static fields and methods in the - * {@code bisq.cli.table} are kept to a minimum in an effort o reduce class load time + * {@code haveno.cli.table} are kept to a minimum in an effort o reduce class load time * in the session-less CLI. */ public class TableBuilder extends AbstractTableBuilder { diff --git a/cli/src/main/java/bisq/cli/table/builder/TableBuilderConstants.java b/cli/src/main/java/haveno/cli/table/builder/TableBuilderConstants.java similarity index 99% rename from cli/src/main/java/bisq/cli/table/builder/TableBuilderConstants.java rename to cli/src/main/java/haveno/cli/table/builder/TableBuilderConstants.java index 2c687e26..fa8b1fd2 100644 --- a/cli/src/main/java/bisq/cli/table/builder/TableBuilderConstants.java +++ b/cli/src/main/java/haveno/cli/table/builder/TableBuilderConstants.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; /** * Table column name constants. diff --git a/cli/src/main/java/bisq/cli/table/builder/TableType.java b/cli/src/main/java/haveno/cli/table/builder/TableType.java similarity index 96% rename from cli/src/main/java/bisq/cli/table/builder/TableType.java rename to cli/src/main/java/haveno/cli/table/builder/TableType.java index 3f30a476..a009ca60 100644 --- a/cli/src/main/java/bisq/cli/table/builder/TableType.java +++ b/cli/src/main/java/haveno/cli/table/builder/TableType.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; /** * Used as param in TableBuilder constructor instead of inspecting diff --git a/cli/src/main/java/bisq/cli/table/builder/TradeDetailTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/TradeDetailTableBuilder.java similarity index 82% rename from cli/src/main/java/bisq/cli/table/builder/TradeDetailTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/TradeDetailTableBuilder.java index 70be7512..714e595c 100644 --- a/cli/src/main/java/bisq/cli/table/builder/TradeDetailTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/TradeDetailTableBuilder.java @@ -15,24 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; - -import bisq.proto.grpc.TradeInfo; +package haveno.cli.table.builder; +import haveno.proto.grpc.TradeInfo; +import haveno.cli.table.Table; +import haveno.cli.table.column.Column; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; import static java.lang.String.format; - - -import bisq.cli.table.Table; -import bisq.cli.table.column.Column; - /** - * Builds a {@code bisq.cli.table.Table} from a {@code bisq.proto.grpc.TradeInfo} object. + * Builds a {@code haveno.cli.table.Table} from a {@code haveno.proto.grpc.TradeInfo} object. */ @SuppressWarnings("ConstantConditions") class TradeDetailTableBuilder extends AbstractTradeListBuilder { @@ -55,15 +51,15 @@ class TradeDetailTableBuilder extends AbstractTradeListBuilder { } private void populateColumns(TradeInfo trade) { - populateBisqV1TradeColumns(trade); + populateHavenoV1TradeColumns(trade); } - private void populateBisqV1TradeColumns(TradeInfo trade) { + private void populateHavenoV1TradeColumns(TradeInfo trade) { colTradeId.addRow(trade.getShortId()); colRole.addRow(trade.getRole()); colPrice.addRow(trade.getPrice()); colAmount.addRow(toTradeAmount.apply(trade)); - colBisqTradeFee.addRow(toMyMakerOrTakerFee.apply(trade)); + colHavenoTradeFee.addRow(toMyMakerOrTakerFee.apply(trade)); colIsDepositPublished.addRow(trade.getIsDepositsPublished()); colIsDepositConfirmed.addRow(trade.getIsDepositsUnlocked()); colTradeCost.addRow(toTradeVolumeAsString.apply(trade)); @@ -76,16 +72,16 @@ class TradeDetailTableBuilder extends AbstractTradeListBuilder { } private List> defineColumnList(TradeInfo trade) { - return getBisqV1TradeColumnList(); + return getHavenoV1TradeColumnList(); } - private List> getBisqV1TradeColumnList() { + private List> getHavenoV1TradeColumnList() { List> columns = new ArrayList<>() {{ add(colTradeId); add(colRole); add(colPrice.justify()); add(colAmount.asStringColumn()); - add(colBisqTradeFee.asStringColumn()); + add(colHavenoTradeFee.asStringColumn()); add(colIsDepositPublished.asStringColumn()); add(colIsDepositConfirmed.asStringColumn()); add(colTradeCost.justify()); diff --git a/cli/src/main/java/bisq/cli/table/builder/TradeTableColumnSupplier.java b/cli/src/main/java/haveno/cli/table/builder/TradeTableColumnSupplier.java similarity index 89% rename from cli/src/main/java/bisq/cli/table/builder/TradeTableColumnSupplier.java rename to cli/src/main/java/haveno/cli/table/builder/TradeTableColumnSupplier.java index 96ef6434..b8be6ccd 100644 --- a/cli/src/main/java/bisq/cli/table/builder/TradeTableColumnSupplier.java +++ b/cli/src/main/java/haveno/cli/table/builder/TradeTableColumnSupplier.java @@ -15,12 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; - -import bisq.proto.grpc.ContractInfo; -import bisq.proto.grpc.OfferInfo; -import bisq.proto.grpc.TradeInfo; +package haveno.cli.table.builder; +import haveno.proto.grpc.ContractInfo; +import haveno.proto.grpc.OfferInfo; +import haveno.proto.grpc.TradeInfo; +import haveno.cli.table.column.AltcoinVolumeColumn; +import haveno.cli.table.column.BooleanColumn; +import haveno.cli.table.column.BtcColumn; +import haveno.cli.table.column.Column; +import haveno.cli.table.column.Iso8601DateTimeColumn; +import haveno.cli.table.column.MixedTradeFeeColumn; +import haveno.cli.table.column.SatoshiColumn; +import haveno.cli.table.column.StringColumn; import java.util.List; import java.util.function.Function; import java.util.function.Predicate; @@ -31,28 +38,17 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.cli.table.builder.TableBuilderConstants.*; -import static bisq.cli.table.builder.TableType.CLOSED_TRADES_TBL; -import static bisq.cli.table.builder.TableType.FAILED_TRADES_TBL; -import static bisq.cli.table.builder.TableType.OPEN_TRADES_TBL; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; -import static bisq.cli.table.column.AltcoinVolumeColumn.DISPLAY_MODE.ALTCOIN_VOLUME; -import static bisq.cli.table.column.AltcoinVolumeColumn.DISPLAY_MODE.BSQ_VOLUME; -import static bisq.cli.table.column.Column.JUSTIFICATION.LEFT; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; +import static haveno.cli.table.builder.TableBuilderConstants.*; +import static haveno.cli.table.builder.TableType.CLOSED_TRADES_TBL; +import static haveno.cli.table.builder.TableType.FAILED_TRADES_TBL; +import static haveno.cli.table.builder.TableType.OPEN_TRADES_TBL; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; +import static haveno.cli.table.column.AltcoinVolumeColumn.DISPLAY_MODE.ALTCOIN_VOLUME; +import static haveno.cli.table.column.AltcoinVolumeColumn.DISPLAY_MODE.BSQ_VOLUME; +import static haveno.cli.table.column.Column.JUSTIFICATION.LEFT; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; import static java.lang.String.format; - - -import bisq.cli.table.column.AltcoinVolumeColumn; -import bisq.cli.table.column.BooleanColumn; -import bisq.cli.table.column.BtcColumn; -import bisq.cli.table.column.Column; -import bisq.cli.table.column.Iso8601DateTimeColumn; -import bisq.cli.table.column.MixedTradeFeeColumn; -import bisq.cli.table.column.SatoshiColumn; -import bisq.cli.table.column.StringColumn; - /** * Convenience for supplying column definitions to * open/closed/failed/detail trade table builders. @@ -186,7 +182,7 @@ class TradeTableColumnSupplier { : null; }; - final Supplier> bisqTradeDetailFeeColumn = () -> { + final Supplier> havenoTradeDetailFeeColumn = () -> { if (isTradeDetailTblBuilder.get()) { TradeInfo t = firstRow.get(); String headerCurrencyCode = "XMR"; diff --git a/cli/src/main/java/bisq/cli/table/builder/TransactionTableBuilder.java b/cli/src/main/java/haveno/cli/table/builder/TransactionTableBuilder.java similarity index 85% rename from cli/src/main/java/bisq/cli/table/builder/TransactionTableBuilder.java rename to cli/src/main/java/haveno/cli/table/builder/TransactionTableBuilder.java index 85c8c559..987196aa 100644 --- a/cli/src/main/java/bisq/cli/table/builder/TransactionTableBuilder.java +++ b/cli/src/main/java/haveno/cli/table/builder/TransactionTableBuilder.java @@ -15,26 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.builder; +package haveno.cli.table.builder; +import static haveno.cli.table.builder.TableBuilderConstants.*; +import static haveno.cli.table.builder.TableType.TRANSACTION_TBL; + +import haveno.cli.table.Table; +import haveno.cli.table.column.BooleanColumn; +import haveno.cli.table.column.Column; +import haveno.cli.table.column.LongColumn; +import haveno.cli.table.column.SatoshiColumn; +import haveno.cli.table.column.StringColumn; import java.util.List; import javax.annotation.Nullable; -import static bisq.cli.table.builder.TableBuilderConstants.*; -import static bisq.cli.table.builder.TableType.TRANSACTION_TBL; - - - -import bisq.cli.table.Table; -import bisq.cli.table.column.BooleanColumn; -import bisq.cli.table.column.Column; -import bisq.cli.table.column.LongColumn; -import bisq.cli.table.column.SatoshiColumn; -import bisq.cli.table.column.StringColumn; - /** - * Builds a {@code bisq.cli.table.Table} from a {@code bisq.proto.grpc.TxInfo} object. + * Builds a {@code haveno.cli.table.Table} from a {@code haveno.proto.grpc.TxInfo} object. */ class TransactionTableBuilder extends AbstractTableBuilder { diff --git a/cli/src/main/java/bisq/cli/table/column/AbstractColumn.java b/cli/src/main/java/haveno/cli/table/column/AbstractColumn.java similarity index 96% rename from cli/src/main/java/bisq/cli/table/column/AbstractColumn.java rename to cli/src/main/java/haveno/cli/table/column/AbstractColumn.java index 12d78b94..6a28f251 100644 --- a/cli/src/main/java/bisq/cli/table/column/AbstractColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/AbstractColumn.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; import static com.google.common.base.Strings.padEnd; import static com.google.common.base.Strings.padStart; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; /** * Partial implementation of the {@link Column} interface. diff --git a/cli/src/main/java/bisq/cli/table/column/AltcoinVolumeColumn.java b/cli/src/main/java/haveno/cli/table/column/AltcoinVolumeColumn.java similarity index 96% rename from cli/src/main/java/bisq/cli/table/column/AltcoinVolumeColumn.java rename to cli/src/main/java/haveno/cli/table/column/AltcoinVolumeColumn.java index dbd49bbd..bd01973b 100644 --- a/cli/src/main/java/bisq/cli/table/column/AltcoinVolumeColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/AltcoinVolumeColumn.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; + +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; import java.math.BigDecimal; import java.util.function.BiFunction; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; - /** * For displaying altcoin volume with appropriate precision. */ diff --git a/cli/src/main/java/bisq/cli/table/column/BooleanColumn.java b/cli/src/main/java/haveno/cli/table/column/BooleanColumn.java similarity index 97% rename from cli/src/main/java/bisq/cli/table/column/BooleanColumn.java rename to cli/src/main/java/haveno/cli/table/column/BooleanColumn.java index 841fd5bf..d5a86b47 100644 --- a/cli/src/main/java/bisq/cli/table/column/BooleanColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/BooleanColumn.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; +import static haveno.cli.table.column.Column.JUSTIFICATION.LEFT; + import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.LEFT; - /** * For displaying boolean values as YES, NO, or user's choice for 'true' and 'false'. */ diff --git a/cli/src/main/java/bisq/cli/table/column/BtcColumn.java b/cli/src/main/java/haveno/cli/table/column/BtcColumn.java similarity index 94% rename from cli/src/main/java/bisq/cli/table/column/BtcColumn.java rename to cli/src/main/java/haveno/cli/table/column/BtcColumn.java index 3d2062d8..f0b6f779 100644 --- a/cli/src/main/java/bisq/cli/table/column/BtcColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/BtcColumn.java @@ -1,9 +1,9 @@ -package bisq.cli.table.column; +package haveno.cli.table.column; import java.util.stream.IntStream; -import static bisq.cli.CurrencyFormat.formatBtc; import static com.google.common.base.Strings.padEnd; +import static haveno.cli.CurrencyFormat.formatBtc; import static java.util.Comparator.comparingInt; public class BtcColumn extends SatoshiColumn { diff --git a/cli/src/main/java/bisq/cli/table/column/Column.java b/cli/src/main/java/haveno/cli/table/column/Column.java similarity index 98% rename from cli/src/main/java/bisq/cli/table/column/Column.java rename to cli/src/main/java/haveno/cli/table/column/Column.java index dc39af17..a9a059f4 100644 --- a/cli/src/main/java/bisq/cli/table/column/Column.java +++ b/cli/src/main/java/haveno/cli/table/column/Column.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; import java.util.List; diff --git a/cli/src/main/java/bisq/cli/table/column/DoubleColumn.java b/cli/src/main/java/haveno/cli/table/column/DoubleColumn.java similarity index 96% rename from cli/src/main/java/bisq/cli/table/column/DoubleColumn.java rename to cli/src/main/java/haveno/cli/table/column/DoubleColumn.java index 01313ebf..b0013991 100644 --- a/cli/src/main/java/bisq/cli/table/column/DoubleColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/DoubleColumn.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; + +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; - /** * For displaying Double values. */ diff --git a/cli/src/main/java/bisq/cli/table/column/FiatColumn.java b/cli/src/main/java/haveno/cli/table/column/FiatColumn.java similarity index 89% rename from cli/src/main/java/bisq/cli/table/column/FiatColumn.java rename to cli/src/main/java/haveno/cli/table/column/FiatColumn.java index 9e2318c5..07143435 100644 --- a/cli/src/main/java/bisq/cli/table/column/FiatColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/FiatColumn.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; + +import static haveno.cli.CurrencyFormat.formatFiatVolume; +import static haveno.cli.CurrencyFormat.formatPrice; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; +import static haveno.cli.table.column.FiatColumn.DISPLAY_MODE.FIAT_PRICE; import java.util.stream.IntStream; -import static bisq.cli.CurrencyFormat.formatFiatVolume; -import static bisq.cli.CurrencyFormat.formatPrice; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; -import static bisq.cli.table.column.FiatColumn.DISPLAY_MODE.FIAT_PRICE; - /** * For displaying fiat volume or price with appropriate precision. */ diff --git a/cli/src/main/java/bisq/cli/table/column/IntegerColumn.java b/cli/src/main/java/haveno/cli/table/column/IntegerColumn.java similarity index 96% rename from cli/src/main/java/bisq/cli/table/column/IntegerColumn.java rename to cli/src/main/java/haveno/cli/table/column/IntegerColumn.java index ed64c19c..7ca2bfbe 100644 --- a/cli/src/main/java/bisq/cli/table/column/IntegerColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/IntegerColumn.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; + +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; - /** * For displaying Integer values. */ diff --git a/cli/src/main/java/bisq/cli/table/column/Iso8601DateTimeColumn.java b/cli/src/main/java/haveno/cli/table/column/Iso8601DateTimeColumn.java similarity index 95% rename from cli/src/main/java/bisq/cli/table/column/Iso8601DateTimeColumn.java rename to cli/src/main/java/haveno/cli/table/column/Iso8601DateTimeColumn.java index a7f60250..c98b7c39 100644 --- a/cli/src/main/java/bisq/cli/table/column/Iso8601DateTimeColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/Iso8601DateTimeColumn.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; import java.text.SimpleDateFormat; import java.util.Date; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.LEFT; import static com.google.common.base.Strings.padEnd; import static com.google.common.base.Strings.padStart; +import static haveno.cli.table.column.Column.JUSTIFICATION.LEFT; import static java.lang.System.currentTimeMillis; import static java.util.TimeZone.getTimeZone; diff --git a/cli/src/main/java/bisq/cli/table/column/LongColumn.java b/cli/src/main/java/haveno/cli/table/column/LongColumn.java similarity index 96% rename from cli/src/main/java/bisq/cli/table/column/LongColumn.java rename to cli/src/main/java/haveno/cli/table/column/LongColumn.java index 445c8123..ede0fc6e 100644 --- a/cli/src/main/java/bisq/cli/table/column/LongColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/LongColumn.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; + +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; - /** * For displaying Long values. */ diff --git a/cli/src/main/java/bisq/cli/table/column/MixedTradeFeeColumn.java b/cli/src/main/java/haveno/cli/table/column/MixedTradeFeeColumn.java similarity index 88% rename from cli/src/main/java/bisq/cli/table/column/MixedTradeFeeColumn.java rename to cli/src/main/java/haveno/cli/table/column/MixedTradeFeeColumn.java index 36efdb0b..e6bee9b4 100644 --- a/cli/src/main/java/bisq/cli/table/column/MixedTradeFeeColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/MixedTradeFeeColumn.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; -import static bisq.cli.CurrencyFormat.formatBsq; -import static bisq.cli.CurrencyFormat.formatSatoshis; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; +import static haveno.cli.CurrencyFormat.formatBsq; +import static haveno.cli.CurrencyFormat.formatSatoshis; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; /** * For displaying a mix of BSQ and BTC trade fees with appropriate precision. diff --git a/cli/src/main/java/bisq/cli/table/column/NumberColumn.java b/cli/src/main/java/haveno/cli/table/column/NumberColumn.java similarity index 97% rename from cli/src/main/java/bisq/cli/table/column/NumberColumn.java rename to cli/src/main/java/haveno/cli/table/column/NumberColumn.java index fcd670fb..6a2d0dd4 100644 --- a/cli/src/main/java/bisq/cli/table/column/NumberColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/NumberColumn.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; /** * Abstract superclass for numeric Columns. diff --git a/cli/src/main/java/bisq/cli/table/column/SatoshiColumn.java b/cli/src/main/java/haveno/cli/table/column/SatoshiColumn.java similarity index 91% rename from cli/src/main/java/bisq/cli/table/column/SatoshiColumn.java rename to cli/src/main/java/haveno/cli/table/column/SatoshiColumn.java index c1501af0..d6ee310f 100644 --- a/cli/src/main/java/bisq/cli/table/column/SatoshiColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/SatoshiColumn.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; -import static bisq.cli.CurrencyFormat.formatBsq; -import static bisq.cli.CurrencyFormat.formatSatoshis; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; +import static haveno.cli.CurrencyFormat.formatBsq; +import static haveno.cli.CurrencyFormat.formatSatoshis; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; /** * For displaying BTC or BSQ satoshi values with appropriate precision. diff --git a/cli/src/main/java/bisq/cli/table/column/StringColumn.java b/cli/src/main/java/haveno/cli/table/column/StringColumn.java similarity index 94% rename from cli/src/main/java/bisq/cli/table/column/StringColumn.java rename to cli/src/main/java/haveno/cli/table/column/StringColumn.java index 97a3fc59..85fcfec4 100644 --- a/cli/src/main/java/bisq/cli/table/column/StringColumn.java +++ b/cli/src/main/java/haveno/cli/table/column/StringColumn.java @@ -15,17 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; +import static haveno.cli.table.column.Column.JUSTIFICATION.LEFT; +import static haveno.cli.table.column.Column.JUSTIFICATION.RIGHT; + import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.stream.IntStream; -import static bisq.cli.table.column.Column.JUSTIFICATION.LEFT; -import static bisq.cli.table.column.Column.JUSTIFICATION.RIGHT; - /** * For displaying justified string values. */ diff --git a/cli/src/main/java/bisq/cli/table/column/ZippedStringColumns.java b/cli/src/main/java/haveno/cli/table/column/ZippedStringColumns.java similarity index 94% rename from cli/src/main/java/bisq/cli/table/column/ZippedStringColumns.java rename to cli/src/main/java/haveno/cli/table/column/ZippedStringColumns.java index 6f9278f6..e2c2215e 100644 --- a/cli/src/main/java/bisq/cli/table/column/ZippedStringColumns.java +++ b/cli/src/main/java/haveno/cli/table/column/ZippedStringColumns.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.cli.table.column; +package haveno.cli.table.column; +import static haveno.cli.table.column.ZippedStringColumns.DUPLICATION_MODE.EXCLUDE_DUPLICATES; +import static haveno.cli.table.column.ZippedStringColumns.DUPLICATION_MODE.INCLUDE_DUPLICATES; + +import haveno.cli.table.column.Column.JUSTIFICATION; import java.util.ArrayList; import java.util.List; import java.util.stream.IntStream; import javax.annotation.Nullable; -import static bisq.cli.table.column.ZippedStringColumns.DUPLICATION_MODE.EXCLUDE_DUPLICATES; -import static bisq.cli.table.column.ZippedStringColumns.DUPLICATION_MODE.INCLUDE_DUPLICATES; - - - -import bisq.cli.table.column.Column.JUSTIFICATION; - /** * For zipping multiple StringColumns into a single StringColumn. * Useful for displaying amount and volume range values. diff --git a/cli/src/test/java/bisq/cli/AbstractCliTest.java b/cli/src/test/java/haveno/cli/AbstractCliTest.java similarity index 93% rename from cli/src/test/java/bisq/cli/AbstractCliTest.java rename to cli/src/test/java/haveno/cli/AbstractCliTest.java index 8fc27929..1df46eee 100644 --- a/cli/src/test/java/bisq/cli/AbstractCliTest.java +++ b/cli/src/test/java/haveno/cli/AbstractCliTest.java @@ -1,7 +1,9 @@ -package bisq.cli; - -import bisq.proto.grpc.OfferInfo; +package haveno.cli; +import haveno.proto.grpc.OfferInfo; +import haveno.cli.CliMain; +import haveno.cli.GrpcClient; +import haveno.cli.opts.ArgumentList; import joptsimple.OptionParser; import joptsimple.OptionSet; @@ -18,18 +20,15 @@ import java.util.stream.IntStream; import lombok.extern.slf4j.Slf4j; -import static bisq.cli.opts.OptLabel.OPT_HOST; -import static bisq.cli.opts.OptLabel.OPT_PASSWORD; -import static bisq.cli.opts.OptLabel.OPT_PORT; +import static haveno.cli.opts.OptLabel.OPT_HOST; +import static haveno.cli.opts.OptLabel.OPT_PASSWORD; +import static haveno.cli.opts.OptLabel.OPT_PORT; import static java.lang.System.out; import static java.math.RoundingMode.HALF_UP; import static java.util.Arrays.stream; import static org.bitbucket.cowwoc.diffmatchpatch.DiffMatchPatch.Operation.DELETE; import static org.bitbucket.cowwoc.diffmatchpatch.DiffMatchPatch.Operation.INSERT; - - -import bisq.cli.opts.ArgumentList; import org.bitbucket.cowwoc.diffmatchpatch.DiffMatchPatch; /** @@ -122,14 +121,14 @@ public abstract class AbstractCliTest { protected List getMyAltcoinOffers(String currencyCode) { String[] args = getMyOffersCommand("buy", currencyCode); - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); out.println("<<<<<"); args = getMyOffersCommand("sell", currencyCode); - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); @@ -168,7 +167,7 @@ public abstract class AbstractCliTest { "--market-price-margin=" + priceMargin, "--enable=" + enable }; - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); @@ -184,7 +183,7 @@ public abstract class AbstractCliTest { "--trigger-price=" + triggerPrice, "--enable=" + enable }; - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); @@ -204,7 +203,7 @@ public abstract class AbstractCliTest { "--trigger-price=" + triggerPrice, "--enable=" + enable }; - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); @@ -220,7 +219,7 @@ public abstract class AbstractCliTest { "--fixed-price=" + fixedPrice, "--enable=" + enable }; - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); @@ -251,7 +250,7 @@ public abstract class AbstractCliTest { "--offer-id=" + offer.getId(), "--enable=" + enable }; - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); diff --git a/cli/src/test/java/bisq/cli/CreateOfferSmokeTest.java b/cli/src/test/java/haveno/cli/CreateOfferSmokeTest.java similarity index 85% rename from cli/src/test/java/bisq/cli/CreateOfferSmokeTest.java rename to cli/src/test/java/haveno/cli/CreateOfferSmokeTest.java index 3b8a4596..cedc3b1b 100644 --- a/cli/src/test/java/bisq/cli/CreateOfferSmokeTest.java +++ b/cli/src/test/java/haveno/cli/CreateOfferSmokeTest.java @@ -1,15 +1,17 @@ -package bisq.cli; +package haveno.cli; import static java.lang.System.out; import static java.util.Arrays.stream; +import haveno.cli.CliMain; + /** Smoke tests for createoffer method. Useful for testing CLI command and examining the format of its console output. Prerequisites: - - Run `./bisq-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false --enableBisqDebugging=false` + - Run `./haveno-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon --shutdownAfterTests=false --enableHavenoDebugging=false` Note: Test harness will not automatically generate BTC blocks to confirm transactions. @@ -26,21 +28,21 @@ public class CreateOfferSmokeTest extends AbstractCliTest { private void createBsqSwapOffer(String direction) { String[] args = createBsqSwapOfferCommand(direction, "0.01", "0.005", "0.00005"); - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); out.println("<<<<<"); args = getMyOffersCommand(direction, "bsq"); - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); out.println("<<<<<"); args = getAvailableOffersCommand(direction, "bsq"); - out.print(">>>>> bisq-cli "); + out.print(">>>>> haveno-cli "); stream(args).forEach(a -> out.print(a + " ")); out.println(); CliMain.main(args); diff --git a/cli/src/test/java/bisq/cli/EditXmrOffersSmokeTest.java b/cli/src/test/java/haveno/cli/EditXmrOffersSmokeTest.java similarity index 93% rename from cli/src/test/java/bisq/cli/EditXmrOffersSmokeTest.java rename to cli/src/test/java/haveno/cli/EditXmrOffersSmokeTest.java index afcc1446..c222f1a8 100644 --- a/cli/src/test/java/bisq/cli/EditXmrOffersSmokeTest.java +++ b/cli/src/test/java/haveno/cli/EditXmrOffersSmokeTest.java @@ -1,6 +1,6 @@ -package bisq.cli; +package haveno.cli; -import bisq.proto.grpc.OfferInfo; +import haveno.proto.grpc.OfferInfo; import java.util.List; import java.util.Random; @@ -13,7 +13,7 @@ import static protobuf.OfferDirection.BUY; Prerequisites: - - Run `./bisq-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdesktop --shutdownAfterTests=false --enableBisqDebugging=false` + - Run `./haveno-apitest --apiPassword=xyz --supportingApps=bitcoind,seednode,arbdaemon,alicedaemon,bobdesktop --shutdownAfterTests=false --enableHavenoDebugging=false` - Create some XMR offers with Alice's UI or CLI. diff --git a/cli/src/test/java/bisq/cli/GetOffersSmokeTest.java b/cli/src/test/java/haveno/cli/GetOffersSmokeTest.java similarity index 96% rename from cli/src/test/java/bisq/cli/GetOffersSmokeTest.java rename to cli/src/test/java/haveno/cli/GetOffersSmokeTest.java index 538587a3..98c46759 100644 --- a/cli/src/test/java/bisq/cli/GetOffersSmokeTest.java +++ b/cli/src/test/java/haveno/cli/GetOffersSmokeTest.java @@ -1,13 +1,15 @@ -package bisq.cli; +package haveno.cli; import static java.lang.System.out; +import haveno.cli.CliMain; + /** Smoke tests for getoffers method. Useful for examining the format of the console output. Prerequisites: - - Run `./bisq-daemon --apiPassword=xyz --appDataDir=$TESTDIR` + - Run `./haveno-daemon --apiPassword=xyz --appDataDir=$TESTDIR` This can be run on mainnet. */ diff --git a/cli/src/test/java/bisq/cli/GetTradesSmokeTest.java b/cli/src/test/java/haveno/cli/GetTradesSmokeTest.java similarity index 84% rename from cli/src/test/java/bisq/cli/GetTradesSmokeTest.java rename to cli/src/test/java/haveno/cli/GetTradesSmokeTest.java index a95b734a..99037072 100644 --- a/cli/src/test/java/bisq/cli/GetTradesSmokeTest.java +++ b/cli/src/test/java/haveno/cli/GetTradesSmokeTest.java @@ -1,17 +1,14 @@ -package bisq.cli; - -import bisq.proto.grpc.TradeInfo; +package haveno.cli; +import haveno.proto.grpc.TradeInfo; +import haveno.cli.GrpcClient; +import haveno.cli.table.builder.TableBuilder; import java.util.List; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; -import static bisq.proto.grpc.GetTradesRequest.Category.CLOSED; +import static haveno.proto.grpc.GetTradesRequest.Category.CLOSED; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; import static java.lang.System.out; - - -import bisq.cli.table.builder.TableBuilder; - @SuppressWarnings("unused") public class GetTradesSmokeTest extends AbstractCliTest { diff --git a/cli/src/test/java/bisq/cli/opts/OptionParsersTest.java b/cli/src/test/java/haveno/cli/opts/OptionParsersTest.java similarity index 95% rename from cli/src/test/java/bisq/cli/opts/OptionParsersTest.java rename to cli/src/test/java/haveno/cli/opts/OptionParsersTest.java index 04b82baf..be3eb31b 100644 --- a/cli/src/test/java/bisq/cli/opts/OptionParsersTest.java +++ b/cli/src/test/java/haveno/cli/opts/OptionParsersTest.java @@ -1,16 +1,21 @@ -package bisq.cli.opts; +package haveno.cli.opts; import org.junit.jupiter.api.Test; -import static bisq.cli.Method.canceloffer; -import static bisq.cli.Method.createcryptopaymentacct; -import static bisq.cli.Method.createoffer; -import static bisq.cli.Method.createpaymentacct; -import static bisq.cli.opts.OptLabel.*; +import static haveno.cli.Method.canceloffer; +import static haveno.cli.Method.createcryptopaymentacct; +import static haveno.cli.Method.createoffer; +import static haveno.cli.Method.createpaymentacct; +import static haveno.cli.opts.OptLabel.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import haveno.cli.opts.CancelOfferOptionParser; +import haveno.cli.opts.CreateCryptoCurrencyPaymentAcctOptionParser; +import haveno.cli.opts.CreateOfferOptionParser; +import haveno.cli.opts.CreatePaymentAcctOptionParser; + public class OptionParsersTest { diff --git a/cli/src/test/java/bisq/cli/table/AddressCliOutputDiffTest.java b/cli/src/test/java/haveno/cli/table/AddressCliOutputDiffTest.java similarity index 90% rename from cli/src/test/java/bisq/cli/table/AddressCliOutputDiffTest.java rename to cli/src/test/java/haveno/cli/table/AddressCliOutputDiffTest.java index be5fd9de..4496bfaf 100644 --- a/cli/src/test/java/bisq/cli/table/AddressCliOutputDiffTest.java +++ b/cli/src/test/java/haveno/cli/table/AddressCliOutputDiffTest.java @@ -1,18 +1,14 @@ -package bisq.cli.table; - -import bisq.proto.grpc.AddressBalanceInfo; +package haveno.cli.table; +import haveno.proto.grpc.AddressBalanceInfo; +import haveno.cli.AbstractCliTest; +import haveno.cli.table.builder.TableBuilder; import java.util.List; -import static bisq.cli.table.builder.TableType.ADDRESS_BALANCE_TBL; +import static haveno.cli.table.builder.TableType.ADDRESS_BALANCE_TBL; import static java.lang.System.err; import static java.util.Collections.singletonList; - - -import bisq.cli.AbstractCliTest; -import bisq.cli.table.builder.TableBuilder; - @SuppressWarnings("unused") public class AddressCliOutputDiffTest extends AbstractCliTest { diff --git a/cli/src/test/java/bisq/cli/table/GetBalanceCliOutputDiffTest.java b/cli/src/test/java/haveno/cli/table/GetBalanceCliOutputDiffTest.java similarity index 83% rename from cli/src/test/java/bisq/cli/table/GetBalanceCliOutputDiffTest.java rename to cli/src/test/java/haveno/cli/table/GetBalanceCliOutputDiffTest.java index bc4dbf97..7d823954 100644 --- a/cli/src/test/java/bisq/cli/table/GetBalanceCliOutputDiffTest.java +++ b/cli/src/test/java/haveno/cli/table/GetBalanceCliOutputDiffTest.java @@ -1,11 +1,9 @@ -package bisq.cli.table; +package haveno.cli.table; -import static bisq.cli.table.builder.TableType.BTC_BALANCE_TBL; +import static haveno.cli.table.builder.TableType.BTC_BALANCE_TBL; - - -import bisq.cli.AbstractCliTest; -import bisq.cli.table.builder.TableBuilder; +import haveno.cli.AbstractCliTest; +import haveno.cli.table.builder.TableBuilder; @SuppressWarnings("unused") public class GetBalanceCliOutputDiffTest extends AbstractCliTest { diff --git a/cli/src/test/java/bisq/cli/table/GetOffersCliOutputDiffTest.java b/cli/src/test/java/haveno/cli/table/GetOffersCliOutputDiffTest.java similarity index 95% rename from cli/src/test/java/bisq/cli/table/GetOffersCliOutputDiffTest.java rename to cli/src/test/java/haveno/cli/table/GetOffersCliOutputDiffTest.java index f5b85bdc..e521b957 100644 --- a/cli/src/test/java/bisq/cli/table/GetOffersCliOutputDiffTest.java +++ b/cli/src/test/java/haveno/cli/table/GetOffersCliOutputDiffTest.java @@ -1,20 +1,16 @@ -package bisq.cli.table; - -import bisq.proto.grpc.OfferInfo; +package haveno.cli.table; +import haveno.proto.grpc.OfferInfo; +import haveno.cli.AbstractCliTest; +import haveno.cli.table.builder.TableBuilder; import java.util.List; import lombok.extern.slf4j.Slf4j; -import static bisq.cli.table.builder.TableType.OFFER_TBL; +import static haveno.cli.table.builder.TableType.OFFER_TBL; import static protobuf.OfferDirection.BUY; import static protobuf.OfferDirection.SELL; - - -import bisq.cli.AbstractCliTest; -import bisq.cli.table.builder.TableBuilder; - @SuppressWarnings("unused") @Slf4j public class GetOffersCliOutputDiffTest extends AbstractCliTest { diff --git a/cli/src/test/java/bisq/cli/table/GetTradeCliOutputDiffTest.java b/cli/src/test/java/haveno/cli/table/GetTradeCliOutputDiffTest.java similarity index 86% rename from cli/src/test/java/bisq/cli/table/GetTradeCliOutputDiffTest.java rename to cli/src/test/java/haveno/cli/table/GetTradeCliOutputDiffTest.java index 25c6ceed..ef927921 100644 --- a/cli/src/test/java/bisq/cli/table/GetTradeCliOutputDiffTest.java +++ b/cli/src/test/java/haveno/cli/table/GetTradeCliOutputDiffTest.java @@ -1,15 +1,13 @@ -package bisq.cli.table; +package haveno.cli.table; import lombok.extern.slf4j.Slf4j; -import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; +import static haveno.cli.table.builder.TableType.TRADE_DETAIL_TBL; import static java.lang.System.out; - - -import bisq.cli.AbstractCliTest; -import bisq.cli.GrpcClient; -import bisq.cli.table.builder.TableBuilder; +import haveno.cli.AbstractCliTest; +import haveno.cli.GrpcClient; +import haveno.cli.table.builder.TableBuilder; @SuppressWarnings("unused") @Slf4j diff --git a/cli/src/test/java/bisq/cli/table/GetTransactionCliOutputDiffTest.java b/cli/src/test/java/haveno/cli/table/GetTransactionCliOutputDiffTest.java similarity index 77% rename from cli/src/test/java/bisq/cli/table/GetTransactionCliOutputDiffTest.java rename to cli/src/test/java/haveno/cli/table/GetTransactionCliOutputDiffTest.java index 82cc4a36..65770625 100644 --- a/cli/src/test/java/bisq/cli/table/GetTransactionCliOutputDiffTest.java +++ b/cli/src/test/java/haveno/cli/table/GetTransactionCliOutputDiffTest.java @@ -1,13 +1,11 @@ -package bisq.cli.table; +package haveno.cli.table; import lombok.extern.slf4j.Slf4j; -import static bisq.cli.table.builder.TableType.TRANSACTION_TBL; +import static haveno.cli.table.builder.TableType.TRANSACTION_TBL; - - -import bisq.cli.AbstractCliTest; -import bisq.cli.table.builder.TableBuilder; +import haveno.cli.AbstractCliTest; +import haveno.cli.table.builder.TableBuilder; @SuppressWarnings("unused") @Slf4j diff --git a/cli/src/test/java/bisq/cli/table/PaymentAccountsCliOutputDiffTest.java b/cli/src/test/java/haveno/cli/table/PaymentAccountsCliOutputDiffTest.java similarity index 86% rename from cli/src/test/java/bisq/cli/table/PaymentAccountsCliOutputDiffTest.java rename to cli/src/test/java/haveno/cli/table/PaymentAccountsCliOutputDiffTest.java index 30dda73d..86db964b 100644 --- a/cli/src/test/java/bisq/cli/table/PaymentAccountsCliOutputDiffTest.java +++ b/cli/src/test/java/haveno/cli/table/PaymentAccountsCliOutputDiffTest.java @@ -1,13 +1,11 @@ -package bisq.cli.table; +package haveno.cli.table; import lombok.extern.slf4j.Slf4j; -import static bisq.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL; +import static haveno.cli.table.builder.TableType.PAYMENT_ACCOUNT_TBL; - - -import bisq.cli.AbstractCliTest; -import bisq.cli.table.builder.TableBuilder; +import haveno.cli.AbstractCliTest; +import haveno.cli.table.builder.TableBuilder; @SuppressWarnings("unused") @Slf4j diff --git a/common/src/main/java/bisq/common/ClockWatcher.java b/common/src/main/java/haveno/common/ClockWatcher.java similarity index 99% rename from common/src/main/java/bisq/common/ClockWatcher.java rename to common/src/main/java/haveno/common/ClockWatcher.java index 072dbfaf..6ec76447 100644 --- a/common/src/main/java/bisq/common/ClockWatcher.java +++ b/common/src/main/java/haveno/common/ClockWatcher.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; import javax.inject.Singleton; diff --git a/common/src/main/java/bisq/common/Envelope.java b/common/src/main/java/haveno/common/Envelope.java similarity index 97% rename from common/src/main/java/bisq/common/Envelope.java rename to common/src/main/java/haveno/common/Envelope.java index bf8b8757..457c896f 100644 --- a/common/src/main/java/bisq/common/Envelope.java +++ b/common/src/main/java/haveno/common/Envelope.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; /** * Interface for the outside envelope object sent over the network or persisted to disk. diff --git a/common/src/main/java/bisq/common/FrameRateTimer.java b/common/src/main/java/haveno/common/FrameRateTimer.java similarity index 99% rename from common/src/main/java/bisq/common/FrameRateTimer.java rename to common/src/main/java/haveno/common/FrameRateTimer.java index eaa2ad7c..19d26d11 100644 --- a/common/src/main/java/bisq/common/FrameRateTimer.java +++ b/common/src/main/java/haveno/common/FrameRateTimer.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; import java.time.Duration; diff --git a/common/src/main/java/bisq/common/HavenoException.java b/common/src/main/java/haveno/common/HavenoException.java similarity index 97% rename from common/src/main/java/bisq/common/HavenoException.java rename to common/src/main/java/haveno/common/HavenoException.java index 4e42f770..f34ca854 100644 --- a/common/src/main/java/bisq/common/HavenoException.java +++ b/common/src/main/java/haveno/common/HavenoException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; public class HavenoException extends RuntimeException { diff --git a/common/src/main/java/bisq/common/MasterTimer.java b/common/src/main/java/haveno/common/MasterTimer.java similarity index 98% rename from common/src/main/java/bisq/common/MasterTimer.java rename to common/src/main/java/haveno/common/MasterTimer.java index 3d515eb4..2c093120 100644 --- a/common/src/main/java/bisq/common/MasterTimer.java +++ b/common/src/main/java/haveno/common/MasterTimer.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; import java.util.Set; import java.util.TimerTask; diff --git a/common/src/main/java/bisq/common/Payload.java b/common/src/main/java/haveno/common/Payload.java similarity index 97% rename from common/src/main/java/bisq/common/Payload.java rename to common/src/main/java/haveno/common/Payload.java index 934554d7..ca9328fd 100644 --- a/common/src/main/java/bisq/common/Payload.java +++ b/common/src/main/java/haveno/common/Payload.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; /** * Interface for objects used inside an Envelope or other Payloads. diff --git a/common/src/main/java/bisq/common/Proto.java b/common/src/main/java/haveno/common/Proto.java similarity index 97% rename from common/src/main/java/bisq/common/Proto.java rename to common/src/main/java/haveno/common/Proto.java index a4666d0a..a6d0e14d 100644 --- a/common/src/main/java/bisq/common/Proto.java +++ b/common/src/main/java/haveno/common/Proto.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; import com.google.protobuf.Message; diff --git a/common/src/main/java/bisq/common/Timer.java b/common/src/main/java/haveno/common/Timer.java similarity index 97% rename from common/src/main/java/bisq/common/Timer.java rename to common/src/main/java/haveno/common/Timer.java index 83277187..38d159fb 100644 --- a/common/src/main/java/bisq/common/Timer.java +++ b/common/src/main/java/haveno/common/Timer.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; import java.time.Duration; diff --git a/common/src/main/java/bisq/common/UserThread.java b/common/src/main/java/haveno/common/UserThread.java similarity index 99% rename from common/src/main/java/bisq/common/UserThread.java rename to common/src/main/java/haveno/common/UserThread.java index 9f493d36..d0e0a07f 100644 --- a/common/src/main/java/bisq/common/UserThread.java +++ b/common/src/main/java/haveno/common/UserThread.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common; +package haveno.common; import com.google.common.util.concurrent.MoreExecutors; diff --git a/common/src/main/java/bisq/common/app/AppModule.java b/common/src/main/java/haveno/common/app/AppModule.java similarity index 97% rename from common/src/main/java/bisq/common/app/AppModule.java rename to common/src/main/java/haveno/common/app/AppModule.java index 638a4dfd..676c29ce 100644 --- a/common/src/main/java/bisq/common/app/AppModule.java +++ b/common/src/main/java/haveno/common/app/AppModule.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.common.app; - -import bisq.common.config.Config; +package haveno.common.app; import com.google.inject.AbstractModule; import com.google.inject.Injector; - +import haveno.common.config.Config; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/bisq/common/app/AsciiLogo.java b/common/src/main/java/haveno/common/app/AsciiLogo.java similarity index 99% rename from common/src/main/java/bisq/common/app/AsciiLogo.java rename to common/src/main/java/haveno/common/app/AsciiLogo.java index 9ed871ed..b89ca083 100644 --- a/common/src/main/java/bisq/common/app/AsciiLogo.java +++ b/common/src/main/java/haveno/common/app/AsciiLogo.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/bisq/common/app/Capabilities.java b/common/src/main/java/haveno/common/app/Capabilities.java similarity index 99% rename from common/src/main/java/bisq/common/app/Capabilities.java rename to common/src/main/java/haveno/common/app/Capabilities.java index 7b88d2ac..f15d74d9 100644 --- a/common/src/main/java/bisq/common/app/Capabilities.java +++ b/common/src/main/java/haveno/common/app/Capabilities.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; import com.google.common.base.Joiner; diff --git a/common/src/main/java/bisq/common/app/Capability.java b/common/src/main/java/haveno/common/app/Capability.java similarity index 99% rename from common/src/main/java/bisq/common/app/Capability.java rename to common/src/main/java/haveno/common/app/Capability.java index 5369b915..80165133 100644 --- a/common/src/main/java/bisq/common/app/Capability.java +++ b/common/src/main/java/haveno/common/app/Capability.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; // We can define here special features the client is supporting. // Useful for updates to new versions where a new data type would break backwards compatibility or to diff --git a/common/src/main/java/bisq/common/app/DevEnv.java b/common/src/main/java/haveno/common/app/DevEnv.java similarity index 97% rename from common/src/main/java/bisq/common/app/DevEnv.java rename to common/src/main/java/haveno/common/app/DevEnv.java index 9180ad78..63ceea15 100644 --- a/common/src/main/java/bisq/common/app/DevEnv.java +++ b/common/src/main/java/haveno/common/app/DevEnv.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.common.app; - -import bisq.common.config.Config; +package haveno.common.app; +import haveno.common.config.Config; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/common/src/main/java/bisq/common/app/HasCapabilities.java b/common/src/main/java/haveno/common/app/HasCapabilities.java similarity index 96% rename from common/src/main/java/bisq/common/app/HasCapabilities.java rename to common/src/main/java/haveno/common/app/HasCapabilities.java index 9621d24a..be3d5baa 100644 --- a/common/src/main/java/bisq/common/app/HasCapabilities.java +++ b/common/src/main/java/haveno/common/app/HasCapabilities.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; /** * Holds a set of {@link Capabilities}. diff --git a/common/src/main/java/bisq/common/app/Log.java b/common/src/main/java/haveno/common/app/Log.java similarity index 99% rename from common/src/main/java/bisq/common/app/Log.java rename to common/src/main/java/haveno/common/app/Log.java index e9984ded..a0605b8f 100644 --- a/common/src/main/java/bisq/common/app/Log.java +++ b/common/src/main/java/haveno/common/app/Log.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/haveno/common/app/Version.java similarity index 99% rename from common/src/main/java/bisq/common/app/Version.java rename to common/src/main/java/haveno/common/app/Version.java index 87b69867..a3f0915c 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/haveno/common/app/Version.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; import java.util.Arrays; import java.util.List; @@ -90,7 +90,7 @@ public class Version { // A taker will check the version of the offers to see if his version is compatible. // For the switch to version 2, offers created with the old version will become invalid and have to be canceled. // For the switch to version 3, offers created with the old version can be migrated to version 3 just by opening - // the Bisq app. + // the Haveno app. // VERSION = 0.0.1 -> TRADE_PROTOCOL_VERSION = 1 public static final int TRADE_PROTOCOL_VERSION = 1; private static String p2pMessageVersion; diff --git a/common/src/main/java/bisq/common/config/BaseCurrencyNetwork.java b/common/src/main/java/haveno/common/config/BaseCurrencyNetwork.java similarity index 98% rename from common/src/main/java/bisq/common/config/BaseCurrencyNetwork.java rename to common/src/main/java/haveno/common/config/BaseCurrencyNetwork.java index 0cd6995c..bed3edf8 100644 --- a/common/src/main/java/bisq/common/config/BaseCurrencyNetwork.java +++ b/common/src/main/java/haveno/common/config/BaseCurrencyNetwork.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.config; +package haveno.common.config; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.params.MainNetParams; diff --git a/common/src/main/java/bisq/common/config/CompositeOptionSet.java b/common/src/main/java/haveno/common/config/CompositeOptionSet.java similarity index 98% rename from common/src/main/java/bisq/common/config/CompositeOptionSet.java rename to common/src/main/java/haveno/common/config/CompositeOptionSet.java index 0b3f3968..56d1ec9b 100644 --- a/common/src/main/java/bisq/common/config/CompositeOptionSet.java +++ b/common/src/main/java/haveno/common/config/CompositeOptionSet.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; import joptsimple.ArgumentAcceptingOptionSpec; import joptsimple.OptionSet; diff --git a/common/src/main/java/bisq/common/config/Config.java b/common/src/main/java/haveno/common/config/Config.java similarity index 97% rename from common/src/main/java/bisq/common/config/Config.java rename to common/src/main/java/haveno/common/config/Config.java index 64917c9b..c38170c1 100644 --- a/common/src/main/java/bisq/common/config/Config.java +++ b/common/src/main/java/haveno/common/config/Config.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; import org.bitcoinj.core.NetworkParameters; @@ -32,12 +32,12 @@ import static java.lang.String.format; import static java.util.stream.Collectors.toList; /** - * Parses and provides access to all Bisq configuration options specified at the command + * Parses and provides access to all Haveno configuration options specified at the command * line and/or via the {@value DEFAULT_CONFIG_FILE_NAME} config file, including any * default values. Constructing a {@link Config} instance is generally side-effect free, * with one key exception being that {@value APP_DATA_DIR} and its subdirectories will * be created if they do not already exist. Care is taken to avoid inadvertent creation or - * modification of the actual system user data directory and/or the production Bisq + * modification of the actual system user data directory and/or the production Haveno * application data directory. Calling code must explicitly specify these values; they are * never assumed. *

@@ -131,7 +131,7 @@ public class Config { private static BaseCurrencyNetwork BASE_CURRENCY_NETWORK_VALUE = BaseCurrencyNetwork.XMR_MAINNET; // Default "data dir properties", i.e. properties that can determine the location of - // Bisq's application data directory (appDataDir) + // Haveno's application data directory (appDataDir) public final String defaultAppName; public final File defaultUserDataDir; public final File defaultAppDataDir; @@ -211,7 +211,7 @@ public class Config { * {@value APP_NAME} and a newly-created temporary directory as the default * {@value USER_DATA_DIR} along with any command line arguments. This constructor is * primarily useful in test code, where no references or modifications should be made - * to the actual system user data directory and/or real Bisq application data + * to the actual system user data directory and/or real Haveno application data * directory. Most production use cases will favor calling the * {@link #Config(String, File, String...)} constructor directly. * @param args zero or more command line arguments in the form "--optName=optValue" @@ -225,7 +225,7 @@ public class Config { /** * Create a new {@link Config} instance with the given default {@value APP_NAME} and * {@value USER_DATA_DIR} values along with any command line arguments, typically - * those supplied via a Bisq application's main() method. + * those supplied via a Haveno application's main() method. *

* This constructor performs all parsing of command line options and config file * options, assuming the default config file exists or a custom config file has been @@ -234,7 +234,7 @@ public class Config { * will take precedence. Note that the {@value HELP} and {@value CONFIG_FILE} options * are supported only at the command line and are disallowed within the config file * itself. - * @param defaultAppName typically "Bisq" or similar + * @param defaultAppName typically "Haveno" or similar * @param defaultUserDataDir typically the OS-specific user data directory location * @param args zero or more command line arguments in the form "--optName=optValue" * @throws ConfigException if any problems are encountered during option parsing @@ -307,14 +307,14 @@ public class Config { .describedAs("host:port[,...]"); ArgumentAcceptingOptionSpec bannedPriceRelayNodesOpt = - parser.accepts(BANNED_PRICE_RELAY_NODES, "List Bisq price nodes to ban") + parser.accepts(BANNED_PRICE_RELAY_NODES, "List Haveno price nodes to ban") .withRequiredArg() .ofType(String.class) .withValuesSeparatedBy(',') .describedAs("host:port[,...]"); ArgumentAcceptingOptionSpec bannedSeedNodesOpt = - parser.accepts(BANNED_SEED_NODES, "List Bisq seed nodes to ban") + parser.accepts(BANNED_SEED_NODES, "List Haveno seed nodes to ban") .withRequiredArg() .ofType(String.class) .withValuesSeparatedBy(',') @@ -377,7 +377,7 @@ public class Config { ArgumentAcceptingOptionSpec ignoreDevMsgOpt = parser.accepts(IGNORE_DEV_MSG, "If set to true all signed " + - "network_messages from bisq developers are ignored (Global " + + "network_messages from haveno developers are ignored (Global " + "alert, Version update alert, Filters for offers, nodes or " + "trading account data)") .withRequiredArg() @@ -431,14 +431,14 @@ public class Config { ArgumentAcceptingOptionSpec torrcFileOpt = parser.accepts(TORRC_FILE, "An existing torrc-file to be sourced for Tor. Note that torrc-entries, " + - "which are critical to Bisq's correct operation, cannot be overwritten.") + "which are critical to Haveno's correct operation, cannot be overwritten.") .withRequiredArg() .describedAs("File") .withValuesConvertedBy(new PathConverter(PathProperties.FILE_EXISTING, PathProperties.READABLE)); ArgumentAcceptingOptionSpec torrcOptionsOpt = - parser.accepts(TORRC_OPTIONS, "A list of torrc-entries to amend to Bisq's torrc. Note that " + - "torrc-entries, which are critical to Bisq's flawless operation, cannot be overwritten. " + + parser.accepts(TORRC_OPTIONS, "A list of torrc-entries to amend to Haveno's torrc. Note that " + + "torrc-entries, which are critical to Haveno's flawless operation, cannot be overwritten. " + "[torrc options line, torrc option, ...]") .withRequiredArg() .withValuesConvertedBy(RegexMatcher.regex("^([^\\s,]+\\s[^,]+,?\\s*)+$")) @@ -446,7 +446,7 @@ public class Config { ArgumentAcceptingOptionSpec torControlPortOpt = parser.accepts(TOR_CONTROL_PORT, - "The control port of an already running Tor service to be used by Bisq.") + "The control port of an already running Tor service to be used by Haveno.") .availableUnless(TORRC_FILE, TORRC_OPTIONS) .withRequiredArg() .ofType(int.class) @@ -547,7 +547,7 @@ public class Config { parser.accepts(USER_AGENT, "User agent at btc node connections") .withRequiredArg() - .defaultsTo("Bisq"); + .defaultsTo("Haveno"); ArgumentAcceptingOptionSpec numConnectionsForBtcOpt = parser.accepts(NUM_CONNECTIONS_FOR_BTC, "Number of connections to the Bitcoin network") @@ -763,7 +763,7 @@ public class Config { private static String randomAppName() { try { - File file = Files.createTempFile("Bisq", "Temp").toFile(); + File file = Files.createTempFile("Haveno", "Temp").toFile(); //noinspection ResultOfMethodCallIgnored file.delete(); return file.toPath().getFileName().toString(); @@ -774,7 +774,7 @@ public class Config { private static File tempUserDataDir() { try { - return Files.createTempDirectory("BisqTempUserData").toFile(); + return Files.createTempDirectory("HavenoTempUserData").toFile(); } catch (IOException ex) { throw new UncheckedIOException(ex); } diff --git a/common/src/main/java/bisq/common/config/ConfigException.java b/common/src/main/java/haveno/common/config/ConfigException.java similarity index 69% rename from common/src/main/java/bisq/common/config/ConfigException.java rename to common/src/main/java/haveno/common/config/ConfigException.java index ee2d57ab..bca1e6f6 100644 --- a/common/src/main/java/bisq/common/config/ConfigException.java +++ b/common/src/main/java/haveno/common/config/ConfigException.java @@ -1,6 +1,6 @@ -package bisq.common.config; +package haveno.common.config; -import bisq.common.HavenoException; +import haveno.common.HavenoException; public class ConfigException extends HavenoException { diff --git a/common/src/main/java/bisq/common/config/ConfigFileEditor.java b/common/src/main/java/haveno/common/config/ConfigFileEditor.java similarity index 98% rename from common/src/main/java/bisq/common/config/ConfigFileEditor.java rename to common/src/main/java/haveno/common/config/ConfigFileEditor.java index f0674301..088a6ab7 100644 --- a/common/src/main/java/bisq/common/config/ConfigFileEditor.java +++ b/common/src/main/java/haveno/common/config/ConfigFileEditor.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; import java.io.File; import java.io.FileNotFoundException; diff --git a/common/src/main/java/bisq/common/config/ConfigFileOption.java b/common/src/main/java/haveno/common/config/ConfigFileOption.java similarity index 96% rename from common/src/main/java/bisq/common/config/ConfigFileOption.java rename to common/src/main/java/haveno/common/config/ConfigFileOption.java index a35ddc33..cc42e617 100644 --- a/common/src/main/java/bisq/common/config/ConfigFileOption.java +++ b/common/src/main/java/haveno/common/config/ConfigFileOption.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; class ConfigFileOption { diff --git a/common/src/main/java/bisq/common/config/ConfigFileReader.java b/common/src/main/java/haveno/common/config/ConfigFileReader.java similarity index 97% rename from common/src/main/java/bisq/common/config/ConfigFileReader.java rename to common/src/main/java/haveno/common/config/ConfigFileReader.java index b6ec89b5..eaa70b34 100644 --- a/common/src/main/java/bisq/common/config/ConfigFileReader.java +++ b/common/src/main/java/haveno/common/config/ConfigFileReader.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; import java.nio.file.Files; diff --git a/common/src/main/java/bisq/common/config/EnumValueConverter.java b/common/src/main/java/haveno/common/config/EnumValueConverter.java similarity index 98% rename from common/src/main/java/bisq/common/config/EnumValueConverter.java rename to common/src/main/java/haveno/common/config/EnumValueConverter.java index 554dc093..e941504b 100644 --- a/common/src/main/java/bisq/common/config/EnumValueConverter.java +++ b/common/src/main/java/haveno/common/config/EnumValueConverter.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.config; +package haveno.common.config; import joptsimple.ValueConverter; diff --git a/common/src/main/java/bisq/common/config/HavenoHelpFormatter.java b/common/src/main/java/haveno/common/config/HavenoHelpFormatter.java similarity index 99% rename from common/src/main/java/bisq/common/config/HavenoHelpFormatter.java rename to common/src/main/java/haveno/common/config/HavenoHelpFormatter.java index 54c5c3a7..b86e755d 100644 --- a/common/src/main/java/bisq/common/config/HavenoHelpFormatter.java +++ b/common/src/main/java/haveno/common/config/HavenoHelpFormatter.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.config; +package haveno.common.config; import joptsimple.HelpFormatter; import joptsimple.OptionDescriptor; diff --git a/common/src/main/java/bisq/common/consensus/UsedForTradeContractJson.java b/common/src/main/java/haveno/common/consensus/UsedForTradeContractJson.java similarity index 97% rename from common/src/main/java/bisq/common/consensus/UsedForTradeContractJson.java rename to common/src/main/java/haveno/common/consensus/UsedForTradeContractJson.java index 961fd824..cf00fc84 100644 --- a/common/src/main/java/bisq/common/consensus/UsedForTradeContractJson.java +++ b/common/src/main/java/haveno/common/consensus/UsedForTradeContractJson.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.consensus; +package haveno.common.consensus; /** * Marker interface for classes which are used in the trade contract. diff --git a/common/src/main/java/bisq/common/crypto/CryptoException.java b/common/src/main/java/haveno/common/crypto/CryptoException.java similarity index 97% rename from common/src/main/java/bisq/common/crypto/CryptoException.java rename to common/src/main/java/haveno/common/crypto/CryptoException.java index fc065f4b..3cef78ae 100644 --- a/common/src/main/java/bisq/common/crypto/CryptoException.java +++ b/common/src/main/java/haveno/common/crypto/CryptoException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; +package haveno.common.crypto; public class CryptoException extends Exception { public CryptoException(String message) { diff --git a/common/src/main/java/bisq/common/crypto/CryptoUtils.java b/common/src/main/java/haveno/common/crypto/CryptoUtils.java similarity index 97% rename from common/src/main/java/bisq/common/crypto/CryptoUtils.java rename to common/src/main/java/haveno/common/crypto/CryptoUtils.java index cc3b4f50..d1d940b7 100644 --- a/common/src/main/java/bisq/common/crypto/CryptoUtils.java +++ b/common/src/main/java/haveno/common/crypto/CryptoUtils.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; +package haveno.common.crypto; import java.security.PublicKey; import java.security.SecureRandom; diff --git a/common/src/main/java/bisq/common/crypto/Encryption.java b/common/src/main/java/haveno/common/crypto/Encryption.java similarity index 99% rename from common/src/main/java/bisq/common/crypto/Encryption.java rename to common/src/main/java/haveno/common/crypto/Encryption.java index dabde8c0..b3103b75 100644 --- a/common/src/main/java/bisq/common/crypto/Encryption.java +++ b/common/src/main/java/haveno/common/crypto/Encryption.java @@ -15,10 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; - -import bisq.common.util.Hex; -import bisq.common.util.Utilities; +package haveno.common.crypto; import javax.crypto.Cipher; import javax.crypto.KeyGenerator; @@ -39,7 +36,8 @@ import java.security.PublicKey; import java.security.spec.InvalidKeySpecException; import java.security.spec.MGF1ParameterSpec; import java.security.spec.X509EncodedKeySpec; - +import haveno.common.util.Hex; +import haveno.common.util.Utilities; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/common/src/main/java/bisq/common/crypto/Hash.java b/common/src/main/java/haveno/common/crypto/Hash.java similarity index 98% rename from common/src/main/java/bisq/common/crypto/Hash.java rename to common/src/main/java/haveno/common/crypto/Hash.java index eec7afe5..c03041d1 100644 --- a/common/src/main/java/bisq/common/crypto/Hash.java +++ b/common/src/main/java/haveno/common/crypto/Hash.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; +package haveno.common.crypto; import org.bitcoinj.core.Utils; diff --git a/common/src/main/java/bisq/common/crypto/IncorrectPasswordException.java b/common/src/main/java/haveno/common/crypto/IncorrectPasswordException.java similarity index 96% rename from common/src/main/java/bisq/common/crypto/IncorrectPasswordException.java rename to common/src/main/java/haveno/common/crypto/IncorrectPasswordException.java index 78b40599..0a05ed0f 100644 --- a/common/src/main/java/bisq/common/crypto/IncorrectPasswordException.java +++ b/common/src/main/java/haveno/common/crypto/IncorrectPasswordException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.common.crypto; +package haveno.common.crypto; public class IncorrectPasswordException extends Exception { public IncorrectPasswordException(String message) { diff --git a/common/src/main/java/bisq/common/crypto/KeyConversionException.java b/common/src/main/java/haveno/common/crypto/KeyConversionException.java similarity index 96% rename from common/src/main/java/bisq/common/crypto/KeyConversionException.java rename to common/src/main/java/haveno/common/crypto/KeyConversionException.java index 158daad4..382be057 100644 --- a/common/src/main/java/bisq/common/crypto/KeyConversionException.java +++ b/common/src/main/java/haveno/common/crypto/KeyConversionException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; +package haveno.common.crypto; public class KeyConversionException extends RuntimeException { public KeyConversionException(Throwable cause) { diff --git a/common/src/main/java/bisq/common/crypto/KeyRing.java b/common/src/main/java/haveno/common/crypto/KeyRing.java similarity index 99% rename from common/src/main/java/bisq/common/crypto/KeyRing.java rename to common/src/main/java/haveno/common/crypto/KeyRing.java index d9bc3dab..79f14859 100644 --- a/common/src/main/java/bisq/common/crypto/KeyRing.java +++ b/common/src/main/java/haveno/common/crypto/KeyRing.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; +package haveno.common.crypto; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/common/src/main/java/bisq/common/crypto/KeyStorage.java b/common/src/main/java/haveno/common/crypto/KeyStorage.java similarity index 98% rename from common/src/main/java/bisq/common/crypto/KeyStorage.java rename to common/src/main/java/haveno/common/crypto/KeyStorage.java index 86602b19..0ac0b3a5 100644 --- a/common/src/main/java/bisq/common/crypto/KeyStorage.java +++ b/common/src/main/java/haveno/common/crypto/KeyStorage.java @@ -15,12 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; +package haveno.common.crypto; + +import static haveno.common.util.Preconditions.checkDir; -import bisq.common.config.Config; -import bisq.common.file.FileUtil; import com.google.inject.Inject; - +import haveno.common.config.Config; +import haveno.common.file.FileUtil; import javax.inject.Named; import javax.inject.Singleton; @@ -55,8 +56,6 @@ import org.slf4j.LoggerFactory; import org.jetbrains.annotations.NotNull; -import static bisq.common.util.Preconditions.checkDir; - /** * KeyStorage uses password protection to save a symmetric key in PKCS#12 format. * The symmetric key is used to encrypt and decrypt other keys in the key ring and other types of persistence. diff --git a/common/src/main/java/bisq/common/crypto/PubKeyRing.java b/common/src/main/java/haveno/common/crypto/PubKeyRing.java similarity index 94% rename from common/src/main/java/bisq/common/crypto/PubKeyRing.java rename to common/src/main/java/haveno/common/crypto/PubKeyRing.java index a6ffb544..a0070870 100644 --- a/common/src/main/java/bisq/common/crypto/PubKeyRing.java +++ b/common/src/main/java/haveno/common/crypto/PubKeyRing.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; - -import bisq.common.consensus.UsedForTradeContractJson; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.util.Utilities; +package haveno.common.crypto; import com.google.protobuf.ByteString; - +import haveno.common.consensus.UsedForTradeContractJson; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.util.Utilities; import com.google.common.annotations.VisibleForTesting; import java.security.PublicKey; diff --git a/common/src/main/java/bisq/common/crypto/PubKeyRingProvider.java b/common/src/main/java/haveno/common/crypto/PubKeyRingProvider.java similarity index 95% rename from common/src/main/java/bisq/common/crypto/PubKeyRingProvider.java rename to common/src/main/java/haveno/common/crypto/PubKeyRingProvider.java index 5134b7cc..c76530ed 100644 --- a/common/src/main/java/bisq/common/crypto/PubKeyRingProvider.java +++ b/common/src/main/java/haveno/common/crypto/PubKeyRingProvider.java @@ -1,4 +1,4 @@ -package bisq.common.crypto; +package haveno.common.crypto; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/common/src/main/java/bisq/common/crypto/ScryptUtil.java b/common/src/main/java/haveno/common/crypto/ScryptUtil.java similarity index 97% rename from common/src/main/java/bisq/common/crypto/ScryptUtil.java rename to common/src/main/java/haveno/common/crypto/ScryptUtil.java index 469e8d55..09275104 100644 --- a/common/src/main/java/bisq/common/crypto/ScryptUtil.java +++ b/common/src/main/java/haveno/common/crypto/ScryptUtil.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; - -import bisq.common.UserThread; -import bisq.common.util.Utilities; +package haveno.common.crypto; import com.google.protobuf.ByteString; - +import haveno.common.UserThread; +import haveno.common.util.Utilities; import org.bitcoinj.crypto.KeyCrypterScrypt; import org.bitcoinj.wallet.Protos; diff --git a/common/src/main/java/bisq/common/crypto/SealedAndSigned.java b/common/src/main/java/haveno/common/crypto/SealedAndSigned.java similarity index 97% rename from common/src/main/java/bisq/common/crypto/SealedAndSigned.java rename to common/src/main/java/haveno/common/crypto/SealedAndSigned.java index a643fb86..3a692101 100644 --- a/common/src/main/java/bisq/common/crypto/SealedAndSigned.java +++ b/common/src/main/java/haveno/common/crypto/SealedAndSigned.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; - -import bisq.common.proto.network.NetworkPayload; +package haveno.common.crypto; import com.google.protobuf.ByteString; - +import haveno.common.proto.network.NetworkPayload; import java.security.PublicKey; import lombok.Value; diff --git a/common/src/main/java/bisq/common/crypto/Sig.java b/common/src/main/java/haveno/common/crypto/Sig.java similarity index 98% rename from common/src/main/java/bisq/common/crypto/Sig.java rename to common/src/main/java/haveno/common/crypto/Sig.java index ede991f6..c06f0f19 100644 --- a/common/src/main/java/bisq/common/crypto/Sig.java +++ b/common/src/main/java/haveno/common/crypto/Sig.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.common.crypto; - -import bisq.common.util.Base64; -import bisq.common.util.Utilities; +package haveno.common.crypto; import com.google.common.base.Charsets; - +import haveno.common.util.Base64; +import haveno.common.util.Utilities; import java.security.InvalidKeyException; import java.security.KeyFactory; import java.security.KeyPair; diff --git a/common/src/main/java/bisq/common/file/CorruptedStorageFileHandler.java b/common/src/main/java/haveno/common/file/CorruptedStorageFileHandler.java similarity index 98% rename from common/src/main/java/bisq/common/file/CorruptedStorageFileHandler.java rename to common/src/main/java/haveno/common/file/CorruptedStorageFileHandler.java index 2b08640a..e0b9f050 100644 --- a/common/src/main/java/bisq/common/file/CorruptedStorageFileHandler.java +++ b/common/src/main/java/haveno/common/file/CorruptedStorageFileHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.file; +package haveno.common.file; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/common/src/main/java/bisq/common/file/FileUtil.java b/common/src/main/java/haveno/common/file/FileUtil.java similarity index 99% rename from common/src/main/java/bisq/common/file/FileUtil.java rename to common/src/main/java/haveno/common/file/FileUtil.java index d754c70d..5780f7c4 100644 --- a/common/src/main/java/bisq/common/file/FileUtil.java +++ b/common/src/main/java/haveno/common/file/FileUtil.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.file; - -import bisq.common.util.Utilities; +package haveno.common.file; import com.google.common.io.Files; - +import haveno.common.util.Utilities; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/common/src/main/java/bisq/common/file/JsonFileManager.java b/common/src/main/java/haveno/common/file/JsonFileManager.java similarity index 98% rename from common/src/main/java/bisq/common/file/JsonFileManager.java rename to common/src/main/java/haveno/common/file/JsonFileManager.java index 9a89bff6..d3b6102b 100644 --- a/common/src/main/java/bisq/common/file/JsonFileManager.java +++ b/common/src/main/java/haveno/common/file/JsonFileManager.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.file; - -import bisq.common.util.Utilities; +package haveno.common.file; import java.nio.file.Paths; - +import haveno.common.util.Utilities; import java.io.File; import java.io.PrintWriter; diff --git a/common/src/main/java/bisq/common/file/ResourceNotFoundException.java b/common/src/main/java/haveno/common/file/ResourceNotFoundException.java similarity index 96% rename from common/src/main/java/bisq/common/file/ResourceNotFoundException.java rename to common/src/main/java/haveno/common/file/ResourceNotFoundException.java index 04c32702..ab59bae8 100644 --- a/common/src/main/java/bisq/common/file/ResourceNotFoundException.java +++ b/common/src/main/java/haveno/common/file/ResourceNotFoundException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.file; +package haveno.common.file; public class ResourceNotFoundException extends Exception { public ResourceNotFoundException(String path) { diff --git a/common/src/main/java/bisq/common/handlers/ErrorMessageHandler.java b/common/src/main/java/haveno/common/handlers/ErrorMessageHandler.java similarity index 96% rename from common/src/main/java/bisq/common/handlers/ErrorMessageHandler.java rename to common/src/main/java/haveno/common/handlers/ErrorMessageHandler.java index b20806cd..19555c2d 100644 --- a/common/src/main/java/bisq/common/handlers/ErrorMessageHandler.java +++ b/common/src/main/java/haveno/common/handlers/ErrorMessageHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.handlers; +package haveno.common.handlers; /** * For reporting error message only (UI) diff --git a/common/src/main/java/bisq/common/handlers/ExceptionHandler.java b/common/src/main/java/haveno/common/handlers/ExceptionHandler.java similarity index 96% rename from common/src/main/java/bisq/common/handlers/ExceptionHandler.java rename to common/src/main/java/haveno/common/handlers/ExceptionHandler.java index ad18e147..bb08cf8e 100644 --- a/common/src/main/java/bisq/common/handlers/ExceptionHandler.java +++ b/common/src/main/java/haveno/common/handlers/ExceptionHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.handlers; +package haveno.common.handlers; /** * For reporting throwable objects only diff --git a/common/src/main/java/bisq/common/handlers/FaultHandler.java b/common/src/main/java/haveno/common/handlers/FaultHandler.java similarity index 96% rename from common/src/main/java/bisq/common/handlers/FaultHandler.java rename to common/src/main/java/haveno/common/handlers/FaultHandler.java index 771be70d..7d29af65 100644 --- a/common/src/main/java/bisq/common/handlers/FaultHandler.java +++ b/common/src/main/java/haveno/common/handlers/FaultHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.handlers; +package haveno.common.handlers; /** * For reporting a description message and throwable diff --git a/common/src/main/java/bisq/common/handlers/ResultHandler.java b/common/src/main/java/haveno/common/handlers/ResultHandler.java similarity index 95% rename from common/src/main/java/bisq/common/handlers/ResultHandler.java rename to common/src/main/java/haveno/common/handlers/ResultHandler.java index fad53d80..3b389f96 100644 --- a/common/src/main/java/bisq/common/handlers/ResultHandler.java +++ b/common/src/main/java/haveno/common/handlers/ResultHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.handlers; +package haveno.common.handlers; public interface ResultHandler { void handleResult(); diff --git a/common/src/main/java/bisq/common/persistence/PersistenceManager.java b/common/src/main/java/haveno/common/persistence/PersistenceManager.java similarity index 97% rename from common/src/main/java/bisq/common/persistence/PersistenceManager.java rename to common/src/main/java/haveno/common/persistence/PersistenceManager.java index f6f41eea..fc92d7cb 100644 --- a/common/src/main/java/bisq/common/persistence/PersistenceManager.java +++ b/common/src/main/java/haveno/common/persistence/PersistenceManager.java @@ -15,25 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.common.persistence; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.config.Config; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Encryption; -import bisq.common.crypto.KeyRing; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.file.FileUtil; -import bisq.common.handlers.ResultHandler; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistenceProtoResolver; -import bisq.common.util.GcUtil; -import bisq.common.util.Utilities; +package haveno.common.persistence; import com.google.inject.Inject; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Encryption; +import haveno.common.crypto.KeyRing; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.file.FileUtil; +import haveno.common.handlers.ResultHandler; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.common.util.GcUtil; +import haveno.common.util.Utilities; import javax.inject.Named; import java.nio.file.Path; @@ -58,8 +56,8 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.common.util.Preconditions.checkDir; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.common.util.Preconditions.checkDir; /** * Responsible for reading persisted data and writing it on disk. We read usually only at start-up and keep data in RAM. diff --git a/common/src/main/java/bisq/common/proto/ProtoResolver.java b/common/src/main/java/haveno/common/proto/ProtoResolver.java similarity index 87% rename from common/src/main/java/bisq/common/proto/ProtoResolver.java rename to common/src/main/java/haveno/common/proto/ProtoResolver.java index 72264513..336fc0d9 100644 --- a/common/src/main/java/bisq/common/proto/ProtoResolver.java +++ b/common/src/main/java/haveno/common/proto/ProtoResolver.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.proto; +package haveno.common.proto; -import bisq.common.Payload; -import bisq.common.proto.persistable.PersistablePayload; +import haveno.common.Payload; +import haveno.common.proto.persistable.PersistablePayload; public interface ProtoResolver { Payload fromProto(protobuf.PaymentAccountPayload proto); diff --git a/common/src/main/java/bisq/common/proto/ProtoUtil.java b/common/src/main/java/haveno/common/proto/ProtoUtil.java similarity index 97% rename from common/src/main/java/bisq/common/proto/ProtoUtil.java rename to common/src/main/java/haveno/common/proto/ProtoUtil.java index 43984aa5..6c7a37d7 100644 --- a/common/src/main/java/bisq/common/proto/ProtoUtil.java +++ b/common/src/main/java/haveno/common/proto/ProtoUtil.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.common.proto; - -import bisq.common.Proto; -import bisq.common.util.CollectionUtils; +package haveno.common.proto; import com.google.protobuf.ByteString; import com.google.protobuf.Message; import com.google.protobuf.ProtocolStringList; - +import haveno.common.Proto; +import haveno.common.util.CollectionUtils; import com.google.common.base.Enums; import java.util.ArrayList; diff --git a/common/src/main/java/bisq/common/proto/ProtobufferException.java b/common/src/main/java/haveno/common/proto/ProtobufferException.java similarity index 97% rename from common/src/main/java/bisq/common/proto/ProtobufferException.java rename to common/src/main/java/haveno/common/proto/ProtobufferException.java index b1b87f50..345e27e0 100644 --- a/common/src/main/java/bisq/common/proto/ProtobufferException.java +++ b/common/src/main/java/haveno/common/proto/ProtobufferException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.proto; +package haveno.common.proto; import java.io.IOException; diff --git a/common/src/main/java/bisq/common/proto/ProtobufferRuntimeException.java b/common/src/main/java/haveno/common/proto/ProtobufferRuntimeException.java similarity index 97% rename from common/src/main/java/bisq/common/proto/ProtobufferRuntimeException.java rename to common/src/main/java/haveno/common/proto/ProtobufferRuntimeException.java index 7322f59d..e7f0e5d7 100644 --- a/common/src/main/java/bisq/common/proto/ProtobufferRuntimeException.java +++ b/common/src/main/java/haveno/common/proto/ProtobufferRuntimeException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.proto; +package haveno.common.proto; public class ProtobufferRuntimeException extends RuntimeException { public ProtobufferRuntimeException(String message) { diff --git a/common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java b/common/src/main/java/haveno/common/proto/network/NetworkEnvelope.java similarity index 97% rename from common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java rename to common/src/main/java/haveno/common/proto/network/NetworkEnvelope.java index 2506af27..62d1f3ac 100644 --- a/common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java +++ b/common/src/main/java/haveno/common/proto/network/NetworkEnvelope.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.network; - -import bisq.common.Envelope; +package haveno.common.proto.network; import com.google.protobuf.Message; - +import haveno.common.Envelope; import lombok.EqualsAndHashCode; import static com.google.common.base.Preconditions.checkArgument; diff --git a/common/src/main/java/bisq/common/proto/network/NetworkPayload.java b/common/src/main/java/haveno/common/proto/network/NetworkPayload.java similarity index 92% rename from common/src/main/java/bisq/common/proto/network/NetworkPayload.java rename to common/src/main/java/haveno/common/proto/network/NetworkPayload.java index eca3289f..85e811b0 100644 --- a/common/src/main/java/bisq/common/proto/network/NetworkPayload.java +++ b/common/src/main/java/haveno/common/proto/network/NetworkPayload.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.network; +package haveno.common.proto.network; -import bisq.common.Payload; +import haveno.common.Payload; /** * Interface for objects used inside WireEnvelope or other WirePayloads. diff --git a/common/src/main/java/bisq/common/proto/network/NetworkProtoResolver.java b/common/src/main/java/haveno/common/proto/network/NetworkProtoResolver.java similarity index 88% rename from common/src/main/java/bisq/common/proto/network/NetworkProtoResolver.java rename to common/src/main/java/haveno/common/proto/network/NetworkProtoResolver.java index 19613c86..c68f58d2 100644 --- a/common/src/main/java/bisq/common/proto/network/NetworkProtoResolver.java +++ b/common/src/main/java/haveno/common/proto/network/NetworkProtoResolver.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.network; - -import bisq.common.proto.ProtoResolver; -import bisq.common.proto.ProtobufferException; +package haveno.common.proto.network; +import haveno.common.proto.ProtoResolver; +import haveno.common.proto.ProtobufferException; import java.time.Clock; diff --git a/common/src/main/java/bisq/common/proto/persistable/NavigationPath.java b/common/src/main/java/haveno/common/proto/persistable/NavigationPath.java similarity index 94% rename from common/src/main/java/bisq/common/proto/persistable/NavigationPath.java rename to common/src/main/java/haveno/common/proto/persistable/NavigationPath.java index 64746f3e..b5ca4245 100644 --- a/common/src/main/java/bisq/common/proto/persistable/NavigationPath.java +++ b/common/src/main/java/haveno/common/proto/persistable/NavigationPath.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.persistable; - -import bisq.common.util.CollectionUtils; +package haveno.common.proto.persistable; import com.google.protobuf.Message; - +import haveno.common.util.CollectionUtils; import java.util.List; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/bisq/common/proto/persistable/PersistableEnvelope.java b/common/src/main/java/haveno/common/proto/persistable/PersistableEnvelope.java similarity index 93% rename from common/src/main/java/bisq/common/proto/persistable/PersistableEnvelope.java rename to common/src/main/java/haveno/common/proto/persistable/PersistableEnvelope.java index 8ab3864c..e4b3cde0 100644 --- a/common/src/main/java/bisq/common/proto/persistable/PersistableEnvelope.java +++ b/common/src/main/java/haveno/common/proto/persistable/PersistableEnvelope.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.persistable; - -import bisq.common.Envelope; +package haveno.common.proto.persistable; import com.google.protobuf.Message; +import haveno.common.Envelope; /** * Interface for the outside envelope object persisted to disk. diff --git a/common/src/main/java/bisq/common/proto/persistable/PersistableList.java b/common/src/main/java/haveno/common/proto/persistable/PersistableList.java similarity index 98% rename from common/src/main/java/bisq/common/proto/persistable/PersistableList.java rename to common/src/main/java/haveno/common/proto/persistable/PersistableList.java index ef883378..e0b648d0 100644 --- a/common/src/main/java/bisq/common/proto/persistable/PersistableList.java +++ b/common/src/main/java/haveno/common/proto/persistable/PersistableList.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.persistable; +package haveno.common.proto.persistable; import java.util.ArrayList; import java.util.Collection; diff --git a/common/src/main/java/bisq/common/proto/persistable/PersistableListAsObservable.java b/common/src/main/java/haveno/common/proto/persistable/PersistableListAsObservable.java similarity index 97% rename from common/src/main/java/bisq/common/proto/persistable/PersistableListAsObservable.java rename to common/src/main/java/haveno/common/proto/persistable/PersistableListAsObservable.java index 3cf46f93..09926bf2 100644 --- a/common/src/main/java/bisq/common/proto/persistable/PersistableListAsObservable.java +++ b/common/src/main/java/haveno/common/proto/persistable/PersistableListAsObservable.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.persistable; +package haveno.common.proto.persistable; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; diff --git a/common/src/main/java/bisq/common/proto/persistable/PersistablePayload.java b/common/src/main/java/haveno/common/proto/persistable/PersistablePayload.java similarity index 92% rename from common/src/main/java/bisq/common/proto/persistable/PersistablePayload.java rename to common/src/main/java/haveno/common/proto/persistable/PersistablePayload.java index d5e4808d..1b78a697 100644 --- a/common/src/main/java/bisq/common/proto/persistable/PersistablePayload.java +++ b/common/src/main/java/haveno/common/proto/persistable/PersistablePayload.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.persistable; +package haveno.common.proto.persistable; -import bisq.common.Payload; +import haveno.common.Payload; /** * Interface for objects used inside Envelope or other Payloads. diff --git a/common/src/main/java/bisq/common/proto/persistable/PersistedDataHost.java b/common/src/main/java/haveno/common/proto/persistable/PersistedDataHost.java similarity index 95% rename from common/src/main/java/bisq/common/proto/persistable/PersistedDataHost.java rename to common/src/main/java/haveno/common/proto/persistable/PersistedDataHost.java index c8254524..30ad8d27 100644 --- a/common/src/main/java/bisq/common/proto/persistable/PersistedDataHost.java +++ b/common/src/main/java/haveno/common/proto/persistable/PersistedDataHost.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.persistable; +package haveno.common.proto.persistable; public interface PersistedDataHost { void readPersisted(Runnable completeHandler); diff --git a/common/src/main/java/bisq/common/proto/persistable/PersistenceProtoResolver.java b/common/src/main/java/haveno/common/proto/persistable/PersistenceProtoResolver.java similarity index 90% rename from common/src/main/java/bisq/common/proto/persistable/PersistenceProtoResolver.java rename to common/src/main/java/haveno/common/proto/persistable/PersistenceProtoResolver.java index 8a3a413e..a24c98d2 100644 --- a/common/src/main/java/bisq/common/proto/persistable/PersistenceProtoResolver.java +++ b/common/src/main/java/haveno/common/proto/persistable/PersistenceProtoResolver.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.common.proto.persistable; +package haveno.common.proto.persistable; -import bisq.common.proto.ProtoResolver; +import haveno.common.proto.ProtoResolver; public interface PersistenceProtoResolver extends ProtoResolver { diff --git a/common/src/main/java/bisq/common/reactfx/FxTimer.java b/common/src/main/java/haveno/common/reactfx/FxTimer.java similarity index 99% rename from common/src/main/java/bisq/common/reactfx/FxTimer.java rename to common/src/main/java/haveno/common/reactfx/FxTimer.java index dfd4aabb..aafc40e2 100644 --- a/common/src/main/java/bisq/common/reactfx/FxTimer.java +++ b/common/src/main/java/haveno/common/reactfx/FxTimer.java @@ -1,4 +1,4 @@ -package bisq.common.reactfx; +package haveno.common.reactfx; import javafx.animation.Animation; import javafx.animation.KeyFrame; diff --git a/common/src/main/java/bisq/common/reactfx/LICENSE b/common/src/main/java/haveno/common/reactfx/LICENSE similarity index 100% rename from common/src/main/java/bisq/common/reactfx/LICENSE rename to common/src/main/java/haveno/common/reactfx/LICENSE diff --git a/common/src/main/java/bisq/common/reactfx/README.md b/common/src/main/java/haveno/common/reactfx/README.md similarity index 100% rename from common/src/main/java/bisq/common/reactfx/README.md rename to common/src/main/java/haveno/common/reactfx/README.md diff --git a/common/src/main/java/bisq/common/reactfx/Timer.java b/common/src/main/java/haveno/common/reactfx/Timer.java similarity index 98% rename from common/src/main/java/bisq/common/reactfx/Timer.java rename to common/src/main/java/haveno/common/reactfx/Timer.java index b7ae0a23..1516dbb9 100644 --- a/common/src/main/java/bisq/common/reactfx/Timer.java +++ b/common/src/main/java/haveno/common/reactfx/Timer.java @@ -1,4 +1,4 @@ -package bisq.common.reactfx; +package haveno.common.reactfx; /** * Timer represents a delayed action. This means that every timer has an diff --git a/common/src/main/java/bisq/common/setup/CommonSetup.java b/common/src/main/java/haveno/common/setup/CommonSetup.java similarity index 91% rename from common/src/main/java/bisq/common/setup/CommonSetup.java rename to common/src/main/java/haveno/common/setup/CommonSetup.java index db248bee..0123adde 100644 --- a/common/src/main/java/bisq/common/setup/CommonSetup.java +++ b/common/src/main/java/haveno/common/setup/CommonSetup.java @@ -15,16 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.setup; - -import bisq.common.UserThread; -import bisq.common.app.AsciiLogo; -import bisq.common.app.DevEnv; -import bisq.common.app.Log; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.util.Profiler; -import bisq.common.util.Utilities; +package haveno.common.setup; import org.bitcoinj.store.BlockStoreException; @@ -37,7 +28,14 @@ import java.nio.file.Paths; import java.util.concurrent.TimeUnit; import ch.qos.logback.classic.Level; - +import haveno.common.UserThread; +import haveno.common.app.AsciiLogo; +import haveno.common.app.DevEnv; +import haveno.common.app.Log; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.util.Profiler; +import haveno.common.util.Utilities; import lombok.extern.slf4j.Slf4j; @@ -91,7 +89,7 @@ public class CommonSetup { } private static void setupLog(Config config) { - String logPath = Paths.get(config.appDataDir.getPath(), "bisq").toString(); + String logPath = Paths.get(config.appDataDir.getPath(), "haveno").toString(); Log.setup(logPath); Utilities.printSysInfo(); Log.setLevel(Level.toLevel(config.logLevel)); @@ -120,7 +118,7 @@ public class CommonSetup { try { final String pathOfCodeSource = Utilities.getPathOfCodeSource(); if (!pathOfCodeSource.endsWith("classes")) - log.info("Path to Bisq jar file: " + pathOfCodeSource); + log.info("Path to Haveno jar file: " + pathOfCodeSource); } catch (URISyntaxException e) { log.error(e.toString()); e.printStackTrace(); diff --git a/common/src/main/java/bisq/common/setup/GracefulShutDownHandler.java b/common/src/main/java/haveno/common/setup/GracefulShutDownHandler.java similarity index 92% rename from common/src/main/java/bisq/common/setup/GracefulShutDownHandler.java rename to common/src/main/java/haveno/common/setup/GracefulShutDownHandler.java index 485791b5..b852b4e4 100644 --- a/common/src/main/java/bisq/common/setup/GracefulShutDownHandler.java +++ b/common/src/main/java/haveno/common/setup/GracefulShutDownHandler.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.common.setup; +package haveno.common.setup; -import bisq.common.handlers.ResultHandler; +import haveno.common.handlers.ResultHandler; public interface GracefulShutDownHandler { void gracefulShutDown(ResultHandler resultHandler); diff --git a/common/src/main/java/bisq/common/setup/UncaughtExceptionHandler.java b/common/src/main/java/haveno/common/setup/UncaughtExceptionHandler.java similarity index 96% rename from common/src/main/java/bisq/common/setup/UncaughtExceptionHandler.java rename to common/src/main/java/haveno/common/setup/UncaughtExceptionHandler.java index d58f71d4..f3deabdf 100644 --- a/common/src/main/java/bisq/common/setup/UncaughtExceptionHandler.java +++ b/common/src/main/java/haveno/common/setup/UncaughtExceptionHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.setup; +package haveno.common.setup; public interface UncaughtExceptionHandler { void handleUncaughtException(Throwable throwable, boolean doShutDown); diff --git a/common/src/main/java/bisq/common/taskrunner/InterceptTaskException.java b/common/src/main/java/haveno/common/taskrunner/InterceptTaskException.java similarity index 96% rename from common/src/main/java/bisq/common/taskrunner/InterceptTaskException.java rename to common/src/main/java/haveno/common/taskrunner/InterceptTaskException.java index 9b3183bb..5f613512 100644 --- a/common/src/main/java/bisq/common/taskrunner/InterceptTaskException.java +++ b/common/src/main/java/haveno/common/taskrunner/InterceptTaskException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.taskrunner; +package haveno.common.taskrunner; public class InterceptTaskException extends RuntimeException { public InterceptTaskException(String message) { diff --git a/common/src/main/java/bisq/common/taskrunner/Model.java b/common/src/main/java/haveno/common/taskrunner/Model.java similarity index 95% rename from common/src/main/java/bisq/common/taskrunner/Model.java rename to common/src/main/java/haveno/common/taskrunner/Model.java index f2664d8a..15c6e72e 100644 --- a/common/src/main/java/bisq/common/taskrunner/Model.java +++ b/common/src/main/java/haveno/common/taskrunner/Model.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.taskrunner; +package haveno.common.taskrunner; public interface Model { void onComplete(); diff --git a/common/src/main/java/bisq/common/taskrunner/Task.java b/common/src/main/java/haveno/common/taskrunner/Task.java similarity index 98% rename from common/src/main/java/bisq/common/taskrunner/Task.java rename to common/src/main/java/haveno/common/taskrunner/Task.java index bb8bcefd..a12a7c3c 100644 --- a/common/src/main/java/bisq/common/taskrunner/Task.java +++ b/common/src/main/java/haveno/common/taskrunner/Task.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.taskrunner; +package haveno.common.taskrunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/bisq/common/taskrunner/TaskRunner.java b/common/src/main/java/haveno/common/taskrunner/TaskRunner.java similarity index 95% rename from common/src/main/java/bisq/common/taskrunner/TaskRunner.java rename to common/src/main/java/haveno/common/taskrunner/TaskRunner.java index 50986bf8..7b03657d 100644 --- a/common/src/main/java/bisq/common/taskrunner/TaskRunner.java +++ b/common/src/main/java/haveno/common/taskrunner/TaskRunner.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.common.taskrunner; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.common.taskrunner; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; import java.util.Arrays; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/common/src/main/java/bisq/common/util/Base64.java b/common/src/main/java/haveno/common/util/Base64.java similarity index 97% rename from common/src/main/java/bisq/common/util/Base64.java rename to common/src/main/java/haveno/common/util/Base64.java index b7bbc4d4..5c0ce6cf 100644 --- a/common/src/main/java/bisq/common/util/Base64.java +++ b/common/src/main/java/haveno/common/util/Base64.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; /** * We use Java 8 builtin Base64 because it is much faster than Guava and Apache versions: diff --git a/common/src/main/java/bisq/common/util/CollectionUtils.java b/common/src/main/java/haveno/common/util/CollectionUtils.java similarity index 83% rename from common/src/main/java/bisq/common/util/CollectionUtils.java rename to common/src/main/java/haveno/common/util/CollectionUtils.java index 9b4a41e6..1afdab44 100644 --- a/common/src/main/java/bisq/common/util/CollectionUtils.java +++ b/common/src/main/java/haveno/common/util/CollectionUtils.java @@ -1,4 +1,4 @@ -package bisq.common.util; +package haveno.common.util; import java.util.Collection; import java.util.Map; @@ -6,8 +6,8 @@ import java.util.Map; /** * Collection utility methods copied from Spring Framework v4.3.6's * {@code org.springframework.util.CollectionUtils} class in order to make it possible to - * drop Bisq's dependency on Spring altogether. The name of the class and methods have - * been preserved here to minimize the impact to the Bisq codebase of making this change. + * drop Haveno's dependency on Spring altogether. The name of the class and methods have + * been preserved here to minimize the impact to the Haveno codebase of making this change. * All that is necessary to swap this implementation in is to change the CollectionUtils * import statement. */ diff --git a/common/src/main/java/bisq/common/util/CompletableFutureUtils.java b/common/src/main/java/haveno/common/util/CompletableFutureUtils.java similarity index 98% rename from common/src/main/java/bisq/common/util/CompletableFutureUtils.java rename to common/src/main/java/haveno/common/util/CompletableFutureUtils.java index 4c34957d..b59596c6 100644 --- a/common/src/main/java/bisq/common/util/CompletableFutureUtils.java +++ b/common/src/main/java/haveno/common/util/CompletableFutureUtils.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/bisq/common/util/DesktopUtil.java b/common/src/main/java/haveno/common/util/DesktopUtil.java similarity index 99% rename from common/src/main/java/bisq/common/util/DesktopUtil.java rename to common/src/main/java/haveno/common/util/DesktopUtil.java index eb83300e..448802c6 100644 --- a/common/src/main/java/bisq/common/util/DesktopUtil.java +++ b/common/src/main/java/haveno/common/util/DesktopUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.net.URI; diff --git a/common/src/main/java/bisq/common/util/DoubleSummaryStatisticsWithStdDev.java b/common/src/main/java/haveno/common/util/DoubleSummaryStatisticsWithStdDev.java similarity index 99% rename from common/src/main/java/bisq/common/util/DoubleSummaryStatisticsWithStdDev.java rename to common/src/main/java/haveno/common/util/DoubleSummaryStatisticsWithStdDev.java index fa419380..9222ca0c 100644 --- a/common/src/main/java/bisq/common/util/DoubleSummaryStatisticsWithStdDev.java +++ b/common/src/main/java/haveno/common/util/DoubleSummaryStatisticsWithStdDev.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.DoubleSummaryStatistics; diff --git a/common/src/main/java/bisq/common/util/ExtraDataMapValidator.java b/common/src/main/java/haveno/common/util/ExtraDataMapValidator.java similarity index 99% rename from common/src/main/java/bisq/common/util/ExtraDataMapValidator.java rename to common/src/main/java/haveno/common/util/ExtraDataMapValidator.java index 8f085c42..c4b8f8cd 100644 --- a/common/src/main/java/bisq/common/util/ExtraDataMapValidator.java +++ b/common/src/main/java/haveno/common/util/ExtraDataMapValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/bisq/common/util/GcUtil.java b/common/src/main/java/haveno/common/util/GcUtil.java similarity index 98% rename from common/src/main/java/bisq/common/util/GcUtil.java rename to common/src/main/java/haveno/common/util/GcUtil.java index c7931d3e..4989e88b 100644 --- a/common/src/main/java/bisq/common/util/GcUtil.java +++ b/common/src/main/java/haveno/common/util/GcUtil.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.common.util; - -import bisq.common.UserThread; +package haveno.common.util; +import haveno.common.UserThread; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/bisq/common/util/Hex.java b/common/src/main/java/haveno/common/util/Hex.java similarity index 97% rename from common/src/main/java/bisq/common/util/Hex.java rename to common/src/main/java/haveno/common/util/Hex.java index 68632955..30ad8deb 100644 --- a/common/src/main/java/bisq/common/util/Hex.java +++ b/common/src/main/java/haveno/common/util/Hex.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import com.google.common.io.BaseEncoding; diff --git a/common/src/main/java/bisq/common/util/InvalidVersionException.java b/common/src/main/java/haveno/common/util/InvalidVersionException.java similarity index 96% rename from common/src/main/java/bisq/common/util/InvalidVersionException.java rename to common/src/main/java/haveno/common/util/InvalidVersionException.java index d02a536b..02a03e83 100644 --- a/common/src/main/java/bisq/common/util/InvalidVersionException.java +++ b/common/src/main/java/haveno/common/util/InvalidVersionException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; public class InvalidVersionException extends Exception { public InvalidVersionException(String msg) { diff --git a/common/src/main/java/bisq/common/util/JsonExclude.java b/common/src/main/java/haveno/common/util/JsonExclude.java similarity index 97% rename from common/src/main/java/bisq/common/util/JsonExclude.java rename to common/src/main/java/haveno/common/util/JsonExclude.java index 891ab850..98d6d9cf 100644 --- a/common/src/main/java/bisq/common/util/JsonExclude.java +++ b/common/src/main/java/haveno/common/util/JsonExclude.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/bisq/common/util/MathUtils.java b/common/src/main/java/haveno/common/util/MathUtils.java similarity index 99% rename from common/src/main/java/bisq/common/util/MathUtils.java rename to common/src/main/java/haveno/common/util/MathUtils.java index 06ef1261..0ccc00aa 100644 --- a/common/src/main/java/bisq/common/util/MathUtils.java +++ b/common/src/main/java/haveno/common/util/MathUtils.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import com.google.common.math.DoubleMath; diff --git a/common/src/main/java/bisq/common/util/PermutationUtil.java b/common/src/main/java/haveno/common/util/PermutationUtil.java similarity index 99% rename from common/src/main/java/bisq/common/util/PermutationUtil.java rename to common/src/main/java/haveno/common/util/PermutationUtil.java index cf96f2fa..2b82c874 100644 --- a/common/src/main/java/bisq/common/util/PermutationUtil.java +++ b/common/src/main/java/haveno/common/util/PermutationUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/bisq/common/util/Preconditions.java b/common/src/main/java/haveno/common/util/Preconditions.java similarity index 97% rename from common/src/main/java/bisq/common/util/Preconditions.java rename to common/src/main/java/haveno/common/util/Preconditions.java index e78215d5..8a1e6d4a 100644 --- a/common/src/main/java/bisq/common/util/Preconditions.java +++ b/common/src/main/java/haveno/common/util/Preconditions.java @@ -1,4 +1,4 @@ -package bisq.common.util; +package haveno.common.util; import java.io.File; diff --git a/common/src/main/java/bisq/common/util/Profiler.java b/common/src/main/java/haveno/common/util/Profiler.java similarity index 97% rename from common/src/main/java/bisq/common/util/Profiler.java rename to common/src/main/java/haveno/common/util/Profiler.java index 2851d03c..9d485dfb 100644 --- a/common/src/main/java/bisq/common/util/Profiler.java +++ b/common/src/main/java/haveno/common/util/Profiler.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.common.util; - -import bisq.common.UserThread; +package haveno.common.util; +import haveno.common.UserThread; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/bisq/common/util/ReflectionUtils.java b/common/src/main/java/haveno/common/util/ReflectionUtils.java similarity index 99% rename from common/src/main/java/bisq/common/util/ReflectionUtils.java rename to common/src/main/java/haveno/common/util/ReflectionUtils.java index 0ae45c11..294b86c6 100644 --- a/common/src/main/java/bisq/common/util/ReflectionUtils.java +++ b/common/src/main/java/haveno/common/util/ReflectionUtils.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.List; diff --git a/common/src/main/java/bisq/common/util/RestartUtil.java b/common/src/main/java/haveno/common/util/RestartUtil.java similarity index 99% rename from common/src/main/java/bisq/common/util/RestartUtil.java rename to common/src/main/java/haveno/common/util/RestartUtil.java index f1ef3fd3..203da109 100644 --- a/common/src/main/java/bisq/common/util/RestartUtil.java +++ b/common/src/main/java/haveno/common/util/RestartUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.io.File; import java.io.IOException; diff --git a/common/src/main/java/bisq/common/util/Tuple2.java b/common/src/main/java/haveno/common/util/Tuple2.java similarity index 98% rename from common/src/main/java/bisq/common/util/Tuple2.java rename to common/src/main/java/haveno/common/util/Tuple2.java index ecf8af11..6315fde4 100644 --- a/common/src/main/java/bisq/common/util/Tuple2.java +++ b/common/src/main/java/haveno/common/util/Tuple2.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.io.Serializable; diff --git a/common/src/main/java/bisq/common/util/Tuple3.java b/common/src/main/java/haveno/common/util/Tuple3.java similarity index 98% rename from common/src/main/java/bisq/common/util/Tuple3.java rename to common/src/main/java/haveno/common/util/Tuple3.java index a25b114d..8688573d 100644 --- a/common/src/main/java/bisq/common/util/Tuple3.java +++ b/common/src/main/java/haveno/common/util/Tuple3.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.Objects; diff --git a/common/src/main/java/bisq/common/util/Tuple4.java b/common/src/main/java/haveno/common/util/Tuple4.java similarity index 98% rename from common/src/main/java/bisq/common/util/Tuple4.java rename to common/src/main/java/haveno/common/util/Tuple4.java index 5ed471b6..f2648466 100644 --- a/common/src/main/java/bisq/common/util/Tuple4.java +++ b/common/src/main/java/haveno/common/util/Tuple4.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.Objects; diff --git a/common/src/main/java/bisq/common/util/Tuple5.java b/common/src/main/java/haveno/common/util/Tuple5.java similarity index 98% rename from common/src/main/java/bisq/common/util/Tuple5.java rename to common/src/main/java/haveno/common/util/Tuple5.java index f9986649..24d71b98 100644 --- a/common/src/main/java/bisq/common/util/Tuple5.java +++ b/common/src/main/java/haveno/common/util/Tuple5.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.Objects; diff --git a/common/src/main/java/bisq/common/util/Utilities.java b/common/src/main/java/haveno/common/util/Utilities.java similarity index 99% rename from common/src/main/java/bisq/common/util/Utilities.java rename to common/src/main/java/haveno/common/util/Utilities.java index 6a479832..e6376665 100644 --- a/common/src/main/java/bisq/common/util/Utilities.java +++ b/common/src/main/java/haveno/common/util/Utilities.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import org.bitcoinj.core.Utils; @@ -203,7 +203,7 @@ public class Utilities { } /** - * @return True, if Bisq is running on a virtualized OS within Qubes, false otherwise + * @return True, if Haveno is running on a virtualized OS within Qubes, false otherwise */ public static boolean isQubesOS() { // For Linux qubes, "os.version" looks like "4.19.132-1.pvops.qubes.x86_64" diff --git a/common/src/main/java/bisq/common/util/ZipUtils.java b/common/src/main/java/haveno/common/util/ZipUtils.java similarity index 97% rename from common/src/main/java/bisq/common/util/ZipUtils.java rename to common/src/main/java/haveno/common/util/ZipUtils.java index e47087b8..f4d487ed 100644 --- a/common/src/main/java/bisq/common/util/ZipUtils.java +++ b/common/src/main/java/haveno/common/util/ZipUtils.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.io.File; import java.io.FileInputStream; @@ -111,8 +111,8 @@ public class ZipUtils { log.info("Unzipped file: " + file.getAbsolutePath()); // Don't overwrite the current logs - if ("bisq.log".equals(file.getName())) { - file = new File(file.getParent() + "/" + "bisq.backup.log"); + if ("haveno.log".equals(file.getName())) { + file = new File(file.getParent() + "/" + "haveno.backup.log"); log.info("Unzipped logfile to backup path: " + file.getAbsolutePath()); } diff --git a/common/src/test/java/bisq/common/app/CapabilitiesTest.java b/common/src/test/java/haveno/common/app/CapabilitiesTest.java similarity index 95% rename from common/src/test/java/bisq/common/app/CapabilitiesTest.java rename to common/src/test/java/haveno/common/app/CapabilitiesTest.java index 9d286445..ec71486a 100644 --- a/common/src/test/java/bisq/common/app/CapabilitiesTest.java +++ b/common/src/test/java/haveno/common/app/CapabilitiesTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; import java.util.Arrays; import java.util.Collections; @@ -23,13 +23,16 @@ import java.util.HashSet; import org.junit.Test; -import static bisq.common.app.Capability.SEED_NODE; -import static bisq.common.app.Capability.TRADE_STATISTICS; -import static bisq.common.app.Capability.TRADE_STATISTICS_2; +import static haveno.common.app.Capability.SEED_NODE; +import static haveno.common.app.Capability.TRADE_STATISTICS; +import static haveno.common.app.Capability.TRADE_STATISTICS_2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; + public class CapabilitiesTest { @Test diff --git a/common/src/test/java/bisq/common/app/VersionTest.java b/common/src/test/java/haveno/common/app/VersionTest.java similarity index 96% rename from common/src/test/java/bisq/common/app/VersionTest.java rename to common/src/test/java/haveno/common/app/VersionTest.java index 82679107..14b62826 100644 --- a/common/src/test/java/bisq/common/app/VersionTest.java +++ b/common/src/test/java/haveno/common/app/VersionTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.app; +package haveno.common.app; import org.junit.Test; @@ -23,6 +23,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import haveno.common.app.Version; + public class VersionTest { @Test diff --git a/common/src/test/java/bisq/common/config/ConfigFileEditorTests.java b/common/src/test/java/haveno/common/config/ConfigFileEditorTests.java similarity index 94% rename from common/src/test/java/bisq/common/config/ConfigFileEditorTests.java rename to common/src/test/java/haveno/common/config/ConfigFileEditorTests.java index 4819c1bd..cb768fe4 100644 --- a/common/src/test/java/bisq/common/config/ConfigFileEditorTests.java +++ b/common/src/test/java/haveno/common/config/ConfigFileEditorTests.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; import java.io.File; import java.io.IOException; @@ -12,6 +12,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import haveno.common.config.ConfigFileEditor; +import haveno.common.config.ConfigFileReader; + public class ConfigFileEditorTests { private File file; @@ -21,7 +24,7 @@ public class ConfigFileEditorTests { @Before public void setUp() throws IOException { - file = File.createTempFile("bisq", "properties"); + file = File.createTempFile("haveno", "properties"); reader = new ConfigFileReader(file); editor = new ConfigFileEditor(file); writer = new PrintWriter(file); diff --git a/common/src/test/java/bisq/common/config/ConfigFileOptionTests.java b/common/src/test/java/haveno/common/config/ConfigFileOptionTests.java similarity index 95% rename from common/src/test/java/bisq/common/config/ConfigFileOptionTests.java rename to common/src/test/java/haveno/common/config/ConfigFileOptionTests.java index a8de344b..d1d2ad66 100644 --- a/common/src/test/java/bisq/common/config/ConfigFileOptionTests.java +++ b/common/src/test/java/haveno/common/config/ConfigFileOptionTests.java @@ -1,10 +1,12 @@ -package bisq.common.config; +package haveno.common.config; import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import haveno.common.config.ConfigFileOption; + public class ConfigFileOptionTests { @Test diff --git a/common/src/test/java/bisq/common/config/ConfigFileReaderTests.java b/common/src/test/java/haveno/common/config/ConfigFileReaderTests.java similarity index 92% rename from common/src/test/java/bisq/common/config/ConfigFileReaderTests.java rename to common/src/test/java/haveno/common/config/ConfigFileReaderTests.java index e0076bc8..7a712acb 100644 --- a/common/src/test/java/bisq/common/config/ConfigFileReaderTests.java +++ b/common/src/test/java/haveno/common/config/ConfigFileReaderTests.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; import java.io.File; import java.io.IOException; @@ -14,6 +14,9 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import haveno.common.config.ConfigException; +import haveno.common.config.ConfigFileReader; + public class ConfigFileReaderTests { private File file; @@ -25,7 +28,7 @@ public class ConfigFileReaderTests { @Before public void setUp() throws IOException { - file = File.createTempFile("bisq", "properties"); + file = File.createTempFile("haveno", "properties"); reader = new ConfigFileReader(file); writer = new PrintWriter(file); } diff --git a/common/src/test/java/bisq/common/config/ConfigTests.java b/common/src/test/java/haveno/common/config/ConfigTests.java similarity index 86% rename from common/src/test/java/bisq/common/config/ConfigTests.java rename to common/src/test/java/haveno/common/config/ConfigTests.java index a354f129..fdf5c7e2 100644 --- a/common/src/test/java/bisq/common/config/ConfigTests.java +++ b/common/src/test/java/haveno/common/config/ConfigTests.java @@ -1,4 +1,4 @@ -package bisq.common.config; +package haveno.common.config; import java.nio.file.Files; import java.nio.file.Path; @@ -14,7 +14,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static bisq.common.config.Config.*; +import static haveno.common.config.Config.*; import static java.lang.String.format; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; @@ -25,28 +25,32 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import haveno.common.config.Config; +import haveno.common.config.ConfigException; +import haveno.common.config.ConfigFileOption; + public class ConfigTests { @Rule public ExpectedException exceptionRule = ExpectedException.none(); // Note: "DataDirProperties" in the test method names below represent the group of - // configuration options that influence the location of a Bisq node's data directory. + // configuration options that influence the location of a Haveno node's data directory. // These options include appName, userDataDir, appDataDir and configFile @Test public void whenNoArgCtorIsCalled_thenDefaultAppNameIsSetToTempValue() { Config config = new Config(); String defaultAppName = config.defaultAppName; - String regex = "Bisq\\d{2,}Temp"; + String regex = "Haveno\\d{2,}Temp"; assertTrue(format("Temp app name '%s' failed to match '%s'", defaultAppName, regex), defaultAppName.matches(regex)); } @Test public void whenAppNameOptionIsSet_thenAppNamePropertyDiffersFromDefaultAppNameProperty() { - Config config = configWithOpts(opt(APP_NAME, "My-Bisq")); - assertThat(config.appName, equalTo("My-Bisq")); + Config config = configWithOpts(opt(APP_NAME, "My-Haveno")); + assertThat(config.appName, equalTo("My-Haveno")); assertThat(config.appName, not(equalTo(config.defaultAppName))); } @@ -61,10 +65,10 @@ public class ConfigTests { @Test public void whenAppNameOptionIsSet_thenDataDirPropertiesReflectItsValue() { - Config config = configWithOpts(opt(APP_NAME, "My-Bisq")); - assertThat(config.appName, equalTo("My-Bisq")); + Config config = configWithOpts(opt(APP_NAME, "My-Haveno")); + assertThat(config.appName, equalTo("My-Haveno")); assertThat(config.userDataDir, equalTo(config.defaultUserDataDir)); - assertThat(config.appDataDir, equalTo(new File(config.userDataDir, "My-Bisq"))); + assertThat(config.appDataDir, equalTo(new File(config.userDataDir, "My-Haveno"))); assertThat(config.configFile, equalTo(new File(config.appDataDir, DEFAULT_CONFIG_FILE_NAME))); } @@ -91,8 +95,8 @@ public class ConfigTests { @Test public void whenAppNameAndAppDataDirOptionsAreSet_thenDataDirPropertiesReflectTheirValues() throws IOException { File appDataDir = Files.createTempDirectory("myapp").toFile(); - Config config = configWithOpts(opt(APP_NAME, "My-Bisq"), opt(APP_DATA_DIR, appDataDir)); - assertThat(config.appName, equalTo("My-Bisq")); + Config config = configWithOpts(opt(APP_NAME, "My-Haveno"), opt(APP_DATA_DIR, appDataDir)); + assertThat(config.appName, equalTo("My-Haveno")); assertThat(config.userDataDir, equalTo(config.defaultUserDataDir)); assertThat(config.appDataDir, equalTo(appDataDir)); assertThat(config.configFile, equalTo(new File(config.appDataDir, DEFAULT_CONFIG_FILE_NAME))); @@ -100,12 +104,12 @@ public class ConfigTests { @Test public void whenOptionIsSetAtCommandLineAndInConfigFile_thenCommandLineValueTakesPrecedence() throws IOException { - File configFile = File.createTempFile("bisq", "properties"); + File configFile = File.createTempFile("haveno", "properties"); try (PrintWriter writer = new PrintWriter(configFile)) { - writer.println(new ConfigFileOption(APP_NAME, "Bisq-configFileValue")); + writer.println(new ConfigFileOption(APP_NAME, "Haveno-configFileValue")); } - Config config = configWithOpts(opt(APP_NAME, "Bisq-commandLineValue")); - assertThat(config.appName, equalTo("Bisq-commandLineValue")); + Config config = configWithOpts(opt(APP_NAME, "Haveno-commandLineValue")); + assertThat(config.appName, equalTo("Haveno-commandLineValue")); } @Test @@ -117,13 +121,13 @@ public class ConfigTests { @Test public void whenUnrecognizedOptionIsSetInConfigFile_thenNoExceptionIsThrown() throws IOException { - File configFile = File.createTempFile("bisq", "properties"); + File configFile = File.createTempFile("haveno", "properties"); try (PrintWriter writer = new PrintWriter(configFile)) { writer.println(new ConfigFileOption("bogusOption", "bogusValue")); - writer.println(new ConfigFileOption(APP_NAME, "BisqTest")); + writer.println(new ConfigFileOption(APP_NAME, "HavenoTest")); } Config config = configWithOpts(opt(CONFIG_FILE, configFile.getAbsolutePath())); - assertThat(config.appName, equalTo("BisqTest")); + assertThat(config.appName, equalTo("HavenoTest")); } @Test @@ -150,7 +154,7 @@ public class ConfigTests { @Test public void whenConfigFileOptionIsSetInConfigFile_thenConfigExceptionIsThrown() throws IOException { - File configFile = File.createTempFile("bisq", "properties"); + File configFile = File.createTempFile("haveno", "properties"); try (PrintWriter writer = new PrintWriter(configFile)) { writer.println(new ConfigFileOption(CONFIG_FILE, "/tmp/other.haveno.properties")); } @@ -161,14 +165,14 @@ public class ConfigTests { @Test public void whenConfigFileOptionIsSetToExistingFile_thenConfigFilePropertyReflectsItsValue() throws IOException { - File configFile = File.createTempFile("bisq", "properties"); + File configFile = File.createTempFile("haveno", "properties"); Config config = configWithOpts(opt(CONFIG_FILE, configFile.getAbsolutePath())); assertThat(config.configFile, equalTo(configFile)); } @Test public void whenConfigFileOptionIsSetToRelativePath_thenThePathIsPrefixedByAppDataDir() throws IOException { - File configFile = Files.createTempFile("my-bisq", ".properties").toFile(); + File configFile = Files.createTempFile("my-haveno", ".properties").toFile(); File appDataDir = configFile.getParentFile(); String relativeConfigFilePath = configFile.getName(); Config config = configWithOpts(opt(APP_DATA_DIR, appDataDir), opt(CONFIG_FILE, relativeConfigFilePath)); @@ -177,12 +181,12 @@ public class ConfigTests { @Test public void whenAppNameIsSetInConfigFile_thenDataDirPropertiesReflectItsValue() throws IOException { - File configFile = File.createTempFile("bisq", "properties"); + File configFile = File.createTempFile("haveno", "properties"); try (PrintWriter writer = new PrintWriter(configFile)) { - writer.println(new ConfigFileOption(APP_NAME, "My-Bisq")); + writer.println(new ConfigFileOption(APP_NAME, "My-Haveno")); } Config config = configWithOpts(opt(CONFIG_FILE, configFile.getAbsolutePath())); - assertThat(config.appName, equalTo("My-Bisq")); + assertThat(config.appName, equalTo("My-Haveno")); assertThat(config.userDataDir, equalTo(config.defaultUserDataDir)); assertThat(config.appDataDir, equalTo(new File(config.userDataDir, config.appName))); assertThat(config.configFile, equalTo(configFile)); diff --git a/common/src/test/java/bisq/common/util/MathUtilsTest.java b/common/src/test/java/haveno/common/util/MathUtilsTest.java similarity index 97% rename from common/src/test/java/bisq/common/util/MathUtilsTest.java rename to common/src/test/java/haveno/common/util/MathUtilsTest.java index 456d70c8..b044e8ce 100644 --- a/common/src/test/java/bisq/common/util/MathUtilsTest.java +++ b/common/src/test/java/haveno/common/util/MathUtilsTest.java @@ -15,13 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import haveno.common.util.MathUtils; + public class MathUtilsTest { @Test(expected = IllegalArgumentException.class) diff --git a/common/src/test/java/bisq/common/util/PermutationTest.java b/common/src/test/java/haveno/common/util/PermutationTest.java similarity index 99% rename from common/src/test/java/bisq/common/util/PermutationTest.java rename to common/src/test/java/haveno/common/util/PermutationTest.java index 3ebc3bc1..8acfe361 100644 --- a/common/src/test/java/bisq/common/util/PermutationTest.java +++ b/common/src/test/java/haveno/common/util/PermutationTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +27,8 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; +import haveno.common.util.PermutationUtil; + public class PermutationTest { diff --git a/common/src/test/java/bisq/common/util/PreconditionsTests.java b/common/src/test/java/haveno/common/util/PreconditionsTests.java similarity index 92% rename from common/src/test/java/bisq/common/util/PreconditionsTests.java rename to common/src/test/java/haveno/common/util/PreconditionsTests.java index 23616faf..552a9640 100644 --- a/common/src/test/java/bisq/common/util/PreconditionsTests.java +++ b/common/src/test/java/haveno/common/util/PreconditionsTests.java @@ -1,4 +1,4 @@ -package bisq.common.util; +package haveno.common.util; import java.nio.file.Files; @@ -9,7 +9,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static bisq.common.util.Preconditions.checkDir; +import static haveno.common.util.Preconditions.checkDir; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertSame; diff --git a/common/src/test/java/bisq/common/util/UtilitiesTest.java b/common/src/test/java/haveno/common/util/UtilitiesTest.java similarity index 98% rename from common/src/test/java/bisq/common/util/UtilitiesTest.java rename to common/src/test/java/haveno/common/util/UtilitiesTest.java index 2a50235d..aed84734 100644 --- a/common/src/test/java/bisq/common/util/UtilitiesTest.java +++ b/common/src/test/java/haveno/common/util/UtilitiesTest.java @@ -15,13 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.common.util; +package haveno.common.util; import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import haveno.common.util.Utilities; + public class UtilitiesTest { @Test diff --git a/core/.tx/config b/core/.tx/config index d5c34aeb..5d6e26e1 100644 --- a/core/.tx/config +++ b/core/.tx/config @@ -1,8 +1,8 @@ [main] host = https://www.transifex.com -[bisq-desktop.displaystringsproperties] -file_filter = translations/bisq-desktop.displaystringsproperties/.properties +[haveno-desktop.displaystringsproperties] +file_filter = translations/haveno-desktop.displaystringsproperties/.properties source_lang = en type = UNICODEPROPERTIES diff --git a/core/src/main/java/bisq/core/account/sign/SignedWitness.java b/core/src/main/java/haveno/core/account/sign/SignedWitness.java similarity index 93% rename from core/src/main/java/bisq/core/account/sign/SignedWitness.java rename to core/src/main/java/haveno/core/account/sign/SignedWitness.java index b8b4f4c7..95e216f9 100644 --- a/core/src/main/java/bisq/core/account/sign/SignedWitness.java +++ b/core/src/main/java/haveno/core/account/sign/SignedWitness.java @@ -15,22 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.account.sign; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; -import bisq.network.p2p.storage.payload.DateTolerantPayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.crypto.Hash; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.Utilities; +package haveno.core.account.sign; import com.google.protobuf.ByteString; - +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.crypto.Hash; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.Utilities; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; +import haveno.network.p2p.storage.payload.DateTolerantPayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; import org.bitcoinj.core.Coin; import java.time.Clock; diff --git a/core/src/main/java/bisq/core/account/sign/SignedWitnessService.java b/core/src/main/java/haveno/core/account/sign/SignedWitnessService.java similarity index 97% rename from core/src/main/java/bisq/core/account/sign/SignedWitnessService.java rename to core/src/main/java/haveno/core/account/sign/SignedWitnessService.java index c6a881d8..e0a2a204 100644 --- a/core/src/main/java/bisq/core/account/sign/SignedWitnessService.java +++ b/core/src/main/java/haveno/core/account/sign/SignedWitnessService.java @@ -15,25 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.account.sign; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.User; - -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; - -import bisq.common.UserThread; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Hash; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.Sig; -import bisq.common.util.Utilities; +package haveno.core.account.sign; import org.bitcoinj.core.Coin; import org.bitcoinj.core.ECKey; @@ -43,7 +25,21 @@ import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Charsets; - +import haveno.common.UserThread; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Hash; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.Sig; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.User; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; import java.math.BigInteger; import java.security.PublicKey; import java.security.SignatureException; diff --git a/core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java b/core/src/main/java/haveno/core/account/sign/SignedWitnessStorageService.java similarity index 89% rename from core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java rename to core/src/main/java/haveno/core/account/sign/SignedWitnessStorageService.java index 7a6f8a3c..25a6db9c 100644 --- a/core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java +++ b/core/src/main/java/haveno/core/account/sign/SignedWitnessStorageService.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.account.sign; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.persistence.MapStoreService; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; +package haveno.core.account.sign; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.persistence.MapStoreService; import javax.inject.Inject; import javax.inject.Named; diff --git a/core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java b/core/src/main/java/haveno/core/account/sign/SignedWitnessStore.java similarity index 95% rename from core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java rename to core/src/main/java/haveno/core/account/sign/SignedWitnessStore.java index 3f2a82de..a1f5319a 100644 --- a/core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java +++ b/core/src/main/java/haveno/core/account/sign/SignedWitnessStore.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.account.sign; +package haveno.core.account.sign; -import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore; - import com.google.protobuf.Message; - +import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitness.java b/core/src/main/java/haveno/core/account/witness/AccountAgeWitness.java similarity index 92% rename from core/src/main/java/bisq/core/account/witness/AccountAgeWitness.java rename to core/src/main/java/haveno/core/account/witness/AccountAgeWitness.java index 69dc8247..da7cfc7c 100644 --- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitness.java +++ b/core/src/main/java/haveno/core/account/witness/AccountAgeWitness.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.account.witness; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.DateTolerantPayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; - -import bisq.common.util.Utilities; +package haveno.core.account.witness; import com.google.protobuf.ByteString; - +import haveno.common.util.Utilities; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.DateTolerantPayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; import java.time.Clock; import java.time.Instant; diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java similarity index 96% rename from core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java rename to core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java index 389afa36..96088c87 100644 --- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java +++ b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java @@ -15,43 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.account.witness; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.filter.FilterManager; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferRestrictions; -import bisq.core.payment.ChargeBackRisk; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.arbitration.TraderDataItem; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.protocol.TradePeer; -import bisq.core.user.User; - -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; - -import bisq.common.UserThread; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Hash; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.util.MathUtils; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.core.account.witness; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; @@ -59,7 +23,39 @@ import org.bitcoinj.core.Utils; import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.UserThread; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Hash; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.util.MathUtils; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.filter.FilterManager; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferRestrictions; +import haveno.core.payment.ChargeBackRisk; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.arbitration.TraderDataItem; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.protocol.TradePeer; +import haveno.core.user.User; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; import java.math.BigInteger; import java.security.PublicKey; diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStorageService.java b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStorageService.java similarity index 89% rename from core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStorageService.java rename to core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStorageService.java index 53f1b5cc..382ed425 100644 --- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStorageService.java +++ b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStorageService.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.account.witness; - -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.persistence.HistoricalDataStoreService; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; +package haveno.core.account.witness; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.persistence.HistoricalDataStoreService; import javax.inject.Inject; import javax.inject.Named; diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStore.java b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStore.java similarity index 95% rename from core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStore.java rename to core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStore.java index 2bcb9e66..3514435a 100644 --- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStore.java +++ b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStore.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.account.witness; - -import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore; +package haveno.core.account.witness; import com.google.protobuf.Message; - +import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessUtils.java b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessUtils.java similarity index 94% rename from core/src/main/java/bisq/core/account/witness/AccountAgeWitnessUtils.java rename to core/src/main/java/haveno/core/account/witness/AccountAgeWitnessUtils.java index 9747fa1e..5676b786 100644 --- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessUtils.java +++ b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessUtils.java @@ -15,20 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.account.witness; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.trade.Trade; - -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.crypto.Hash; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.util.Utilities; +package haveno.core.account.witness; +import haveno.common.crypto.Hash; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.util.Utilities; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.trade.Trade; +import haveno.network.p2p.storage.P2PDataStorage; import java.util.Arrays; import java.util.Collection; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/alert/Alert.java b/core/src/main/java/haveno/core/alert/Alert.java similarity index 94% rename from core/src/main/java/bisq/core/alert/Alert.java rename to core/src/main/java/haveno/core/alert/Alert.java index 19518dd4..a923a66a 100644 --- a/core/src/main/java/bisq/core/alert/Alert.java +++ b/core/src/main/java/haveno/core/alert/Alert.java @@ -15,20 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.alert; - -import bisq.core.user.Preferences; - -import bisq.network.p2p.storage.payload.ExpirablePayload; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.Version; -import bisq.common.crypto.Sig; -import bisq.common.util.CollectionUtils; -import bisq.common.util.ExtraDataMapValidator; +package haveno.core.alert; import com.google.protobuf.ByteString; - +import haveno.common.app.Version; +import haveno.common.crypto.Sig; +import haveno.common.util.CollectionUtils; +import haveno.common.util.ExtraDataMapValidator; +import haveno.core.user.Preferences; +import haveno.network.p2p.storage.payload.ExpirablePayload; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.PublicKey; import java.util.Map; diff --git a/core/src/main/java/bisq/core/alert/AlertManager.java b/core/src/main/java/haveno/core/alert/AlertManager.java similarity index 94% rename from core/src/main/java/bisq/core/alert/AlertManager.java rename to core/src/main/java/haveno/core/alert/AlertManager.java index 91050968..1d7341f2 100644 --- a/core/src/main/java/bisq/core/alert/AlertManager.java +++ b/core/src/main/java/haveno/core/alert/AlertManager.java @@ -15,18 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.alert; - -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.HashMapChangedListener; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.DevEnv; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.core.alert; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; @@ -35,7 +24,14 @@ import javax.inject.Inject; import javax.inject.Named; import com.google.common.base.Charsets; - +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.user.User; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.HashMapChangedListener; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/core/src/main/java/bisq/core/alert/AlertModule.java b/core/src/main/java/haveno/core/alert/AlertModule.java similarity index 88% rename from core/src/main/java/bisq/core/alert/AlertModule.java rename to core/src/main/java/haveno/core/alert/AlertModule.java index 2bf408d3..95cdec5d 100644 --- a/core/src/main/java/bisq/core/alert/AlertModule.java +++ b/core/src/main/java/haveno/core/alert/AlertModule.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.alert; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.core.alert; import com.google.inject.Singleton; +import haveno.common.app.AppModule; +import haveno.common.config.Config; -import static bisq.common.config.Config.IGNORE_DEV_MSG; import static com.google.inject.name.Names.named; +import static haveno.common.config.Config.IGNORE_DEV_MSG; public class AlertModule extends AppModule { diff --git a/core/src/main/java/bisq/core/alert/PrivateNotificationManager.java b/core/src/main/java/haveno/core/alert/PrivateNotificationManager.java similarity index 92% rename from core/src/main/java/bisq/core/alert/PrivateNotificationManager.java rename to core/src/main/java/haveno/core/alert/PrivateNotificationManager.java index 0451c6a6..fd4e8d6a 100644 --- a/core/src/main/java/bisq/core/alert/PrivateNotificationManager.java +++ b/core/src/main/java/haveno/core/alert/PrivateNotificationManager.java @@ -15,24 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.alert; - -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.SendMailboxMessageListener; -import bisq.network.p2p.mailbox.MailboxMessageService; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.keepalive.messages.Ping; -import bisq.network.p2p.peers.keepalive.messages.Pong; - -import bisq.common.app.DevEnv; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.alert; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; @@ -45,7 +28,21 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.SendMailboxMessageListener; +import haveno.network.p2p.mailbox.MailboxMessageService; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.keepalive.messages.Ping; +import haveno.network.p2p.peers.keepalive.messages.Pong; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/core/src/main/java/bisq/core/alert/PrivateNotificationMessage.java b/core/src/main/java/haveno/core/alert/PrivateNotificationMessage.java similarity index 93% rename from core/src/main/java/bisq/core/alert/PrivateNotificationMessage.java rename to core/src/main/java/haveno/core/alert/PrivateNotificationMessage.java index 55d57caf..6589587f 100644 --- a/core/src/main/java/bisq/core/alert/PrivateNotificationMessage.java +++ b/core/src/main/java/haveno/core/alert/PrivateNotificationMessage.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.alert; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.mailbox.MailboxMessage; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.alert; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.mailbox.MailboxMessage; import java.util.concurrent.TimeUnit; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/alert/PrivateNotificationPayload.java b/core/src/main/java/haveno/core/alert/PrivateNotificationPayload.java similarity index 95% rename from core/src/main/java/bisq/core/alert/PrivateNotificationPayload.java rename to core/src/main/java/haveno/core/alert/PrivateNotificationPayload.java index fec3d224..cb24d8c6 100644 --- a/core/src/main/java/bisq/core/alert/PrivateNotificationPayload.java +++ b/core/src/main/java/haveno/core/alert/PrivateNotificationPayload.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.alert; - -import bisq.common.crypto.Sig; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.util.Utilities; +package haveno.core.alert; import com.google.protobuf.ByteString; - +import haveno.common.crypto.Sig; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.util.Utilities; import java.security.PublicKey; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/api/AccountServiceListener.java b/core/src/main/java/haveno/core/api/AccountServiceListener.java similarity index 94% rename from core/src/main/java/bisq/core/api/AccountServiceListener.java rename to core/src/main/java/haveno/core/api/AccountServiceListener.java index e2c71268..27bcaf47 100644 --- a/core/src/main/java/bisq/core/api/AccountServiceListener.java +++ b/core/src/main/java/haveno/core/api/AccountServiceListener.java @@ -1,4 +1,4 @@ -package bisq.core.api; +package haveno.core.api; /** * Default account listener (takes no action). diff --git a/core/src/main/java/bisq/core/api/CoreAccountService.java b/core/src/main/java/haveno/core/api/CoreAccountService.java similarity index 95% rename from core/src/main/java/bisq/core/api/CoreAccountService.java rename to core/src/main/java/haveno/core/api/CoreAccountService.java index 60042226..274a1369 100644 --- a/core/src/main/java/bisq/core/api/CoreAccountService.java +++ b/core/src/main/java/haveno/core/api/CoreAccountService.java @@ -15,17 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; import static com.google.common.base.Preconditions.checkState; -import bisq.common.config.Config; -import bisq.common.crypto.IncorrectPasswordException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.file.FileUtil; -import bisq.common.persistence.PersistenceManager; -import bisq.common.util.ZipUtils; +import haveno.common.config.Config; +import haveno.common.crypto.IncorrectPasswordException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.file.FileUtil; +import haveno.common.persistence.PersistenceManager; +import haveno.common.util.ZipUtils; import java.io.File; import java.io.InputStream; import java.io.PipedInputStream; diff --git a/core/src/main/java/bisq/core/api/CoreApi.java b/core/src/main/java/haveno/core/api/CoreApi.java similarity index 93% rename from core/src/main/java/bisq/core/api/CoreApi.java rename to core/src/main/java/haveno/core/api/CoreApi.java index 8285cc19..15247d9b 100644 --- a/core/src/main/java/bisq/core/api/CoreApi.java +++ b/core/src/main/java/haveno/core/api/CoreApi.java @@ -15,38 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; -import bisq.core.api.model.AddressBalanceInfo; -import bisq.core.api.model.BalancesInfo; -import bisq.core.api.model.MarketDepthInfo; -import bisq.core.api.model.MarketPriceInfo; -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.app.AppStartupState; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OpenOffer; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.support.dispute.Attachment; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.Trade; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.xmr.MoneroNodeSettings; - -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.crypto.IncorrectPasswordException; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.FaultHandler; -import bisq.common.handlers.ResultHandler; - -import bisq.proto.grpc.NotificationMessage; +import haveno.proto.grpc.NotificationMessage; import org.bitcoinj.core.Transaction; @@ -54,7 +25,33 @@ import javax.inject.Inject; import javax.inject.Singleton; import com.google.common.util.concurrent.FutureCallback; - +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.crypto.IncorrectPasswordException; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.FaultHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.api.model.AddressBalanceInfo; +import haveno.core.api.model.BalancesInfo; +import haveno.core.api.model.MarketDepthInfo; +import haveno.core.api.model.MarketPriceInfo; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.app.AppStartupState; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OpenOffer; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.support.dispute.Attachment; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.Trade; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.xmr.MoneroNodeSettings; import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; @@ -74,8 +71,8 @@ import monero.wallet.model.MoneroDestination; import monero.wallet.model.MoneroTxWallet; /** - * Provides high level interface to functionality of core Bisq features. - * E.g. useful for different APIs to access data of different domains of Bisq. + * Provides high level interface to functionality of core Haveno features. + * E.g. useful for different APIs to access data of different domains of Haveno. */ @Singleton @Slf4j diff --git a/core/src/main/java/bisq/core/api/CoreContext.java b/core/src/main/java/haveno/core/api/CoreContext.java similarity index 97% rename from core/src/main/java/bisq/core/api/CoreContext.java rename to core/src/main/java/haveno/core/api/CoreContext.java index f0502782..f6fb634b 100644 --- a/core/src/main/java/bisq/core/api/CoreContext.java +++ b/core/src/main/java/haveno/core/api/CoreContext.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java b/core/src/main/java/haveno/core/api/CoreDisputeAgentsService.java similarity index 90% rename from core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java rename to core/src/main/java/haveno/core/api/CoreDisputeAgentsService.java index 6de591a7..8a91063f 100644 --- a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java +++ b/core/src/main/java/haveno/core/api/CoreDisputeAgentsService.java @@ -15,24 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.mediator.Mediator; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; -import bisq.core.user.User; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.core.user.User; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import org.bitcoinj.core.ECKey; import javax.inject.Inject; @@ -45,10 +44,10 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import static bisq.core.support.SupportType.ARBITRATION; -import static bisq.core.support.SupportType.MEDIATION; -import static bisq.core.support.SupportType.REFUND; -import static bisq.core.support.SupportType.TRADE; +import static haveno.core.support.SupportType.ARBITRATION; +import static haveno.core.support.SupportType.MEDIATION; +import static haveno.core.support.SupportType.REFUND; +import static haveno.core.support.SupportType.TRADE; import static java.lang.String.format; import static java.net.InetAddress.getLoopbackAddress; import static java.util.Arrays.asList; diff --git a/core/src/main/java/bisq/core/api/CoreDisputesService.java b/core/src/main/java/haveno/core/api/CoreDisputesService.java similarity index 93% rename from core/src/main/java/bisq/core/api/CoreDisputesService.java rename to core/src/main/java/haveno/core/api/CoreDisputesService.java index e792aba3..44a658fc 100644 --- a/core/src/main/java/bisq/core/api/CoreDisputesService.java +++ b/core/src/main/java/haveno/core/api/CoreDisputesService.java @@ -1,30 +1,28 @@ -package bisq.core.api; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Attachment; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.DisputeSummaryVerification; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.handlers.FaultHandler; -import bisq.common.handlers.ResultHandler; +package haveno.core.api; import com.google.inject.name.Named; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.handlers.FaultHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Attachment; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.DisputeSummaryVerification; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/api/CoreHelpService.java b/core/src/main/java/haveno/core/api/CoreHelpService.java similarity index 99% rename from core/src/main/java/bisq/core/api/CoreHelpService.java rename to core/src/main/java/haveno/core/api/CoreHelpService.java index d4d6bff7..15ca8537 100644 --- a/core/src/main/java/bisq/core/api/CoreHelpService.java +++ b/core/src/main/java/haveno/core/api/CoreHelpService.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/api/CoreMoneroConnectionsService.java b/core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java similarity index 98% rename from core/src/main/java/bisq/core/api/CoreMoneroConnectionsService.java rename to core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java index 8bbdea09..d5fe2ce9 100644 --- a/core/src/main/java/bisq/core/api/CoreMoneroConnectionsService.java +++ b/core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java @@ -1,12 +1,12 @@ -package bisq.core.api; +package haveno.core.api; -import bisq.common.app.DevEnv; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.core.btc.model.EncryptedConnectionList; -import bisq.core.btc.setup.DownloadListener; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.trade.HavenoUtils; +import haveno.common.app.DevEnv; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.btc.model.EncryptedConnectionList; +import haveno.core.btc.setup.DownloadListener; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.trade.HavenoUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/api/CoreMoneroNodeService.java b/core/src/main/java/haveno/core/api/CoreMoneroNodeService.java similarity index 95% rename from core/src/main/java/bisq/core/api/CoreMoneroNodeService.java rename to core/src/main/java/haveno/core/api/CoreMoneroNodeService.java index dc738342..3c987ba2 100644 --- a/core/src/main/java/bisq/core/api/CoreMoneroNodeService.java +++ b/core/src/main/java/haveno/core/api/CoreMoneroNodeService.java @@ -14,15 +14,14 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.core.api; - -import bisq.core.trade.HavenoUtils; -import bisq.core.user.Preferences; -import bisq.core.xmr.MoneroNodeSettings; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.common.util.Utilities; +package haveno.core.api; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.Preferences; +import haveno.core.xmr.MoneroNodeSettings; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/api/CoreNotificationService.java b/core/src/main/java/haveno/core/api/CoreNotificationService.java similarity index 90% rename from core/src/main/java/bisq/core/api/CoreNotificationService.java rename to core/src/main/java/haveno/core/api/CoreNotificationService.java index 0a0ebbad..b877331a 100644 --- a/core/src/main/java/bisq/core/api/CoreNotificationService.java +++ b/core/src/main/java/haveno/core/api/CoreNotificationService.java @@ -1,10 +1,10 @@ -package bisq.core.api; +package haveno.core.api; -import bisq.core.api.model.TradeInfo; -import bisq.core.trade.Trade; -import bisq.core.support.messages.ChatMessage; -import bisq.proto.grpc.NotificationMessage; -import bisq.proto.grpc.NotificationMessage.NotificationType; +import haveno.proto.grpc.NotificationMessage; +import haveno.proto.grpc.NotificationMessage.NotificationType; +import haveno.core.api.model.TradeInfo; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.Trade; import javax.inject.Singleton; import java.util.Iterator; diff --git a/core/src/main/java/bisq/core/api/CoreOffersService.java b/core/src/main/java/haveno/core/api/CoreOffersService.java similarity index 92% rename from core/src/main/java/bisq/core/api/CoreOffersService.java rename to core/src/main/java/haveno/core/api/CoreOffersService.java index 569b266a..d5b28ba3 100644 --- a/core/src/main/java/bisq/core/api/CoreOffersService.java +++ b/core/src/main/java/haveno/core/api/CoreOffersService.java @@ -15,24 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.offer.CreateOfferService; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferBookService; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferFilterService; -import bisq.core.offer.OfferFilterService.Result; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.PaymentAccount; -import bisq.core.user.User; -import bisq.core.util.PriceUtil; -import bisq.common.crypto.KeyRing; -import bisq.common.handlers.ErrorMessageHandler; +import haveno.common.crypto.KeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.offer.CreateOfferService; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferBookService; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferFilterService; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.offer.OfferFilterService.Result; +import haveno.core.payment.PaymentAccount; +import haveno.core.user.User; +import haveno.core.util.PriceUtil; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; import org.bitcoinj.utils.Fiat; @@ -53,12 +53,12 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.common.util.MathUtils.exactMultiply; -import static bisq.common.util.MathUtils.roundDoubleToLong; -import static bisq.common.util.MathUtils.scaleUpByPowerOf10; -import static bisq.core.locale.CurrencyUtil.isCryptoCurrency; -import static bisq.core.offer.OfferDirection.BUY; -import static bisq.core.payment.PaymentAccountUtil.isPaymentAccountValidForOffer; +import static haveno.common.util.MathUtils.exactMultiply; +import static haveno.common.util.MathUtils.roundDoubleToLong; +import static haveno.common.util.MathUtils.scaleUpByPowerOf10; +import static haveno.core.locale.CurrencyUtil.isCryptoCurrency; +import static haveno.core.offer.OfferDirection.BUY; +import static haveno.core.payment.PaymentAccountUtil.isPaymentAccountValidForOffer; import static java.lang.String.format; import static java.util.Comparator.comparing; diff --git a/core/src/main/java/bisq/core/api/CorePaymentAccountsService.java b/core/src/main/java/haveno/core/api/CorePaymentAccountsService.java similarity index 90% rename from core/src/main/java/bisq/core/api/CorePaymentAccountsService.java rename to core/src/main/java/haveno/core/api/CorePaymentAccountsService.java index 951480fd..1130f837 100644 --- a/core/src/main/java/bisq/core/api/CorePaymentAccountsService.java +++ b/core/src/main/java/haveno/core/api/CorePaymentAccountsService.java @@ -15,25 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.core.api; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.AssetAccount; -import bisq.core.payment.CryptoCurrencyAccount; -import bisq.core.payment.InstantCryptoCurrencyAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountFactory; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.user.User; - -import bisq.asset.Asset; -import bisq.asset.AssetRegistry; +package haveno.core.api; +import haveno.asset.Asset; +import haveno.asset.AssetRegistry; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.AssetAccount; +import haveno.core.payment.CryptoCurrencyAccount; +import haveno.core.payment.InstantCryptoCurrencyAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountFactory; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.user.User; import javax.inject.Inject; import javax.inject.Singleton; @@ -47,9 +45,9 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.common.config.Config.baseCurrencyNetwork; -import static bisq.core.locale.CurrencyUtil.findAsset; -import static bisq.core.locale.CurrencyUtil.getCryptoCurrency; +import static haveno.common.config.Config.baseCurrencyNetwork; +import static haveno.core.locale.CurrencyUtil.findAsset; +import static haveno.core.locale.CurrencyUtil.getCryptoCurrency; import static java.lang.String.format; @Singleton diff --git a/core/src/main/java/bisq/core/api/CorePriceService.java b/core/src/main/java/haveno/core/api/CorePriceService.java similarity index 94% rename from core/src/main/java/bisq/core/api/CorePriceService.java rename to core/src/main/java/haveno/core/api/CorePriceService.java index e9221b77..0ce54bd7 100644 --- a/core/src/main/java/bisq/core/api/CorePriceService.java +++ b/core/src/main/java/haveno/core/api/CorePriceService.java @@ -15,23 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.api; - -import bisq.core.api.model.MarketDepthInfo; -import bisq.core.api.model.MarketPriceInfo; -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferBookService; -import bisq.core.offer.OfferDirection; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.HavenoUtils; +package haveno.core.api; import javax.inject.Inject; import javax.inject.Singleton; import com.google.common.math.LongMath; - +import haveno.core.api.model.MarketDepthInfo; +import haveno.core.api.model.MarketPriceInfo; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferBookService; +import haveno.core.offer.OfferDirection; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.HavenoUtils; import java.util.List; import java.util.Comparator; import java.util.LinkedHashMap; diff --git a/core/src/main/java/bisq/core/api/CoreTradesService.java b/core/src/main/java/haveno/core/api/CoreTradesService.java similarity index 92% rename from core/src/main/java/bisq/core/api/CoreTradesService.java rename to core/src/main/java/haveno/core/api/CoreTradesService.java index 2c314c0a..a531e984 100644 --- a/core/src/main/java/bisq/core/api/CoreTradesService.java +++ b/core/src/main/java/haveno/core/api/CoreTradesService.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.offer.Offer; -import bisq.core.offer.takeoffer.TakeOfferModel; -import bisq.core.support.messages.ChatMessage; -import bisq.core.support.traderchat.TradeChatSession; -import bisq.core.support.traderchat.TraderChatManager; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.TradeUtil; -import bisq.core.trade.protocol.BuyerProtocol; -import bisq.core.trade.protocol.SellerProtocol; -import bisq.core.user.User; -import bisq.core.util.validation.BtcAddressValidator; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.offer.Offer; +import haveno.core.offer.takeoffer.TakeOfferModel; +import haveno.core.support.messages.ChatMessage; +import haveno.core.support.traderchat.TradeChatSession; +import haveno.core.support.traderchat.TraderChatManager; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.TradeUtil; +import haveno.core.trade.protocol.BuyerProtocol; +import haveno.core.trade.protocol.SellerProtocol; +import haveno.core.user.User; +import haveno.core.util.validation.BtcAddressValidator; import org.bitcoinj.core.Coin; import javax.inject.Inject; @@ -47,7 +46,7 @@ import java.util.function.Consumer; import lombok.extern.slf4j.Slf4j; -import static bisq.core.btc.model.AddressEntry.Context.TRADE_PAYOUT; +import static haveno.core.btc.model.AddressEntry.Context.TRADE_PAYOUT; import static java.lang.String.format; import java.math.BigInteger; diff --git a/core/src/main/java/bisq/core/api/CoreWalletsService.java b/core/src/main/java/haveno/core/api/CoreWalletsService.java similarity index 95% rename from core/src/main/java/bisq/core/api/CoreWalletsService.java rename to core/src/main/java/haveno/core/api/CoreWalletsService.java index 0c4ceb56..571cd8ef 100644 --- a/core/src/main/java/bisq/core/api/CoreWalletsService.java +++ b/core/src/main/java/haveno/core/api/CoreWalletsService.java @@ -15,27 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.api; - -import bisq.core.api.model.AddressBalanceInfo; -import bisq.core.api.model.BalancesInfo; -import bisq.core.api.model.BtcBalanceInfo; -import bisq.core.api.model.XmrBalanceInfo; -import bisq.core.app.AppStartupState; -import bisq.core.btc.Balances; -import bisq.core.btc.exceptions.AddressEntryException; -import bisq.core.btc.exceptions.InsufficientFundsException; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.Timer; -import bisq.common.UserThread; +package haveno.core.api; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; @@ -53,7 +33,24 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.FutureCallback; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.core.api.model.AddressBalanceInfo; +import haveno.core.api.model.BalancesInfo; +import haveno.core.api.model.BtcBalanceInfo; +import haveno.core.api.model.XmrBalanceInfo; +import haveno.core.app.AppStartupState; +import haveno.core.btc.Balances; +import haveno.core.btc.exceptions.AddressEntryException; +import haveno.core.btc.exceptions.InsufficientFundsException; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; import org.bouncycastle.crypto.params.KeyParameter; import java.util.List; @@ -66,8 +63,8 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.core.btc.wallet.Restrictions.getMinNonDustOutput; -import static bisq.core.util.ParsingUtils.parseToCoin; +import static haveno.core.btc.wallet.Restrictions.getMinNonDustOutput; +import static haveno.core.util.ParsingUtils.parseToCoin; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/core/src/main/java/bisq/core/api/MoneroNodeServiceListener.java b/core/src/main/java/haveno/core/api/MoneroNodeServiceListener.java similarity index 97% rename from core/src/main/java/bisq/core/api/MoneroNodeServiceListener.java rename to core/src/main/java/haveno/core/api/MoneroNodeServiceListener.java index b70650c4..0957e016 100644 --- a/core/src/main/java/bisq/core/api/MoneroNodeServiceListener.java +++ b/core/src/main/java/haveno/core/api/MoneroNodeServiceListener.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.core.api; +package haveno.core.api; import monero.daemon.MoneroDaemonRpc; diff --git a/core/src/main/java/bisq/core/api/NotificationListener.java b/core/src/main/java/haveno/core/api/NotificationListener.java similarity index 91% rename from core/src/main/java/bisq/core/api/NotificationListener.java rename to core/src/main/java/haveno/core/api/NotificationListener.java index bb2a74eb..28cce350 100644 --- a/core/src/main/java/bisq/core/api/NotificationListener.java +++ b/core/src/main/java/haveno/core/api/NotificationListener.java @@ -1,6 +1,6 @@ -package bisq.core.api; +package haveno.core.api; -import bisq.proto.grpc.NotificationMessage; +import haveno.proto.grpc.NotificationMessage; import lombok.NonNull; /* diff --git a/core/src/main/java/bisq/core/api/model/AddressBalanceInfo.java b/core/src/main/java/haveno/core/api/model/AddressBalanceInfo.java similarity index 89% rename from core/src/main/java/bisq/core/api/model/AddressBalanceInfo.java rename to core/src/main/java/haveno/core/api/model/AddressBalanceInfo.java index 7c0d2d8c..2227478a 100644 --- a/core/src/main/java/bisq/core/api/model/AddressBalanceInfo.java +++ b/core/src/main/java/haveno/core/api/model/AddressBalanceInfo.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; +package haveno.core.api.model; -import bisq.common.Payload; +import haveno.common.Payload; public class AddressBalanceInfo implements Payload { @@ -41,8 +41,8 @@ public class AddressBalanceInfo implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.AddressBalanceInfo toProtoMessage() { - return bisq.proto.grpc.AddressBalanceInfo.newBuilder() + public haveno.proto.grpc.AddressBalanceInfo toProtoMessage() { + return haveno.proto.grpc.AddressBalanceInfo.newBuilder() .setAddress(address) .setBalance(balance) .setNumConfirmations(numConfirmations) @@ -50,7 +50,7 @@ public class AddressBalanceInfo implements Payload { .build(); } - public static AddressBalanceInfo fromProto(bisq.proto.grpc.AddressBalanceInfo proto) { + public static AddressBalanceInfo fromProto(haveno.proto.grpc.AddressBalanceInfo proto) { return new AddressBalanceInfo(proto.getAddress(), proto.getBalance(), proto.getNumConfirmations(), diff --git a/core/src/main/java/bisq/core/api/model/BalancesInfo.java b/core/src/main/java/haveno/core/api/model/BalancesInfo.java similarity index 81% rename from core/src/main/java/bisq/core/api/model/BalancesInfo.java rename to core/src/main/java/haveno/core/api/model/BalancesInfo.java index 7d36e5a1..51513f95 100644 --- a/core/src/main/java/bisq/core/api/model/BalancesInfo.java +++ b/core/src/main/java/haveno/core/api/model/BalancesInfo.java @@ -1,7 +1,6 @@ -package bisq.core.api.model; - -import bisq.common.Payload; +package haveno.core.api.model; +import haveno.common.Payload; import lombok.Getter; @Getter @@ -23,14 +22,14 @@ public class BalancesInfo implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.BalancesInfo toProtoMessage() { - return bisq.proto.grpc.BalancesInfo.newBuilder() + public haveno.proto.grpc.BalancesInfo toProtoMessage() { + return haveno.proto.grpc.BalancesInfo.newBuilder() .setBtc(btc.toProtoMessage()) .setXmr(xmr.toProtoMessage()) .build(); } - public static BalancesInfo fromProto(bisq.proto.grpc.BalancesInfo proto) { + public static BalancesInfo fromProto(haveno.proto.grpc.BalancesInfo proto) { return new BalancesInfo( BtcBalanceInfo.fromProto(proto.getBtc()), XmrBalanceInfo.fromProto(proto.getXmr())); diff --git a/core/src/main/java/bisq/core/api/model/BtcBalanceInfo.java b/core/src/main/java/haveno/core/api/model/BtcBalanceInfo.java similarity index 90% rename from core/src/main/java/bisq/core/api/model/BtcBalanceInfo.java rename to core/src/main/java/haveno/core/api/model/BtcBalanceInfo.java index e3803b00..7269c88d 100644 --- a/core/src/main/java/bisq/core/api/model/BtcBalanceInfo.java +++ b/core/src/main/java/haveno/core/api/model/BtcBalanceInfo.java @@ -1,9 +1,7 @@ -package bisq.core.api.model; - -import bisq.common.Payload; +package haveno.core.api.model; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.Payload; import lombok.Getter; @Getter @@ -47,8 +45,8 @@ public class BtcBalanceInfo implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.BtcBalanceInfo toProtoMessage() { - return bisq.proto.grpc.BtcBalanceInfo.newBuilder() + public haveno.proto.grpc.BtcBalanceInfo toProtoMessage() { + return haveno.proto.grpc.BtcBalanceInfo.newBuilder() .setAvailableBalance(availableBalance) .setReservedBalance(reservedBalance) .setTotalAvailableBalance(totalAvailableBalance) @@ -56,7 +54,7 @@ public class BtcBalanceInfo implements Payload { .build(); } - public static BtcBalanceInfo fromProto(bisq.proto.grpc.BtcBalanceInfo proto) { + public static BtcBalanceInfo fromProto(haveno.proto.grpc.BtcBalanceInfo proto) { return new BtcBalanceInfo(proto.getAvailableBalance(), proto.getReservedBalance(), proto.getTotalAvailableBalance(), diff --git a/core/src/main/java/bisq/core/api/model/ContractInfo.java b/core/src/main/java/haveno/core/api/model/ContractInfo.java similarity index 92% rename from core/src/main/java/bisq/core/api/model/ContractInfo.java rename to core/src/main/java/haveno/core/api/model/ContractInfo.java index 31752515..ceed9947 100644 --- a/core/src/main/java/bisq/core/api/model/ContractInfo.java +++ b/core/src/main/java/haveno/core/api/model/ContractInfo.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; - -import bisq.common.Payload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.proto.CoreProtoResolver; +package haveno.core.api.model; +import haveno.common.Payload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.proto.CoreProtoResolver; import java.util.function.Supplier; import lombok.Getter; @@ -87,7 +86,7 @@ public class ContractInfo implements Payload { // PROTO BUFFER /////////////////////////////////////////////////////////////////////////////////////////// - public static ContractInfo fromProto(bisq.proto.grpc.ContractInfo proto) { + public static ContractInfo fromProto(haveno.proto.grpc.ContractInfo proto) { CoreProtoResolver coreProtoResolver = new CoreProtoResolver(); return new ContractInfo(proto.getBuyerNodeAddress(), proto.getSellerNodeAddress(), @@ -103,8 +102,8 @@ public class ContractInfo implements Payload { } @Override - public bisq.proto.grpc.ContractInfo toProtoMessage() { - bisq.proto.grpc.ContractInfo.Builder builder = bisq.proto.grpc.ContractInfo.newBuilder() + public haveno.proto.grpc.ContractInfo toProtoMessage() { + haveno.proto.grpc.ContractInfo.Builder builder = haveno.proto.grpc.ContractInfo.newBuilder() .setBuyerNodeAddress(buyerNodeAddress) .setSellerNodeAddress(sellerNodeAddress) .setArbitratorNodeAddress(arbitratorNodeAddress) diff --git a/core/src/main/java/bisq/core/api/model/EncryptedConnection.java b/core/src/main/java/haveno/core/api/model/EncryptedConnection.java similarity index 92% rename from core/src/main/java/bisq/core/api/model/EncryptedConnection.java rename to core/src/main/java/haveno/core/api/model/EncryptedConnection.java index 41ff4717..03123a83 100644 --- a/core/src/main/java/bisq/core/api/model/EncryptedConnection.java +++ b/core/src/main/java/haveno/core/api/model/EncryptedConnection.java @@ -1,9 +1,7 @@ -package bisq.core.api.model; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.api.model; import com.google.protobuf.ByteString; - +import haveno.common.proto.persistable.PersistablePayload; import lombok.Builder; import lombok.Value; diff --git a/core/src/main/java/bisq/core/api/model/MarketDepthInfo.java b/core/src/main/java/haveno/core/api/model/MarketDepthInfo.java similarity index 90% rename from core/src/main/java/bisq/core/api/model/MarketDepthInfo.java rename to core/src/main/java/haveno/core/api/model/MarketDepthInfo.java index 23fd2b95..b1f2475b 100644 --- a/core/src/main/java/bisq/core/api/model/MarketDepthInfo.java +++ b/core/src/main/java/haveno/core/api/model/MarketDepthInfo.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; +package haveno.core.api.model; import java.util.Arrays; @@ -37,8 +37,8 @@ public class MarketDepthInfo { /////////////////////////////////////////////////////////////////////////////////////////// // @Override - public bisq.proto.grpc.MarketDepthInfo toProtoMessage() { - return bisq.proto.grpc.MarketDepthInfo.newBuilder() + public haveno.proto.grpc.MarketDepthInfo toProtoMessage() { + return haveno.proto.grpc.MarketDepthInfo.newBuilder() .setCurrencyCode(currencyCode) .addAllBuyPrices(Arrays.asList(buyPrices)) .addAllBuyDepth(Arrays.asList((buyDepth))) diff --git a/core/src/main/java/bisq/core/api/model/MarketPriceInfo.java b/core/src/main/java/haveno/core/api/model/MarketPriceInfo.java similarity index 83% rename from core/src/main/java/bisq/core/api/model/MarketPriceInfo.java rename to core/src/main/java/haveno/core/api/model/MarketPriceInfo.java index c2e77c5d..0190fb0c 100644 --- a/core/src/main/java/bisq/core/api/model/MarketPriceInfo.java +++ b/core/src/main/java/haveno/core/api/model/MarketPriceInfo.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; - -import bisq.common.Payload; +package haveno.core.api.model; +import haveno.common.Payload; import lombok.AllArgsConstructor; import lombok.ToString; @@ -34,14 +33,14 @@ public class MarketPriceInfo implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.MarketPriceInfo toProtoMessage() { - return bisq.proto.grpc.MarketPriceInfo.newBuilder() + public haveno.proto.grpc.MarketPriceInfo toProtoMessage() { + return haveno.proto.grpc.MarketPriceInfo.newBuilder() .setPrice(price) .setCurrencyCode(currencyCode) .build(); } - public static MarketPriceInfo fromProto(bisq.proto.grpc.MarketPriceInfo proto) { + public static MarketPriceInfo fromProto(haveno.proto.grpc.MarketPriceInfo proto) { return new MarketPriceInfo(proto.getCurrencyCode(), proto.getPrice()); } diff --git a/core/src/main/java/bisq/core/api/model/OfferInfo.java b/core/src/main/java/haveno/core/api/model/OfferInfo.java similarity index 93% rename from core/src/main/java/bisq/core/api/model/OfferInfo.java rename to core/src/main/java/haveno/core/api/model/OfferInfo.java index c9079ffe..7d0b305b 100644 --- a/core/src/main/java/bisq/core/api/model/OfferInfo.java +++ b/core/src/main/java/haveno/core/api/model/OfferInfo.java @@ -15,23 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; +package haveno.core.api.model; -import bisq.core.api.model.builder.OfferInfoBuilder; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOffer; -import bisq.common.Payload; -import bisq.common.proto.ProtoUtil; +import haveno.common.Payload; +import haveno.common.proto.ProtoUtil; +import haveno.core.api.model.builder.OfferInfoBuilder; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOffer; import java.util.Optional; import javax.annotation.Nullable; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import static bisq.common.util.MathUtils.exactMultiply; -import static bisq.core.util.PriceUtil.reformatMarketPrice; -import static bisq.core.util.VolumeUtil.formatVolume; +import static haveno.common.util.MathUtils.exactMultiply; +import static haveno.core.util.PriceUtil.reformatMarketPrice; +import static haveno.core.util.VolumeUtil.formatVolume; import static java.util.Objects.requireNonNull; @EqualsAndHashCode @@ -39,7 +39,7 @@ import static java.util.Objects.requireNonNull; @Getter public class OfferInfo implements Payload { - // The client cannot see bisq.core.Offer or its fromProto method. We use the lighter + // The client cannot see haveno.core.Offer or its fromProto method. We use the lighter // weight OfferInfo proto wrapper instead, containing just enough fields to view, // create and take offers. @@ -177,8 +177,8 @@ public class OfferInfo implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.OfferInfo toProtoMessage() { - bisq.proto.grpc.OfferInfo.Builder builder = bisq.proto.grpc.OfferInfo.newBuilder() + public haveno.proto.grpc.OfferInfo toProtoMessage() { + haveno.proto.grpc.OfferInfo.Builder builder = haveno.proto.grpc.OfferInfo.newBuilder() .setId(id) .setDirection(direction) .setPrice(price) @@ -212,7 +212,7 @@ public class OfferInfo implements Payload { } @SuppressWarnings("unused") - public static OfferInfo fromProto(bisq.proto.grpc.OfferInfo proto) { + public static OfferInfo fromProto(haveno.proto.grpc.OfferInfo proto) { return new OfferInfoBuilder() .withId(proto.getId()) .withDirection(proto.getDirection()) diff --git a/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java b/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java similarity index 96% rename from core/src/main/java/bisq/core/api/model/PaymentAccountForm.java rename to core/src/main/java/haveno/core/api/model/PaymentAccountForm.java index b94e16ab..6cab77da 100644 --- a/core/src/main/java/bisq/core/api/model/PaymentAccountForm.java +++ b/core/src/main/java/haveno/core/api/model/PaymentAccountForm.java @@ -15,22 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; +package haveno.core.api.model; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; import static java.lang.System.getProperty; import static java.nio.charset.StandardCharsets.UTF_8; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountFactory; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.HavenoUtils; - import com.google.common.annotations.VisibleForTesting; import com.google.gson.Gson; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountFactory; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.HavenoUtils; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/core/src/main/java/bisq/core/api/model/PaymentAccountFormField.java b/core/src/main/java/haveno/core/api/model/PaymentAccountFormField.java similarity index 97% rename from core/src/main/java/bisq/core/api/model/PaymentAccountFormField.java rename to core/src/main/java/haveno/core/api/model/PaymentAccountFormField.java index a48c4e79..05b91f67 100644 --- a/core/src/main/java/bisq/core/api/model/PaymentAccountFormField.java +++ b/core/src/main/java/haveno/core/api/model/PaymentAccountFormField.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; +package haveno.core.api.model; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.core.locale.Country; -import bisq.core.locale.TradeCurrency; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.core.locale.Country; +import haveno.core.locale.TradeCurrency; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/api/model/TradeInfo.java b/core/src/main/java/haveno/core/api/model/TradeInfo.java similarity index 95% rename from core/src/main/java/bisq/core/api/model/TradeInfo.java rename to core/src/main/java/haveno/core/api/model/TradeInfo.java index 79093c55..03159060 100644 --- a/core/src/main/java/bisq/core/api/model/TradeInfo.java +++ b/core/src/main/java/haveno/core/api/model/TradeInfo.java @@ -15,28 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model; - -import bisq.core.api.model.builder.TradeInfoV1Builder; -import bisq.core.trade.Trade; -import bisq.core.trade.Contract; - -import bisq.common.Payload; +package haveno.core.api.model; +import haveno.common.Payload; +import haveno.core.api.model.builder.TradeInfoV1Builder; +import haveno.core.trade.Contract; +import haveno.core.trade.Trade; import java.util.function.Function; import lombok.EqualsAndHashCode; import lombok.Getter; -import static bisq.core.api.model.OfferInfo.toOfferInfo; -import static bisq.core.util.PriceUtil.reformatMarketPrice; -import static bisq.core.util.VolumeUtil.formatVolume; +import static haveno.core.api.model.OfferInfo.toOfferInfo; +import static haveno.core.util.PriceUtil.reformatMarketPrice; +import static haveno.core.util.VolumeUtil.formatVolume; import static java.util.Objects.requireNonNull; @EqualsAndHashCode @Getter public class TradeInfo implements Payload { - // The client cannot see bisq.core.trade.Trade or its fromProto method. We use the + // The client cannot see haveno.core.trade.Trade or its fromProto method. We use the // lighter weight TradeInfo proto wrapper instead, containing just enough fields to // view and interact with trades. @@ -59,7 +57,7 @@ public class TradeInfo implements Payload { reformatMarketPrice(requireNonNull(trade.getPrice()).toPlainString(), trade.getOffer().getCurrencyCode()); - // Bisq v1 trade protocol fields (some are in common with the BSQ Swap protocol). + // Haveno v1 trade protocol fields (some are in common with the BSQ Swap protocol). private final OfferInfo offer; private final String tradeId; private final String shortId; @@ -192,8 +190,8 @@ public class TradeInfo implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.TradeInfo toProtoMessage() { - return bisq.proto.grpc.TradeInfo.newBuilder() + public haveno.proto.grpc.TradeInfo toProtoMessage() { + return haveno.proto.grpc.TradeInfo.newBuilder() .setOffer(offer.toProtoMessage()) .setTradeId(tradeId) .setShortId(shortId) @@ -229,7 +227,7 @@ public class TradeInfo implements Payload { .build(); } - public static TradeInfo fromProto(bisq.proto.grpc.TradeInfo proto) { + public static TradeInfo fromProto(haveno.proto.grpc.TradeInfo proto) { return new TradeInfoV1Builder() .withOffer(OfferInfo.fromProto(proto.getOffer())) .withTradeId(proto.getTradeId()) diff --git a/core/src/main/java/bisq/core/api/model/XmrBalanceInfo.java b/core/src/main/java/haveno/core/api/model/XmrBalanceInfo.java similarity index 90% rename from core/src/main/java/bisq/core/api/model/XmrBalanceInfo.java rename to core/src/main/java/haveno/core/api/model/XmrBalanceInfo.java index 111f72a4..1483e112 100644 --- a/core/src/main/java/bisq/core/api/model/XmrBalanceInfo.java +++ b/core/src/main/java/haveno/core/api/model/XmrBalanceInfo.java @@ -1,9 +1,7 @@ -package bisq.core.api.model; - -import bisq.common.Payload; +package haveno.core.api.model; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.Payload; import lombok.Getter; @Getter @@ -52,8 +50,8 @@ public class XmrBalanceInfo implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.XmrBalanceInfo toProtoMessage() { - return bisq.proto.grpc.XmrBalanceInfo.newBuilder() + public haveno.proto.grpc.XmrBalanceInfo toProtoMessage() { + return haveno.proto.grpc.XmrBalanceInfo.newBuilder() .setBalance(balance) .setAvailableBalance(availableBalance) .setPendingBalance(pendingBalance) @@ -62,7 +60,7 @@ public class XmrBalanceInfo implements Payload { .build(); } - public static XmrBalanceInfo fromProto(bisq.proto.grpc.XmrBalanceInfo proto) { + public static XmrBalanceInfo fromProto(haveno.proto.grpc.XmrBalanceInfo proto) { return new XmrBalanceInfo(proto.getBalance(), proto.getAvailableBalance(), proto.getPendingBalance(), diff --git a/core/src/main/java/bisq/core/api/model/XmrDestination.java b/core/src/main/java/haveno/core/api/model/XmrDestination.java similarity index 87% rename from core/src/main/java/bisq/core/api/model/XmrDestination.java rename to core/src/main/java/haveno/core/api/model/XmrDestination.java index e118d47c..f3ffe939 100644 --- a/core/src/main/java/bisq/core/api/model/XmrDestination.java +++ b/core/src/main/java/haveno/core/api/model/XmrDestination.java @@ -1,6 +1,6 @@ -package bisq.core.api.model; +package haveno.core.api.model; -import bisq.common.Payload; +import haveno.common.Payload; import java.math.BigInteger; import lombok.Getter; import monero.wallet.model.MoneroDestination; @@ -28,14 +28,14 @@ public class XmrDestination implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.XmrDestination toProtoMessage() { - return bisq.proto.grpc.XmrDestination.newBuilder() + public haveno.proto.grpc.XmrDestination toProtoMessage() { + return haveno.proto.grpc.XmrDestination.newBuilder() .setAddress(address) .setAmount(amount.toString()) .build(); } - public static XmrDestination fromProto(bisq.proto.grpc.XmrDestination proto) { + public static XmrDestination fromProto(haveno.proto.grpc.XmrDestination proto) { return new XmrDestinationBuilder() .withAddress(proto.getAddress()) .withAmount(new BigInteger(proto.getAmount())) diff --git a/core/src/main/java/bisq/core/api/model/XmrIncomingTransfer.java b/core/src/main/java/haveno/core/api/model/XmrIncomingTransfer.java similarity index 92% rename from core/src/main/java/bisq/core/api/model/XmrIncomingTransfer.java rename to core/src/main/java/haveno/core/api/model/XmrIncomingTransfer.java index 6a5316f8..3abf737e 100644 --- a/core/src/main/java/bisq/core/api/model/XmrIncomingTransfer.java +++ b/core/src/main/java/haveno/core/api/model/XmrIncomingTransfer.java @@ -1,6 +1,6 @@ -package bisq.core.api.model; +package haveno.core.api.model; -import bisq.common.Payload; +import haveno.common.Payload; import java.math.BigInteger; import lombok.Getter; import monero.wallet.model.MoneroIncomingTransfer; @@ -37,8 +37,8 @@ public class XmrIncomingTransfer implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.XmrIncomingTransfer toProtoMessage() { - return bisq.proto.grpc.XmrIncomingTransfer.newBuilder() + public haveno.proto.grpc.XmrIncomingTransfer toProtoMessage() { + return haveno.proto.grpc.XmrIncomingTransfer.newBuilder() .setAmount(amount.toString()) .setAccountIndex(accountIndex) .setSubaddressIndex(subaddressIndex) @@ -47,7 +47,7 @@ public class XmrIncomingTransfer implements Payload { .build(); } - public static XmrIncomingTransfer fromProto(bisq.proto.grpc.XmrIncomingTransfer proto) { + public static XmrIncomingTransfer fromProto(haveno.proto.grpc.XmrIncomingTransfer proto) { return new XmrIncomingTransferBuilder() .withAmount(new BigInteger(proto.getAmount())) .withAccountIndex(proto.getAccountIndex()) diff --git a/core/src/main/java/bisq/core/api/model/XmrOutgoingTransfer.java b/core/src/main/java/haveno/core/api/model/XmrOutgoingTransfer.java similarity index 88% rename from core/src/main/java/bisq/core/api/model/XmrOutgoingTransfer.java rename to core/src/main/java/haveno/core/api/model/XmrOutgoingTransfer.java index 587772d9..26b64315 100644 --- a/core/src/main/java/bisq/core/api/model/XmrOutgoingTransfer.java +++ b/core/src/main/java/haveno/core/api/model/XmrOutgoingTransfer.java @@ -1,9 +1,9 @@ -package bisq.core.api.model; +package haveno.core.api.model; -import static bisq.core.api.model.XmrDestination.toXmrDestination; +import static haveno.core.api.model.XmrDestination.toXmrDestination; -import bisq.common.Payload; -import bisq.common.proto.ProtoUtil; +import haveno.common.Payload; +import haveno.common.proto.ProtoUtil; import java.math.BigInteger; import java.util.List; import java.util.Optional; @@ -47,16 +47,16 @@ public class XmrOutgoingTransfer implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.XmrOutgoingTransfer toProtoMessage() { - var builder = bisq.proto.grpc.XmrOutgoingTransfer.newBuilder() + public haveno.proto.grpc.XmrOutgoingTransfer toProtoMessage() { + var builder = haveno.proto.grpc.XmrOutgoingTransfer.newBuilder() .setAmount(amount.toString()) .setAccountIndex(accountIndex); Optional.ofNullable(subaddressIndices).ifPresent(e -> builder.addAllSubaddressIndices(subaddressIndices)); - Optional.ofNullable(destinations).ifPresent(e -> builder.addAllDestinations(ProtoUtil.collectionToProto(destinations, bisq.proto.grpc.XmrDestination.class))); + Optional.ofNullable(destinations).ifPresent(e -> builder.addAllDestinations(ProtoUtil.collectionToProto(destinations, haveno.proto.grpc.XmrDestination.class))); return builder.build(); } - public static XmrOutgoingTransfer fromProto(bisq.proto.grpc.XmrOutgoingTransfer proto) { + public static XmrOutgoingTransfer fromProto(haveno.proto.grpc.XmrOutgoingTransfer proto) { List destinations = proto.getDestinationsList().isEmpty() ? null : proto.getDestinationsList().stream() .map(XmrDestination::fromProto).collect(Collectors.toList()); diff --git a/core/src/main/java/bisq/core/api/model/XmrTx.java b/core/src/main/java/haveno/core/api/model/XmrTx.java similarity index 92% rename from core/src/main/java/bisq/core/api/model/XmrTx.java rename to core/src/main/java/haveno/core/api/model/XmrTx.java index e888eec8..897cf76e 100644 --- a/core/src/main/java/bisq/core/api/model/XmrTx.java +++ b/core/src/main/java/haveno/core/api/model/XmrTx.java @@ -1,10 +1,10 @@ -package bisq.core.api.model; +package haveno.core.api.model; -import static bisq.core.api.model.XmrIncomingTransfer.toXmrIncomingTransfer; -import static bisq.core.api.model.XmrOutgoingTransfer.toXmrOutgoingTransfer; +import static haveno.core.api.model.XmrIncomingTransfer.toXmrIncomingTransfer; +import static haveno.core.api.model.XmrOutgoingTransfer.toXmrOutgoingTransfer; -import bisq.common.Payload; -import bisq.common.proto.ProtoUtil; +import haveno.common.Payload; +import haveno.common.proto.ProtoUtil; import java.math.BigInteger; import java.util.List; import java.util.Optional; @@ -69,8 +69,8 @@ public class XmrTx implements Payload { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public bisq.proto.grpc.XmrTx toProtoMessage() { - bisq.proto.grpc.XmrTx.Builder builder = bisq.proto.grpc.XmrTx.newBuilder() + public haveno.proto.grpc.XmrTx toProtoMessage() { + haveno.proto.grpc.XmrTx.Builder builder = haveno.proto.grpc.XmrTx.newBuilder() .setHash(hash) .setFee(fee.toString()) .setIsConfirmed(isConfirmed) @@ -78,12 +78,12 @@ public class XmrTx implements Payload { Optional.ofNullable(height).ifPresent(e -> builder.setHeight(height)); Optional.ofNullable(timestamp).ifPresent(e -> builder.setTimestamp(timestamp)); Optional.ofNullable(outgoingTransfer).ifPresent(e -> builder.setOutgoingTransfer(outgoingTransfer.toProtoMessage())); - Optional.ofNullable(incomingTransfers).ifPresent(e -> builder.addAllIncomingTransfers(ProtoUtil.collectionToProto(incomingTransfers, bisq.proto.grpc.XmrIncomingTransfer.class))); + Optional.ofNullable(incomingTransfers).ifPresent(e -> builder.addAllIncomingTransfers(ProtoUtil.collectionToProto(incomingTransfers, haveno.proto.grpc.XmrIncomingTransfer.class))); Optional.ofNullable(metadata).ifPresent(e -> builder.setMetadata(metadata)); return builder.build(); } - public static XmrTx fromProto(bisq.proto.grpc.XmrTx proto) { + public static XmrTx fromProto(haveno.proto.grpc.XmrTx proto) { return new XmrTxBuilder() .withHash(proto.getHash()) .withFee(new BigInteger(proto.getFee())) diff --git a/core/src/main/java/bisq/core/api/model/builder/OfferInfoBuilder.java b/core/src/main/java/haveno/core/api/model/builder/OfferInfoBuilder.java similarity index 98% rename from core/src/main/java/bisq/core/api/model/builder/OfferInfoBuilder.java rename to core/src/main/java/haveno/core/api/model/builder/OfferInfoBuilder.java index cef34312..edeef705 100644 --- a/core/src/main/java/bisq/core/api/model/builder/OfferInfoBuilder.java +++ b/core/src/main/java/haveno/core/api/model/builder/OfferInfoBuilder.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model.builder; - -import bisq.core.api.model.OfferInfo; +package haveno.core.api.model.builder; +import haveno.core.api.model.OfferInfo; import lombok.Getter; /* diff --git a/core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java b/core/src/main/java/haveno/core/api/model/builder/TradeInfoV1Builder.java similarity index 97% rename from core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java rename to core/src/main/java/haveno/core/api/model/builder/TradeInfoV1Builder.java index 5c05ffa6..3f8d6dab 100644 --- a/core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java +++ b/core/src/main/java/haveno/core/api/model/builder/TradeInfoV1Builder.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.api.model.builder; - -import bisq.core.api.model.ContractInfo; -import bisq.core.api.model.OfferInfo; -import bisq.core.api.model.TradeInfo; +package haveno.core.api.model.builder; +import haveno.core.api.model.ContractInfo; +import haveno.core.api.model.OfferInfo; +import haveno.core.api.model.TradeInfo; import lombok.Getter; /** diff --git a/core/src/main/java/bisq/core/app/AppStartupState.java b/core/src/main/java/haveno/core/app/AppStartupState.java similarity index 96% rename from core/src/main/java/bisq/core/app/AppStartupState.java rename to core/src/main/java/haveno/core/app/AppStartupState.java index 70093ba2..77a6595e 100644 --- a/core/src/main/java/bisq/core/app/AppStartupState.java +++ b/core/src/main/java/haveno/core/app/AppStartupState.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.app; +package haveno.core.app; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.api.CoreNotificationService; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.api.CoreNotificationService; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/core/src/main/java/bisq/core/app/AvoidStandbyModeService.java b/core/src/main/java/haveno/core/app/AvoidStandbyModeService.java similarity index 92% rename from core/src/main/java/bisq/core/app/AvoidStandbyModeService.java rename to core/src/main/java/haveno/core/app/AvoidStandbyModeService.java index 647eb700..4d35dfcc 100644 --- a/core/src/main/java/bisq/core/app/AvoidStandbyModeService.java +++ b/core/src/main/java/haveno/core/app/AvoidStandbyModeService.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.core.user.Preferences; - -import bisq.common.config.Config; -import bisq.common.file.FileUtil; -import bisq.common.file.ResourceNotFoundException; -import bisq.common.util.Utilities; +package haveno.core.app; +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.common.file.ResourceNotFoundException; +import haveno.common.util.Utilities; +import haveno.core.user.Preferences; import javax.inject.Inject; import javax.inject.Singleton; @@ -53,9 +51,9 @@ import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; /** - * Prevents that Bisq gets hibernated from the OS. On OSX there is a tool called caffeinate but it seems it does not + * Prevents that Haveno gets hibernated from the OS. On OSX there is a tool called caffeinate but it seems it does not * provide the behaviour we need, thus we use the trick to play a almost silent sound file in a loop. This keeps the - * application active even if the OS has moved to hibernate. Hibernating Bisq would cause network degradations and other + * application active even if the OS has moved to hibernate. Hibernating Haveno would cause network degradations and other * resource limitations which would lead to offers not published or if a taker takes an offer that the trade process is * at risk to fail due too slow response time. */ @@ -201,8 +199,8 @@ public class AvoidStandbyModeService { String cmd = inhibitorPathSpec.get(); if (Utilities.isLinux()) { params = cmd.contains("gnome-session-inhibit") - ? new String[]{cmd, "--app-id", "Bisq", "--inhibit", "suspend", "--reason", "Avoid Standby", "--inhibit-only"} - : new String[]{cmd, "--who", "Bisq", "--what", "sleep", "--why", "Avoid Standby", "--mode", "block", "tail", "-f", "/dev/null"}; + ? new String[]{cmd, "--app-id", "Haveno", "--inhibit", "suspend", "--reason", "Avoid Standby", "--inhibit-only"} + : new String[]{cmd, "--who", "Haveno", "--what", "sleep", "--why", "Avoid Standby", "--mode", "block", "tail", "-f", "/dev/null"}; } else { params = null; } diff --git a/core/src/main/java/bisq/core/app/ConsoleInput.java b/core/src/main/java/haveno/core/app/ConsoleInput.java similarity index 98% rename from core/src/main/java/bisq/core/app/ConsoleInput.java rename to core/src/main/java/haveno/core/app/ConsoleInput.java index a3aadad7..85e65c81 100644 --- a/core/src/main/java/bisq/core/app/ConsoleInput.java +++ b/core/src/main/java/haveno/core/app/ConsoleInput.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.core.app; +package haveno.core.app; import java.util.concurrent.*; diff --git a/core/src/main/java/bisq/core/app/ConsoleInputReadTask.java b/core/src/main/java/haveno/core/app/ConsoleInputReadTask.java similarity index 98% rename from core/src/main/java/bisq/core/app/ConsoleInputReadTask.java rename to core/src/main/java/haveno/core/app/ConsoleInputReadTask.java index b4a263ce..dca21354 100644 --- a/core/src/main/java/bisq/core/app/ConsoleInputReadTask.java +++ b/core/src/main/java/haveno/core/app/ConsoleInputReadTask.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.core.app; +package haveno.core.app; import java.io.*; import java.util.concurrent.Callable; diff --git a/core/src/main/java/bisq/core/app/CoreModule.java b/core/src/main/java/haveno/core/app/CoreModule.java similarity index 68% rename from core/src/main/java/bisq/core/app/CoreModule.java rename to core/src/main/java/haveno/core/app/CoreModule.java index d1fe4352..d4f71d72 100644 --- a/core/src/main/java/bisq/core/app/CoreModule.java +++ b/core/src/main/java/haveno/core/app/CoreModule.java @@ -15,41 +15,37 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.core.alert.AlertModule; -import bisq.core.btc.BitcoinModule; -import bisq.core.filter.FilterModule; -import bisq.core.network.CoreNetworkFilter; -import bisq.core.network.p2p.seed.DefaultSeedNodeRepository; -import bisq.core.offer.OfferModule; -import bisq.core.presentation.CorePresentationModule; -import bisq.core.proto.network.CoreNetworkProtoResolver; -import bisq.core.proto.persistable.CorePersistenceProtoResolver; -import bisq.core.trade.TradeModule; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.ImmutableCoinFormatter; -import bisq.core.xmr.connection.MoneroConnectionModule; - -import bisq.network.crypto.EncryptionServiceModule; -import bisq.network.p2p.P2PModule; -import bisq.network.p2p.network.BridgeAddressProvider; -import bisq.network.p2p.network.NetworkFilter; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistenceProtoResolver; +package haveno.core.app; import com.google.inject.Singleton; - +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.core.alert.AlertModule; +import haveno.core.btc.BitcoinModule; +import haveno.core.filter.FilterModule; +import haveno.core.network.CoreNetworkFilter; +import haveno.core.network.p2p.seed.DefaultSeedNodeRepository; +import haveno.core.offer.OfferModule; +import haveno.core.presentation.CorePresentationModule; +import haveno.core.proto.network.CoreNetworkProtoResolver; +import haveno.core.proto.persistable.CorePersistenceProtoResolver; +import haveno.core.trade.TradeModule; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.ImmutableCoinFormatter; +import haveno.core.xmr.connection.MoneroConnectionModule; +import haveno.network.crypto.EncryptionServiceModule; +import haveno.network.p2p.P2PModule; +import haveno.network.p2p.network.BridgeAddressProvider; +import haveno.network.p2p.network.NetworkFilter; +import haveno.network.p2p.seed.SeedNodeRepository; import java.io.File; -import static bisq.common.config.Config.*; import static com.google.inject.name.Names.named; +import static haveno.common.config.Config.*; public class CoreModule extends AppModule { diff --git a/core/src/main/java/bisq/core/app/DomainInitialisation.java b/core/src/main/java/haveno/core/app/DomainInitialisation.java similarity index 84% rename from core/src/main/java/bisq/core/app/DomainInitialisation.java rename to core/src/main/java/haveno/core/app/DomainInitialisation.java index d68f2420..e51cffe3 100644 --- a/core/src/main/java/bisq/core/app/DomainInitialisation.java +++ b/core/src/main/java/haveno/core/app/DomainInitialisation.java @@ -15,46 +15,43 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.alert.PrivateNotificationPayload; -import bisq.core.btc.Balances; -import bisq.core.filter.FilterManager; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.notifications.alerts.DisputeMsgEvents; -import bisq.core.notifications.alerts.MyOfferTakenEvents; -import bisq.core.notifications.alerts.TradeEvents; -import bisq.core.notifications.alerts.market.MarketAlerts; -import bisq.core.notifications.alerts.price.PriceAlert; -import bisq.core.offer.OpenOfferManager; -import bisq.core.offer.TriggerPriceService; -import bisq.core.payment.AmazonGiftCardAccount; -import bisq.core.payment.RevolutAccount; -import bisq.core.provider.mempool.MempoolService; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; -import bisq.core.support.traderchat.TraderChatManager; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.TradeManager; -import bisq.core.trade.failed.FailedTradesManager; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.trade.txproof.xmr.XmrTxProofService; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; - -import bisq.common.ClockWatcher; -import bisq.common.app.DevEnv; -import bisq.common.persistence.PersistenceManager; +package haveno.core.app; +import haveno.common.ClockWatcher; +import haveno.common.app.DevEnv; +import haveno.common.persistence.PersistenceManager; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.alert.PrivateNotificationPayload; +import haveno.core.btc.Balances; +import haveno.core.filter.FilterManager; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.notifications.alerts.DisputeMsgEvents; +import haveno.core.notifications.alerts.MyOfferTakenEvents; +import haveno.core.notifications.alerts.TradeEvents; +import haveno.core.notifications.alerts.market.MarketAlerts; +import haveno.core.notifications.alerts.price.PriceAlert; +import haveno.core.offer.OpenOfferManager; +import haveno.core.offer.TriggerPriceService; +import haveno.core.payment.AmazonGiftCardAccount; +import haveno.core.payment.RevolutAccount; +import haveno.core.provider.mempool.MempoolService; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.core.support.traderchat.TraderChatManager; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.TradeManager; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.trade.txproof.xmr.XmrTxProofService; +import haveno.core.user.User; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import javafx.collections.ListChangeListener; diff --git a/core/src/main/java/bisq/core/app/HavenoExecutable.java b/core/src/main/java/haveno/core/app/HavenoExecutable.java similarity index 91% rename from core/src/main/java/bisq/core/app/HavenoExecutable.java rename to core/src/main/java/haveno/core/app/HavenoExecutable.java index f7ad4cea..c34dfc11 100644 --- a/core/src/main/java/bisq/core/app/HavenoExecutable.java +++ b/core/src/main/java/haveno/core/app/HavenoExecutable.java @@ -15,42 +15,38 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.core.api.AccountServiceListener; -import bisq.core.api.CoreAccountService; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.OpenOfferManager; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.setup.CorePersistedDataHost; -import bisq.core.setup.CoreSetup; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.TradeManager; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.trade.txproof.xmr.XmrTxProofService; - -import bisq.network.p2p.P2PService; - -import bisq.common.UserThread; -import bisq.common.app.AppModule; -import bisq.common.config.Config; -import bisq.common.config.ConfigException; -import bisq.common.config.HavenoHelpFormatter; -import bisq.common.crypto.IncorrectPasswordException; -import bisq.common.handlers.ResultHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; -import bisq.common.setup.CommonSetup; -import bisq.common.setup.GracefulShutDownHandler; -import bisq.common.setup.UncaughtExceptionHandler; -import bisq.common.util.Utilities; +package haveno.core.app; import com.google.inject.Guice; import com.google.inject.Injector; - +import haveno.common.UserThread; +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.common.config.ConfigException; +import haveno.common.config.HavenoHelpFormatter; +import haveno.common.crypto.IncorrectPasswordException; +import haveno.common.handlers.ResultHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.common.setup.CommonSetup; +import haveno.common.setup.GracefulShutDownHandler; +import haveno.common.setup.UncaughtExceptionHandler; +import haveno.common.util.Utilities; +import haveno.core.api.AccountServiceListener; +import haveno.core.api.CoreAccountService; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.OpenOfferManager; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.setup.CorePersistedDataHost; +import haveno.core.setup.CoreSetup; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.TradeManager; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.trade.txproof.xmr.XmrTxProofService; +import haveno.network.p2p.P2PService; import java.io.Console; import java.util.Arrays; @@ -106,7 +102,7 @@ public abstract class HavenoExecutable implements GracefulShutDownHandler, Haven System.exit(EXIT_FAILURE); } catch (Throwable ex) { System.err.println("fault: An unexpected error occurred. " + - "Please file a report at https://bisq.network/issues"); + "Please file a report at https://haveno.network/issues"); ex.printStackTrace(System.err); System.exit(EXIT_FAILURE); } diff --git a/core/src/main/java/bisq/core/app/HavenoHeadlessApp.java b/core/src/main/java/haveno/core/app/HavenoHeadlessApp.java similarity index 62% rename from core/src/main/java/bisq/core/app/HavenoHeadlessApp.java rename to core/src/main/java/haveno/core/app/HavenoHeadlessApp.java index 4280525a..f3ce0039 100644 --- a/core/src/main/java/bisq/core/app/HavenoHeadlessApp.java +++ b/core/src/main/java/haveno/core/app/HavenoHeadlessApp.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.core.trade.TradeManager; - -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.setup.GracefulShutDownHandler; +package haveno.core.app; import com.google.inject.Injector; - +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.setup.GracefulShutDownHandler; +import haveno.core.trade.TradeManager; import java.util.concurrent.TimeUnit; import lombok.Getter; @@ -44,7 +41,7 @@ public class HavenoHeadlessApp implements HeadlessApp { @Setter private GracefulShutDownHandler gracefulShutDownHandler; private boolean shutDownRequested; - protected HavenoSetup bisqSetup; + protected HavenoSetup havenoSetup; private CorruptedStorageFileHandler corruptedStorageFileHandler; private TradeManager tradeManager; @@ -55,8 +52,8 @@ public class HavenoHeadlessApp implements HeadlessApp { @Override public void startApplication() { try { - bisqSetup = injector.getInstance(HavenoSetup.class); - bisqSetup.addHavenoSetupListener(this); + havenoSetup = injector.getInstance(HavenoSetup.class); + havenoSetup.addHavenoSetupListener(this); corruptedStorageFileHandler = injector.getInstance(CorruptedStorageFileHandler.class); tradeManager = injector.getInstance(TradeManager.class); @@ -74,28 +71,28 @@ public class HavenoHeadlessApp implements HeadlessApp { } protected void setupHandlers() { - bisqSetup.setDisplayTacHandler(acceptedHandler -> { + havenoSetup.setDisplayTacHandler(acceptedHandler -> { log.info("onDisplayTacHandler: We accept the tacs automatically in headless mode"); acceptedHandler.run(); }); - bisqSetup.setDisplayTorNetworkSettingsHandler(show -> log.info("onDisplayTorNetworkSettingsHandler: show={}", show)); - bisqSetup.setSpvFileCorruptedHandler(msg -> log.error("onSpvFileCorruptedHandler: msg={}", msg)); - bisqSetup.setChainFileLockedExceptionHandler(msg -> log.error("onChainFileLockedExceptionHandler: msg={}", msg)); - bisqSetup.setLockedUpFundsHandler(msg -> log.info("onLockedUpFundsHandler: msg={}", msg)); - bisqSetup.setShowFirstPopupIfResyncSPVRequestedHandler(() -> log.info("onShowFirstPopupIfResyncSPVRequestedHandler")); - bisqSetup.setDisplayUpdateHandler((alert, key) -> log.info("onDisplayUpdateHandler")); - bisqSetup.setDisplayAlertHandler(alert -> log.info("onDisplayAlertHandler. alert={}", alert)); - bisqSetup.setDisplayPrivateNotificationHandler(privateNotification -> log.info("onDisplayPrivateNotificationHandler. privateNotification={}", privateNotification)); - bisqSetup.setDisplaySecurityRecommendationHandler(key -> log.info("onDisplaySecurityRecommendationHandler")); - bisqSetup.setWrongOSArchitectureHandler(msg -> log.error("onWrongOSArchitectureHandler. msg={}", msg)); - bisqSetup.setRejectedTxErrorMessageHandler(errorMessage -> log.warn("setRejectedTxErrorMessageHandler. errorMessage={}", errorMessage)); - bisqSetup.setShowPopupIfInvalidBtcConfigHandler(() -> log.error("onShowPopupIfInvalidBtcConfigHandler")); - bisqSetup.setRevolutAccountsUpdateHandler(revolutAccountList -> log.info("setRevolutAccountsUpdateHandler: revolutAccountList={}", revolutAccountList)); - bisqSetup.setOsxKeyLoggerWarningHandler(() -> log.info("setOsxKeyLoggerWarningHandler")); - bisqSetup.setQubesOSInfoHandler(() -> log.info("setQubesOSInfoHandler")); - bisqSetup.setDownGradePreventionHandler(lastVersion -> log.info("Downgrade from version {} to version {} is not supported", + havenoSetup.setDisplayTorNetworkSettingsHandler(show -> log.info("onDisplayTorNetworkSettingsHandler: show={}", show)); + havenoSetup.setSpvFileCorruptedHandler(msg -> log.error("onSpvFileCorruptedHandler: msg={}", msg)); + havenoSetup.setChainFileLockedExceptionHandler(msg -> log.error("onChainFileLockedExceptionHandler: msg={}", msg)); + havenoSetup.setLockedUpFundsHandler(msg -> log.info("onLockedUpFundsHandler: msg={}", msg)); + havenoSetup.setShowFirstPopupIfResyncSPVRequestedHandler(() -> log.info("onShowFirstPopupIfResyncSPVRequestedHandler")); + havenoSetup.setDisplayUpdateHandler((alert, key) -> log.info("onDisplayUpdateHandler")); + havenoSetup.setDisplayAlertHandler(alert -> log.info("onDisplayAlertHandler. alert={}", alert)); + havenoSetup.setDisplayPrivateNotificationHandler(privateNotification -> log.info("onDisplayPrivateNotificationHandler. privateNotification={}", privateNotification)); + havenoSetup.setDisplaySecurityRecommendationHandler(key -> log.info("onDisplaySecurityRecommendationHandler")); + havenoSetup.setWrongOSArchitectureHandler(msg -> log.error("onWrongOSArchitectureHandler. msg={}", msg)); + havenoSetup.setRejectedTxErrorMessageHandler(errorMessage -> log.warn("setRejectedTxErrorMessageHandler. errorMessage={}", errorMessage)); + havenoSetup.setShowPopupIfInvalidBtcConfigHandler(() -> log.error("onShowPopupIfInvalidBtcConfigHandler")); + havenoSetup.setRevolutAccountsUpdateHandler(revolutAccountList -> log.info("setRevolutAccountsUpdateHandler: revolutAccountList={}", revolutAccountList)); + havenoSetup.setOsxKeyLoggerWarningHandler(() -> log.info("setOsxKeyLoggerWarningHandler")); + havenoSetup.setQubesOSInfoHandler(() -> log.info("setQubesOSInfoHandler")); + havenoSetup.setDownGradePreventionHandler(lastVersion -> log.info("Downgrade from version {} to version {} is not supported", lastVersion, Version.VERSION)); - bisqSetup.setTorAddressUpgradeHandler(() -> log.info("setTorAddressUpgradeHandler")); + havenoSetup.setTorAddressUpgradeHandler(() -> log.info("setTorAddressUpgradeHandler")); corruptedStorageFileHandler.getFiles().ifPresent(files -> log.warn("getCorruptedDatabaseFiles. files={}", files)); tradeManager.setTakeOfferRequestErrorMessageHandler(errorMessage -> log.error("Error taking offer: " + errorMessage)); } diff --git a/core/src/main/java/bisq/core/app/HavenoHeadlessAppMain.java b/core/src/main/java/haveno/core/app/HavenoHeadlessAppMain.java similarity index 94% rename from core/src/main/java/bisq/core/app/HavenoHeadlessAppMain.java rename to core/src/main/java/haveno/core/app/HavenoHeadlessAppMain.java index b2e7da41..2388340b 100644 --- a/core/src/main/java/bisq/core/app/HavenoHeadlessAppMain.java +++ b/core/src/main/java/haveno/core/app/HavenoHeadlessAppMain.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.common.UserThread; -import bisq.common.app.AppModule; -import bisq.common.app.Version; +package haveno.core.app; import com.google.common.util.concurrent.ThreadFactoryBuilder; - +import haveno.common.UserThread; +import haveno.common.app.AppModule; +import haveno.common.app.Version; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -33,7 +31,7 @@ public class HavenoHeadlessAppMain extends HavenoExecutable { protected HeadlessApp headlessApp; public HavenoHeadlessAppMain() { - super("Bisq Daemon", "bisqd", "Bisq", Version.VERSION); + super("Haveno Daemon", "havenod", "Haveno", Version.VERSION); } public static void main(String[] args) throws Exception { diff --git a/core/src/main/java/bisq/core/app/HavenoSetup.java b/core/src/main/java/haveno/core/app/HavenoSetup.java similarity index 93% rename from core/src/main/java/bisq/core/app/HavenoSetup.java rename to core/src/main/java/haveno/core/app/HavenoSetup.java index 58f5074a..e3fe4631 100644 --- a/core/src/main/java/bisq/core/app/HavenoSetup.java +++ b/core/src/main/java/haveno/core/app/HavenoSetup.java @@ -15,56 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.sign.SignedWitnessStorageService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.Alert; -import bisq.core.alert.AlertManager; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.alert.PrivateNotificationPayload; -import bisq.core.api.CoreMoneroNodeService; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.AmazonGiftCardAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.RevolutAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.TradeManager; -import bisq.core.trade.TradeTxException; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.utils.Utils; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.app.Log; -import bisq.common.app.Version; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.common.file.FileUtil; -import bisq.common.util.InvalidVersionException; -import bisq.common.util.Utilities; +package haveno.core.app; import org.bitcoinj.core.Coin; @@ -100,7 +51,52 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import ch.qos.logback.classic.Level; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.app.Log; +import haveno.common.app.Version; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.common.util.InvalidVersionException; +import haveno.common.util.Utilities; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.sign.SignedWitnessStorageService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.Alert; +import haveno.core.alert.AlertManager; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.alert.PrivateNotificationPayload; +import haveno.core.api.CoreMoneroNodeService; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.AmazonGiftCardAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.RevolutAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.TradeManager; +import haveno.core.trade.TradeTxException; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.network.Socks5ProxyProvider; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.utils.Utils; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -538,7 +534,7 @@ public class HavenoSetup { } @Nullable - public static String getLastBisqVersion() { + public static String getLastHavenoVersion() { File versionFile = getVersionFile(); if (!versionFile.exists()) { return null; @@ -585,7 +581,7 @@ public class HavenoSetup { } public static boolean hasDowngraded() { - return hasDowngraded(getLastBisqVersion()); + return hasDowngraded(getLastHavenoVersion()); } public static boolean hasDowngraded(String lastVersion) { @@ -593,7 +589,7 @@ public class HavenoSetup { } public static boolean hasDowngraded(@Nullable Consumer downGradePreventionHandler) { - String lastVersion = getLastBisqVersion(); + String lastVersion = getLastHavenoVersion(); boolean hasDowngraded = hasDowngraded(lastVersion); if (hasDowngraded) { log.error("Downgrade from version {} to version {} is not supported", lastVersion, Version.VERSION); @@ -651,7 +647,7 @@ public class HavenoSetup { } /** - * If Bisq is running on an OS that is virtualized under Qubes, show info popup with + * If Haveno is running on an OS that is virtualized under Qubes, show info popup with * link to the Setup Guide. The guide documents what other steps are needed, in * addition to installing the Linux package (qube sizing, etc) */ diff --git a/core/src/main/java/bisq/core/app/HeadlessApp.java b/core/src/main/java/haveno/core/app/HeadlessApp.java similarity index 88% rename from core/src/main/java/bisq/core/app/HeadlessApp.java rename to core/src/main/java/haveno/core/app/HeadlessApp.java index e95d32d9..81a957dd 100644 --- a/core/src/main/java/bisq/core/app/HeadlessApp.java +++ b/core/src/main/java/haveno/core/app/HeadlessApp.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.common.setup.GracefulShutDownHandler; -import bisq.common.setup.UncaughtExceptionHandler; +package haveno.core.app; import com.google.inject.Injector; +import haveno.common.setup.GracefulShutDownHandler; +import haveno.common.setup.UncaughtExceptionHandler; public interface HeadlessApp extends UncaughtExceptionHandler, HavenoSetup.HavenoSetupListener { void setGracefulShutDownHandler(GracefulShutDownHandler gracefulShutDownHandler); diff --git a/core/src/main/java/bisq/core/app/P2PNetworkSetup.java b/core/src/main/java/haveno/core/app/P2PNetworkSetup.java similarity index 95% rename from core/src/main/java/bisq/core/app/P2PNetworkSetup.java rename to core/src/main/java/haveno/core/app/P2PNetworkSetup.java index 2c0e9073..d520ea7b 100644 --- a/core/src/main/java/bisq/core/app/P2PNetworkSetup.java +++ b/core/src/main/java/haveno/core/app/P2PNetworkSetup.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.common.UserThread; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.locale.Res; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.Preferences; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.P2PServiceListener; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; +package haveno.core.app; +import haveno.common.UserThread; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.locale.Res; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.Preferences; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.P2PServiceListener; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/app/TorSetup.java b/core/src/main/java/haveno/core/app/TorSetup.java similarity index 90% rename from core/src/main/java/bisq/core/app/TorSetup.java rename to core/src/main/java/haveno/core/app/TorSetup.java index e1c3fd9f..a6d176a4 100644 --- a/core/src/main/java/bisq/core/app/TorSetup.java +++ b/core/src/main/java/haveno/core/app/TorSetup.java @@ -15,11 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.common.config.Config; -import bisq.common.file.FileUtil; -import bisq.common.handlers.ErrorMessageHandler; +package haveno.core.app; import javax.inject.Inject; import javax.inject.Named; @@ -27,6 +23,11 @@ import javax.inject.Singleton; import java.nio.file.Paths; +import static haveno.common.util.Preconditions.checkDir; + +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.common.handlers.ErrorMessageHandler; import java.io.File; import java.io.IOException; @@ -34,8 +35,6 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.common.util.Preconditions.checkDir; - @Slf4j @Singleton public class TorSetup { diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/haveno/core/app/WalletAppSetup.java similarity index 96% rename from core/src/main/java/bisq/core/app/WalletAppSetup.java rename to core/src/main/java/haveno/core/app/WalletAppSetup.java index c934817a..25a5d3f9 100644 --- a/core/src/main/java/bisq/core/app/WalletAppSetup.java +++ b/core/src/main/java/haveno/core/app/WalletAppSetup.java @@ -15,23 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.core.api.CoreContext; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.exceptions.InvalidHostException; -import bisq.core.btc.exceptions.RejectedTxException; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; - -import bisq.common.UserThread; -import bisq.common.config.Config; +package haveno.core.app; +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.core.api.CoreContext; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.exceptions.InvalidHostException; +import haveno.core.btc.exceptions.RejectedTxException; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; import org.bitcoinj.core.RejectMessage; import org.bitcoinj.core.VersionMessage; import org.bitcoinj.store.BlockStoreException; diff --git a/core/src/main/java/bisq/core/app/misc/AppSetup.java b/core/src/main/java/haveno/core/app/misc/AppSetup.java similarity index 92% rename from core/src/main/java/bisq/core/app/misc/AppSetup.java rename to core/src/main/java/haveno/core/app/misc/AppSetup.java index 94f440e4..bd3e09ef 100644 --- a/core/src/main/java/bisq/core/app/misc/AppSetup.java +++ b/core/src/main/java/haveno/core/app/misc/AppSetup.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.app.misc; - -import bisq.common.app.Version; -import bisq.common.config.Config; +package haveno.core.app.misc; +import haveno.common.app.Version; +import haveno.common.config.Config; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java b/core/src/main/java/haveno/core/app/misc/AppSetupWithP2P.java similarity index 89% rename from core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java rename to core/src/main/java/haveno/core/app/misc/AppSetupWithP2P.java index 140690cb..203e6fd5 100644 --- a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java +++ b/core/src/main/java/haveno/core/app/misc/AppSetupWithP2P.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.app.misc; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.filter.FilterManager; -import bisq.core.trade.statistics.TradeStatisticsManager; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.P2PServiceListener; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.core.app.misc; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.filter.FilterManager; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.P2PServiceListener; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.storage.P2PDataStorage; import javax.inject.Inject; import javafx.beans.property.BooleanProperty; diff --git a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java b/core/src/main/java/haveno/core/app/misc/AppSetupWithP2PAndDAO.java similarity index 80% rename from core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java rename to core/src/main/java/haveno/core/app/misc/AppSetupWithP2PAndDAO.java index 42b63a7d..43b2b3e9 100644 --- a/core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java +++ b/core/src/main/java/haveno/core/app/misc/AppSetupWithP2PAndDAO.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.app.misc; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.filter.FilterManager; -import bisq.core.trade.statistics.TradeStatisticsManager; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.config.Config; +package haveno.core.app.misc; +import haveno.common.config.Config; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.filter.FilterManager; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.storage.P2PDataStorage; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java b/core/src/main/java/haveno/core/app/misc/ExecutableForAppWithP2p.java similarity index 92% rename from core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java rename to core/src/main/java/haveno/core/app/misc/ExecutableForAppWithP2p.java index ca2d7832..3d0e9965 100644 --- a/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java +++ b/core/src/main/java/haveno/core/app/misc/ExecutableForAppWithP2p.java @@ -15,30 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.app.misc; - -import bisq.core.app.HavenoExecutable; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.OpenOfferManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.config.Config; -import bisq.common.file.JsonFileManager; -import bisq.common.handlers.ResultHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.setup.GracefulShutDownHandler; -import bisq.common.util.Profiler; +package haveno.core.app.misc; import com.google.common.util.concurrent.ThreadFactoryBuilder; - +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.common.file.JsonFileManager; +import haveno.common.handlers.ResultHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.setup.GracefulShutDownHandler; +import haveno.common.util.Profiler; +import haveno.core.app.HavenoExecutable; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.OpenOfferManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.seed.SeedNodeRepository; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; diff --git a/core/src/main/java/bisq/core/app/misc/ModuleForAppWithP2p.java b/core/src/main/java/haveno/core/app/misc/ModuleForAppWithP2p.java similarity index 70% rename from core/src/main/java/bisq/core/app/misc/ModuleForAppWithP2p.java rename to core/src/main/java/haveno/core/app/misc/ModuleForAppWithP2p.java index cbfd7a2f..e7d4c963 100644 --- a/core/src/main/java/bisq/core/app/misc/ModuleForAppWithP2p.java +++ b/core/src/main/java/haveno/core/app/misc/ModuleForAppWithP2p.java @@ -15,41 +15,38 @@ * along with Haveno. If not, see . */ -package bisq.core.app.misc; - -import bisq.core.alert.AlertModule; -import bisq.core.app.TorSetup; -import bisq.core.btc.BitcoinModule; -import bisq.core.filter.FilterModule; -import bisq.core.network.CoreNetworkFilter; -import bisq.core.network.p2p.seed.DefaultSeedNodeRepository; -import bisq.core.offer.OfferModule; -import bisq.core.proto.network.CoreNetworkProtoResolver; -import bisq.core.proto.persistable.CorePersistenceProtoResolver; -import bisq.core.trade.TradeModule; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.xmr.connection.MoneroConnectionModule; -import bisq.network.crypto.EncryptionServiceModule; -import bisq.network.p2p.P2PModule; -import bisq.network.p2p.network.BridgeAddressProvider; -import bisq.network.p2p.network.NetworkFilter; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.ClockWatcher; -import bisq.common.app.AppModule; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistenceProtoResolver; +package haveno.core.app.misc; import com.google.inject.Singleton; - +import haveno.common.ClockWatcher; +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.core.alert.AlertModule; +import haveno.core.app.TorSetup; +import haveno.core.btc.BitcoinModule; +import haveno.core.filter.FilterModule; +import haveno.core.network.CoreNetworkFilter; +import haveno.core.network.p2p.seed.DefaultSeedNodeRepository; +import haveno.core.offer.OfferModule; +import haveno.core.proto.network.CoreNetworkProtoResolver; +import haveno.core.proto.persistable.CorePersistenceProtoResolver; +import haveno.core.trade.TradeModule; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.xmr.connection.MoneroConnectionModule; +import haveno.network.crypto.EncryptionServiceModule; +import haveno.network.p2p.P2PModule; +import haveno.network.p2p.network.BridgeAddressProvider; +import haveno.network.p2p.network.NetworkFilter; +import haveno.network.p2p.seed.SeedNodeRepository; import java.io.File; -import static bisq.common.config.Config.*; import static com.google.inject.name.Names.named; +import static haveno.common.config.Config.*; public class ModuleForAppWithP2p extends AppModule { diff --git a/core/src/main/java/bisq/core/btc/Balances.java b/core/src/main/java/haveno/core/btc/Balances.java similarity index 92% rename from core/src/main/java/bisq/core/btc/Balances.java rename to core/src/main/java/haveno/core/btc/Balances.java index 29590784..252edb15 100644 --- a/core/src/main/java/bisq/core/btc/Balances.java +++ b/core/src/main/java/haveno/core/btc/Balances.java @@ -15,20 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.btc; +package haveno.core.btc; -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.failed.FailedTradesManager; -import bisq.network.p2p.P2PService; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.network.p2p.P2PService; import java.math.BigInteger; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/btc/BitcoinModule.java b/core/src/main/java/haveno/core/btc/BitcoinModule.java similarity index 80% rename from core/src/main/java/bisq/core/btc/BitcoinModule.java rename to core/src/main/java/haveno/core/btc/BitcoinModule.java index 4d0e803f..a1e2b3d9 100644 --- a/core/src/main/java/bisq/core/btc/BitcoinModule.java +++ b/core/src/main/java/haveno/core/btc/BitcoinModule.java @@ -15,37 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.core.btc; - -import bisq.core.btc.model.AddressEntryList; -import bisq.core.btc.model.EncryptedConnectionList; -import bisq.core.btc.model.XmrAddressEntryList; -import bisq.core.btc.nodes.BtcNodes; -import bisq.core.btc.setup.RegTestHost; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.NonBsqCoinSelector; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.provider.ProvidersRepository; -import bisq.core.provider.fee.FeeProvider; -import bisq.core.provider.price.PriceFeedService; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.core.btc; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; - +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.core.btc.model.AddressEntryList; +import haveno.core.btc.model.EncryptedConnectionList; +import haveno.core.btc.model.XmrAddressEntryList; +import haveno.core.btc.nodes.BtcNodes; +import haveno.core.btc.setup.RegTestHost; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.NonBsqCoinSelector; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.provider.ProvidersRepository; +import haveno.core.provider.fee.FeeProvider; +import haveno.core.provider.price.PriceFeedService; import java.io.File; import java.util.Arrays; import java.util.List; -import static bisq.common.config.Config.PROVIDERS; -import static bisq.common.config.Config.WALLET_DIR; -import static bisq.common.config.Config.WALLET_RPC_BIND_PORT; import static com.google.inject.name.Names.named; +import static haveno.common.config.Config.PROVIDERS; +import static haveno.common.config.Config.WALLET_DIR; +import static haveno.common.config.Config.WALLET_RPC_BIND_PORT; public class BitcoinModule extends AppModule { diff --git a/core/src/main/java/bisq/core/btc/exceptions/AddressEntryException.java b/core/src/main/java/haveno/core/btc/exceptions/AddressEntryException.java similarity index 95% rename from core/src/main/java/bisq/core/btc/exceptions/AddressEntryException.java rename to core/src/main/java/haveno/core/btc/exceptions/AddressEntryException.java index f526b843..32659b53 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/AddressEntryException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/AddressEntryException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; public class AddressEntryException extends Exception { public AddressEntryException(String message) { diff --git a/core/src/main/java/bisq/core/btc/exceptions/InsufficientFundsException.java b/core/src/main/java/haveno/core/btc/exceptions/InsufficientFundsException.java similarity index 95% rename from core/src/main/java/bisq/core/btc/exceptions/InsufficientFundsException.java rename to core/src/main/java/haveno/core/btc/exceptions/InsufficientFundsException.java index 7195face..8f2d58f4 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/InsufficientFundsException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/InsufficientFundsException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; public class InsufficientFundsException extends Exception { public InsufficientFundsException(String message) { diff --git a/core/src/main/java/bisq/core/btc/exceptions/InvalidHostException.java b/core/src/main/java/haveno/core/btc/exceptions/InvalidHostException.java similarity index 95% rename from core/src/main/java/bisq/core/btc/exceptions/InvalidHostException.java rename to core/src/main/java/haveno/core/btc/exceptions/InvalidHostException.java index f5aedf57..fd465eef 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/InvalidHostException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/InvalidHostException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; public class InvalidHostException extends IllegalArgumentException { diff --git a/core/src/main/java/bisq/core/btc/exceptions/RejectedTxException.java b/core/src/main/java/haveno/core/btc/exceptions/RejectedTxException.java similarity index 97% rename from core/src/main/java/bisq/core/btc/exceptions/RejectedTxException.java rename to core/src/main/java/haveno/core/btc/exceptions/RejectedTxException.java index 909581a4..38a7c694 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/RejectedTxException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/RejectedTxException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; import org.bitcoinj.core.RejectMessage; diff --git a/core/src/main/java/bisq/core/btc/exceptions/SigningException.java b/core/src/main/java/haveno/core/btc/exceptions/SigningException.java similarity index 95% rename from core/src/main/java/bisq/core/btc/exceptions/SigningException.java rename to core/src/main/java/haveno/core/btc/exceptions/SigningException.java index 156d74a7..fef7b34b 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/SigningException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/SigningException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; public class SigningException extends Exception { public SigningException(String message) { diff --git a/core/src/main/java/bisq/core/btc/exceptions/TransactionVerificationException.java b/core/src/main/java/haveno/core/btc/exceptions/TransactionVerificationException.java similarity index 96% rename from core/src/main/java/bisq/core/btc/exceptions/TransactionVerificationException.java rename to core/src/main/java/haveno/core/btc/exceptions/TransactionVerificationException.java index 47f21765..4c39c0b0 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/TransactionVerificationException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/TransactionVerificationException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; public class TransactionVerificationException extends Exception { public TransactionVerificationException(Throwable t) { diff --git a/core/src/main/java/bisq/core/btc/exceptions/TxBroadcastException.java b/core/src/main/java/haveno/core/btc/exceptions/TxBroadcastException.java similarity index 97% rename from core/src/main/java/bisq/core/btc/exceptions/TxBroadcastException.java rename to core/src/main/java/haveno/core/btc/exceptions/TxBroadcastException.java index 5f22e6f3..7d121729 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/TxBroadcastException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/TxBroadcastException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; import lombok.Getter; diff --git a/core/src/main/java/bisq/core/btc/exceptions/TxBroadcastTimeoutException.java b/core/src/main/java/haveno/core/btc/exceptions/TxBroadcastTimeoutException.java similarity index 98% rename from core/src/main/java/bisq/core/btc/exceptions/TxBroadcastTimeoutException.java rename to core/src/main/java/haveno/core/btc/exceptions/TxBroadcastTimeoutException.java index f1dc4e4d..9622a023 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/TxBroadcastTimeoutException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/TxBroadcastTimeoutException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; import org.bitcoinj.core.Transaction; import org.bitcoinj.wallet.Wallet; diff --git a/core/src/main/java/bisq/core/btc/exceptions/WalletException.java b/core/src/main/java/haveno/core/btc/exceptions/WalletException.java similarity index 95% rename from core/src/main/java/bisq/core/btc/exceptions/WalletException.java rename to core/src/main/java/haveno/core/btc/exceptions/WalletException.java index e6a284b4..a18357a4 100644 --- a/core/src/main/java/bisq/core/btc/exceptions/WalletException.java +++ b/core/src/main/java/haveno/core/btc/exceptions/WalletException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.exceptions; +package haveno.core.btc.exceptions; public class WalletException extends Exception { public WalletException(Throwable t) { diff --git a/core/src/main/java/bisq/core/btc/listeners/AddressConfidenceListener.java b/core/src/main/java/haveno/core/btc/listeners/AddressConfidenceListener.java similarity index 97% rename from core/src/main/java/bisq/core/btc/listeners/AddressConfidenceListener.java rename to core/src/main/java/haveno/core/btc/listeners/AddressConfidenceListener.java index 1c9cafb9..dcf0ea9e 100644 --- a/core/src/main/java/bisq/core/btc/listeners/AddressConfidenceListener.java +++ b/core/src/main/java/haveno/core/btc/listeners/AddressConfidenceListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.listeners; +package haveno.core.btc.listeners; import org.bitcoinj.core.Address; import org.bitcoinj.core.TransactionConfidence; diff --git a/core/src/main/java/bisq/core/btc/listeners/BalanceListener.java b/core/src/main/java/haveno/core/btc/listeners/BalanceListener.java similarity index 97% rename from core/src/main/java/bisq/core/btc/listeners/BalanceListener.java rename to core/src/main/java/haveno/core/btc/listeners/BalanceListener.java index 445c8e6a..2a492994 100644 --- a/core/src/main/java/bisq/core/btc/listeners/BalanceListener.java +++ b/core/src/main/java/haveno/core/btc/listeners/BalanceListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.listeners; +package haveno.core.btc.listeners; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java b/core/src/main/java/haveno/core/btc/listeners/TxConfidenceListener.java similarity index 96% rename from core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java rename to core/src/main/java/haveno/core/btc/listeners/TxConfidenceListener.java index a27983f8..34e60858 100644 --- a/core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java +++ b/core/src/main/java/haveno/core/btc/listeners/TxConfidenceListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.listeners; +package haveno.core.btc.listeners; import org.bitcoinj.core.TransactionConfidence; diff --git a/core/src/main/java/bisq/core/btc/listeners/XmrBalanceListener.java b/core/src/main/java/haveno/core/btc/listeners/XmrBalanceListener.java similarity index 96% rename from core/src/main/java/bisq/core/btc/listeners/XmrBalanceListener.java rename to core/src/main/java/haveno/core/btc/listeners/XmrBalanceListener.java index 8d60825f..4a85ba3e 100644 --- a/core/src/main/java/bisq/core/btc/listeners/XmrBalanceListener.java +++ b/core/src/main/java/haveno/core/btc/listeners/XmrBalanceListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.listeners; +package haveno.core.btc.listeners; import java.math.BigInteger; diff --git a/core/src/main/java/bisq/core/btc/model/AddressEntry.java b/core/src/main/java/haveno/core/btc/model/AddressEntry.java similarity index 97% rename from core/src/main/java/bisq/core/btc/model/AddressEntry.java rename to core/src/main/java/haveno/core/btc/model/AddressEntry.java index 2ce6c2ba..16cd5825 100644 --- a/core/src/main/java/bisq/core/btc/model/AddressEntry.java +++ b/core/src/main/java/haveno/core/btc/model/AddressEntry.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.model; - -import bisq.common.config.Config; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.Utilities; +package haveno.core.btc.model; import com.google.protobuf.ByteString; - +import haveno.common.config.Config; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.Utilities; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; import org.bitcoinj.crypto.DeterministicKey; diff --git a/core/src/main/java/bisq/core/btc/model/AddressEntryList.java b/core/src/main/java/haveno/core/btc/model/AddressEntryList.java similarity index 98% rename from core/src/main/java/bisq/core/btc/model/AddressEntryList.java rename to core/src/main/java/haveno/core/btc/model/AddressEntryList.java index 8aa9e82d..159d4445 100644 --- a/core/src/main/java/bisq/core/btc/model/AddressEntryList.java +++ b/core/src/main/java/haveno/core/btc/model/AddressEntryList.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.model; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.core.btc.model; import com.google.protobuf.Message; - +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistedDataHost; import org.bitcoinj.core.Address; import org.bitcoinj.core.SegwitAddress; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/bisq/core/btc/model/EncryptedConnectionList.java b/core/src/main/java/haveno/core/btc/model/EncryptedConnectionList.java similarity index 97% rename from core/src/main/java/bisq/core/btc/model/EncryptedConnectionList.java rename to core/src/main/java/haveno/core/btc/model/EncryptedConnectionList.java index 5e4a979e..552194a6 100644 --- a/core/src/main/java/bisq/core/btc/model/EncryptedConnectionList.java +++ b/core/src/main/java/haveno/core/btc/model/EncryptedConnectionList.java @@ -1,15 +1,15 @@ -package bisq.core.btc.model; +package haveno.core.btc.model; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Encryption; -import bisq.common.crypto.ScryptUtil; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistedDataHost; -import bisq.core.api.CoreAccountService; -import bisq.core.api.model.EncryptedConnection; import com.google.protobuf.ByteString; import com.google.protobuf.Message; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Encryption; +import haveno.common.crypto.ScryptUtil; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.core.api.CoreAccountService; +import haveno.core.api.model.EncryptedConnection; import java.nio.charset.StandardCharsets; import java.security.SecureRandom; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/btc/model/InputsAndChangeOutput.java b/core/src/main/java/haveno/core/btc/model/InputsAndChangeOutput.java similarity index 97% rename from core/src/main/java/bisq/core/btc/model/InputsAndChangeOutput.java rename to core/src/main/java/haveno/core/btc/model/InputsAndChangeOutput.java index 63430c0b..24876a7f 100644 --- a/core/src/main/java/bisq/core/btc/model/InputsAndChangeOutput.java +++ b/core/src/main/java/haveno/core/btc/model/InputsAndChangeOutput.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.model; +package haveno.core.btc.model; import java.util.List; diff --git a/core/src/main/java/bisq/core/btc/model/PreparedDepositTxAndMakerInputs.java b/core/src/main/java/haveno/core/btc/model/PreparedDepositTxAndMakerInputs.java similarity index 97% rename from core/src/main/java/bisq/core/btc/model/PreparedDepositTxAndMakerInputs.java rename to core/src/main/java/haveno/core/btc/model/PreparedDepositTxAndMakerInputs.java index 04f6a745..3ab0463a 100644 --- a/core/src/main/java/bisq/core/btc/model/PreparedDepositTxAndMakerInputs.java +++ b/core/src/main/java/haveno/core/btc/model/PreparedDepositTxAndMakerInputs.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.model; +package haveno.core.btc.model; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/btc/model/RawTransactionInput.java b/core/src/main/java/haveno/core/btc/model/RawTransactionInput.java similarity index 93% rename from core/src/main/java/bisq/core/btc/model/RawTransactionInput.java rename to core/src/main/java/haveno/core/btc/model/RawTransactionInput.java index e57725f2..582021f3 100644 --- a/core/src/main/java/bisq/core/btc/model/RawTransactionInput.java +++ b/core/src/main/java/haveno/core/btc/model/RawTransactionInput.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.model; - -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.Utilities; +package haveno.core.btc.model; import com.google.protobuf.ByteString; - +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.Utilities; import lombok.EqualsAndHashCode; import javax.annotation.concurrent.Immutable; diff --git a/core/src/main/java/bisq/core/btc/model/XmrAddressEntry.java b/core/src/main/java/haveno/core/btc/model/XmrAddressEntry.java similarity index 96% rename from core/src/main/java/bisq/core/btc/model/XmrAddressEntry.java rename to core/src/main/java/haveno/core/btc/model/XmrAddressEntry.java index 97bc8569..012a52be 100644 --- a/core/src/main/java/bisq/core/btc/model/XmrAddressEntry.java +++ b/core/src/main/java/haveno/core/btc/model/XmrAddressEntry.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.model; - -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.Utilities; +package haveno.core.btc.model; import org.bitcoinj.core.Coin; - +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.Utilities; import java.util.Optional; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/btc/model/XmrAddressEntryList.java b/core/src/main/java/haveno/core/btc/model/XmrAddressEntryList.java similarity index 96% rename from core/src/main/java/bisq/core/btc/model/XmrAddressEntryList.java rename to core/src/main/java/haveno/core/btc/model/XmrAddressEntryList.java index 9f9fb238..9ad1f3a2 100644 --- a/core/src/main/java/bisq/core/btc/model/XmrAddressEntryList.java +++ b/core/src/main/java/haveno/core/btc/model/XmrAddressEntryList.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.model; - -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.core.btc.model; import com.google.protobuf.Message; - +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistedDataHost; import com.google.inject.Inject; import com.google.common.collect.ImmutableList; diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNetworkConfig.java b/core/src/main/java/haveno/core/btc/nodes/BtcNetworkConfig.java similarity index 91% rename from core/src/main/java/bisq/core/btc/nodes/BtcNetworkConfig.java rename to core/src/main/java/haveno/core/btc/nodes/BtcNetworkConfig.java index 55d1cc35..aaf1fe9b 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNetworkConfig.java +++ b/core/src/main/java/haveno/core/btc/nodes/BtcNetworkConfig.java @@ -15,20 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.core.btc.setup.WalletConfig; - -import bisq.network.Socks5MultiDiscovery; - -import bisq.common.config.Config; +package haveno.core.btc.nodes; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.core.PeerAddress; import org.bitcoinj.params.MainNetParams; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.common.config.Config; +import haveno.core.btc.setup.WalletConfig; +import haveno.network.Socks5MultiDiscovery; import java.util.List; import org.slf4j.Logger; @@ -63,7 +59,7 @@ public class BtcNetworkConfig { MainNetParams mainNetParams = MainNetParams.get(); if (parameters.equals(mainNetParams)) { log.warn("You use the public Bitcoin network and are exposed to privacy issues " + - "caused by the broken bloom filters. See https://bisq.network/blog/privacy-in-bitsquare/ " + + "caused by the broken bloom filters. See https://haveno.network/blog/privacy-in-bitsquare/ " + "for more info. It is recommended to use the provided nodes."); } } @@ -71,7 +67,7 @@ public class BtcNetworkConfig { delegate.setDiscovery(new Socks5MultiDiscovery(proxy, parameters, socks5DiscoverMode)); } else if (Config.baseCurrencyNetwork().isMainnet()) { log.warn("You don't use tor and use the public Bitcoin network and are exposed to privacy issues " + - "caused by the broken bloom filters. See https://bisq.network/blog/privacy-in-bitsquare/ " + + "caused by the broken bloom filters. See https://haveno.network/blog/privacy-in-bitsquare/ " + "for more info. It is recommended to use Tor and the provided nodes."); } } diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodeConverter.java b/core/src/main/java/haveno/core/btc/nodes/BtcNodeConverter.java similarity index 96% rename from core/src/main/java/bisq/core/btc/nodes/BtcNodeConverter.java rename to core/src/main/java/haveno/core/btc/nodes/BtcNodeConverter.java index 8e282fcc..be6bcf48 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNodeConverter.java +++ b/core/src/main/java/haveno/core/btc/nodes/BtcNodeConverter.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.core.btc.nodes.BtcNodes.BtcNode; - -import bisq.network.DnsLookupException; -import bisq.network.DnsLookupTor; +package haveno.core.btc.nodes; import org.bitcoinj.core.PeerAddress; import org.bitcoinj.net.OnionCatConverter; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.core.btc.nodes.BtcNodes.BtcNode; +import haveno.network.DnsLookupException; +import haveno.network.DnsLookupTor; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodes.java b/core/src/main/java/haveno/core/btc/nodes/BtcNodes.java similarity index 94% rename from core/src/main/java/bisq/core/btc/nodes/BtcNodes.java rename to core/src/main/java/haveno/core/btc/nodes/BtcNodes.java index ea7184f2..895b2380 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNodes.java +++ b/core/src/main/java/haveno/core/btc/nodes/BtcNodes.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.common.config.Config; +package haveno.core.btc.nodes; import java.util.ArrayList; import java.util.Arrays; @@ -33,6 +31,8 @@ import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkArgument; +import haveno.common.config.Config; + // Managed here: https://github.com/bisq-network/roles/issues/39 @Slf4j public class BtcNodes { @@ -68,8 +68,8 @@ public class BtcNodes { new BtcNode("btc.ispol.sk", "mbm6ffx6j5ygi2ck.onion", "193.58.196.212", BtcNode.DEFAULT_PORT, "@KanoczTomas"), // Devin Bileck - new BtcNode("btc1.bisq.services", "devinbtctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion", "172.105.21.216", BtcNode.DEFAULT_PORT, "@devinbileck"), - new BtcNode("btc2.bisq.services", "devinbtcyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion", "173.255.240.205", BtcNode.DEFAULT_PORT, "@devinbileck"), + new BtcNode("btc1.haveno.services", "devinbtctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion", "172.105.21.216", BtcNode.DEFAULT_PORT, "@devinbileck"), + new BtcNode("btc2.haveno.services", "devinbtcyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion", "173.255.240.205", BtcNode.DEFAULT_PORT, "@devinbileck"), new BtcNode(null, "devinbtcmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion", null, BtcNode.DEFAULT_PORT, "@devinbileck"), // m52go diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodesRepository.java b/core/src/main/java/haveno/core/btc/nodes/BtcNodesRepository.java similarity index 99% rename from core/src/main/java/bisq/core/btc/nodes/BtcNodesRepository.java rename to core/src/main/java/haveno/core/btc/nodes/BtcNodesRepository.java index 2cfedbed..72442508 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNodesRepository.java +++ b/core/src/main/java/haveno/core/btc/nodes/BtcNodesRepository.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; +package haveno.core.btc.nodes; import org.bitcoinj.core.PeerAddress; diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java b/core/src/main/java/haveno/core/btc/nodes/BtcNodesSetupPreferences.java similarity index 96% rename from core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java rename to core/src/main/java/haveno/core/btc/nodes/BtcNodesSetupPreferences.java index e88ee9f3..7b2bc9ee 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java +++ b/core/src/main/java/haveno/core/btc/nodes/BtcNodesSetupPreferences.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.core.user.Preferences; - -import bisq.common.config.Config; -import bisq.common.util.Utilities; +package haveno.core.btc.nodes; +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.core.user.Preferences; import java.util.Collections; import java.util.List; import java.util.Set; diff --git a/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java b/core/src/main/java/haveno/core/btc/nodes/LocalBitcoinNode.java similarity index 88% rename from core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java rename to core/src/main/java/haveno/core/btc/nodes/LocalBitcoinNode.java index d8e4356c..6cacaf9c 100644 --- a/core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java +++ b/core/src/main/java/haveno/core/btc/nodes/LocalBitcoinNode.java @@ -1,7 +1,4 @@ -package bisq.core.btc.nodes; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.core.btc.nodes; import javax.inject.Inject; import javax.inject.Singleton; @@ -9,7 +6,8 @@ import javax.inject.Singleton; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; - +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; import java.io.IOException; import org.slf4j.Logger; @@ -18,7 +16,7 @@ import org.slf4j.LoggerFactory; /** * Detects whether a Bitcoin node is running on localhost and contains logic for when to * ignore it. The query methods lazily trigger the needed checks and cache the results. - * @see bisq.common.config.Config#ignoreLocalBtcNode + * @see haveno.common.config.Config#ignoreLocalBtcNode */ @Singleton public class LocalBitcoinNode { @@ -38,7 +36,7 @@ public class LocalBitcoinNode { } /** - * Returns whether Bisq should use a local Bitcoin node, meaning that a node was + * Returns whether Haveno should use a local Bitcoin node, meaning that a node was * detected and conditions under which it should be ignored have not been met. If * the local node should be ignored, a call to this method will not trigger an * unnecessary detection attempt. @@ -48,7 +46,7 @@ public class LocalBitcoinNode { } /** - * Returns whether Bisq should ignore a local Bitcoin node even if it is usable. + * Returns whether Haveno should ignore a local Bitcoin node even if it is usable. */ public boolean shouldBeIgnored() { BaseCurrencyNetwork baseCurrencyNetwork = config.baseCurrencyNetwork; diff --git a/core/src/main/java/bisq/core/btc/nodes/ProxySocketFactory.java b/core/src/main/java/haveno/core/btc/nodes/ProxySocketFactory.java similarity index 99% rename from core/src/main/java/bisq/core/btc/nodes/ProxySocketFactory.java rename to core/src/main/java/haveno/core/btc/nodes/ProxySocketFactory.java index 1d31bcae..1e0a8088 100644 --- a/core/src/main/java/bisq/core/btc/nodes/ProxySocketFactory.java +++ b/core/src/main/java/haveno/core/btc/nodes/ProxySocketFactory.java @@ -33,7 +33,7 @@ * PircBotX. If not, see . */ -package bisq.core.btc.nodes; +package haveno.core.btc.nodes; import javax.net.SocketFactory; diff --git a/core/src/main/java/bisq/core/btc/nodes/SeedPeersSocks5Dns.java b/core/src/main/java/haveno/core/btc/nodes/SeedPeersSocks5Dns.java similarity index 99% rename from core/src/main/java/bisq/core/btc/nodes/SeedPeersSocks5Dns.java rename to core/src/main/java/haveno/core/btc/nodes/SeedPeersSocks5Dns.java index 2327f767..e9d53a8a 100644 --- a/core/src/main/java/bisq/core/btc/nodes/SeedPeersSocks5Dns.java +++ b/core/src/main/java/haveno/core/btc/nodes/SeedPeersSocks5Dns.java @@ -31,7 +31,7 @@ * limitations under the License. */ -package bisq.core.btc.nodes; +package haveno.core.btc.nodes; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.net.discovery.PeerDiscovery; diff --git a/core/src/main/java/bisq/core/btc/setup/DownloadListener.java b/core/src/main/java/haveno/core/btc/setup/DownloadListener.java similarity index 90% rename from core/src/main/java/bisq/core/btc/setup/DownloadListener.java rename to core/src/main/java/haveno/core/btc/setup/DownloadListener.java index 2d2e2b13..c88286d0 100644 --- a/core/src/main/java/bisq/core/btc/setup/DownloadListener.java +++ b/core/src/main/java/haveno/core/btc/setup/DownloadListener.java @@ -1,11 +1,9 @@ -package bisq.core.btc.setup; - -import bisq.common.UserThread; +package haveno.core.btc.setup; import javafx.beans.property.DoubleProperty; import javafx.beans.property.ReadOnlyDoubleProperty; import javafx.beans.property.SimpleDoubleProperty; - +import haveno.common.UserThread; import java.util.Date; public class DownloadListener { diff --git a/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainFactory.java b/core/src/main/java/haveno/core/btc/setup/HavenoKeyChainFactory.java similarity index 93% rename from core/src/main/java/bisq/core/btc/setup/HavenoKeyChainFactory.java rename to core/src/main/java/haveno/core/btc/setup/HavenoKeyChainFactory.java index 5ce8ca11..eeaa4311 100644 --- a/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainFactory.java +++ b/core/src/main/java/haveno/core/btc/setup/HavenoKeyChainFactory.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.setup; +package haveno.core.btc.setup; import org.bitcoinj.crypto.ChildNumber; import org.bitcoinj.crypto.DeterministicKey; @@ -57,11 +57,11 @@ public class HavenoKeyChainFactory extends DefaultKeyChainFactory { @Override public DeterministicKeyChain makeWatchingKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicKey accountKey, boolean isFollowingKey, boolean isMarried, Script.ScriptType outputScriptType) { - throw new UnsupportedOperationException("Bisq is not supposed to use this"); + throw new UnsupportedOperationException("Haveno is not supposed to use this"); } @Override public DeterministicKeyChain makeSpendingKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicKey accountKey, boolean isMarried, Script.ScriptType outputScriptType) { - throw new UnsupportedOperationException("Bisq is not supposed to use this"); + throw new UnsupportedOperationException("Haveno is not supposed to use this"); } } diff --git a/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainGroupStructure.java b/core/src/main/java/haveno/core/btc/setup/HavenoKeyChainGroupStructure.java similarity index 98% rename from core/src/main/java/bisq/core/btc/setup/HavenoKeyChainGroupStructure.java rename to core/src/main/java/haveno/core/btc/setup/HavenoKeyChainGroupStructure.java index 139d843f..6461a5e8 100644 --- a/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainGroupStructure.java +++ b/core/src/main/java/haveno/core/btc/setup/HavenoKeyChainGroupStructure.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.setup; +package haveno.core.btc.setup; import org.bitcoinj.crypto.ChildNumber; import org.bitcoinj.script.Script; diff --git a/core/src/main/java/bisq/core/btc/setup/MoneroWalletRpcManager.java b/core/src/main/java/haveno/core/btc/setup/MoneroWalletRpcManager.java similarity index 99% rename from core/src/main/java/bisq/core/btc/setup/MoneroWalletRpcManager.java rename to core/src/main/java/haveno/core/btc/setup/MoneroWalletRpcManager.java index d1f4736a..8579d638 100644 --- a/core/src/main/java/bisq/core/btc/setup/MoneroWalletRpcManager.java +++ b/core/src/main/java/haveno/core/btc/setup/MoneroWalletRpcManager.java @@ -1,4 +1,4 @@ -package bisq.core.btc.setup; +package haveno.core.btc.setup; import java.net.ServerSocket; diff --git a/core/src/main/java/bisq/core/btc/setup/RegTestHost.java b/core/src/main/java/haveno/core/btc/setup/RegTestHost.java similarity index 92% rename from core/src/main/java/bisq/core/btc/setup/RegTestHost.java rename to core/src/main/java/haveno/core/btc/setup/RegTestHost.java index 32a152d3..ddd7c3b4 100644 --- a/core/src/main/java/bisq/core/btc/setup/RegTestHost.java +++ b/core/src/main/java/haveno/core/btc/setup/RegTestHost.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.setup; +package haveno.core.btc.setup; -import bisq.common.config.Config; +import haveno.common.config.Config; public enum RegTestHost { diff --git a/core/src/main/java/bisq/core/btc/setup/WalletConfig.java b/core/src/main/java/haveno/core/btc/setup/WalletConfig.java similarity index 98% rename from core/src/main/java/bisq/core/btc/setup/WalletConfig.java rename to core/src/main/java/haveno/core/btc/setup/WalletConfig.java index 6471f45a..3e301f1a 100644 --- a/core/src/main/java/bisq/core/btc/setup/WalletConfig.java +++ b/core/src/main/java/haveno/core/btc/setup/WalletConfig.java @@ -15,12 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.setup; - -import bisq.core.btc.nodes.LocalBitcoinNode; - -import bisq.common.config.Config; -import bisq.common.file.FileUtil; +package haveno.core.btc.setup; import org.bitcoinj.core.BlockChain; import org.bitcoinj.core.Context; @@ -38,7 +33,9 @@ import org.bitcoinj.wallet.DeterministicSeed; import org.bitcoinj.wallet.Wallet; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.core.btc.nodes.LocalBitcoinNode; import com.google.common.io.Closeables; import com.google.common.util.concurrent.AbstractIdleService; @@ -63,9 +60,9 @@ import lombok.Setter; import javax.annotation.Nullable; -import static bisq.common.util.Preconditions.checkDir; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import static haveno.common.util.Preconditions.checkDir; /** *

Utility class that wraps the boilerplate needed to set up a new SPV bitcoinj app. Instantiate it with a directory diff --git a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java b/core/src/main/java/haveno/core/btc/setup/WalletsSetup.java similarity index 95% rename from core/src/main/java/bisq/core/btc/setup/WalletsSetup.java rename to core/src/main/java/haveno/core/btc/setup/WalletsSetup.java index 3a20c20f..3fe0f729 100644 --- a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java +++ b/core/src/main/java/haveno/core/btc/setup/WalletsSetup.java @@ -15,29 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.setup; - -import bisq.core.btc.exceptions.InvalidHostException; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.model.AddressEntryList; -import bisq.core.btc.nodes.BtcNetworkConfig; -import bisq.core.btc.nodes.BtcNodes; -import bisq.core.btc.nodes.BtcNodes.BtcNode; -import bisq.core.btc.nodes.BtcNodesRepository; -import bisq.core.btc.nodes.BtcNodesSetupPreferences; -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.user.Preferences; - -import bisq.network.Socks5MultiDiscovery; -import bisq.network.Socks5ProxyProvider; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.file.FileUtil; -import bisq.common.handlers.ExceptionHandler; -import bisq.common.handlers.ResultHandler; +package haveno.core.btc.setup; import org.bitcoinj.core.Address; import org.bitcoinj.core.BlockChain; @@ -50,7 +28,25 @@ import org.bitcoinj.wallet.DeterministicSeed; import org.bitcoinj.wallet.Wallet; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.common.handlers.ExceptionHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.btc.exceptions.InvalidHostException; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.model.AddressEntryList; +import haveno.core.btc.nodes.BtcNetworkConfig; +import haveno.core.btc.nodes.BtcNodes; +import haveno.core.btc.nodes.BtcNodesRepository; +import haveno.core.btc.nodes.BtcNodesSetupPreferences; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.btc.nodes.BtcNodes.BtcNode; +import haveno.core.user.Preferences; +import haveno.network.Socks5MultiDiscovery; +import haveno.network.Socks5ProxyProvider; import com.google.inject.Inject; import com.google.inject.name.Named; diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcCoinSelector.java b/core/src/main/java/haveno/core/btc/wallet/BtcCoinSelector.java similarity index 98% rename from core/src/main/java/bisq/core/btc/wallet/BtcCoinSelector.java rename to core/src/main/java/haveno/core/btc/wallet/BtcCoinSelector.java index cf35a874..02370706 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BtcCoinSelector.java +++ b/core/src/main/java/haveno/core/btc/wallet/BtcCoinSelector.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; +package haveno.core.btc.wallet; import org.bitcoinj.core.Address; import org.bitcoinj.core.TransactionOutput; diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java b/core/src/main/java/haveno/core/btc/wallet/BtcWalletService.java similarity index 98% rename from core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java rename to core/src/main/java/haveno/core/btc/wallet/BtcWalletService.java index 9fb9a9f7..bc3fd0ff 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java +++ b/core/src/main/java/haveno/core/btc/wallet/BtcWalletService.java @@ -15,20 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; - -import bisq.core.btc.exceptions.AddressEntryException; -import bisq.core.btc.exceptions.InsufficientFundsException; -import bisq.core.btc.exceptions.TransactionVerificationException; -import bisq.core.btc.exceptions.WalletException; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.model.AddressEntryList; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; -import bisq.core.user.Preferences; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.util.Tuple2; +package haveno.core.btc.wallet; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; @@ -54,7 +41,17 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.util.Tuple2; +import haveno.core.btc.exceptions.AddressEntryException; +import haveno.core.btc.exceptions.InsufficientFundsException; +import haveno.core.btc.exceptions.TransactionVerificationException; +import haveno.core.btc.exceptions.WalletException; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.model.AddressEntryList; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; +import haveno.core.user.Preferences; import org.bouncycastle.crypto.params.KeyParameter; import java.util.Arrays; @@ -353,7 +350,7 @@ public class BtcWalletService extends WalletService { // address if same peers trade again. // We swap TRADE_PAYOUT to be sure all is cleaned up. There might be cases where a user cannot send the funds - // to an external wallet directly in the last step of the trade, but the funds are in the Bisq wallet anyway and + // to an external wallet directly in the last step of the trade, but the funds are in the Haveno wallet anyway and // the dealing with the external wallet is pure UI thing. The user can move the funds to the wallet and then // send out the funds to the external wallet. As this cleanup is a rare situation and most users do not use // the feature to send out the funds we prefer that strategy (if we keep the address entry it might cause diff --git a/core/src/main/java/bisq/core/btc/wallet/HavenoDefaultCoinSelector.java b/core/src/main/java/haveno/core/btc/wallet/HavenoDefaultCoinSelector.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/HavenoDefaultCoinSelector.java rename to core/src/main/java/haveno/core/btc/wallet/HavenoDefaultCoinSelector.java index e5b3ff6f..9128215d 100644 --- a/core/src/main/java/bisq/core/btc/wallet/HavenoDefaultCoinSelector.java +++ b/core/src/main/java/haveno/core/btc/wallet/HavenoDefaultCoinSelector.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; +package haveno.core.btc.wallet; import org.bitcoinj.core.Coin; import org.bitcoinj.core.InsufficientMoneyException; diff --git a/core/src/main/java/bisq/core/btc/wallet/HavenoRiskAnalysis.java b/core/src/main/java/haveno/core/btc/wallet/HavenoRiskAnalysis.java similarity index 96% rename from core/src/main/java/bisq/core/btc/wallet/HavenoRiskAnalysis.java rename to core/src/main/java/haveno/core/btc/wallet/HavenoRiskAnalysis.java index 511afae2..38da642b 100644 --- a/core/src/main/java/bisq/core/btc/wallet/HavenoRiskAnalysis.java +++ b/core/src/main/java/haveno/core/btc/wallet/HavenoRiskAnalysis.java @@ -32,7 +32,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; +package haveno.core.btc.wallet; import org.bitcoinj.core.Coin; import org.bitcoinj.core.ECKey; @@ -62,9 +62,9 @@ import static com.google.common.base.Preconditions.checkState; // override it. // The changes to DefaultRiskAnalysis are: removal of the RBF check and accept as standard an OP_RETURN outputs // with 0 value. -// For Bisq's use cases RBF is not considered risky. Requiring a confirmation for RBF payments from a user's -// external wallet to Bisq would hurt usability. The trade transaction requires anyway a confirmation and we don't see -// a use case where a Bisq user accepts unconfirmed payment from untrusted peers and would not wait anyway for at least +// For Haveno's use cases RBF is not considered risky. Requiring a confirmation for RBF payments from a user's +// external wallet to Haveno would hurt usability. The trade transaction requires anyway a confirmation and we don't see +// a use case where a Haveno user accepts unconfirmed payment from untrusted peers and would not wait anyway for at least // one confirmation. /** diff --git a/core/src/main/java/bisq/core/btc/wallet/MoneroKeyImageListener.java b/core/src/main/java/haveno/core/btc/wallet/MoneroKeyImageListener.java similarity index 90% rename from core/src/main/java/bisq/core/btc/wallet/MoneroKeyImageListener.java rename to core/src/main/java/haveno/core/btc/wallet/MoneroKeyImageListener.java index f2accf0e..cdd0fea9 100644 --- a/core/src/main/java/bisq/core/btc/wallet/MoneroKeyImageListener.java +++ b/core/src/main/java/haveno/core/btc/wallet/MoneroKeyImageListener.java @@ -1,4 +1,4 @@ -package bisq.core.btc.wallet; +package haveno.core.btc.wallet; import java.util.Map; diff --git a/core/src/main/java/bisq/core/btc/wallet/MoneroKeyImagePoller.java b/core/src/main/java/haveno/core/btc/wallet/MoneroKeyImagePoller.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/MoneroKeyImagePoller.java rename to core/src/main/java/haveno/core/btc/wallet/MoneroKeyImagePoller.java index 96918bc8..eb7c2df0 100644 --- a/core/src/main/java/bisq/core/btc/wallet/MoneroKeyImagePoller.java +++ b/core/src/main/java/haveno/core/btc/wallet/MoneroKeyImagePoller.java @@ -1,4 +1,4 @@ -package bisq.core.btc.wallet; +package haveno.core.btc.wallet; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/bisq/core/btc/wallet/NonBsqCoinSelector.java b/core/src/main/java/haveno/core/btc/wallet/NonBsqCoinSelector.java similarity index 96% rename from core/src/main/java/bisq/core/btc/wallet/NonBsqCoinSelector.java rename to core/src/main/java/haveno/core/btc/wallet/NonBsqCoinSelector.java index 547b5793..f521ffb9 100644 --- a/core/src/main/java/bisq/core/btc/wallet/NonBsqCoinSelector.java +++ b/core/src/main/java/haveno/core/btc/wallet/NonBsqCoinSelector.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; - -import bisq.core.user.Preferences; +package haveno.core.btc.wallet; import org.bitcoinj.core.Transaction; import org.bitcoinj.core.TransactionConfidence; import org.bitcoinj.core.TransactionOutput; - +import haveno.core.user.Preferences; import javax.inject.Inject; import lombok.Setter; diff --git a/core/src/main/java/bisq/core/btc/wallet/Restrictions.java b/core/src/main/java/haveno/core/btc/wallet/Restrictions.java similarity index 97% rename from core/src/main/java/bisq/core/btc/wallet/Restrictions.java rename to core/src/main/java/haveno/core/btc/wallet/Restrictions.java index 1abea58a..51236015 100644 --- a/core/src/main/java/bisq/core/btc/wallet/Restrictions.java +++ b/core/src/main/java/haveno/core/btc/wallet/Restrictions.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; - -import bisq.common.config.Config; -import bisq.core.trade.HavenoUtils; +package haveno.core.btc.wallet; +import haveno.common.config.Config; +import haveno.core.trade.HavenoUtils; import java.math.BigInteger; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java b/core/src/main/java/haveno/core/btc/wallet/TradeWalletService.java similarity index 99% rename from core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java rename to core/src/main/java/haveno/core/btc/wallet/TradeWalletService.java index d1af93e8..830d5de5 100644 --- a/core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java +++ b/core/src/main/java/haveno/core/btc/wallet/TradeWalletService.java @@ -15,20 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; - -import bisq.core.btc.exceptions.SigningException; -import bisq.core.btc.exceptions.TransactionVerificationException; -import bisq.core.btc.exceptions.WalletException; -import bisq.core.btc.model.InputsAndChangeOutput; -import bisq.core.btc.model.PreparedDepositTxAndMakerInputs; -import bisq.core.btc.model.RawTransactionInput; -import bisq.core.btc.setup.WalletConfig; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.user.Preferences; - -import bisq.common.config.Config; -import bisq.common.util.Tuple2; +package haveno.core.btc.wallet; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; @@ -55,7 +42,17 @@ import org.bitcoinj.wallet.Wallet; import javax.inject.Inject; import com.google.common.collect.ImmutableList; - +import haveno.common.config.Config; +import haveno.common.util.Tuple2; +import haveno.core.btc.exceptions.SigningException; +import haveno.core.btc.exceptions.TransactionVerificationException; +import haveno.core.btc.exceptions.WalletException; +import haveno.core.btc.model.InputsAndChangeOutput; +import haveno.core.btc.model.PreparedDepositTxAndMakerInputs; +import haveno.core.btc.model.RawTransactionInput; +import haveno.core.btc.setup.WalletConfig; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.user.Preferences; import org.bouncycastle.crypto.params.KeyParameter; import java.util.ArrayList; @@ -1061,7 +1058,7 @@ public class TradeWalletService { "input.getConnectedOutput().getParentTransaction() must not be null"); checkNotNull(input.getValue(), "input.getValue() must not be null"); - // bitcoinSerialize(false) is used just in case the serialized tx is parsed by a bisq node still using + // bitcoinSerialize(false) is used just in case the serialized tx is parsed by a haveno node still using // bitcoinj 0.14. This is not supposed to happen ever since Version.TRADE_PROTOCOL_VERSION was set to 3, // but it costs nothing to be on the safe side. // The serialized tx is just used to obtain its hash, so the witness data is not relevant. @@ -1215,7 +1212,7 @@ public class TradeWalletService { tx.setLockTime(lockTime); } - // BISQ issue #4039: prevent dust outputs from being created. + // HAVENO issue #4039: prevent dust outputs from being created. // check all the outputs in a proposed transaction, if any are below the dust threshold // remove them, noting the details in the log. returns 'true' to indicate if any dust was // removed. diff --git a/core/src/main/java/bisq/core/btc/wallet/TxBroadcaster.java b/core/src/main/java/haveno/core/btc/wallet/TxBroadcaster.java similarity index 96% rename from core/src/main/java/bisq/core/btc/wallet/TxBroadcaster.java rename to core/src/main/java/haveno/core/btc/wallet/TxBroadcaster.java index 7acbea54..62762600 100644 --- a/core/src/main/java/bisq/core/btc/wallet/TxBroadcaster.java +++ b/core/src/main/java/haveno/core/btc/wallet/TxBroadcaster.java @@ -15,14 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; - -import bisq.core.btc.exceptions.TxBroadcastException; -import bisq.core.btc.exceptions.TxBroadcastTimeoutException; -import bisq.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; - -import bisq.common.Timer; -import bisq.common.UserThread; +package haveno.core.btc.wallet; import org.bitcoinj.core.PeerGroup; import org.bitcoinj.core.Transaction; @@ -32,7 +25,11 @@ import org.bitcoinj.wallet.Wallet; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.core.btc.exceptions.TxBroadcastException; +import haveno.core.btc.exceptions.TxBroadcastTimeoutException; +import haveno.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletService.java b/core/src/main/java/haveno/core/btc/wallet/WalletService.java similarity index 97% rename from core/src/main/java/bisq/core/btc/wallet/WalletService.java rename to core/src/main/java/haveno/core/btc/wallet/WalletService.java index 206a7ea1..9469d46b 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletService.java +++ b/core/src/main/java/haveno/core/btc/wallet/WalletService.java @@ -15,20 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; - -import bisq.core.btc.exceptions.TransactionVerificationException; -import bisq.core.btc.exceptions.WalletException; -import bisq.core.btc.listeners.AddressConfidenceListener; -import bisq.core.btc.listeners.BalanceListener; -import bisq.core.btc.listeners.TxConfidenceListener; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; -import bisq.core.user.Preferences; - -import bisq.common.config.Config; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.core.btc.wallet; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; @@ -78,7 +65,17 @@ import com.google.common.collect.SetMultimap; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; - +import haveno.common.config.Config; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.btc.exceptions.TransactionVerificationException; +import haveno.core.btc.exceptions.WalletException; +import haveno.core.btc.listeners.AddressConfidenceListener; +import haveno.core.btc.listeners.BalanceListener; +import haveno.core.btc.listeners.TxConfidenceListener; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.http.MemPoolSpaceTxBroadcaster; +import haveno.core.user.Preferences; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; @@ -117,7 +114,7 @@ public abstract class WalletService { protected final WalletsSetup walletsSetup; protected final Preferences preferences; protected final NetworkParameters params; - private final BisqWalletListener walletEventListener = new BisqWalletListener(); + private final HavenoWalletListener walletEventListener = new HavenoWalletListener(); private final CopyOnWriteArraySet addressConfidenceListeners = new CopyOnWriteArraySet<>(); private final CopyOnWriteArraySet txConfidenceListeners = new CopyOnWriteArraySet<>(); private final CopyOnWriteArraySet balanceListeners = new CopyOnWriteArraySet<>(); @@ -540,7 +537,7 @@ public abstract class WalletService { return getNumTxOutputsForAddress(address) == 0; } - // BISQ issue #4039: Prevent dust outputs from being created. + // HAVENO issue #4039: Prevent dust outputs from being created. // Check the outputs of a proposed transaction. If any are below the dust threshold, // add up the dust, log the details, and return the cumulative dust amount. public Coin getDust(Transaction proposedTransaction) { @@ -828,10 +825,10 @@ public abstract class WalletService { } /////////////////////////////////////////////////////////////////////////////////////////// - // bisqWalletEventListener + // havenoWalletEventListener /////////////////////////////////////////////////////////////////////////////////////////// - public class BisqWalletListener implements WalletCoinsReceivedEventListener, WalletCoinsSentEventListener, WalletReorganizeEventListener, TransactionConfidenceEventListener { + public class HavenoWalletListener implements WalletCoinsReceivedEventListener, WalletCoinsSentEventListener, WalletReorganizeEventListener, TransactionConfidenceEventListener { @Override public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) { notifyBalanceListeners(tx); diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletsManager.java b/core/src/main/java/haveno/core/btc/wallet/WalletsManager.java similarity index 95% rename from core/src/main/java/bisq/core/btc/wallet/WalletsManager.java rename to core/src/main/java/haveno/core/btc/wallet/WalletsManager.java index 6a6ec321..6b79361d 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletsManager.java +++ b/core/src/main/java/haveno/core/btc/wallet/WalletsManager.java @@ -15,13 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; - -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.locale.Res; -import bisq.common.crypto.ScryptUtil; -import bisq.common.handlers.ExceptionHandler; -import bisq.common.handlers.ResultHandler; +package haveno.core.btc.wallet; import org.bitcoinj.crypto.KeyCrypter; import org.bitcoinj.crypto.KeyCrypterScrypt; @@ -29,7 +23,11 @@ import org.bitcoinj.wallet.DeterministicSeed; import org.bitcoinj.wallet.Wallet; import com.google.inject.Inject; - +import haveno.common.crypto.ScryptUtil; +import haveno.common.handlers.ExceptionHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.locale.Res; import org.bouncycastle.crypto.params.KeyParameter; import org.slf4j.Logger; diff --git a/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/btc/wallet/XmrWalletService.java similarity index 98% rename from core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java rename to core/src/main/java/haveno/core/btc/wallet/XmrWalletService.java index ae329856..44f23315 100644 --- a/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java +++ b/core/src/main/java/haveno/core/btc/wallet/XmrWalletService.java @@ -1,31 +1,30 @@ -package bisq.core.btc.wallet; +package haveno.core.btc.wallet; import static com.google.common.base.Preconditions.checkState; -import bisq.common.UserThread; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.common.file.FileUtil; -import bisq.common.util.Utilities; -import bisq.core.api.AccountServiceListener; -import bisq.core.api.CoreAccountService; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.app.HavenoSetup; -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.model.XmrAddressEntryList; -import bisq.core.btc.setup.MoneroWalletRpcManager; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.offer.Offer; -import bisq.core.trade.MakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.HavenoUtils; - import com.google.common.util.concurrent.Service.State; import com.google.inject.name.Named; import common.utils.JsonUtils; +import haveno.common.UserThread; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.common.util.Utilities; +import haveno.core.api.AccountServiceListener; +import haveno.core.api.CoreAccountService; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.app.HavenoSetup; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.model.XmrAddressEntryList; +import haveno.core.btc.setup.MoneroWalletRpcManager; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.offer.Offer; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.MakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; import java.io.File; import java.math.BigDecimal; import java.math.BigInteger; @@ -796,7 +795,7 @@ public class XmrWalletService { // We swap also TRADE_PAYOUT to be sure all is cleaned up. There might be cases // where a user cannot send the funds // to an external wallet directly in the last step of the trade, but the funds - // are in the Bisq wallet anyway and + // are in the Haveno wallet anyway and // the dealing with the external wallet is pure UI thing. The user can move the // funds to the wallet and then // send out the funds to the external wallet. As this cleanup is a rare diff --git a/core/src/main/java/bisq/core/btc/wallet/http/MemPoolSpaceTxBroadcaster.java b/core/src/main/java/haveno/core/btc/wallet/http/MemPoolSpaceTxBroadcaster.java similarity index 94% rename from core/src/main/java/bisq/core/btc/wallet/http/MemPoolSpaceTxBroadcaster.java rename to core/src/main/java/haveno/core/btc/wallet/http/MemPoolSpaceTxBroadcaster.java index ba20cb42..93184469 100644 --- a/core/src/main/java/bisq/core/btc/wallet/http/MemPoolSpaceTxBroadcaster.java +++ b/core/src/main/java/haveno/core/btc/wallet/http/MemPoolSpaceTxBroadcaster.java @@ -15,17 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet.http; - -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.user.Preferences; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.http.HttpException; - -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.util.Utilities; +package haveno.core.btc.wallet.http; import org.bitcoinj.core.Transaction; import org.bitcoinj.core.Utils; @@ -35,7 +25,13 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.user.Preferences; +import haveno.network.Socks5ProxyProvider; +import haveno.network.http.HttpException; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -112,7 +108,7 @@ public class MemPoolSpaceTxBroadcaster { log.info("We broadcast rawTx {} to {}", rawTx, serviceAddress); ListenableFuture future = executorService.submit(() -> { Thread.currentThread().setName("MemPoolSpaceTxBroadcaster @ " + serviceAddress); - return httpClient.post(rawTx, "User-Agent", "bisq/" + Version.VERSION); + return httpClient.post(rawTx, "User-Agent", "haveno/" + Version.VERSION); }); Futures.addCallback(future, new FutureCallback<>() { diff --git a/core/src/main/java/bisq/core/btc/wallet/http/TxBroadcastHttpClient.java b/core/src/main/java/haveno/core/btc/wallet/http/TxBroadcastHttpClient.java similarity index 83% rename from core/src/main/java/bisq/core/btc/wallet/http/TxBroadcastHttpClient.java rename to core/src/main/java/haveno/core/btc/wallet/http/TxBroadcastHttpClient.java index e4293f39..315045a6 100644 --- a/core/src/main/java/bisq/core/btc/wallet/http/TxBroadcastHttpClient.java +++ b/core/src/main/java/haveno/core/btc/wallet/http/TxBroadcastHttpClient.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet.http; - -import bisq.core.trade.txproof.AssetTxProofHttpClient; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.http.HttpClientImpl; +package haveno.core.btc.wallet.http; +import haveno.core.trade.txproof.AssetTxProofHttpClient; +import haveno.network.Socks5ProxyProvider; +import haveno.network.http.HttpClientImpl; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/exceptions/TradePriceOutOfToleranceException.java b/core/src/main/java/haveno/core/exceptions/TradePriceOutOfToleranceException.java similarity index 96% rename from core/src/main/java/bisq/core/exceptions/TradePriceOutOfToleranceException.java rename to core/src/main/java/haveno/core/exceptions/TradePriceOutOfToleranceException.java index 932bc824..3f6283d3 100644 --- a/core/src/main/java/bisq/core/exceptions/TradePriceOutOfToleranceException.java +++ b/core/src/main/java/haveno/core/exceptions/TradePriceOutOfToleranceException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.exceptions; +package haveno.core.exceptions; public class TradePriceOutOfToleranceException extends Exception { public TradePriceOutOfToleranceException(String message) { diff --git a/core/src/main/java/bisq/core/filter/Filter.java b/core/src/main/java/haveno/core/filter/Filter.java similarity index 98% rename from core/src/main/java/bisq/core/filter/Filter.java rename to core/src/main/java/haveno/core/filter/Filter.java index ccc04f84..0b9e230e 100644 --- a/core/src/main/java/bisq/core/filter/Filter.java +++ b/core/src/main/java/haveno/core/filter/Filter.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.filter; - -import bisq.network.p2p.storage.payload.ExpirablePayload; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.crypto.Sig; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.CollectionUtils; -import bisq.common.util.ExtraDataMapValidator; -import bisq.common.util.Utilities; +package haveno.core.filter; import com.google.protobuf.ByteString; - +import haveno.common.crypto.Sig; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.CollectionUtils; +import haveno.common.util.ExtraDataMapValidator; +import haveno.common.util.Utilities; +import haveno.network.p2p.storage.payload.ExpirablePayload; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import com.google.common.annotations.VisibleForTesting; import java.security.PublicKey; diff --git a/core/src/main/java/bisq/core/filter/FilterManager.java b/core/src/main/java/haveno/core/filter/FilterManager.java similarity index 96% rename from core/src/main/java/bisq/core/filter/FilterManager.java rename to core/src/main/java/haveno/core/filter/FilterManager.java index e18267a5..e57a017d 100644 --- a/core/src/main/java/bisq/core/filter/FilterManager.java +++ b/core/src/main/java/haveno/core/filter/FilterManager.java @@ -15,29 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.filter; - -import bisq.core.btc.nodes.BtcNodes; -import bisq.core.locale.Res; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.ProvidersRepository; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.P2PServiceListener; -import bisq.network.p2p.network.NetworkFilter; -import bisq.network.p2p.storage.HashMapChangedListener; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.app.DevEnv; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.config.ConfigFileEditor; -import bisq.common.crypto.KeyRing; +package haveno.core.filter; +import haveno.common.app.DevEnv; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.config.ConfigFileEditor; +import haveno.common.crypto.KeyRing; +import haveno.core.btc.nodes.BtcNodes; +import haveno.core.locale.Res; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.ProvidersRepository; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.P2PServiceListener; +import haveno.network.p2p.network.NetworkFilter; +import haveno.network.p2p.storage.HashMapChangedListener; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; @@ -154,7 +151,7 @@ public class FilterManager { .forEach(this::onFilterAddedFromNetwork); // On mainNet we expect to have received a filter object, if not show a popup to the user to inform the - // Bisq devs. + // Haveno devs. if (Config.baseCurrencyNetwork().isMainnet() && getFilter() == null) { filterWarningHandler.accept(Res.get("popup.warning.noFilter")); } diff --git a/core/src/main/java/bisq/core/filter/FilterModule.java b/core/src/main/java/haveno/core/filter/FilterModule.java similarity index 87% rename from core/src/main/java/bisq/core/filter/FilterModule.java rename to core/src/main/java/haveno/core/filter/FilterModule.java index 7d4e2916..2a0e8897 100644 --- a/core/src/main/java/bisq/core/filter/FilterModule.java +++ b/core/src/main/java/haveno/core/filter/FilterModule.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.filter; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.core.filter; import com.google.inject.Singleton; +import haveno.common.app.AppModule; +import haveno.common.config.Config; -import static bisq.common.config.Config.IGNORE_DEV_MSG; import static com.google.inject.name.Names.named; +import static haveno.common.config.Config.IGNORE_DEV_MSG; public class FilterModule extends AppModule { diff --git a/core/src/main/java/bisq/core/filter/PaymentAccountFilter.java b/core/src/main/java/haveno/core/filter/PaymentAccountFilter.java similarity index 95% rename from core/src/main/java/bisq/core/filter/PaymentAccountFilter.java rename to core/src/main/java/haveno/core/filter/PaymentAccountFilter.java index 3572cfce..75a11b5a 100644 --- a/core/src/main/java/bisq/core/filter/PaymentAccountFilter.java +++ b/core/src/main/java/haveno/core/filter/PaymentAccountFilter.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.filter; - -import bisq.common.proto.network.NetworkPayload; +package haveno.core.filter; +import haveno.common.proto.network.NetworkPayload; import lombok.Value; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/locale/BankUtil.java b/core/src/main/java/haveno/core/locale/BankUtil.java similarity index 99% rename from core/src/main/java/bisq/core/locale/BankUtil.java rename to core/src/main/java/haveno/core/locale/BankUtil.java index 163ad4bc..fd569e4c 100644 --- a/core/src/main/java/bisq/core/locale/BankUtil.java +++ b/core/src/main/java/haveno/core/locale/BankUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/bisq/core/locale/Country.java b/core/src/main/java/haveno/core/locale/Country.java similarity index 94% rename from core/src/main/java/bisq/core/locale/Country.java rename to core/src/main/java/haveno/core/locale/Country.java index eb9103cf..4b54f83c 100644 --- a/core/src/main/java/bisq/core/locale/Country.java +++ b/core/src/main/java/haveno/core/locale/Country.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.locale; import com.google.protobuf.Message; - +import haveno.common.proto.persistable.PersistablePayload; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/core/src/main/java/bisq/core/locale/CountryUtil.java b/core/src/main/java/haveno/core/locale/CountryUtil.java similarity index 99% rename from core/src/main/java/bisq/core/locale/CountryUtil.java rename to core/src/main/java/haveno/core/locale/CountryUtil.java index 7df50cd6..44a2b097 100644 --- a/core/src/main/java/bisq/core/locale/CountryUtil.java +++ b/core/src/main/java/haveno/core/locale/CountryUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; diff --git a/core/src/main/java/bisq/core/locale/CryptoCurrency.java b/core/src/main/java/haveno/core/locale/CryptoCurrency.java similarity index 98% rename from core/src/main/java/bisq/core/locale/CryptoCurrency.java rename to core/src/main/java/haveno/core/locale/CryptoCurrency.java index bfdd44d4..830912cd 100644 --- a/core/src/main/java/bisq/core/locale/CryptoCurrency.java +++ b/core/src/main/java/haveno/core/locale/CryptoCurrency.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import com.google.protobuf.Message; diff --git a/core/src/main/java/bisq/core/locale/CurrencyTuple.java b/core/src/main/java/haveno/core/locale/CurrencyTuple.java similarity index 97% rename from core/src/main/java/bisq/core/locale/CurrencyTuple.java rename to core/src/main/java/haveno/core/locale/CurrencyTuple.java index 6f09f735..80480e71 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyTuple.java +++ b/core/src/main/java/haveno/core/locale/CurrencyTuple.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/haveno/core/locale/CurrencyUtil.java similarity index 98% rename from core/src/main/java/bisq/core/locale/CurrencyUtil.java rename to core/src/main/java/haveno/core/locale/CurrencyUtil.java index 44bdeb90..d226dbee 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyUtil.java +++ b/core/src/main/java/haveno/core/locale/CurrencyUtil.java @@ -15,20 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; - -import bisq.core.filter.FilterManager; - -import bisq.asset.Asset; -import bisq.asset.AssetRegistry; -import bisq.asset.Coin; -import bisq.asset.Token; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.core.locale; import com.google.common.base.Suppliers; - +import haveno.asset.Asset; +import haveno.asset.AssetRegistry; +import haveno.asset.Coin; +import haveno.asset.Token; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.filter.FilterManager; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/core/src/main/java/bisq/core/locale/FiatCurrency.java b/core/src/main/java/haveno/core/locale/FiatCurrency.java similarity index 98% rename from core/src/main/java/bisq/core/locale/FiatCurrency.java rename to core/src/main/java/haveno/core/locale/FiatCurrency.java index 12d64be7..ee3d040f 100644 --- a/core/src/main/java/bisq/core/locale/FiatCurrency.java +++ b/core/src/main/java/haveno/core/locale/FiatCurrency.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import com.google.protobuf.Message; diff --git a/core/src/main/java/bisq/core/locale/GlobalSettings.java b/core/src/main/java/haveno/core/locale/GlobalSettings.java similarity index 98% rename from core/src/main/java/bisq/core/locale/GlobalSettings.java rename to core/src/main/java/haveno/core/locale/GlobalSettings.java index 75381832..0ec2721f 100644 --- a/core/src/main/java/bisq/core/locale/GlobalSettings.java +++ b/core/src/main/java/haveno/core/locale/GlobalSettings.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; diff --git a/core/src/main/java/bisq/core/locale/LanguageUtil.java b/core/src/main/java/haveno/core/locale/LanguageUtil.java similarity index 99% rename from core/src/main/java/bisq/core/locale/LanguageUtil.java rename to core/src/main/java/haveno/core/locale/LanguageUtil.java index f675d522..b03dc063 100644 --- a/core/src/main/java/bisq/core/locale/LanguageUtil.java +++ b/core/src/main/java/haveno/core/locale/LanguageUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/bisq/core/locale/LocaleUtil.java b/core/src/main/java/haveno/core/locale/LocaleUtil.java similarity index 99% rename from core/src/main/java/bisq/core/locale/LocaleUtil.java rename to core/src/main/java/haveno/core/locale/LocaleUtil.java index c883511f..8d67e05b 100644 --- a/core/src/main/java/bisq/core/locale/LocaleUtil.java +++ b/core/src/main/java/haveno/core/locale/LocaleUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/locale/Region.java b/core/src/main/java/haveno/core/locale/Region.java similarity index 94% rename from core/src/main/java/bisq/core/locale/Region.java rename to core/src/main/java/haveno/core/locale/Region.java index 466c5ce9..3e31e9eb 100644 --- a/core/src/main/java/bisq/core/locale/Region.java +++ b/core/src/main/java/haveno/core/locale/Region.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.locale; import com.google.protobuf.Message; - +import haveno.common.proto.persistable.PersistablePayload; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/core/src/main/java/bisq/core/locale/Res.java b/core/src/main/java/haveno/core/locale/Res.java similarity index 96% rename from core/src/main/java/bisq/core/locale/Res.java rename to core/src/main/java/haveno/core/locale/Res.java index bdc236db..6c327561 100644 --- a/core/src/main/java/bisq/core/locale/Res.java +++ b/core/src/main/java/haveno/core/locale/Res.java @@ -15,12 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.core.locale; import org.apache.commons.lang3.StringUtils; @@ -44,9 +39,14 @@ import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import static bisq.common.util.Utilities.toListOfWrappedStrings; +import static haveno.common.util.Utilities.toListOfWrappedStrings; import static java.nio.charset.StandardCharsets.UTF_8; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; + @Slf4j public class Res { public static void setup() { diff --git a/core/src/main/java/bisq/core/locale/TradeCurrency.java b/core/src/main/java/haveno/core/locale/TradeCurrency.java similarity index 94% rename from core/src/main/java/bisq/core/locale/TradeCurrency.java rename to core/src/main/java/haveno/core/locale/TradeCurrency.java index 042e4438..30ca6fbe 100644 --- a/core/src/main/java/bisq/core/locale/TradeCurrency.java +++ b/core/src/main/java/haveno/core/locale/TradeCurrency.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; - -import bisq.common.proto.ProtobufferRuntimeException; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.locale; +import haveno.common.proto.ProtobufferRuntimeException; +import haveno.common.proto.persistable.PersistablePayload; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/core/src/main/java/bisq/core/monetary/Altcoin.java b/core/src/main/java/haveno/core/monetary/Altcoin.java similarity index 99% rename from core/src/main/java/bisq/core/monetary/Altcoin.java rename to core/src/main/java/haveno/core/monetary/Altcoin.java index 69d1e385..f270bd10 100644 --- a/core/src/main/java/bisq/core/monetary/Altcoin.java +++ b/core/src/main/java/haveno/core/monetary/Altcoin.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.monetary; - -import bisq.core.util.ParsingUtils; +package haveno.core.monetary; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.MonetaryFormat; import com.google.common.math.LongMath; - +import haveno.core.util.ParsingUtils; import java.math.BigDecimal; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/bisq/core/monetary/AltcoinExchangeRate.java b/core/src/main/java/haveno/core/monetary/AltcoinExchangeRate.java similarity index 99% rename from core/src/main/java/bisq/core/monetary/AltcoinExchangeRate.java rename to core/src/main/java/haveno/core/monetary/AltcoinExchangeRate.java index fe8c227f..97cf8505 100644 --- a/core/src/main/java/bisq/core/monetary/AltcoinExchangeRate.java +++ b/core/src/main/java/haveno/core/monetary/AltcoinExchangeRate.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.monetary; +package haveno.core.monetary; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/bisq/core/monetary/MonetaryWrapper.java b/core/src/main/java/haveno/core/monetary/MonetaryWrapper.java similarity index 98% rename from core/src/main/java/bisq/core/monetary/MonetaryWrapper.java rename to core/src/main/java/haveno/core/monetary/MonetaryWrapper.java index 8006ac4c..bcf8b3f4 100644 --- a/core/src/main/java/bisq/core/monetary/MonetaryWrapper.java +++ b/core/src/main/java/haveno/core/monetary/MonetaryWrapper.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.monetary; +package haveno.core.monetary; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.MonetaryFormat; diff --git a/core/src/main/java/bisq/core/monetary/Price.java b/core/src/main/java/haveno/core/monetary/Price.java similarity index 97% rename from core/src/main/java/bisq/core/monetary/Price.java rename to core/src/main/java/haveno/core/monetary/Price.java index ac30715b..2389b0b9 100644 --- a/core/src/main/java/bisq/core/monetary/Price.java +++ b/core/src/main/java/haveno/core/monetary/Price.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.monetary; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.ParsingUtils; +package haveno.core.monetary; +import haveno.core.locale.CurrencyUtil; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.ParsingUtils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/main/java/bisq/core/monetary/Volume.java b/core/src/main/java/haveno/core/monetary/Volume.java similarity index 95% rename from core/src/main/java/bisq/core/monetary/Volume.java rename to core/src/main/java/haveno/core/monetary/Volume.java index 56fa1657..cfcd1213 100644 --- a/core/src/main/java/bisq/core/monetary/Volume.java +++ b/core/src/main/java/haveno/core/monetary/Volume.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.monetary; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.util.ParsingUtils; +package haveno.core.monetary; +import haveno.core.locale.CurrencyUtil; +import haveno.core.util.ParsingUtils; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.Fiat; diff --git a/core/src/main/java/bisq/core/network/CoreNetworkFilter.java b/core/src/main/java/haveno/core/network/CoreNetworkFilter.java similarity index 91% rename from core/src/main/java/bisq/core/network/CoreNetworkFilter.java rename to core/src/main/java/haveno/core/network/CoreNetworkFilter.java index 42a35b96..0f5a9660 100644 --- a/core/src/main/java/bisq/core/network/CoreNetworkFilter.java +++ b/core/src/main/java/haveno/core/network/CoreNetworkFilter.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.network; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.NetworkFilter; - -import bisq.common.config.Config; +package haveno.core.network; +import haveno.common.config.Config; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.NetworkFilter; import javax.inject.Inject; import javax.inject.Named; diff --git a/core/src/main/java/bisq/core/network/MessageState.java b/core/src/main/java/haveno/core/network/MessageState.java similarity index 96% rename from core/src/main/java/bisq/core/network/MessageState.java rename to core/src/main/java/haveno/core/network/MessageState.java index 2def7c7f..34f3e63c 100644 --- a/core/src/main/java/bisq/core/network/MessageState.java +++ b/core/src/main/java/haveno/core/network/MessageState.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.network; +package haveno.core.network; public enum MessageState { UNDEFINED, diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestHandler.java b/core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequestHandler.java similarity index 86% rename from core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestHandler.java rename to core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequestHandler.java index fc10f9ea..f7f3a5dd 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestHandler.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequestHandler.java @@ -15,28 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory; - -import bisq.core.filter.Filter; -import bisq.core.filter.FilterManager; -import bisq.core.network.p2p.inventory.messages.GetInventoryRequest; -import bisq.core.network.p2p.inventory.messages.GetInventoryResponse; -import bisq.core.network.p2p.inventory.model.InventoryItem; -import bisq.core.network.p2p.inventory.model.RequestInfo; - -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.Statistic; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.util.Profiler; -import bisq.common.util.Utilities; +package haveno.core.network.p2p.inventory; import javax.inject.Inject; import javax.inject.Named; @@ -44,7 +23,24 @@ import javax.inject.Named; import com.google.common.base.Enums; import com.google.common.base.Joiner; import com.google.common.base.Optional; - +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.util.Profiler; +import haveno.common.util.Utilities; +import haveno.core.filter.Filter; +import haveno.core.filter.FilterManager; +import haveno.core.network.p2p.inventory.messages.GetInventoryRequest; +import haveno.core.network.p2p.inventory.messages.GetInventoryResponse; +import haveno.core.network.p2p.inventory.model.InventoryItem; +import haveno.core.network.p2p.inventory.model.RequestInfo; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.Statistic; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestManager.java b/core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequestManager.java similarity index 90% rename from core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestManager.java rename to core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequestManager.java index 18da40bc..671154a9 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestManager.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequestManager.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory; - -import bisq.core.network.p2p.inventory.model.InventoryItem; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.NetworkNode; - -import bisq.common.handlers.ErrorMessageHandler; +package haveno.core.network.p2p.inventory; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.network.p2p.inventory.model.InventoryItem; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.NetworkNode; import javax.inject.Inject; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequester.java b/core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequester.java similarity index 83% rename from core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequester.java rename to core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequester.java index e7b7c35b..06dc426c 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequester.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/GetInventoryRequester.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory; - -import bisq.core.network.p2p.inventory.messages.GetInventoryRequest; -import bisq.core.network.p2p.inventory.messages.GetInventoryResponse; -import bisq.core.network.p2p.inventory.model.InventoryItem; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.network.p2p.inventory; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.network.p2p.inventory.messages.GetInventoryRequest; +import haveno.core.network.p2p.inventory.messages.GetInventoryResponse; +import haveno.core.network.p2p.inventory.model.InventoryItem; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; import java.util.Map; import java.util.function.Consumer; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryRequest.java b/core/src/main/java/haveno/core/network/p2p/inventory/messages/GetInventoryRequest.java similarity index 93% rename from core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryRequest.java rename to core/src/main/java/haveno/core/network/p2p/inventory/messages/GetInventoryRequest.java index 02201963..9fcc9a15 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryRequest.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/messages/GetInventoryRequest.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.messages; +package haveno.core.network.p2p.inventory.messages; -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; - +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryResponse.java b/core/src/main/java/haveno/core/network/p2p/inventory/messages/GetInventoryResponse.java similarity index 93% rename from core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryResponse.java rename to core/src/main/java/haveno/core/network/p2p/inventory/messages/GetInventoryResponse.java index 77d48422..11400f1c 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/messages/GetInventoryResponse.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/messages/GetInventoryResponse.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.messages; - -import bisq.core.network.p2p.inventory.model.InventoryItem; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.network.p2p.inventory.messages; import com.google.common.base.Enums; import com.google.common.base.Optional; - +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.network.p2p.inventory.model.InventoryItem; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/Average.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/Average.java similarity index 97% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/Average.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/Average.java index 7833ba82..d1a5970b 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/Average.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/Average.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; +package haveno.core.network.p2p.inventory.model; import java.util.Arrays; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationByIntegerDiff.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationByIntegerDiff.java similarity index 97% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationByIntegerDiff.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationByIntegerDiff.java index fbfcac3c..eff97872 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationByIntegerDiff.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationByIntegerDiff.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; - -import bisq.common.util.Tuple2; +package haveno.core.network.p2p.inventory.model; +import haveno.common.util.Tuple2; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationByPercentage.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationByPercentage.java similarity index 97% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationByPercentage.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationByPercentage.java index 0aceb509..388ae381 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationByPercentage.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationByPercentage.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; +package haveno.core.network.p2p.inventory.model; public class DeviationByPercentage implements DeviationType { private final double lowerAlertTrigger; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationOfHashes.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationOfHashes.java similarity index 97% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationOfHashes.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationOfHashes.java index 7c1009da..f7d24d7e 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationOfHashes.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationOfHashes.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; - -import bisq.common.util.Tuple2; +package haveno.core.network.p2p.inventory.model; +import haveno.common.util.Tuple2; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationSeverity.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationSeverity.java similarity index 93% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationSeverity.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationSeverity.java index 55f40696..ac09419a 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationSeverity.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationSeverity.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; +package haveno.core.network.p2p.inventory.model; public enum DeviationSeverity { IGNORED, diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationType.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationType.java similarity index 93% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationType.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationType.java index 5fe8b504..fb887fb1 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/DeviationType.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/DeviationType.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; +package haveno.core.network.p2p.inventory.model; public interface DeviationType { } diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/InventoryItem.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/InventoryItem.java similarity index 98% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/InventoryItem.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/InventoryItem.java index 7c4f242e..3df57fad 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/InventoryItem.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/InventoryItem.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; - -import bisq.common.util.Tuple2; +package haveno.core.network.p2p.inventory.model; +import haveno.common.util.Tuple2; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/RequestInfo.java b/core/src/main/java/haveno/core/network/p2p/inventory/model/RequestInfo.java similarity index 98% rename from core/src/main/java/bisq/core/network/p2p/inventory/model/RequestInfo.java rename to core/src/main/java/haveno/core/network/p2p/inventory/model/RequestInfo.java index 7c83e1f3..edfe8cc4 100644 --- a/core/src/main/java/bisq/core/network/p2p/inventory/model/RequestInfo.java +++ b/core/src/main/java/haveno/core/network/p2p/inventory/model/RequestInfo.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.inventory.model; +package haveno.core.network.p2p.inventory.model; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java b/core/src/main/java/haveno/core/network/p2p/seed/DefaultSeedNodeRepository.java similarity index 96% rename from core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java rename to core/src/main/java/haveno/core/network/p2p/seed/DefaultSeedNodeRepository.java index 90ee3240..0418ce9a 100644 --- a/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepository.java +++ b/core/src/main/java/haveno/core/network/p2p/seed/DefaultSeedNodeRepository.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.seed; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.config.Config; +package haveno.core.network.p2p.seed; +import haveno.common.config.Config; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.seed.SeedNodeRepository; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/notifications/MobileMessage.java b/core/src/main/java/haveno/core/notifications/MobileMessage.java similarity index 95% rename from core/src/main/java/bisq/core/notifications/MobileMessage.java rename to core/src/main/java/haveno/core/notifications/MobileMessage.java index 39c53b43..27f65f9b 100644 --- a/core/src/main/java/bisq/core/notifications/MobileMessage.java +++ b/core/src/main/java/haveno/core/notifications/MobileMessage.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications; - -import bisq.common.util.JsonExclude; +package haveno.core.notifications; +import haveno.common.util.JsonExclude; import java.util.Date; import lombok.Value; diff --git a/core/src/main/java/bisq/core/notifications/MobileMessageEncryption.java b/core/src/main/java/haveno/core/notifications/MobileMessageEncryption.java similarity index 98% rename from core/src/main/java/bisq/core/notifications/MobileMessageEncryption.java rename to core/src/main/java/haveno/core/notifications/MobileMessageEncryption.java index 89f326c9..77d1bb8e 100644 --- a/core/src/main/java/bisq/core/notifications/MobileMessageEncryption.java +++ b/core/src/main/java/haveno/core/notifications/MobileMessageEncryption.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications; +package haveno.core.notifications; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/notifications/MobileMessageType.java b/core/src/main/java/haveno/core/notifications/MobileMessageType.java similarity index 95% rename from core/src/main/java/bisq/core/notifications/MobileMessageType.java rename to core/src/main/java/haveno/core/notifications/MobileMessageType.java index a8eaef55..a3ecc4f4 100644 --- a/core/src/main/java/bisq/core/notifications/MobileMessageType.java +++ b/core/src/main/java/haveno/core/notifications/MobileMessageType.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications; +package haveno.core.notifications; public enum MobileMessageType { SETUP_CONFIRMATION, diff --git a/core/src/main/java/bisq/core/notifications/MobileModel.java b/core/src/main/java/haveno/core/notifications/MobileModel.java similarity index 99% rename from core/src/main/java/bisq/core/notifications/MobileModel.java rename to core/src/main/java/haveno/core/notifications/MobileModel.java index 77e1d876..ed904429 100644 --- a/core/src/main/java/bisq/core/notifications/MobileModel.java +++ b/core/src/main/java/haveno/core/notifications/MobileModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications; +package haveno.core.notifications; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/notifications/MobileNotificationService.java b/core/src/main/java/haveno/core/notifications/MobileNotificationService.java similarity index 94% rename from core/src/main/java/bisq/core/notifications/MobileNotificationService.java rename to core/src/main/java/haveno/core/notifications/MobileNotificationService.java index 9177ec9a..05f0913d 100644 --- a/core/src/main/java/bisq/core/notifications/MobileNotificationService.java +++ b/core/src/main/java/haveno/core/notifications/MobileNotificationService.java @@ -15,22 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications; - -import bisq.core.user.Preferences; - -import bisq.network.http.HttpClient; - -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.util.Utilities; +package haveno.core.notifications; import com.google.gson.Gson; import com.google.inject.Inject; import com.google.inject.Singleton; - +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.core.user.Preferences; +import haveno.network.http.HttpClient; import javax.inject.Named; import com.google.common.util.concurrent.FutureCallback; @@ -64,8 +60,8 @@ public class MobileNotificationService { private static final String DEV_URL_LOCALHOST = "http://localhost:8080/"; private static final String DEV_URL = "http://165.227.40.124:8080/"; private static final String URL = "http://jtboonrvwmq7frkj.onion/"; - private static final String BISQ_MESSAGE_IOS_MAGIC = "BisqMessageiOS"; - private static final String BISQ_MESSAGE_ANDROID_MAGIC = "BisqMessageAndroid"; + private static final String HAVENO_MESSAGE_IOS_MAGIC = "HavenoMessageiOS"; + private static final String HAVENO_MESSAGE_ANDROID_MAGIC = "HavenoMessageAndroid"; private final Preferences preferences; private final MobileMessageEncryption mobileMessageEncryption; @@ -267,13 +263,13 @@ public class MobileNotificationService { switch (mobileModel.getOs()) { case IOS: - msg = BISQ_MESSAGE_IOS_MAGIC; + msg = HAVENO_MESSAGE_IOS_MAGIC; break; case IOS_DEV: - msg = BISQ_MESSAGE_IOS_MAGIC; + msg = HAVENO_MESSAGE_IOS_MAGIC; break; case ANDROID: - msg = BISQ_MESSAGE_ANDROID_MAGIC; + msg = HAVENO_MESSAGE_ANDROID_MAGIC; break; case UNDEFINED: default: @@ -303,7 +299,7 @@ public class MobileNotificationService { ListenableFuture future = executorService.submit(() -> { Thread.currentThread().setName(threadName); String result = httpClient.get(param, "User-Agent", - "bisq/" + Version.VERSION + ", uid:" + httpClient.getUid()); + "haveno/" + Version.VERSION + ", uid:" + httpClient.getUid()); log.info("sendMobileNotification result: " + result); checkArgument(result.equals(SUCCESS), "Result was not 'success'. result=" + result); return result; diff --git a/core/src/main/java/bisq/core/notifications/MobileNotificationValidator.java b/core/src/main/java/haveno/core/notifications/MobileNotificationValidator.java similarity index 87% rename from core/src/main/java/bisq/core/notifications/MobileNotificationValidator.java rename to core/src/main/java/haveno/core/notifications/MobileNotificationValidator.java index afdb6700..f4ffd89a 100644 --- a/core/src/main/java/bisq/core/notifications/MobileNotificationValidator.java +++ b/core/src/main/java/haveno/core/notifications/MobileNotificationValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications; +package haveno.core.notifications; import javax.inject.Inject; import javax.inject.Singleton; @@ -50,16 +50,16 @@ public class MobileNotificationValidator { if (magic.equals(MobileModel.OS.IOS.getMagicString()) || magic.equals(MobileModel.OS.IOS_DEV.getMagicString())) { if (phoneId.length() != 64) { - log.error("invalid Bisq MobileModel ID format: iOS token not 64 bytes"); + log.error("invalid Haveno MobileModel ID format: iOS token not 64 bytes"); return false; } } else if (magic.equals(MobileModel.OS.ANDROID.getMagicString())) { if (phoneId.length() < 32) { - log.error("invalid Bisq MobileModel ID format: Android token too short (<32 bytes)"); + log.error("invalid Haveno MobileModel ID format: Android token too short (<32 bytes)"); return false; } } else { - log.error("invalid Bisq MobileModel ID format"); + log.error("invalid Haveno MobileModel ID format"); return false; } diff --git a/core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java b/core/src/main/java/haveno/core/notifications/alerts/DisputeMsgEvents.java similarity index 90% rename from core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java rename to core/src/main/java/haveno/core/notifications/alerts/DisputeMsgEvents.java index ff675973..4dba1a70 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java +++ b/core/src/main/java/haveno/core/notifications/alerts/DisputeMsgEvents.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications.alerts; - -import bisq.core.locale.Res; -import bisq.core.notifications.MobileMessage; -import bisq.core.notifications.MobileMessageType; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.support.messages.ChatMessage; - -import bisq.network.p2p.P2PService; +package haveno.core.notifications.alerts; +import haveno.core.locale.Res; +import haveno.core.notifications.MobileMessage; +import haveno.core.notifications.MobileMessageType; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.support.messages.ChatMessage; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/notifications/alerts/MyOfferTakenEvents.java b/core/src/main/java/haveno/core/notifications/alerts/MyOfferTakenEvents.java similarity index 89% rename from core/src/main/java/bisq/core/notifications/alerts/MyOfferTakenEvents.java rename to core/src/main/java/haveno/core/notifications/alerts/MyOfferTakenEvents.java index bada591f..2554de57 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/MyOfferTakenEvents.java +++ b/core/src/main/java/haveno/core/notifications/alerts/MyOfferTakenEvents.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications.alerts; - -import bisq.core.locale.Res; -import bisq.core.notifications.MobileMessage; -import bisq.core.notifications.MobileMessageType; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; +package haveno.core.notifications.alerts; import javax.inject.Inject; import javax.inject.Singleton; import javafx.collections.ListChangeListener; - +import haveno.core.locale.Res; +import haveno.core.notifications.MobileMessage; +import haveno.core.notifications.MobileMessageType; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; import java.util.UUID; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/notifications/alerts/TradeEvents.java b/core/src/main/java/haveno/core/notifications/alerts/TradeEvents.java similarity index 93% rename from core/src/main/java/bisq/core/notifications/alerts/TradeEvents.java rename to core/src/main/java/haveno/core/notifications/alerts/TradeEvents.java index f772fa72..4f952ecd 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/TradeEvents.java +++ b/core/src/main/java/haveno/core/notifications/alerts/TradeEvents.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications.alerts; - -import bisq.core.locale.Res; -import bisq.core.notifications.MobileMessage; -import bisq.core.notifications.MobileMessageType; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; - -import bisq.common.crypto.PubKeyRingProvider; +package haveno.core.notifications.alerts; +import haveno.common.crypto.PubKeyRingProvider; +import haveno.core.locale.Res; +import haveno.core.notifications.MobileMessage; +import haveno.core.notifications.MobileMessageType; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/notifications/alerts/market/MarketAlertFilter.java b/core/src/main/java/haveno/core/notifications/alerts/market/MarketAlertFilter.java similarity index 94% rename from core/src/main/java/bisq/core/notifications/alerts/market/MarketAlertFilter.java rename to core/src/main/java/haveno/core/notifications/alerts/market/MarketAlertFilter.java index 1fac27c7..10176811 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/market/MarketAlertFilter.java +++ b/core/src/main/java/haveno/core/notifications/alerts/market/MarketAlertFilter.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications.alerts.market; - -import bisq.core.payment.PaymentAccount; -import bisq.core.proto.CoreProtoResolver; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.notifications.alerts.market; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.core.payment.PaymentAccount; +import haveno.core.proto.CoreProtoResolver; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java b/core/src/main/java/haveno/core/notifications/alerts/market/MarketAlerts.java similarity index 92% rename from core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java rename to core/src/main/java/haveno/core/notifications/alerts/market/MarketAlerts.java index e639059b..5440c868 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java +++ b/core/src/main/java/haveno/core/notifications/alerts/market/MarketAlerts.java @@ -15,27 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications.alerts.market; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.notifications.MobileMessage; -import bisq.core.notifications.MobileMessageType; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferBookService; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; - -import bisq.common.crypto.KeyRing; -import bisq.common.util.MathUtils; +package haveno.core.notifications.alerts.market; +import haveno.common.crypto.KeyRing; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.notifications.MobileMessage; +import haveno.core.notifications.MobileMessageType; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferBookService; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; import org.bitcoinj.utils.Fiat; import javax.inject.Inject; @@ -209,7 +207,7 @@ public class MarketAlerts { String shortId = UUID.randomUUID().toString().substring(0, 8); return new MobileMessage(Res.get("account.notifications.marketAlert.message.title"), "A new 'sell BTC/USD' offer with price 6019.2744 (5.36% below market price) and payment method " + - "'Perfect Money' was published to the Bisq offerbook.\n" + + "'Perfect Money' was published to the Haveno offerbook.\n" + "Offer ID: wygiaw.", shortId, MobileMessageType.MARKET); diff --git a/core/src/main/java/bisq/core/notifications/alerts/price/PriceAlert.java b/core/src/main/java/haveno/core/notifications/alerts/price/PriceAlert.java similarity index 87% rename from core/src/main/java/bisq/core/notifications/alerts/price/PriceAlert.java rename to core/src/main/java/haveno/core/notifications/alerts/price/PriceAlert.java index cef9681b..8d576aca 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/price/PriceAlert.java +++ b/core/src/main/java/haveno/core/notifications/alerts/price/PriceAlert.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications.alerts.price; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.notifications.MobileMessage; -import bisq.core.notifications.MobileMessageType; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; - -import bisq.common.util.MathUtils; +package haveno.core.notifications.alerts.price; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.notifications.MobileMessage; +import haveno.core.notifications.MobileMessageType; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; import org.bitcoinj.utils.Fiat; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/notifications/alerts/price/PriceAlertFilter.java b/core/src/main/java/haveno/core/notifications/alerts/price/PriceAlertFilter.java similarity index 93% rename from core/src/main/java/bisq/core/notifications/alerts/price/PriceAlertFilter.java rename to core/src/main/java/haveno/core/notifications/alerts/price/PriceAlertFilter.java index 4d195b66..61534bed 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/price/PriceAlertFilter.java +++ b/core/src/main/java/haveno/core/notifications/alerts/price/PriceAlertFilter.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications.alerts.price; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.notifications.alerts.price; +import haveno.common.proto.persistable.PersistablePayload; import lombok.Value; @Value diff --git a/core/src/main/java/bisq/core/offer/AvailabilityResult.java b/core/src/main/java/haveno/core/offer/AvailabilityResult.java similarity index 98% rename from core/src/main/java/bisq/core/offer/AvailabilityResult.java rename to core/src/main/java/haveno/core/offer/AvailabilityResult.java index 5c893918..48094580 100644 --- a/core/src/main/java/bisq/core/offer/AvailabilityResult.java +++ b/core/src/main/java/haveno/core/offer/AvailabilityResult.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; public enum AvailabilityResult { UNKNOWN_FAILURE("cannot take offer for unknown reason"), diff --git a/core/src/main/java/bisq/core/offer/CreateOfferService.java b/core/src/main/java/haveno/core/offer/CreateOfferService.java similarity index 92% rename from core/src/main/java/bisq/core/offer/CreateOfferService.java rename to core/src/main/java/haveno/core/offer/CreateOfferService.java index a0f7184b..15b71511 100644 --- a/core/src/main/java/bisq/core/offer/CreateOfferService.java +++ b/core/src/main/java/haveno/core/offer/CreateOfferService.java @@ -15,31 +15,30 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.coin.CoinUtil; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.app.Version; -import bisq.common.crypto.PubKeyRingProvider; -import bisq.common.util.Utilities; +import static haveno.core.payment.payload.PaymentMethod.HAL_CASH_ID; +import haveno.common.app.Version; +import haveno.common.crypto.PubKeyRingProvider; +import haveno.common.util.Utilities; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.coin.CoinUtil; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import org.bitcoinj.core.Coin; import javax.inject.Inject; @@ -53,8 +52,6 @@ import java.util.UUID; import lombok.extern.slf4j.Slf4j; -import static bisq.core.payment.payload.PaymentMethod.HAL_CASH_ID; - @Slf4j @Singleton public class CreateOfferService { diff --git a/core/src/main/java/bisq/core/offer/MarketPriceNotAvailableException.java b/core/src/main/java/haveno/core/offer/MarketPriceNotAvailableException.java similarity index 97% rename from core/src/main/java/bisq/core/offer/MarketPriceNotAvailableException.java rename to core/src/main/java/haveno/core/offer/MarketPriceNotAvailableException.java index 3aa6caa6..c30929e3 100644 --- a/core/src/main/java/bisq/core/offer/MarketPriceNotAvailableException.java +++ b/core/src/main/java/haveno/core/offer/MarketPriceNotAvailableException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; public class MarketPriceNotAvailableException extends Exception { public MarketPriceNotAvailableException(@SuppressWarnings("SameParameterValue") String message) { diff --git a/core/src/main/java/bisq/core/offer/Offer.java b/core/src/main/java/haveno/core/offer/Offer.java similarity index 95% rename from core/src/main/java/bisq/core/offer/Offer.java rename to core/src/main/java/haveno/core/offer/Offer.java index 726298f1..7d7cd927 100644 --- a/core/src/main/java/bisq/core/offer/Offer.java +++ b/core/src/main/java/haveno/core/offer/Offer.java @@ -15,31 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; - -import bisq.core.exceptions.TradePriceOutOfToleranceException; -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.availability.OfferAvailabilityModel; -import bisq.core.offer.availability.OfferAvailabilityProtocol; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.util.VolumeUtil; -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.JsonExclude; -import bisq.common.util.MathUtils; -import bisq.common.util.Utilities; +package haveno.core.offer; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.JsonExclude; +import haveno.common.util.MathUtils; +import haveno.common.util.Utilities; +import haveno.core.exceptions.TradePriceOutOfToleranceException; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.availability.OfferAvailabilityModel; +import haveno.core.offer.availability.OfferAvailabilityProtocol; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.util.VolumeUtil; +import haveno.network.p2p.NodeAddress; import org.bitcoinj.utils.Fiat; import javafx.beans.property.ObjectProperty; diff --git a/core/src/main/java/bisq/core/offer/OfferBookService.java b/core/src/main/java/haveno/core/offer/OfferBookService.java similarity index 94% rename from core/src/main/java/bisq/core/offer/OfferBookService.java rename to core/src/main/java/haveno/core/offer/OfferBookService.java index abb26968..69c88c48 100644 --- a/core/src/main/java/bisq/core/offer/OfferBookService.java +++ b/core/src/main/java/haveno/core/offer/OfferBookService.java @@ -15,29 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.wallet.MoneroKeyImageListener; -import bisq.core.btc.wallet.MoneroKeyImagePoller; -import bisq.core.filter.FilterManager; -import bisq.core.locale.Res; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.util.JsonUtil; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.HashMapChangedListener; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; import common.utils.GenUtils; +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.file.JsonFileManager; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.wallet.MoneroKeyImageListener; +import haveno.core.btc.wallet.MoneroKeyImagePoller; +import haveno.core.filter.FilterManager; +import haveno.core.locale.Res; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.util.JsonUtil; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.HashMapChangedListener; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import monero.common.MoneroConnectionManagerListener; import monero.common.MoneroRpcConnection; import monero.daemon.model.MoneroKeyImageSpentStatus; -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.file.JsonFileManager; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; - import javax.inject.Inject; import javax.inject.Named; diff --git a/core/src/main/java/bisq/core/offer/OfferDirection.java b/core/src/main/java/haveno/core/offer/OfferDirection.java similarity index 94% rename from core/src/main/java/bisq/core/offer/OfferDirection.java rename to core/src/main/java/haveno/core/offer/OfferDirection.java index b284d10b..d1b9a6a1 100644 --- a/core/src/main/java/bisq/core/offer/OfferDirection.java +++ b/core/src/main/java/haveno/core/offer/OfferDirection.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.common.proto.ProtoUtil; +import haveno.common.proto.ProtoUtil; public enum OfferDirection { BUY, diff --git a/core/src/main/java/bisq/core/offer/OfferFilterService.java b/core/src/main/java/haveno/core/offer/OfferFilterService.java similarity index 95% rename from core/src/main/java/bisq/core/offer/OfferFilterService.java rename to core/src/main/java/haveno/core/offer/OfferFilterService.java index 87847363..7ed6a259 100644 --- a/core/src/main/java/bisq/core/offer/OfferFilterService.java +++ b/core/src/main/java/haveno/core/offer/OfferFilterService.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.filter.FilterManager; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.common.app.Version; +package haveno.core.offer; +import haveno.common.app.Version; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.filter.FilterManager; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.Preferences; +import haveno.core.user.User; import org.bitcoinj.core.Coin; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/offer/OfferForJson.java b/core/src/main/java/haveno/core/offer/OfferForJson.java similarity index 95% rename from core/src/main/java/bisq/core/offer/OfferForJson.java rename to core/src/main/java/haveno/core/offer/OfferForJson.java index 3eb5483a..978aebac 100644 --- a/core/src/main/java/bisq/core/offer/OfferForJson.java +++ b/core/src/main/java/haveno/core/offer/OfferForJson.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.HavenoUtils; -import bisq.common.util.MathUtils; +package haveno.core.offer; import org.bitcoinj.utils.MonetaryFormat; import com.fasterxml.jackson.annotation.JsonIgnore; - +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.HavenoUtils; import java.math.BigInteger; import java.util.Date; diff --git a/core/src/main/java/bisq/core/offer/OfferModule.java b/core/src/main/java/haveno/core/offer/OfferModule.java similarity index 91% rename from core/src/main/java/bisq/core/offer/OfferModule.java rename to core/src/main/java/haveno/core/offer/OfferModule.java index 5bae5921..39a16646 100644 --- a/core/src/main/java/bisq/core/offer/OfferModule.java +++ b/core/src/main/java/haveno/core/offer/OfferModule.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.core.offer; import com.google.inject.Singleton; - +import haveno.common.app.AppModule; +import haveno.common.config.Config; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/offer/OfferPayload.java b/core/src/main/java/haveno/core/offer/OfferPayload.java similarity index 97% rename from core/src/main/java/bisq/core/offer/OfferPayload.java rename to core/src/main/java/haveno/core/offer/OfferPayload.java index c5bead4c..01af576c 100644 --- a/core/src/main/java/bisq/core/offer/OfferPayload.java +++ b/core/src/main/java/haveno/core/offer/OfferPayload.java @@ -15,22 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.storage.payload.ExpirablePayload; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; -import bisq.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; -import bisq.common.crypto.Hash; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.CollectionUtils; -import bisq.common.util.Hex; -import bisq.common.util.JsonExclude; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; - +import haveno.common.crypto.Hash; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.CollectionUtils; +import haveno.common.util.Hex; +import haveno.common.util.JsonExclude; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.storage.payload.ExpirablePayload; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; +import haveno.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -96,7 +95,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay public static final String F2F_EXTRA_INFO = "f2fExtraInfo"; public static final String CASH_BY_MAIL_EXTRA_INFO = "cashByMailExtraInfo"; - // Comma separated list of ordinal of a bisq.common.app.Capability. E.g. ordinal of + // Comma separated list of ordinal of a haveno.common.app.Capability. E.g. ordinal of // Capability.SIGNED_ACCOUNT_AGE_WITNESS is 11 and Capability.MEDIATION is 12 so if we want to signal that maker // of the offer supports both capabilities we add "11, 12" to capabilities. public static final String CAPABILITIES = "capabilities"; diff --git a/core/src/main/java/bisq/core/offer/OfferRestrictions.java b/core/src/main/java/haveno/core/offer/OfferRestrictions.java similarity index 90% rename from core/src/main/java/bisq/core/offer/OfferRestrictions.java rename to core/src/main/java/haveno/core/offer/OfferRestrictions.java index 5a91bf66..2d33b68b 100644 --- a/core/src/main/java/bisq/core/offer/OfferRestrictions.java +++ b/core/src/main/java/haveno/core/offer/OfferRestrictions.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.config.Config; -import bisq.common.util.Utilities; -import bisq.core.trade.HavenoUtils; +package haveno.core.offer; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.core.trade.HavenoUtils; import java.math.BigInteger; import java.util.Date; import java.util.GregorianCalendar; diff --git a/core/src/main/java/bisq/core/offer/OfferUtil.java b/core/src/main/java/haveno/core/offer/OfferUtil.java similarity index 90% rename from core/src/main/java/bisq/core/offer/OfferUtil.java rename to core/src/main/java/haveno/core/offer/OfferUtil.java index f4258a7e..780b0bf3 100644 --- a/core/src/main/java/bisq/core/offer/OfferUtil.java +++ b/core/src/main/java/haveno/core/offer/OfferUtil.java @@ -15,31 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.filter.FilterManager; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.payment.CashByMailAccount; -import bisq.core.payment.F2FAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.ReferralIdService; -import bisq.core.user.AutoConfirmSettings; -import bisq.core.user.Preferences; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; - -import bisq.common.app.Capabilities; -import bisq.common.app.Version; -import bisq.common.util.MathUtils; -import bisq.common.util.Utilities; +import haveno.common.app.Capabilities; +import haveno.common.app.Version; +import haveno.common.util.MathUtils; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.filter.FilterManager; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.payment.CashByMailAccount; +import haveno.core.payment.F2FAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.ReferralIdService; +import haveno.core.user.AutoConfirmSettings; +import haveno.core.user.Preferences; +import haveno.core.util.coin.CoinFormatter; +import haveno.network.p2p.P2PService; import org.bitcoinj.core.Transaction; import org.bitcoinj.core.TransactionInput; import org.bitcoinj.core.TransactionOutput; @@ -56,13 +54,13 @@ import java.util.UUID; import lombok.extern.slf4j.Slf4j; -import static bisq.common.util.MathUtils.roundDoubleToLong; -import static bisq.common.util.MathUtils.scaleUpByPowerOf10; -import static bisq.core.btc.wallet.Restrictions.getMaxBuyerSecurityDepositAsPercent; -import static bisq.core.btc.wallet.Restrictions.getMinBuyerSecurityDepositAsPercent; -import static bisq.core.offer.OfferPayload.*; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.common.util.MathUtils.roundDoubleToLong; +import static haveno.common.util.MathUtils.scaleUpByPowerOf10; +import static haveno.core.btc.wallet.Restrictions.getMaxBuyerSecurityDepositAsPercent; +import static haveno.core.btc.wallet.Restrictions.getMinBuyerSecurityDepositAsPercent; +import static haveno.core.offer.OfferPayload.*; /** * This class holds utility methods for creating, editing and taking an Offer. @@ -265,7 +263,7 @@ public class OfferUtil { "' has an invalid maker fee transaction.\n\n"; String spendingTransaction = null; String extraString = "\nYou have to remove that offer to avoid failed trades.\n" + - "If this happened because of a bug please contact the Bisq developers " + + "If this happened because of a bug please contact the Haveno developers " + "and you can request reimbursement for the lost maker fee."; if (makerFeeTx.getOutputs().size() > 1) { // Our output to fund the deposit tx is at index 1 diff --git a/core/src/main/java/bisq/core/offer/OpenOffer.java b/core/src/main/java/haveno/core/offer/OpenOffer.java similarity index 97% rename from core/src/main/java/bisq/core/offer/OpenOffer.java rename to core/src/main/java/haveno/core/offer/OpenOffer.java index 365a9c68..b81f9b80 100644 --- a/core/src/main/java/bisq/core/offer/OpenOffer.java +++ b/core/src/main/java/haveno/core/offer/OpenOffer.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.core.trade.Tradable; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.ProtoUtil; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.ProtoUtil; +import haveno.core.trade.Tradable; import java.util.Date; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/haveno/core/offer/OpenOfferManager.java similarity index 96% rename from core/src/main/java/bisq/core/offer/OpenOfferManager.java rename to core/src/main/java/haveno/core/offer/OpenOfferManager.java index 5833f723..6fc28b3a 100644 --- a/core/src/main/java/bisq/core/offer/OpenOfferManager.java +++ b/core/src/main/java/haveno/core/offer/OpenOfferManager.java @@ -15,65 +15,63 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.CoreContext; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.MoneroKeyImageListener; -import bisq.core.btc.wallet.MoneroKeyImagePoller; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.exceptions.TradePriceOutOfToleranceException; -import bisq.core.filter.FilterManager; -import bisq.core.offer.OfferBookService.OfferBookChangedListener; -import bisq.core.offer.messages.OfferAvailabilityRequest; -import bisq.core.offer.messages.OfferAvailabilityResponse; -import bisq.core.offer.messages.SignOfferRequest; -import bisq.core.offer.messages.SignOfferResponse; -import bisq.core.offer.placeoffer.PlaceOfferModel; -import bisq.core.offer.placeoffer.PlaceOfferProtocol; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.TradableList; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.handlers.TransactionResultHandler; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.JsonUtil; -import bisq.core.util.Validator; - -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.DecryptedDirectMessageListener; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.SendDirectMessageListener; -import bisq.network.p2p.peers.Broadcaster; -import bisq.network.p2p.peers.PeerManager; import common.utils.GenUtils; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.app.Version; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.persistable.PersistedDataHost; -import bisq.common.util.Tuple2; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.app.Version; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.common.util.Tuple2; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.CoreContext; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.MoneroKeyImageListener; +import haveno.core.btc.wallet.MoneroKeyImagePoller; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.exceptions.TradePriceOutOfToleranceException; +import haveno.core.filter.FilterManager; +import haveno.core.offer.OfferBookService.OfferBookChangedListener; +import haveno.core.offer.messages.OfferAvailabilityRequest; +import haveno.core.offer.messages.OfferAvailabilityResponse; +import haveno.core.offer.messages.SignOfferRequest; +import haveno.core.offer.messages.SignOfferResponse; +import haveno.core.offer.placeoffer.PlaceOfferModel; +import haveno.core.offer.placeoffer.PlaceOfferProtocol; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.TradableList; +import haveno.core.trade.handlers.TransactionResultHandler; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.JsonUtil; +import haveno.core.util.Validator; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.DecryptedDirectMessageListener; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.SendDirectMessageListener; +import haveno.network.p2p.peers.Broadcaster; +import haveno.network.p2p.peers.PeerManager; import javax.inject.Inject; import javafx.collections.FXCollections; diff --git a/core/src/main/java/bisq/core/offer/SignedOffer.java b/core/src/main/java/haveno/core/offer/SignedOffer.java similarity index 98% rename from core/src/main/java/bisq/core/offer/SignedOffer.java rename to core/src/main/java/haveno/core/offer/SignedOffer.java index 77bdfa08..ef116986 100644 --- a/core/src/main/java/bisq/core/offer/SignedOffer.java +++ b/core/src/main/java/haveno/core/offer/SignedOffer.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; +import haveno.common.proto.persistable.PersistablePayload; import java.util.List; - -import bisq.common.proto.persistable.PersistablePayload; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/offer/SignedOfferList.java b/core/src/main/java/haveno/core/offer/SignedOfferList.java similarity index 67% rename from core/src/main/java/bisq/core/offer/SignedOfferList.java rename to core/src/main/java/haveno/core/offer/SignedOfferList.java index f3a59586..13e1a034 100644 --- a/core/src/main/java/bisq/core/offer/SignedOfferList.java +++ b/core/src/main/java/haveno/core/offer/SignedOfferList.java @@ -1,27 +1,8 @@ -package bisq.core.offer; - -/* - * This file is part of Haveno. - * - * Haveno is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Haveno is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Haveno. If not, see . - */ - -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistableListAsObservable; +package haveno.core.offer; import com.google.protobuf.Message; - +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistableListAsObservable; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/offer/TriggerPriceService.java b/core/src/main/java/haveno/core/offer/TriggerPriceService.java similarity index 93% rename from core/src/main/java/bisq/core/offer/TriggerPriceService.java rename to core/src/main/java/haveno/core/offer/TriggerPriceService.java index 253a63ef..03a7bc98 100644 --- a/core/src/main/java/bisq/core/offer/TriggerPriceService.java +++ b/core/src/main/java/haveno/core/offer/TriggerPriceService.java @@ -15,20 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.provider.mempool.MempoolService; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; - -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; - -import bisq.common.util.MathUtils; +import static haveno.common.util.MathUtils.roundDoubleToLong; +import static haveno.common.util.MathUtils.scaleUpByPowerOf10; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.provider.mempool.MempoolService; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; import org.bitcoinj.utils.Fiat; import javax.inject.Inject; @@ -45,9 +45,6 @@ import java.util.Set; import lombok.extern.slf4j.Slf4j; -import static bisq.common.util.MathUtils.roundDoubleToLong; -import static bisq.common.util.MathUtils.scaleUpByPowerOf10; - @Slf4j @Singleton public class TriggerPriceService { diff --git a/core/src/main/java/bisq/core/offer/availability/DisputeAgentSelection.java b/core/src/main/java/haveno/core/offer/availability/DisputeAgentSelection.java similarity index 93% rename from core/src/main/java/bisq/core/offer/availability/DisputeAgentSelection.java rename to core/src/main/java/haveno/core/offer/availability/DisputeAgentSelection.java index db92d9f4..5fcc89c5 100644 --- a/core/src/main/java/bisq/core/offer/availability/DisputeAgentSelection.java +++ b/core/src/main/java/haveno/core/offer/availability/DisputeAgentSelection.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.availability; - -import bisq.core.support.dispute.agent.DisputeAgent; -import bisq.core.support.dispute.agent.DisputeAgentManager; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.network.p2p.NodeAddress; -import bisq.common.util.Tuple2; +package haveno.core.offer.availability; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.util.Tuple2; +import haveno.core.support.dispute.agent.DisputeAgent; +import haveno.core.support.dispute.agent.DisputeAgentManager; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.network.p2p.NodeAddress; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/core/src/main/java/bisq/core/offer/availability/OfferAvailabilityModel.java b/core/src/main/java/haveno/core/offer/availability/OfferAvailabilityModel.java similarity index 84% rename from core/src/main/java/bisq/core/offer/availability/OfferAvailabilityModel.java rename to core/src/main/java/haveno/core/offer/availability/OfferAvailabilityModel.java index 35e2808f..c4a5830e 100644 --- a/core/src/main/java/bisq/core/offer/availability/OfferAvailabilityModel.java +++ b/core/src/main/java/haveno/core/offer/availability/OfferAvailabilityModel.java @@ -15,23 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.availability; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.messages.OfferAvailabilityResponse; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.User; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.Model; +package haveno.core.offer.availability; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.Model; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.messages.OfferAvailabilityResponse; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.User; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/bisq/core/offer/availability/OfferAvailabilityProtocol.java b/core/src/main/java/haveno/core/offer/availability/OfferAvailabilityProtocol.java similarity index 89% rename from core/src/main/java/bisq/core/offer/availability/OfferAvailabilityProtocol.java rename to core/src/main/java/haveno/core/offer/availability/OfferAvailabilityProtocol.java index 02d70513..c7da58aa 100644 --- a/core/src/main/java/bisq/core/offer/availability/OfferAvailabilityProtocol.java +++ b/core/src/main/java/haveno/core/offer/availability/OfferAvailabilityProtocol.java @@ -15,29 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.availability; - -import bisq.core.offer.Offer; -import bisq.core.offer.availability.tasks.ProcessOfferAvailabilityResponse; -import bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest; -import bisq.core.offer.messages.OfferAvailabilityResponse; -import bisq.core.offer.messages.OfferMessage; -import bisq.core.util.Validator; - -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.DecryptedDirectMessageListener; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendDirectMessageListener; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.crypto.PubKeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.offer.availability; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.crypto.PubKeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.Offer; +import haveno.core.offer.availability.tasks.ProcessOfferAvailabilityResponse; +import haveno.core.offer.availability.tasks.SendOfferAvailabilityRequest; +import haveno.core.offer.messages.OfferAvailabilityResponse; +import haveno.core.offer.messages.OfferMessage; +import haveno.core.util.Validator; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.DecryptedDirectMessageListener; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendDirectMessageListener; import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; diff --git a/core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java b/core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java similarity index 88% rename from core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java rename to core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java index a953ad91..ace9dce0 100644 --- a/core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java +++ b/core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.availability.tasks; - -import bisq.core.offer.AvailabilityResult; -import bisq.core.offer.Offer; -import bisq.core.offer.availability.OfferAvailabilityModel; -import bisq.core.offer.messages.OfferAvailabilityResponse; -import bisq.core.trade.HavenoUtils; -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.offer.availability.tasks; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.AvailabilityResult; +import haveno.core.offer.Offer; +import haveno.core.offer.availability.OfferAvailabilityModel; +import haveno.core.offer.messages.OfferAvailabilityResponse; +import haveno.core.trade.HavenoUtils; import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkArgument; diff --git a/core/src/main/java/bisq/core/offer/availability/tasks/SendOfferAvailabilityRequest.java b/core/src/main/java/haveno/core/offer/availability/tasks/SendOfferAvailabilityRequest.java similarity index 88% rename from core/src/main/java/bisq/core/offer/availability/tasks/SendOfferAvailabilityRequest.java rename to core/src/main/java/haveno/core/offer/availability/tasks/SendOfferAvailabilityRequest.java index 7198c773..7eef4f46 100644 --- a/core/src/main/java/bisq/core/offer/availability/tasks/SendOfferAvailabilityRequest.java +++ b/core/src/main/java/haveno/core/offer/availability/tasks/SendOfferAvailabilityRequest.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.availability.tasks; +package haveno.core.offer.availability.tasks; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.availability.OfferAvailabilityModel; -import bisq.core.offer.messages.OfferAvailabilityRequest; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.user.User; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.SendDirectMessageListener; import com.google.common.base.Charsets; +import haveno.common.app.Version; +import haveno.common.crypto.Sig; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.availability.OfferAvailabilityModel; +import haveno.core.offer.messages.OfferAvailabilityRequest; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.user.User; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.SendDirectMessageListener; import java.util.Date; import java.util.UUID; -import bisq.common.app.Version; -import bisq.common.crypto.Sig; -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; - import lombok.extern.slf4j.Slf4j; // TODO (woodser): rename to TakerSendOfferAvailabilityRequest and group with other taker tasks diff --git a/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityRequest.java b/core/src/main/java/haveno/core/offer/messages/OfferAvailabilityRequest.java similarity index 94% rename from core/src/main/java/bisq/core/offer/messages/OfferAvailabilityRequest.java rename to core/src/main/java/haveno/core/offer/messages/OfferAvailabilityRequest.java index e7b74694..6127133b 100644 --- a/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityRequest.java +++ b/core/src/main/java/haveno/core/offer/messages/OfferAvailabilityRequest.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.messages; +package haveno.core.offer.messages; -import bisq.network.p2p.SupportedCapabilitiesMessage; - -import bisq.common.app.Capabilities; -import bisq.common.app.Version; -import bisq.common.crypto.PubKeyRing; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.trade.messages.InitTradeRequest; +import haveno.common.app.Capabilities; +import haveno.common.app.Version; +import haveno.common.crypto.PubKeyRing; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.network.p2p.SupportedCapabilitiesMessage; import java.util.Optional; import java.util.UUID; diff --git a/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java b/core/src/main/java/haveno/core/offer/messages/OfferAvailabilityResponse.java similarity index 94% rename from core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java rename to core/src/main/java/haveno/core/offer/messages/OfferAvailabilityResponse.java index 65e62f63..383abe53 100644 --- a/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java +++ b/core/src/main/java/haveno/core/offer/messages/OfferAvailabilityResponse.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.messages; +package haveno.core.offer.messages; -import bisq.core.offer.AvailabilityResult; - -import bisq.network.p2p.SupportedCapabilitiesMessage; - -import bisq.common.app.Capabilities; -import bisq.common.app.Version; -import bisq.common.proto.ProtoUtil; - +import haveno.common.app.Capabilities; +import haveno.common.app.Version; +import haveno.common.proto.ProtoUtil; +import haveno.core.offer.AvailabilityResult; +import haveno.network.p2p.SupportedCapabilitiesMessage; import java.util.Optional; import java.util.UUID; diff --git a/core/src/main/java/bisq/core/offer/messages/OfferMessage.java b/core/src/main/java/haveno/core/offer/messages/OfferMessage.java similarity index 88% rename from core/src/main/java/bisq/core/offer/messages/OfferMessage.java rename to core/src/main/java/haveno/core/offer/messages/OfferMessage.java index 91c031c2..f9e3dbfc 100644 --- a/core/src/main/java/bisq/core/offer/messages/OfferMessage.java +++ b/core/src/main/java/haveno/core/offer/messages/OfferMessage.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.messages; - -import bisq.network.p2p.DirectMessage; -import bisq.network.p2p.UidMessage; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.offer.messages; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.DirectMessage; +import haveno.network.p2p.UidMessage; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/core/src/main/java/bisq/core/offer/messages/SignOfferRequest.java b/core/src/main/java/haveno/core/offer/messages/SignOfferRequest.java similarity index 96% rename from core/src/main/java/bisq/core/offer/messages/SignOfferRequest.java rename to core/src/main/java/haveno/core/offer/messages/SignOfferRequest.java index c0d834be..f995c112 100644 --- a/core/src/main/java/bisq/core/offer/messages/SignOfferRequest.java +++ b/core/src/main/java/haveno/core/offer/messages/SignOfferRequest.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.messages; +package haveno.core.offer.messages; -import bisq.common.crypto.PubKeyRing; -import bisq.core.offer.OfferPayload; -import bisq.network.p2p.DirectMessage; -import bisq.network.p2p.NodeAddress; +import haveno.common.crypto.PubKeyRing; +import haveno.core.offer.OfferPayload; +import haveno.network.p2p.DirectMessage; +import haveno.network.p2p.NodeAddress; import java.util.ArrayList; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/offer/messages/SignOfferResponse.java b/core/src/main/java/haveno/core/offer/messages/SignOfferResponse.java similarity index 95% rename from core/src/main/java/bisq/core/offer/messages/SignOfferResponse.java rename to core/src/main/java/haveno/core/offer/messages/SignOfferResponse.java index 27f01834..f2bf4095 100644 --- a/core/src/main/java/bisq/core/offer/messages/SignOfferResponse.java +++ b/core/src/main/java/haveno/core/offer/messages/SignOfferResponse.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.messages; +package haveno.core.offer.messages; -import bisq.core.offer.OfferPayload; -import bisq.network.p2p.DirectMessage; +import haveno.core.offer.OfferPayload; +import haveno.network.p2p.DirectMessage; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferModel.java b/core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferModel.java similarity index 82% rename from core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferModel.java rename to core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferModel.java index 9fe49ce3..dd51ab0d 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferModel.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferModel.java @@ -15,25 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.filter.FilterManager; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferBookService; -import bisq.core.offer.messages.SignOfferResponse; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.User; -import bisq.common.crypto.KeyRing; -import bisq.common.taskrunner.Model; - -import bisq.network.p2p.P2PService; +package haveno.core.offer.placeoffer; +import haveno.common.crypto.KeyRing; +import haveno.common.taskrunner.Model; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.filter.FilterManager; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferBookService; +import haveno.core.offer.messages.SignOfferResponse; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.User; +import haveno.network.p2p.P2PService; import java.math.BigInteger; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java b/core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferProtocol.java similarity index 86% rename from core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java rename to core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferProtocol.java index d4ad9adf..b89e4793 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferProtocol.java @@ -15,23 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer; - -import bisq.core.locale.Res; -import bisq.core.offer.messages.SignOfferResponse; -import bisq.core.offer.placeoffer.tasks.AddToOfferBook; -import bisq.core.offer.placeoffer.tasks.MakerReserveOfferFunds; -import bisq.core.offer.placeoffer.tasks.MakerSendSignOfferRequest; -import bisq.core.offer.placeoffer.tasks.MakerProcessSignOfferResponse; -import bisq.core.offer.placeoffer.tasks.ValidateOffer; -import bisq.core.trade.handlers.TransactionResultHandler; -import bisq.core.trade.protocol.TradeProtocol; -import bisq.network.p2p.NodeAddress; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.offer.placeoffer; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.locale.Res; +import haveno.core.offer.messages.SignOfferResponse; +import haveno.core.offer.placeoffer.tasks.AddToOfferBook; +import haveno.core.offer.placeoffer.tasks.MakerProcessSignOfferResponse; +import haveno.core.offer.placeoffer.tasks.MakerReserveOfferFunds; +import haveno.core.offer.placeoffer.tasks.MakerSendSignOfferRequest; +import haveno.core.offer.placeoffer.tasks.ValidateOffer; +import haveno.core.trade.handlers.TransactionResultHandler; +import haveno.core.trade.protocol.TradeProtocol; +import haveno.network.p2p.NodeAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/AddToOfferBook.java b/core/src/main/java/haveno/core/offer/placeoffer/tasks/AddToOfferBook.java similarity index 90% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/AddToOfferBook.java rename to core/src/main/java/haveno/core/offer/placeoffer/tasks/AddToOfferBook.java index 05ee2ba1..cdb187e1 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/AddToOfferBook.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/tasks/AddToOfferBook.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer.tasks; +package haveno.core.offer.placeoffer.tasks; -import bisq.core.offer.Offer; -import bisq.core.offer.placeoffer.PlaceOfferModel; - -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.Offer; +import haveno.core.offer.placeoffer.PlaceOfferModel; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java b/core/src/main/java/haveno/core/offer/placeoffer/tasks/CreateMakerFeeTx.java similarity index 78% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java rename to core/src/main/java/haveno/core/offer/placeoffer/tasks/CreateMakerFeeTx.java index 006e2b0c..3304c88a 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/tasks/CreateMakerFeeTx.java @@ -15,22 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer.tasks; - -import bisq.core.btc.exceptions.TxBroadcastException; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.TxBroadcaster; -import bisq.core.btc.wallet.WalletService; -import bisq.core.offer.Offer; -import bisq.core.offer.placeoffer.PlaceOfferModel; -//import bisq.core.util.FeeReceiverSelector; - -import bisq.common.UserThread; -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.offer.placeoffer.tasks; +//import haveno.core.util.FeeReceiverSelector; +import haveno.common.UserThread; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.exceptions.TxBroadcastException; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.TxBroadcaster; +import haveno.core.btc.wallet.WalletService; +import haveno.core.offer.Offer; +import haveno.core.offer.placeoffer.PlaceOfferModel; import org.bitcoinj.core.Address; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java b/core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java similarity index 87% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java rename to core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java index 34e0456d..30af3bfe 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerProcessSignOfferResponse.java @@ -15,18 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer.tasks; +package haveno.core.offer.placeoffer.tasks; -import bisq.core.offer.Offer; -import bisq.core.offer.placeoffer.PlaceOfferModel; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.trade.HavenoUtils; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.Offer; +import haveno.core.offer.placeoffer.PlaceOfferModel; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.trade.HavenoUtils; import static com.google.common.base.Preconditions.checkNotNull; -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; - public class MakerProcessSignOfferResponse extends Task { public MakerProcessSignOfferResponse(TaskRunner taskHandler, PlaceOfferModel model) { super(taskHandler, model); diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java b/core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java similarity index 90% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java rename to core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java index cac12924..5c4adc64 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer.tasks; +package haveno.core.offer.placeoffer.tasks; -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.placeoffer.PlaceOfferModel; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.placeoffer.PlaceOfferModel; import lombok.extern.slf4j.Slf4j; import java.math.BigInteger; diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java b/core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java similarity index 89% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java rename to core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java index d5edd1e8..fddf4f38 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerSendSignOfferRequest.java @@ -15,26 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer.tasks; +package haveno.core.offer.placeoffer.tasks; -import bisq.common.app.Version; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.offer.Offer; -import bisq.core.offer.availability.DisputeAgentSelection; -import bisq.core.offer.messages.SignOfferRequest; -import bisq.core.offer.placeoffer.PlaceOfferModel; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.DecryptedDirectMessageListener; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.SendDirectMessageListener; +import haveno.common.app.Version; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.offer.Offer; +import haveno.core.offer.availability.DisputeAgentSelection; +import haveno.core.offer.messages.SignOfferRequest; +import haveno.core.offer.placeoffer.PlaceOfferModel; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.DecryptedDirectMessageListener; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.SendDirectMessageListener; import java.util.Date; import java.util.HashSet; import java.util.Set; diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java b/core/src/main/java/haveno/core/offer/placeoffer/tasks/ValidateOffer.java similarity index 95% rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java rename to core/src/main/java/haveno/core/offer/placeoffer/tasks/ValidateOffer.java index bd8a6cea..e791b136 100644 --- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java +++ b/core/src/main/java/haveno/core/offer/placeoffer/tasks/ValidateOffer.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.placeoffer.tasks; - -import bisq.core.offer.Offer; -import bisq.core.offer.placeoffer.PlaceOfferModel; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.messages.TradeMessage; - -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.offer.placeoffer.tasks; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.Offer; +import haveno.core.offer.placeoffer.PlaceOfferModel; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.messages.TradeMessage; import org.bitcoinj.core.Coin; import static com.google.common.base.Preconditions.checkArgument; diff --git a/core/src/main/java/bisq/core/offer/takeoffer/TakeOfferModel.java b/core/src/main/java/haveno/core/offer/takeoffer/TakeOfferModel.java similarity index 89% rename from core/src/main/java/bisq/core/offer/takeoffer/TakeOfferModel.java rename to core/src/main/java/haveno/core/offer/takeoffer/TakeOfferModel.java index 23a4e4d5..d8550acd 100644 --- a/core/src/main/java/bisq/core/offer/takeoffer/TakeOfferModel.java +++ b/core/src/main/java/haveno/core/offer/takeoffer/TakeOfferModel.java @@ -15,22 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.takeoffer; +package haveno.core.offer.takeoffer; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.HavenoUtils; -import bisq.common.taskrunner.Model; +import static haveno.core.btc.model.XmrAddressEntry.Context.OFFER_FUNDING; +import static haveno.core.offer.OfferDirection.SELL; +import static haveno.core.util.VolumeUtil.getAdjustedVolumeForHalCash; +import static haveno.core.util.VolumeUtil.getRoundedFiatVolume; +import haveno.common.taskrunner.Model; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.HavenoUtils; import javax.inject.Inject; import java.math.BigInteger; @@ -41,10 +45,6 @@ import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import static bisq.core.btc.model.XmrAddressEntry.Context.OFFER_FUNDING; -import static bisq.core.offer.OfferDirection.SELL; -import static bisq.core.util.VolumeUtil.getAdjustedVolumeForHalCash; -import static bisq.core.util.VolumeUtil.getRoundedFiatVolume; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/bisq/core/payment/AchTransferAccount.java b/core/src/main/java/haveno/core/payment/AchTransferAccount.java similarity index 85% rename from core/src/main/java/bisq/core/payment/AchTransferAccount.java rename to core/src/main/java/haveno/core/payment/AchTransferAccount.java index a2b2c91b..f1676662 100644 --- a/core/src/main/java/bisq/core/payment/AchTransferAccount.java +++ b/core/src/main/java/haveno/core/payment/AchTransferAccount.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.AchTransferAccountPayload; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.AchTransferAccountPayload; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/AdvancedCashAccount.java b/core/src/main/java/haveno/core/payment/AdvancedCashAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/AdvancedCashAccount.java rename to core/src/main/java/haveno/core/payment/AdvancedCashAccount.java index 9f6429a5..87bde7e8 100644 --- a/core/src/main/java/bisq/core/payment/AdvancedCashAccount.java +++ b/core/src/main/java/haveno/core/payment/AdvancedCashAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.AdvancedCashAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.AdvancedCashAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/AliPayAccount.java b/core/src/main/java/haveno/core/payment/AliPayAccount.java similarity index 84% rename from core/src/main/java/bisq/core/payment/AliPayAccount.java rename to core/src/main/java/haveno/core/payment/AliPayAccount.java index 7e0ac51a..36d1cd9a 100644 --- a/core/src/main/java/bisq/core/payment/AliPayAccount.java +++ b/core/src/main/java/haveno/core/payment/AliPayAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.AliPayAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.AliPayAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/AmazonGiftCardAccount.java b/core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/AmazonGiftCardAccount.java rename to core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java index 0c9a17a1..2ca61b0e 100644 --- a/core/src/main/java/bisq/core/payment/AmazonGiftCardAccount.java +++ b/core/src/main/java/haveno/core/payment/AmazonGiftCardAccount.java @@ -15,17 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.AmazonGiftCardAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.AmazonGiftCardAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/bisq/core/payment/AssetAccount.java b/core/src/main/java/haveno/core/payment/AssetAccount.java similarity index 88% rename from core/src/main/java/bisq/core/payment/AssetAccount.java rename to core/src/main/java/haveno/core/payment/AssetAccount.java index 732bb195..2009dc19 100644 --- a/core/src/main/java/bisq/core/payment/AssetAccount.java +++ b/core/src/main/java/haveno/core/payment/AssetAccount.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.payment.payload.AssetAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.AssetAccountPayload; +import haveno.core.payment.payload.PaymentMethod; public abstract class AssetAccount extends PaymentAccount { protected AssetAccount(PaymentMethod paymentMethod) { diff --git a/core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java b/core/src/main/java/haveno/core/payment/AustraliaPayidAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java rename to core/src/main/java/haveno/core/payment/AustraliaPayidAccount.java index f575b043..727882c6 100644 --- a/core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java +++ b/core/src/main/java/haveno/core/payment/AustraliaPayidAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.AustraliaPayidAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.AustraliaPayidAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/BankAccount.java b/core/src/main/java/haveno/core/payment/BankAccount.java similarity index 96% rename from core/src/main/java/bisq/core/payment/BankAccount.java rename to core/src/main/java/haveno/core/payment/BankAccount.java index b3194100..bb91c85b 100644 --- a/core/src/main/java/bisq/core/payment/BankAccount.java +++ b/core/src/main/java/haveno/core/payment/BankAccount.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; import javax.annotation.Nullable; diff --git a/core/src/main/java/bisq/core/payment/BankNameRestrictedBankAccount.java b/core/src/main/java/haveno/core/payment/BankNameRestrictedBankAccount.java similarity index 96% rename from core/src/main/java/bisq/core/payment/BankNameRestrictedBankAccount.java rename to core/src/main/java/haveno/core/payment/BankNameRestrictedBankAccount.java index 37632422..0eaac8c2 100644 --- a/core/src/main/java/bisq/core/payment/BankNameRestrictedBankAccount.java +++ b/core/src/main/java/haveno/core/payment/BankNameRestrictedBankAccount.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; public interface BankNameRestrictedBankAccount extends BankAccount { diff --git a/core/src/main/java/bisq/core/payment/BizumAccount.java b/core/src/main/java/haveno/core/payment/BizumAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/BizumAccount.java rename to core/src/main/java/haveno/core/payment/BizumAccount.java index 6a4bddd2..247b3043 100644 --- a/core/src/main/java/bisq/core/payment/BizumAccount.java +++ b/core/src/main/java/haveno/core/payment/BizumAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.BizumAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.BizumAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/CapitualAccount.java b/core/src/main/java/haveno/core/payment/CapitualAccount.java similarity index 85% rename from core/src/main/java/bisq/core/payment/CapitualAccount.java rename to core/src/main/java/haveno/core/payment/CapitualAccount.java index da27fe61..cce3b885 100644 --- a/core/src/main/java/bisq/core/payment/CapitualAccount.java +++ b/core/src/main/java/haveno/core/payment/CapitualAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.CapitualAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.CapitualAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/CashAppAccount.java b/core/src/main/java/haveno/core/payment/CashAppAccount.java similarity index 85% rename from core/src/main/java/bisq/core/payment/CashAppAccount.java rename to core/src/main/java/haveno/core/payment/CashAppAccount.java index e3166323..0ab7bbda 100644 --- a/core/src/main/java/bisq/core/payment/CashAppAccount.java +++ b/core/src/main/java/haveno/core/payment/CashAppAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.CashAppAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.CashAppAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/CashByMailAccount.java b/core/src/main/java/haveno/core/payment/CashByMailAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/CashByMailAccount.java rename to core/src/main/java/haveno/core/payment/CashByMailAccount.java index dfc2fd5f..241aa0b5 100644 --- a/core/src/main/java/bisq/core/payment/CashByMailAccount.java +++ b/core/src/main/java/haveno/core/payment/CashByMailAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.CashByMailAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.CashByMailAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/CashDepositAccount.java b/core/src/main/java/haveno/core/payment/CashDepositAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/CashDepositAccount.java rename to core/src/main/java/haveno/core/payment/CashDepositAccount.java index 702961ec..9913fb5a 100644 --- a/core/src/main/java/bisq/core/payment/CashDepositAccount.java +++ b/core/src/main/java/haveno/core/payment/CashDepositAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.CashDepositAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.CashDepositAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/CelPayAccount.java b/core/src/main/java/haveno/core/payment/CelPayAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/CelPayAccount.java rename to core/src/main/java/haveno/core/payment/CelPayAccount.java index e1b0f2ac..fcf6ad89 100644 --- a/core/src/main/java/bisq/core/payment/CelPayAccount.java +++ b/core/src/main/java/haveno/core/payment/CelPayAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.CelPayAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.CelPayAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/ChargeBackRisk.java b/core/src/main/java/haveno/core/payment/ChargeBackRisk.java similarity index 92% rename from core/src/main/java/bisq/core/payment/ChargeBackRisk.java rename to core/src/main/java/haveno/core/payment/ChargeBackRisk.java index 378508b1..7587ab45 100644 --- a/core/src/main/java/bisq/core/payment/ChargeBackRisk.java +++ b/core/src/main/java/haveno/core/payment/ChargeBackRisk.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.payment.payload.PaymentMethod; import javax.inject.Singleton; @Singleton diff --git a/core/src/main/java/bisq/core/payment/ChaseQuickPayAccount.java b/core/src/main/java/haveno/core/payment/ChaseQuickPayAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/ChaseQuickPayAccount.java rename to core/src/main/java/haveno/core/payment/ChaseQuickPayAccount.java index 153baa07..680c3845 100644 --- a/core/src/main/java/bisq/core/payment/ChaseQuickPayAccount.java +++ b/core/src/main/java/haveno/core/payment/ChaseQuickPayAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.ChaseQuickPayAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.ChaseQuickPayAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/ClearXchangeAccount.java b/core/src/main/java/haveno/core/payment/ClearXchangeAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/ClearXchangeAccount.java rename to core/src/main/java/haveno/core/payment/ClearXchangeAccount.java index edcb62ce..6150a306 100644 --- a/core/src/main/java/bisq/core/payment/ClearXchangeAccount.java +++ b/core/src/main/java/haveno/core/payment/ClearXchangeAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.ClearXchangeAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.ClearXchangeAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/CountryBasedPaymentAccount.java b/core/src/main/java/haveno/core/payment/CountryBasedPaymentAccount.java similarity index 92% rename from core/src/main/java/bisq/core/payment/CountryBasedPaymentAccount.java rename to core/src/main/java/haveno/core/payment/CountryBasedPaymentAccount.java index e0065f73..17d02d88 100644 --- a/core/src/main/java/bisq/core/payment/CountryBasedPaymentAccount.java +++ b/core/src/main/java/haveno/core/payment/CountryBasedPaymentAccount.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.payment.payload.CountryBasedPaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.payment.payload.CountryBasedPaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/bisq/core/payment/CryptoCurrencyAccount.java b/core/src/main/java/haveno/core/payment/CryptoCurrencyAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/CryptoCurrencyAccount.java rename to core/src/main/java/haveno/core/payment/CryptoCurrencyAccount.java index fefd70be..b1e65283 100644 --- a/core/src/main/java/bisq/core/payment/CryptoCurrencyAccount.java +++ b/core/src/main/java/haveno/core/payment/CryptoCurrencyAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.CryptoCurrencyAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.CryptoCurrencyAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/DomesticWireTransferAccount.java b/core/src/main/java/haveno/core/payment/DomesticWireTransferAccount.java similarity index 85% rename from core/src/main/java/bisq/core/payment/DomesticWireTransferAccount.java rename to core/src/main/java/haveno/core/payment/DomesticWireTransferAccount.java index e48ccbf7..409e2ae1 100644 --- a/core/src/main/java/bisq/core/payment/DomesticWireTransferAccount.java +++ b/core/src/main/java/haveno/core/payment/DomesticWireTransferAccount.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.DomesticWireTransferAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.DomesticWireTransferAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/F2FAccount.java b/core/src/main/java/haveno/core/payment/F2FAccount.java similarity index 89% rename from core/src/main/java/bisq/core/payment/F2FAccount.java rename to core/src/main/java/haveno/core/payment/F2FAccount.java index 920f3291..31a08cd6 100644 --- a/core/src/main/java/bisq/core/payment/F2FAccount.java +++ b/core/src/main/java/haveno/core/payment/F2FAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.F2FAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; - +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.F2FAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/FasterPaymentsAccount.java b/core/src/main/java/haveno/core/payment/FasterPaymentsAccount.java similarity index 88% rename from core/src/main/java/bisq/core/payment/FasterPaymentsAccount.java rename to core/src/main/java/haveno/core/payment/FasterPaymentsAccount.java index dd36a838..49c82010 100644 --- a/core/src/main/java/bisq/core/payment/FasterPaymentsAccount.java +++ b/core/src/main/java/haveno/core/payment/FasterPaymentsAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.FasterPaymentsAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.FasterPaymentsAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/HalCashAccount.java b/core/src/main/java/haveno/core/payment/HalCashAccount.java similarity index 84% rename from core/src/main/java/bisq/core/payment/HalCashAccount.java rename to core/src/main/java/haveno/core/payment/HalCashAccount.java index f3f543fb..3a3deae8 100644 --- a/core/src/main/java/bisq/core/payment/HalCashAccount.java +++ b/core/src/main/java/haveno/core/payment/HalCashAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.HalCashAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.HalCashAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/IfscBasedAccount.java b/core/src/main/java/haveno/core/payment/IfscBasedAccount.java similarity index 85% rename from core/src/main/java/bisq/core/payment/IfscBasedAccount.java rename to core/src/main/java/haveno/core/payment/IfscBasedAccount.java index 9be970b5..759b6f57 100644 --- a/core/src/main/java/bisq/core/payment/IfscBasedAccount.java +++ b/core/src/main/java/haveno/core/payment/IfscBasedAccount.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/ImpsAccount.java b/core/src/main/java/haveno/core/payment/ImpsAccount.java similarity index 84% rename from core/src/main/java/bisq/core/payment/ImpsAccount.java rename to core/src/main/java/haveno/core/payment/ImpsAccount.java index c6560c00..d6fedc49 100644 --- a/core/src/main/java/bisq/core/payment/ImpsAccount.java +++ b/core/src/main/java/haveno/core/payment/ImpsAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.ImpsAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.ImpsAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/InstantCryptoCurrencyAccount.java b/core/src/main/java/haveno/core/payment/InstantCryptoCurrencyAccount.java similarity index 82% rename from core/src/main/java/bisq/core/payment/InstantCryptoCurrencyAccount.java rename to core/src/main/java/haveno/core/payment/InstantCryptoCurrencyAccount.java index 4d4f78f3..82a1130a 100644 --- a/core/src/main/java/bisq/core/payment/InstantCryptoCurrencyAccount.java +++ b/core/src/main/java/haveno/core/payment/InstantCryptoCurrencyAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.InstantCryptoCurrencyPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.InstantCryptoCurrencyPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/InteracETransferAccount.java b/core/src/main/java/haveno/core/payment/InteracETransferAccount.java similarity index 88% rename from core/src/main/java/bisq/core/payment/InteracETransferAccount.java rename to core/src/main/java/haveno/core/payment/InteracETransferAccount.java index a6ae04d5..11858546 100644 --- a/core/src/main/java/bisq/core/payment/InteracETransferAccount.java +++ b/core/src/main/java/haveno/core/payment/InteracETransferAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.InteracETransferAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.InteracETransferAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/JapanBankAccount.java b/core/src/main/java/haveno/core/payment/JapanBankAccount.java similarity index 92% rename from core/src/main/java/bisq/core/payment/JapanBankAccount.java rename to core/src/main/java/haveno/core/payment/JapanBankAccount.java index 8dcd47db..6d9299fc 100644 --- a/core/src/main/java/bisq/core/payment/JapanBankAccount.java +++ b/core/src/main/java/haveno/core/payment/JapanBankAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.JapanBankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.JapanBankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/JapanBankData.java b/core/src/main/java/haveno/core/payment/JapanBankData.java similarity index 99% rename from core/src/main/java/bisq/core/payment/JapanBankData.java rename to core/src/main/java/haveno/core/payment/JapanBankData.java index 23d3efa7..8b5851f9 100644 --- a/core/src/main/java/bisq/core/payment/JapanBankData.java +++ b/core/src/main/java/haveno/core/payment/JapanBankData.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.user.Preferences; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; +import haveno.core.user.Preferences; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/MoneseAccount.java b/core/src/main/java/haveno/core/payment/MoneseAccount.java similarity index 88% rename from core/src/main/java/bisq/core/payment/MoneseAccount.java rename to core/src/main/java/haveno/core/payment/MoneseAccount.java index 7f49888b..4d27cd49 100644 --- a/core/src/main/java/bisq/core/payment/MoneseAccount.java +++ b/core/src/main/java/haveno/core/payment/MoneseAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.MoneseAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.MoneseAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/MoneyBeamAccount.java b/core/src/main/java/haveno/core/payment/MoneyBeamAccount.java similarity index 84% rename from core/src/main/java/bisq/core/payment/MoneyBeamAccount.java rename to core/src/main/java/haveno/core/payment/MoneyBeamAccount.java index a7b1d45b..d78c4837 100644 --- a/core/src/main/java/bisq/core/payment/MoneyBeamAccount.java +++ b/core/src/main/java/haveno/core/payment/MoneyBeamAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.MoneyBeamAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.MoneyBeamAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/MoneyGramAccount.java b/core/src/main/java/haveno/core/payment/MoneyGramAccount.java similarity index 93% rename from core/src/main/java/bisq/core/payment/MoneyGramAccount.java rename to core/src/main/java/haveno/core/payment/MoneyGramAccount.java index 30dff1ea..603aad58 100644 --- a/core/src/main/java/bisq/core/payment/MoneyGramAccount.java +++ b/core/src/main/java/haveno/core/payment/MoneyGramAccount.java @@ -15,17 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.MoneyGramAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.MoneyGramAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/NationalBankAccount.java b/core/src/main/java/haveno/core/payment/NationalBankAccount.java similarity index 82% rename from core/src/main/java/bisq/core/payment/NationalBankAccount.java rename to core/src/main/java/haveno/core/payment/NationalBankAccount.java index eba88a75..2ffb9d3a 100644 --- a/core/src/main/java/bisq/core/payment/NationalBankAccount.java +++ b/core/src/main/java/haveno/core/payment/NationalBankAccount.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.NationalBankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.NationalBankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/NeftAccount.java b/core/src/main/java/haveno/core/payment/NeftAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/NeftAccount.java rename to core/src/main/java/haveno/core/payment/NeftAccount.java index 781510ff..45321df0 100644 --- a/core/src/main/java/bisq/core/payment/NeftAccount.java +++ b/core/src/main/java/haveno/core/payment/NeftAccount.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.payment.payload.NeftAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.payment.payload.NeftAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) diff --git a/core/src/main/java/bisq/core/payment/NequiAccount.java b/core/src/main/java/haveno/core/payment/NequiAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/NequiAccount.java rename to core/src/main/java/haveno/core/payment/NequiAccount.java index a08f6b7f..7013831e 100644 --- a/core/src/main/java/bisq/core/payment/NequiAccount.java +++ b/core/src/main/java/haveno/core/payment/NequiAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.NequiAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.NequiAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/OKPayAccount.java b/core/src/main/java/haveno/core/payment/OKPayAccount.java similarity index 89% rename from core/src/main/java/bisq/core/payment/OKPayAccount.java rename to core/src/main/java/haveno/core/payment/OKPayAccount.java index 552eb80b..f23e13b8 100644 --- a/core/src/main/java/bisq/core/payment/OKPayAccount.java +++ b/core/src/main/java/haveno/core/payment/OKPayAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.OKPayAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.OKPayAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/PaxumAccount.java b/core/src/main/java/haveno/core/payment/PaxumAccount.java similarity index 90% rename from core/src/main/java/bisq/core/payment/PaxumAccount.java rename to core/src/main/java/haveno/core/payment/PaxumAccount.java index 47288727..5ff3ecfa 100644 --- a/core/src/main/java/bisq/core/payment/PaxumAccount.java +++ b/core/src/main/java/haveno/core/payment/PaxumAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaxumAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaxumAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; import java.util.List; import java.util.stream.Collectors; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/PaymentAccount.java b/core/src/main/java/haveno/core/payment/PaymentAccount.java similarity index 96% rename from core/src/main/java/bisq/core/payment/PaymentAccount.java rename to core/src/main/java/haveno/core/payment/PaymentAccount.java index d1399842..5ac71c47 100644 --- a/core/src/main/java/bisq/core/payment/PaymentAccount.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccount.java @@ -15,31 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.validation.AccountNrValidator; -import bisq.core.payment.validation.BICValidator; -import bisq.core.payment.validation.BranchIdValidator; -import bisq.core.payment.validation.EmailOrMobileNrValidator; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.payment.validation.IBANValidator; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.InputValidator.ValidationResult; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.Utilities; +package haveno.core.payment; import java.util.ArrayList; import java.util.Date; @@ -63,9 +39,32 @@ import javax.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.Utilities; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.validation.AccountNrValidator; +import haveno.core.payment.validation.BICValidator; +import haveno.core.payment.validation.BranchIdValidator; +import haveno.core.payment.validation.EmailOrMobileNrValidator; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.payment.validation.IBANValidator; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator.ValidationResult; -import static bisq.core.payment.payload.PaymentMethod.TRANSFERWISE_ID; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.core.payment.payload.PaymentMethod.TRANSFERWISE_ID; import static java.util.Arrays.stream; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; diff --git a/core/src/main/java/bisq/core/payment/PaymentAccountFactory.java b/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java similarity index 98% rename from core/src/main/java/bisq/core/payment/PaymentAccountFactory.java rename to core/src/main/java/haveno/core/payment/PaymentAccountFactory.java index 2625c3a9..8832d300 100644 --- a/core/src/main/java/bisq/core/payment/PaymentAccountFactory.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.PaymentMethod; public class PaymentAccountFactory { public static PaymentAccount getPaymentAccount(PaymentMethod paymentMethod) { diff --git a/core/src/main/java/bisq/core/payment/PaymentAccountList.java b/core/src/main/java/haveno/core/payment/PaymentAccountList.java similarity index 93% rename from core/src/main/java/bisq/core/payment/PaymentAccountList.java rename to core/src/main/java/haveno/core/payment/PaymentAccountList.java index e25654e1..5bac2e7e 100644 --- a/core/src/main/java/bisq/core/payment/PaymentAccountList.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccountList.java @@ -15,14 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.proto.CoreProtoResolver; - -import bisq.common.proto.persistable.PersistableList; +package haveno.core.payment; import com.google.protobuf.Message; - +import haveno.common.proto.persistable.PersistableList; +import haveno.core.proto.CoreProtoResolver; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/bisq/core/payment/PaymentAccountTypeAdapter.java b/core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java similarity index 96% rename from core/src/main/java/bisq/core/payment/PaymentAccountTypeAdapter.java rename to core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java index ef2619ff..99d9e95e 100644 --- a/core/src/main/java/bisq/core/payment/PaymentAccountTypeAdapter.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccountTypeAdapter.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; - import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; - +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; import java.io.IOException; import java.util.ArrayList; @@ -46,14 +44,14 @@ import java.lang.reflect.Method; import lombok.extern.slf4j.Slf4j; -import static bisq.common.util.ReflectionUtils.*; -import static bisq.common.util.Utilities.decodeFromHex; -import static bisq.core.locale.CountryUtil.findCountryByCode; -import static bisq.core.locale.CurrencyUtil.getCurrencyByCountryCode; -import static bisq.core.locale.CurrencyUtil.getTradeCurrenciesInList; -import static bisq.core.locale.CurrencyUtil.getTradeCurrency; -import static bisq.core.payment.payload.PaymentMethod.MONEY_GRAM_ID; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.common.util.ReflectionUtils.*; +import static haveno.common.util.Utilities.decodeFromHex; +import static haveno.core.locale.CountryUtil.findCountryByCode; +import static haveno.core.locale.CurrencyUtil.getCurrencyByCountryCode; +import static haveno.core.locale.CurrencyUtil.getTradeCurrenciesInList; +import static haveno.core.locale.CurrencyUtil.getTradeCurrency; +import static haveno.core.payment.payload.PaymentMethod.MONEY_GRAM_ID; import static java.lang.String.format; import static java.util.Arrays.stream; import static java.util.Collections.unmodifiableMap; @@ -363,7 +361,7 @@ class PaymentAccountTypeAdapter extends TypeAdapter { } } else { // Log a warning. We should not throw an exception here because the - // gson library will not pass it up to the calling Bisq object exactly as + // gson library will not pass it up to the calling Haveno object exactly as // it would be defined here (causing confusion). Do a check in a calling // class to make sure the tradeCurrencies field is populated in the // PaymentAccount object, if it is required for the payment account method. @@ -391,7 +389,7 @@ class PaymentAccountTypeAdapter extends TypeAdapter { account.setSelectedTradeCurrency(tradeCurrency.get()); } else { // Log an error. We should not throw an exception here because the - // gson library will not pass it up to the calling Bisq object exactly as + // gson library will not pass it up to the calling Haveno object exactly as // it would be defined here (causing confusion). log.error("{} is not a valid trade currency code.", fieldValue); } diff --git a/core/src/main/java/bisq/core/payment/PaymentAccountUtil.java b/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java similarity index 96% rename from core/src/main/java/bisq/core/payment/PaymentAccountUtil.java rename to core/src/main/java/haveno/core/payment/PaymentAccountUtil.java index e44a5010..78d415d9 100644 --- a/core/src/main/java/bisq/core/payment/PaymentAccountUtil.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java @@ -15,19 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.user.User; +package haveno.core.payment; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import static haveno.core.payment.payload.PaymentMethod.*; + +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.user.User; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -40,8 +41,6 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.core.payment.payload.PaymentMethod.*; - @Slf4j public class PaymentAccountUtil { diff --git a/core/src/main/java/bisq/core/payment/PaymentAccounts.java b/core/src/main/java/haveno/core/payment/PaymentAccounts.java similarity index 95% rename from core/src/main/java/bisq/core/payment/PaymentAccounts.java rename to core/src/main/java/haveno/core/payment/PaymentAccounts.java index 6b3fac17..dec48e40 100644 --- a/core/src/main/java/bisq/core/payment/PaymentAccounts.java +++ b/core/src/main/java/haveno/core/payment/PaymentAccounts.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.offer.Offer; +package haveno.core.payment; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.offer.Offer; import java.util.Comparator; import java.util.Date; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/PayseraAccount.java b/core/src/main/java/haveno/core/payment/PayseraAccount.java similarity index 89% rename from core/src/main/java/bisq/core/payment/PayseraAccount.java rename to core/src/main/java/haveno/core/payment/PayseraAccount.java index 0d8fc822..55e8db8e 100644 --- a/core/src/main/java/bisq/core/payment/PayseraAccount.java +++ b/core/src/main/java/haveno/core/payment/PayseraAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.PayseraAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.PayseraAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/PaytmAccount.java b/core/src/main/java/haveno/core/payment/PaytmAccount.java similarity index 89% rename from core/src/main/java/bisq/core/payment/PaytmAccount.java rename to core/src/main/java/haveno/core/payment/PaytmAccount.java index 2630cf51..3aaf727a 100644 --- a/core/src/main/java/bisq/core/payment/PaytmAccount.java +++ b/core/src/main/java/haveno/core/payment/PaytmAccount.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.PaytmAccountPayload; +package haveno.core.payment; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.PaytmAccountPayload; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) diff --git a/core/src/main/java/bisq/core/payment/PerfectMoneyAccount.java b/core/src/main/java/haveno/core/payment/PerfectMoneyAccount.java similarity index 84% rename from core/src/main/java/bisq/core/payment/PerfectMoneyAccount.java rename to core/src/main/java/haveno/core/payment/PerfectMoneyAccount.java index c6a83fce..dc439e15 100644 --- a/core/src/main/java/bisq/core/payment/PerfectMoneyAccount.java +++ b/core/src/main/java/haveno/core/payment/PerfectMoneyAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.PerfectMoneyAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.PerfectMoneyAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/PixAccount.java b/core/src/main/java/haveno/core/payment/PixAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/PixAccount.java rename to core/src/main/java/haveno/core/payment/PixAccount.java index fe20ad9e..55c03bc7 100644 --- a/core/src/main/java/bisq/core/payment/PixAccount.java +++ b/core/src/main/java/haveno/core/payment/PixAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.PixAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.PixAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/PopmoneyAccount.java b/core/src/main/java/haveno/core/payment/PopmoneyAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/PopmoneyAccount.java rename to core/src/main/java/haveno/core/payment/PopmoneyAccount.java index c2642cf2..63c0038e 100644 --- a/core/src/main/java/bisq/core/payment/PopmoneyAccount.java +++ b/core/src/main/java/haveno/core/payment/PopmoneyAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.PopmoneyAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.PopmoneyAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/PromptPayAccount.java b/core/src/main/java/haveno/core/payment/PromptPayAccount.java similarity index 84% rename from core/src/main/java/bisq/core/payment/PromptPayAccount.java rename to core/src/main/java/haveno/core/payment/PromptPayAccount.java index 6167d70a..471b746d 100644 --- a/core/src/main/java/bisq/core/payment/PromptPayAccount.java +++ b/core/src/main/java/haveno/core/payment/PromptPayAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.PromptPayAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.PromptPayAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/ReceiptPredicates.java b/core/src/main/java/haveno/core/payment/ReceiptPredicates.java similarity index 96% rename from core/src/main/java/bisq/core/payment/ReceiptPredicates.java rename to core/src/main/java/haveno/core/payment/ReceiptPredicates.java index bb6ae629..ddf5eb25 100644 --- a/core/src/main/java/bisq/core/payment/ReceiptPredicates.java +++ b/core/src/main/java/haveno/core/payment/ReceiptPredicates.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; import com.google.common.base.Preconditions; - +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.payment.payload.PaymentMethod; import java.util.Collections; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/payment/ReceiptValidator.java b/core/src/main/java/haveno/core/payment/ReceiptValidator.java similarity index 97% rename from core/src/main/java/bisq/core/payment/ReceiptValidator.java rename to core/src/main/java/haveno/core/payment/ReceiptValidator.java index 258f3318..827453ac 100644 --- a/core/src/main/java/bisq/core/payment/ReceiptValidator.java +++ b/core/src/main/java/haveno/core/payment/ReceiptValidator.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.offer.Offer; +package haveno.core.payment; +import haveno.core.offer.Offer; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/payment/RevolutAccount.java b/core/src/main/java/haveno/core/payment/RevolutAccount.java similarity index 92% rename from core/src/main/java/bisq/core/payment/RevolutAccount.java rename to core/src/main/java/haveno/core/payment/RevolutAccount.java index d6e4587a..43ba6877 100644 --- a/core/src/main/java/bisq/core/payment/RevolutAccount.java +++ b/core/src/main/java/haveno/core/payment/RevolutAccount.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.RevolutAccountPayload; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.RevolutAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/RtgsAccount.java b/core/src/main/java/haveno/core/payment/RtgsAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/RtgsAccount.java rename to core/src/main/java/haveno/core/payment/RtgsAccount.java index eac2205c..3a6a90ec 100644 --- a/core/src/main/java/bisq/core/payment/RtgsAccount.java +++ b/core/src/main/java/haveno/core/payment/RtgsAccount.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.RtgsAccountPayload; +package haveno.core.payment; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.RtgsAccountPayload; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) diff --git a/core/src/main/java/bisq/core/payment/SameBankAccount.java b/core/src/main/java/haveno/core/payment/SameBankAccount.java similarity index 82% rename from core/src/main/java/bisq/core/payment/SameBankAccount.java rename to core/src/main/java/haveno/core/payment/SameBankAccount.java index b0f27613..7d3fdb31 100644 --- a/core/src/main/java/bisq/core/payment/SameBankAccount.java +++ b/core/src/main/java/haveno/core/payment/SameBankAccount.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SameBankAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SameBankAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/SameCountryRestrictedBankAccount.java b/core/src/main/java/haveno/core/payment/SameCountryRestrictedBankAccount.java similarity index 96% rename from core/src/main/java/bisq/core/payment/SameCountryRestrictedBankAccount.java rename to core/src/main/java/haveno/core/payment/SameCountryRestrictedBankAccount.java index 113d1960..e0d464ea 100644 --- a/core/src/main/java/bisq/core/payment/SameCountryRestrictedBankAccount.java +++ b/core/src/main/java/haveno/core/payment/SameCountryRestrictedBankAccount.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; public interface SameCountryRestrictedBankAccount extends BankAccount { String getCountryCode(); diff --git a/core/src/main/java/bisq/core/payment/SatispayAccount.java b/core/src/main/java/haveno/core/payment/SatispayAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/SatispayAccount.java rename to core/src/main/java/haveno/core/payment/SatispayAccount.java index 82773a96..eaff725b 100644 --- a/core/src/main/java/bisq/core/payment/SatispayAccount.java +++ b/core/src/main/java/haveno/core/payment/SatispayAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SatispayAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SatispayAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/SepaAccount.java b/core/src/main/java/haveno/core/payment/SepaAccount.java similarity index 90% rename from core/src/main/java/bisq/core/payment/SepaAccount.java rename to core/src/main/java/haveno/core/payment/SepaAccount.java index c27a7aff..8b6abbb5 100644 --- a/core/src/main/java/bisq/core/payment/SepaAccount.java +++ b/core/src/main/java/haveno/core/payment/SepaAccount.java @@ -15,18 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SepaAccountPayload; -import bisq.core.payment.validation.SepaIBANValidator; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SepaAccountPayload; +import haveno.core.payment.validation.SepaIBANValidator; import java.util.List; import javax.annotation.Nullable; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/SepaInstantAccount.java b/core/src/main/java/haveno/core/payment/SepaInstantAccount.java similarity index 89% rename from core/src/main/java/bisq/core/payment/SepaInstantAccount.java rename to core/src/main/java/haveno/core/payment/SepaInstantAccount.java index a026d2c6..428efa19 100644 --- a/core/src/main/java/bisq/core/payment/SepaInstantAccount.java +++ b/core/src/main/java/haveno/core/payment/SepaInstantAccount.java @@ -15,18 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SepaInstantAccountPayload; -import bisq.core.payment.validation.SepaIBANValidator; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SepaInstantAccountPayload; +import haveno.core.payment.validation.SepaIBANValidator; import java.util.List; import javax.annotation.Nullable; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/SpecificBanksAccount.java b/core/src/main/java/haveno/core/payment/SpecificBanksAccount.java similarity index 85% rename from core/src/main/java/bisq/core/payment/SpecificBanksAccount.java rename to core/src/main/java/haveno/core/payment/SpecificBanksAccount.java index e8ce48e2..682f916b 100644 --- a/core/src/main/java/bisq/core/payment/SpecificBanksAccount.java +++ b/core/src/main/java/haveno/core/payment/SpecificBanksAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SpecificBanksAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SpecificBanksAccountPayload; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/StrikeAccount.java b/core/src/main/java/haveno/core/payment/StrikeAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/StrikeAccount.java rename to core/src/main/java/haveno/core/payment/StrikeAccount.java index 31625fba..6b1f5dda 100644 --- a/core/src/main/java/bisq/core/payment/StrikeAccount.java +++ b/core/src/main/java/haveno/core/payment/StrikeAccount.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.StrikeAccountPayload; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.StrikeAccountPayload; import java.util.List; import javax.annotation.Nullable; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/SwiftAccount.java b/core/src/main/java/haveno/core/payment/SwiftAccount.java similarity index 90% rename from core/src/main/java/bisq/core/payment/SwiftAccount.java rename to core/src/main/java/haveno/core/payment/SwiftAccount.java index 20dfd671..4aa297f6 100644 --- a/core/src/main/java/bisq/core/payment/SwiftAccount.java +++ b/core/src/main/java/haveno/core/payment/SwiftAccount.java @@ -15,13 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SwiftAccountPayload; +package haveno.core.payment; import java.util.ArrayList; import java.util.List; @@ -29,9 +23,15 @@ import java.util.List; import lombok.EqualsAndHashCode; import lombok.NonNull; -import static bisq.core.locale.CurrencyUtil.getAllSortedFiatCurrencies; +import static haveno.core.locale.CurrencyUtil.getAllSortedFiatCurrencies; import static java.util.Comparator.comparing; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SwiftAccountPayload; + @EqualsAndHashCode(callSuper = true) public final class SwiftAccount extends PaymentAccount { diff --git a/core/src/main/java/bisq/core/payment/SwishAccount.java b/core/src/main/java/haveno/core/payment/SwishAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/SwishAccount.java rename to core/src/main/java/haveno/core/payment/SwishAccount.java index 1ab95f5d..1cab5a7c 100644 --- a/core/src/main/java/bisq/core/payment/SwishAccount.java +++ b/core/src/main/java/haveno/core/payment/SwishAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SwishAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SwishAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/TikkieAccount.java b/core/src/main/java/haveno/core/payment/TikkieAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/TikkieAccount.java rename to core/src/main/java/haveno/core/payment/TikkieAccount.java index a89b3820..bd0fe6f3 100644 --- a/core/src/main/java/bisq/core/payment/TikkieAccount.java +++ b/core/src/main/java/haveno/core/payment/TikkieAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.TikkieAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.TikkieAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/TradeLimits.java b/core/src/main/java/haveno/core/payment/TradeLimits.java similarity index 95% rename from core/src/main/java/bisq/core/payment/TradeLimits.java rename to core/src/main/java/haveno/core/payment/TradeLimits.java index c922578d..81b5c124 100644 --- a/core/src/main/java/bisq/core/payment/TradeLimits.java +++ b/core/src/main/java/haveno/core/payment/TradeLimits.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.common.util.MathUtils; -import bisq.core.trade.HavenoUtils; +package haveno.core.payment; import javax.inject.Inject; import javax.inject.Singleton; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.util.MathUtils; +import haveno.core.trade.HavenoUtils; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -55,7 +53,7 @@ public class TradeLimits { /** * The default trade limits. * - * @see bisq.core.payment.payload.PaymentMethod + * @see haveno.core.payment.payload.PaymentMethod * @return the maximum trade limit */ public BigInteger getMaxTradeLimit() { diff --git a/core/src/main/java/bisq/core/payment/TransferwiseAccount.java b/core/src/main/java/haveno/core/payment/TransferwiseAccount.java similarity index 92% rename from core/src/main/java/bisq/core/payment/TransferwiseAccount.java rename to core/src/main/java/haveno/core/payment/TransferwiseAccount.java index e32e6d7c..c89d5470 100644 --- a/core/src/main/java/bisq/core/payment/TransferwiseAccount.java +++ b/core/src/main/java/haveno/core/payment/TransferwiseAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.TransferwiseAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.TransferwiseAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/TransferwiseUsdAccount.java b/core/src/main/java/haveno/core/payment/TransferwiseUsdAccount.java similarity index 89% rename from core/src/main/java/bisq/core/payment/TransferwiseUsdAccount.java rename to core/src/main/java/haveno/core/payment/TransferwiseUsdAccount.java index 99c4e8d8..aa4ddb76 100644 --- a/core/src/main/java/bisq/core/payment/TransferwiseUsdAccount.java +++ b/core/src/main/java/haveno/core/payment/TransferwiseUsdAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.TransferwiseUsdAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.TransferwiseUsdAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/USPostalMoneyOrderAccount.java b/core/src/main/java/haveno/core/payment/USPostalMoneyOrderAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/USPostalMoneyOrderAccount.java rename to core/src/main/java/haveno/core/payment/USPostalMoneyOrderAccount.java index 78450cc3..ba0e18f4 100644 --- a/core/src/main/java/bisq/core/payment/USPostalMoneyOrderAccount.java +++ b/core/src/main/java/haveno/core/payment/USPostalMoneyOrderAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.USPostalMoneyOrderAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/UpholdAccount.java b/core/src/main/java/haveno/core/payment/UpholdAccount.java similarity index 91% rename from core/src/main/java/bisq/core/payment/UpholdAccount.java rename to core/src/main/java/haveno/core/payment/UpholdAccount.java index 8226581f..effeb737 100644 --- a/core/src/main/java/bisq/core/payment/UpholdAccount.java +++ b/core/src/main/java/haveno/core/payment/UpholdAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.UpholdAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.UpholdAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/UpiAccount.java b/core/src/main/java/haveno/core/payment/UpiAccount.java similarity index 89% rename from core/src/main/java/bisq/core/payment/UpiAccount.java rename to core/src/main/java/haveno/core/payment/UpiAccount.java index 26197498..204bc877 100644 --- a/core/src/main/java/bisq/core/payment/UpiAccount.java +++ b/core/src/main/java/haveno/core/payment/UpiAccount.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.UpiAccountPayload; +package haveno.core.payment; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.UpiAccountPayload; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) diff --git a/core/src/main/java/bisq/core/payment/VenmoAccount.java b/core/src/main/java/haveno/core/payment/VenmoAccount.java similarity index 86% rename from core/src/main/java/bisq/core/payment/VenmoAccount.java rename to core/src/main/java/haveno/core/payment/VenmoAccount.java index e6b868a3..d19a8fe5 100644 --- a/core/src/main/java/bisq/core/payment/VenmoAccount.java +++ b/core/src/main/java/haveno/core/payment/VenmoAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.VenmoAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.VenmoAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/VerseAccount.java b/core/src/main/java/haveno/core/payment/VerseAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/VerseAccount.java rename to core/src/main/java/haveno/core/payment/VerseAccount.java index c32f93de..1e97eb7b 100644 --- a/core/src/main/java/bisq/core/payment/VerseAccount.java +++ b/core/src/main/java/haveno/core/payment/VerseAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.VerseAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.VerseAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/WeChatPayAccount.java b/core/src/main/java/haveno/core/payment/WeChatPayAccount.java similarity index 84% rename from core/src/main/java/bisq/core/payment/WeChatPayAccount.java rename to core/src/main/java/haveno/core/payment/WeChatPayAccount.java index bae5a2f6..28c6d958 100644 --- a/core/src/main/java/bisq/core/payment/WeChatPayAccount.java +++ b/core/src/main/java/haveno/core/payment/WeChatPayAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.WeChatPayAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.WeChatPayAccountPayload; import java.util.List; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/payment/WesternUnionAccount.java b/core/src/main/java/haveno/core/payment/WesternUnionAccount.java similarity index 87% rename from core/src/main/java/bisq/core/payment/WesternUnionAccount.java rename to core/src/main/java/haveno/core/payment/WesternUnionAccount.java index a1ab90e4..87fe5468 100644 --- a/core/src/main/java/bisq/core/payment/WesternUnionAccount.java +++ b/core/src/main/java/haveno/core/payment/WesternUnionAccount.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.WesternUnionAccountPayload; +package haveno.core.payment; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.WesternUnionAccountPayload; import java.util.List; import lombok.NonNull; diff --git a/core/src/main/java/bisq/core/payment/payload/AchTransferAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/AchTransferAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/AchTransferAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/AchTransferAccountPayload.java index 3f234c47..b3e58804 100644 --- a/core/src/main/java/bisq/core/payment/payload/AchTransferAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/AchTransferAccountPayload.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; +import haveno.core.locale.Res; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/AdvancedCashAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/AdvancedCashAccountPayload.java index 0b506aaf..9b0224c2 100644 --- a/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/AdvancedCashAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/AliPayAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/AliPayAccountPayload.java index 2b91352d..f509563f 100644 --- a/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/AliPayAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/AmazonGiftCardAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/AmazonGiftCardAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/AmazonGiftCardAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/AmazonGiftCardAccountPayload.java index 90dc4db0..ea52e2f8 100644 --- a/core/src/main/java/bisq/core/payment/payload/AmazonGiftCardAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/AmazonGiftCardAccountPayload.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; -import bisq.common.util.JsonExclude; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.common.util.JsonExclude; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/AssetAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/AssetAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/AssetAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/AssetAccountPayload.java index f204d9bf..ae99909c 100644 --- a/core/src/main/java/bisq/core/payment/payload/AssetAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/AssetAccountPayload.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/AustraliaPayidAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/AustraliaPayidAccountPayload.java index 046ca48b..f6b27f03 100644 --- a/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/AustraliaPayidAccountPayload.java @@ -15,14 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; - -import bisq.common.util.CollectionUtils; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.common.util.CollectionUtils; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/BankAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/BankAccountPayload.java index 15e02475..82d02395 100644 --- a/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/BankAccountPayload.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.BankUtil; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; +package haveno.core.payment.payload; +import haveno.core.locale.BankUtil; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/payload/BizumAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/BizumAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/BizumAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/BizumAccountPayload.java index 5e2a0401..45904f9e 100644 --- a/core/src/main/java/bisq/core/payment/payload/BizumAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/BizumAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/CapitualAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/CapitualAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/CapitualAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/CapitualAccountPayload.java index a765d7cd..6994aba1 100644 --- a/core/src/main/java/bisq/core/payment/payload/CapitualAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/CapitualAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/CashAppAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/CashAppAccountPayload.java index 965b6019..54875edf 100644 --- a/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/CashAppAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java index 3fc49293..bb32c29a 100644 --- a/core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/CashDepositAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/CashDepositAccountPayload.java index 4ed78f7e..f6c85e47 100644 --- a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/CashDepositAccountPayload.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.BankUtil; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; +import haveno.core.locale.BankUtil; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/payload/CelPayAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/CelPayAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/CelPayAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/CelPayAccountPayload.java index 2c9a62a5..a35d9e97 100644 --- a/core/src/main/java/bisq/core/payment/payload/CelPayAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/CelPayAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/ChaseQuickPayAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/ChaseQuickPayAccountPayload.java index 6446e3d9..46085236 100644 --- a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/ChaseQuickPayAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/ClearXchangeAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/ClearXchangeAccountPayload.java index 16967906..d7be23c9 100644 --- a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/ClearXchangeAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/CountryBasedPaymentAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/CountryBasedPaymentAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/CountryBasedPaymentAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/CountryBasedPaymentAccountPayload.java index 22b7c95d..e1ad7779 100644 --- a/core/src/main/java/bisq/core/payment/payload/CountryBasedPaymentAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/CountryBasedPaymentAccountPayload.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; +package haveno.core.payment.payload; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/CryptoCurrencyAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/CryptoCurrencyAccountPayload.java index 2eba4c5d..efc3e4c6 100644 --- a/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/CryptoCurrencyAccountPayload.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; +package haveno.core.payment.payload; import com.google.protobuf.Message; diff --git a/core/src/main/java/bisq/core/payment/payload/DomesticWireTransferAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/DomesticWireTransferAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/DomesticWireTransferAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/DomesticWireTransferAccountPayload.java index 65ebe634..e70a395d 100644 --- a/core/src/main/java/bisq/core/payment/payload/DomesticWireTransferAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/DomesticWireTransferAccountPayload.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.Res; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/F2FAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/F2FAccountPayload.java index 6c09b31b..4ae0873e 100644 --- a/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/F2FAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/FasterPaymentsAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/FasterPaymentsAccountPayload.java index 920d47fe..08cd0c59 100644 --- a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/FasterPaymentsAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import com.google.common.base.Strings; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/HalCashAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/HalCashAccountPayload.java index 1f347c22..2c486b4e 100644 --- a/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/HalCashAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/IfscBasedAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/IfscBasedAccountPayload.java similarity index 96% rename from core/src/main/java/bisq/core/payment/payload/IfscBasedAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/IfscBasedAccountPayload.java index c7074745..25a2bb69 100644 --- a/core/src/main/java/bisq/core/payment/payload/IfscBasedAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/IfscBasedAccountPayload.java @@ -1,10 +1,9 @@ -package bisq.core.payment.payload; +package haveno.core.payment.payload; -import bisq.core.locale.BankUtil; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; - +import haveno.core.locale.BankUtil; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/payload/ImpsAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/ImpsAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/ImpsAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/ImpsAccountPayload.java index 9dcc1fb0..98105c9b 100644 --- a/core/src/main/java/bisq/core/payment/payload/ImpsAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/ImpsAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java b/core/src/main/java/haveno/core/payment/payload/InstantCryptoCurrencyPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java rename to core/src/main/java/haveno/core/payment/payload/InstantCryptoCurrencyPayload.java index 9d96a62e..bc423467 100644 --- a/core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/InstantCryptoCurrencyPayload.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; +package haveno.core.payment.payload; import com.google.protobuf.Message; diff --git a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/InteracETransferAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/InteracETransferAccountPayload.java index 09445f32..60a2e7ed 100644 --- a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/InteracETransferAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/JapanBankAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/JapanBankAccountPayload.java index 146eb438..ecd525dd 100644 --- a/core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/JapanBankAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/MoneseAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/MoneseAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/MoneseAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/MoneseAccountPayload.java index bbc299a1..2a5651be 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneseAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/MoneseAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/MoneyBeamAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/MoneyBeamAccountPayload.java index f63ef5b1..acab5641 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/MoneyBeamAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/MoneyGramAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/MoneyGramAccountPayload.java index d24729b8..517f6589 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/MoneyGramAccountPayload.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.BankUtil; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.BankUtil; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/NationalBankAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/NationalBankAccountPayload.java index ff6a356d..3b4dd556 100644 --- a/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/NationalBankAccountPayload.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; +import haveno.core.locale.Res; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/payload/NeftAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/NeftAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/NeftAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/NeftAccountPayload.java index 4726a667..80d2fec3 100644 --- a/core/src/main/java/bisq/core/payment/payload/NeftAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/NeftAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/NequiAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/NequiAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/NequiAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/NequiAccountPayload.java index 25628ed9..907f6be3 100644 --- a/core/src/main/java/bisq/core/payment/payload/NequiAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/NequiAccountPayload.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Country; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Country; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/OKPayAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/OKPayAccountPayload.java index 956ba85d..bd9e280f 100644 --- a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/OKPayAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PaxumAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PaxumAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/PaxumAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PaxumAccountPayload.java index 00e3c533..fa53a2a0 100644 --- a/core/src/main/java/bisq/core/payment/payload/PaxumAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PaxumAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PayloadWithHolderName.java b/core/src/main/java/haveno/core/payment/payload/PayloadWithHolderName.java similarity index 95% rename from core/src/main/java/bisq/core/payment/payload/PayloadWithHolderName.java rename to core/src/main/java/haveno/core/payment/payload/PayloadWithHolderName.java index a377eaa8..9d6e8cea 100644 --- a/core/src/main/java/bisq/core/payment/payload/PayloadWithHolderName.java +++ b/core/src/main/java/haveno/core/payment/payload/PayloadWithHolderName.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; +package haveno.core.payment.payload; public interface PayloadWithHolderName { String getHolderName(); diff --git a/core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PaymentAccountPayload.java similarity index 94% rename from core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PaymentAccountPayload.java index e3f4cc69..29e8dfc5 100644 --- a/core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PaymentAccountPayload.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.common.consensus.UsedForTradeContractJson; -import bisq.common.crypto.CryptoUtils; -import bisq.common.crypto.Hash; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.util.JsonExclude; -import bisq.common.util.Utilities; -import bisq.core.proto.CoreProtoResolver; +package haveno.core.payment.payload; import org.apache.commons.lang3.ArrayUtils; import com.google.gson.GsonBuilder; - +import haveno.common.consensus.UsedForTradeContractJson; +import haveno.common.crypto.CryptoUtils; +import haveno.common.crypto.Hash; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.util.JsonExclude; +import haveno.common.util.Utilities; +import haveno.core.proto.CoreProtoResolver; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java similarity index 91% rename from core/src/main/java/bisq/core/payment/payload/PaymentMethod.java rename to core/src/main/java/haveno/core/payment/payload/PaymentMethod.java index 55237ee5..fc115173 100644 --- a/core/src/main/java/bisq/core/payment/payload/PaymentMethod.java +++ b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java @@ -15,68 +15,67 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.payment.AchTransferAccount; -import bisq.core.payment.AdvancedCashAccount; -import bisq.core.payment.AliPayAccount; -import bisq.core.payment.AmazonGiftCardAccount; -import bisq.core.payment.AustraliaPayidAccount; -import bisq.core.payment.BizumAccount; -import bisq.core.payment.CapitualAccount; -import bisq.core.payment.CashByMailAccount; -import bisq.core.payment.CashDepositAccount; -import bisq.core.payment.CelPayAccount; -import bisq.core.payment.ClearXchangeAccount; -import bisq.core.payment.DomesticWireTransferAccount; -import bisq.core.payment.F2FAccount; -import bisq.core.payment.FasterPaymentsAccount; -import bisq.core.payment.HalCashAccount; -import bisq.core.payment.ImpsAccount; -import bisq.core.payment.InteracETransferAccount; -import bisq.core.payment.JapanBankAccount; -import bisq.core.payment.MoneseAccount; -import bisq.core.payment.MoneyBeamAccount; -import bisq.core.payment.MoneyGramAccount; -import bisq.core.payment.NationalBankAccount; -import bisq.core.payment.NeftAccount; -import bisq.core.payment.NequiAccount; -import bisq.core.payment.PaxumAccount; -import bisq.core.payment.PayseraAccount; -import bisq.core.payment.PaytmAccount; -import bisq.core.payment.PerfectMoneyAccount; -import bisq.core.payment.PixAccount; -import bisq.core.payment.PopmoneyAccount; -import bisq.core.payment.PromptPayAccount; -import bisq.core.payment.RevolutAccount; -import bisq.core.payment.RtgsAccount; -import bisq.core.payment.SameBankAccount; -import bisq.core.payment.SatispayAccount; -import bisq.core.payment.SepaAccount; -import bisq.core.payment.SepaInstantAccount; -import bisq.core.payment.SpecificBanksAccount; -import bisq.core.payment.StrikeAccount; -import bisq.core.payment.SwiftAccount; -import bisq.core.payment.SwishAccount; -import bisq.core.payment.TikkieAccount; -import bisq.core.payment.TradeLimits; -import bisq.core.payment.TransferwiseAccount; -import bisq.core.payment.TransferwiseUsdAccount; -import bisq.core.payment.USPostalMoneyOrderAccount; -import bisq.core.payment.UpholdAccount; -import bisq.core.payment.UpiAccount; -import bisq.core.payment.VerseAccount; -import bisq.core.payment.WeChatPayAccount; -import bisq.core.payment.WesternUnionAccount; -import bisq.core.trade.HavenoUtils; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.OfferRestrictions; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.payment.payload; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.OfferRestrictions; +import haveno.core.payment.AchTransferAccount; +import haveno.core.payment.AdvancedCashAccount; +import haveno.core.payment.AliPayAccount; +import haveno.core.payment.AmazonGiftCardAccount; +import haveno.core.payment.AustraliaPayidAccount; +import haveno.core.payment.BizumAccount; +import haveno.core.payment.CapitualAccount; +import haveno.core.payment.CashByMailAccount; +import haveno.core.payment.CashDepositAccount; +import haveno.core.payment.CelPayAccount; +import haveno.core.payment.ClearXchangeAccount; +import haveno.core.payment.DomesticWireTransferAccount; +import haveno.core.payment.F2FAccount; +import haveno.core.payment.FasterPaymentsAccount; +import haveno.core.payment.HalCashAccount; +import haveno.core.payment.ImpsAccount; +import haveno.core.payment.InteracETransferAccount; +import haveno.core.payment.JapanBankAccount; +import haveno.core.payment.MoneseAccount; +import haveno.core.payment.MoneyBeamAccount; +import haveno.core.payment.MoneyGramAccount; +import haveno.core.payment.NationalBankAccount; +import haveno.core.payment.NeftAccount; +import haveno.core.payment.NequiAccount; +import haveno.core.payment.PaxumAccount; +import haveno.core.payment.PayseraAccount; +import haveno.core.payment.PaytmAccount; +import haveno.core.payment.PerfectMoneyAccount; +import haveno.core.payment.PixAccount; +import haveno.core.payment.PopmoneyAccount; +import haveno.core.payment.PromptPayAccount; +import haveno.core.payment.RevolutAccount; +import haveno.core.payment.RtgsAccount; +import haveno.core.payment.SameBankAccount; +import haveno.core.payment.SatispayAccount; +import haveno.core.payment.SepaAccount; +import haveno.core.payment.SepaInstantAccount; +import haveno.core.payment.SpecificBanksAccount; +import haveno.core.payment.StrikeAccount; +import haveno.core.payment.SwiftAccount; +import haveno.core.payment.SwishAccount; +import haveno.core.payment.TikkieAccount; +import haveno.core.payment.TradeLimits; +import haveno.core.payment.TransferwiseAccount; +import haveno.core.payment.TransferwiseUsdAccount; +import haveno.core.payment.USPostalMoneyOrderAccount; +import haveno.core.payment.UpholdAccount; +import haveno.core.payment.UpiAccount; +import haveno.core.payment.VerseAccount; +import haveno.core.payment.WeChatPayAccount; +import haveno.core.payment.WesternUnionAccount; +import haveno.core.trade.HavenoUtils; import java.math.BigInteger; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/bisq/core/payment/payload/PayseraAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PayseraAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/PayseraAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PayseraAccountPayload.java index e26710c2..d47aaaef 100644 --- a/core/src/main/java/bisq/core/payment/payload/PayseraAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PayseraAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PaytmAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PaytmAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/PaytmAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PaytmAccountPayload.java index 508644bd..554a6593 100644 --- a/core/src/main/java/bisq/core/payment/payload/PaytmAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PaytmAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PerfectMoneyAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PerfectMoneyAccountPayload.java index 8c72fa99..5610fbeb 100644 --- a/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PerfectMoneyAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PixAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PixAccountPayload.java index e0ed8300..91069527 100644 --- a/core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PixAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PopmoneyAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PopmoneyAccountPayload.java index 46fe2c08..7abd1c2f 100644 --- a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PopmoneyAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PromptPayAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/PromptPayAccountPayload.java index 98c38eec..37d0d58c 100644 --- a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/PromptPayAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/RevolutAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/RevolutAccountPayload.java index 3212c2a7..77a9c7e8 100644 --- a/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/RevolutAccountPayload.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; - -import bisq.common.util.JsonExclude; -import bisq.common.util.Tuple2; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.common.util.JsonExclude; +import haveno.common.util.Tuple2; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/RtgsAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/RtgsAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/RtgsAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/RtgsAccountPayload.java index c5ea0944..e2c02174 100644 --- a/core/src/main/java/bisq/core/payment/payload/RtgsAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/RtgsAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/SameBankAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/SameBankAccountPayload.java index afc9db01..ff39e7c1 100644 --- a/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/SameBankAccountPayload.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; +import haveno.core.locale.Res; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/bisq/core/payment/payload/SatispayAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/SatispayAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/SatispayAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/SatispayAccountPayload.java index 956f1157..f9aa8f31 100644 --- a/core/src/main/java/bisq/core/payment/payload/SatispayAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/SatispayAccountPayload.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Country; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Country; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/SepaAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/SepaAccountPayload.java index 8d6bb18b..85325b8c 100644 --- a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/SepaAccountPayload.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/SepaInstantAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/SepaInstantAccountPayload.java index 27872f64..387113a7 100644 --- a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/SepaInstantAccountPayload.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/SpecificBanksAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/SpecificBanksAccountPayload.java index 7c989d2c..80660d39 100644 --- a/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/SpecificBanksAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import com.google.common.base.Joiner; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/payment/payload/StrikeAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/StrikeAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/StrikeAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/StrikeAccountPayload.java index ab68a202..760aac40 100644 --- a/core/src/main/java/bisq/core/payment/payload/StrikeAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/StrikeAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/SwiftAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/SwiftAccountPayload.java similarity index 99% rename from core/src/main/java/bisq/core/payment/payload/SwiftAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/SwiftAccountPayload.java index 4c8cc986..1b02ea6e 100644 --- a/core/src/main/java/bisq/core/payment/payload/SwiftAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/SwiftAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/SwishAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/SwishAccountPayload.java index 0153c52a..abc76a27 100644 --- a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/SwishAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/TikkieAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/TikkieAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/TikkieAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/TikkieAccountPayload.java index b593c4a2..1b1189f0 100644 --- a/core/src/main/java/bisq/core/payment/payload/TikkieAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/TikkieAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/TransferwiseAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/TransferwiseAccountPayload.java index 4e4165bd..df34d5bb 100644 --- a/core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/TransferwiseAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/TransferwiseUsdAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/TransferwiseUsdAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/TransferwiseUsdAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/TransferwiseUsdAccountPayload.java index 80030397..117359b4 100644 --- a/core/src/main/java/bisq/core/payment/payload/TransferwiseUsdAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/TransferwiseUsdAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/USPostalMoneyOrderAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/USPostalMoneyOrderAccountPayload.java index d0dc1218..de232219 100644 --- a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/USPostalMoneyOrderAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; diff --git a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/UpholdAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/UpholdAccountPayload.java index 05f2f4d0..1e53c024 100644 --- a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/UpholdAccountPayload.java @@ -15,14 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; - -import bisq.common.util.JsonExclude; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.common.util.JsonExclude; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/UpiAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/UpiAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/UpiAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/UpiAccountPayload.java index ab3fba2a..b0014eed 100644 --- a/core/src/main/java/bisq/core/payment/payload/UpiAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/UpiAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/VenmoAccountPayload.java similarity index 98% rename from core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/VenmoAccountPayload.java index 1bd1f411..04e1a0e8 100644 --- a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/VenmoAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/VerseAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/VerseAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/VerseAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/VerseAccountPayload.java index d9344ef2..f64767b8 100644 --- a/core/src/main/java/bisq/core/payment/payload/VerseAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/VerseAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/WeChatPayAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/WeChatPayAccountPayload.java index 8eeb59d4..92d7d486 100644 --- a/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/WeChatPayAccountPayload.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/WesternUnionAccountPayload.java similarity index 97% rename from core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java rename to core/src/main/java/haveno/core/payment/payload/WesternUnionAccountPayload.java index 7da2f60b..a99ef0bf 100644 --- a/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java +++ b/core/src/main/java/haveno/core/payment/payload/WesternUnionAccountPayload.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.payload; - -import bisq.core.locale.BankUtil; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; +package haveno.core.payment.payload; import com.google.protobuf.Message; - +import haveno.core.locale.BankUtil; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/bisq/core/payment/validation/AccountNrValidator.java b/core/src/main/java/haveno/core/payment/validation/AccountNrValidator.java similarity index 98% rename from core/src/main/java/bisq/core/payment/validation/AccountNrValidator.java rename to core/src/main/java/haveno/core/payment/validation/AccountNrValidator.java index b1c2f4d4..ff031ed8 100644 --- a/core/src/main/java/bisq/core/payment/validation/AccountNrValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/AccountNrValidator.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.BankUtil; -import bisq.core.locale.Res; +package haveno.core.payment.validation; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Res; import org.apache.commons.lang3.StringUtils; public final class AccountNrValidator extends BankValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/AdvancedCashValidator.java b/core/src/main/java/haveno/core/payment/validation/AdvancedCashValidator.java similarity index 83% rename from core/src/main/java/bisq/core/payment/validation/AdvancedCashValidator.java rename to core/src/main/java/haveno/core/payment/validation/AdvancedCashValidator.java index c8c22a46..58a15ace 100644 --- a/core/src/main/java/bisq/core/payment/validation/AdvancedCashValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/AdvancedCashValidator.java @@ -1,9 +1,8 @@ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +package haveno.core.payment.validation; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; import javax.inject.Inject; public class AdvancedCashValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/AliPayValidator.java b/core/src/main/java/haveno/core/payment/validation/AliPayValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/AliPayValidator.java rename to core/src/main/java/haveno/core/payment/validation/AliPayValidator.java index 92dcc1f6..9956b861 100644 --- a/core/src/main/java/bisq/core/payment/validation/AliPayValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/AliPayValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class AliPayValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/AltCoinAddressValidator.java b/core/src/main/java/haveno/core/payment/validation/AltCoinAddressValidator.java similarity index 87% rename from core/src/main/java/bisq/core/payment/validation/AltCoinAddressValidator.java rename to core/src/main/java/haveno/core/payment/validation/AltCoinAddressValidator.java index dac938b0..fad3b2e5 100644 --- a/core/src/main/java/bisq/core/payment/validation/AltCoinAddressValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/AltCoinAddressValidator.java @@ -15,20 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; - -import bisq.asset.AddressValidationResult; -import bisq.asset.Asset; -import bisq.asset.AssetRegistry; - -import bisq.common.config.Config; +package haveno.core.payment.validation; import com.google.inject.Inject; - +import haveno.asset.AddressValidationResult; +import haveno.asset.Asset; +import haveno.asset.AssetRegistry; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; import java.util.Optional; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/payment/validation/AustraliaPayidAccountNameValidator.java b/core/src/main/java/haveno/core/payment/validation/AustraliaPayidAccountNameValidator.java similarity index 91% rename from core/src/main/java/bisq/core/payment/validation/AustraliaPayidAccountNameValidator.java rename to core/src/main/java/haveno/core/payment/validation/AustraliaPayidAccountNameValidator.java index 4f56d306..4d3f461f 100644 --- a/core/src/main/java/bisq/core/payment/validation/AustraliaPayidAccountNameValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/AustraliaPayidAccountNameValidator.java @@ -16,11 +16,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +package haveno.core.payment.validation; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; import javax.inject.Inject; public final class AustraliaPayidAccountNameValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/AustraliaPayidValidator.java b/core/src/main/java/haveno/core/payment/validation/AustraliaPayidValidator.java similarity index 95% rename from core/src/main/java/bisq/core/payment/validation/AustraliaPayidValidator.java rename to core/src/main/java/haveno/core/payment/validation/AustraliaPayidValidator.java index d1a90763..9c8bf57b 100644 --- a/core/src/main/java/bisq/core/payment/validation/AustraliaPayidValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/AustraliaPayidValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class AustraliaPayidValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/BICValidator.java b/core/src/main/java/haveno/core/payment/validation/BICValidator.java similarity index 96% rename from core/src/main/java/bisq/core/payment/validation/BICValidator.java rename to core/src/main/java/haveno/core/payment/validation/BICValidator.java index 94015a39..cca6b094 100644 --- a/core/src/main/java/bisq/core/payment/validation/BICValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/BICValidator.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; +package haveno.core.payment.validation; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; import java.util.Locale; /* diff --git a/core/src/main/java/bisq/core/payment/validation/BankIdValidator.java b/core/src/main/java/haveno/core/payment/validation/BankIdValidator.java similarity index 94% rename from core/src/main/java/bisq/core/payment/validation/BankIdValidator.java rename to core/src/main/java/haveno/core/payment/validation/BankIdValidator.java index 823e553c..ca939f61 100644 --- a/core/src/main/java/bisq/core/payment/validation/BankIdValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/BankIdValidator.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Res; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Res; public final class BankIdValidator extends BankValidator { public BankIdValidator(String countryCode) { diff --git a/core/src/main/java/bisq/core/payment/validation/BankValidator.java b/core/src/main/java/haveno/core/payment/validation/BankValidator.java similarity index 91% rename from core/src/main/java/bisq/core/payment/validation/BankValidator.java rename to core/src/main/java/haveno/core/payment/validation/BankValidator.java index fabaaed6..4ec60b6c 100644 --- a/core/src/main/java/bisq/core/payment/validation/BankValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/BankValidator.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public abstract class BankValidator extends InputValidator { protected String countryCode = ""; diff --git a/core/src/main/java/bisq/core/payment/validation/BranchIdValidator.java b/core/src/main/java/haveno/core/payment/validation/BranchIdValidator.java similarity index 96% rename from core/src/main/java/bisq/core/payment/validation/BranchIdValidator.java rename to core/src/main/java/haveno/core/payment/validation/BranchIdValidator.java index 71bba899..c497a636 100644 --- a/core/src/main/java/bisq/core/payment/validation/BranchIdValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/BranchIdValidator.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Res; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Res; public final class BranchIdValidator extends BankValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/CapitualValidator.java b/core/src/main/java/haveno/core/payment/validation/CapitualValidator.java similarity index 75% rename from core/src/main/java/bisq/core/payment/validation/CapitualValidator.java rename to core/src/main/java/haveno/core/payment/validation/CapitualValidator.java index 19c310a8..76a37b35 100644 --- a/core/src/main/java/bisq/core/payment/validation/CapitualValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/CapitualValidator.java @@ -1,9 +1,8 @@ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +package haveno.core.payment.validation; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; import javax.inject.Inject; public class CapitualValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/ChaseQuickPayValidator.java b/core/src/main/java/haveno/core/payment/validation/ChaseQuickPayValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/ChaseQuickPayValidator.java rename to core/src/main/java/haveno/core/payment/validation/ChaseQuickPayValidator.java index 218d0f9a..0bd19a0c 100644 --- a/core/src/main/java/bisq/core/payment/validation/ChaseQuickPayValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/ChaseQuickPayValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class ChaseQuickPayValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/CountryCallingCodes.java b/core/src/main/java/haveno/core/payment/validation/CountryCallingCodes.java similarity index 99% rename from core/src/main/java/bisq/core/payment/validation/CountryCallingCodes.java rename to core/src/main/java/haveno/core/payment/validation/CountryCallingCodes.java index f1e0e83f..99ce3bb7 100644 --- a/core/src/main/java/bisq/core/payment/validation/CountryCallingCodes.java +++ b/core/src/main/java/haveno/core/payment/validation/CountryCallingCodes.java @@ -1,4 +1,4 @@ -package bisq.core.payment.validation; +package haveno.core.payment.validation; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/validation/EmailOrMobileNrValidator.java b/core/src/main/java/haveno/core/payment/validation/EmailOrMobileNrValidator.java similarity index 95% rename from core/src/main/java/bisq/core/payment/validation/EmailOrMobileNrValidator.java rename to core/src/main/java/haveno/core/payment/validation/EmailOrMobileNrValidator.java index ceb65054..544f8058 100644 --- a/core/src/main/java/bisq/core/payment/validation/EmailOrMobileNrValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/EmailOrMobileNrValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class EmailOrMobileNrValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/EmailValidator.java b/core/src/main/java/haveno/core/payment/validation/EmailValidator.java similarity index 97% rename from core/src/main/java/bisq/core/payment/validation/EmailValidator.java rename to core/src/main/java/haveno/core/payment/validation/EmailValidator.java index eb49e0fc..d2720de2 100644 --- a/core/src/main/java/bisq/core/payment/validation/EmailValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/EmailValidator.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; /* * Mail addresses consist of localPart @ domainPart diff --git a/core/src/main/java/bisq/core/payment/validation/F2FValidator.java b/core/src/main/java/haveno/core/payment/validation/F2FValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/F2FValidator.java rename to core/src/main/java/haveno/core/payment/validation/F2FValidator.java index 00be30d7..97cfc29c 100644 --- a/core/src/main/java/bisq/core/payment/validation/F2FValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/F2FValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class F2FValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/FiatVolumeValidator.java b/core/src/main/java/haveno/core/payment/validation/FiatVolumeValidator.java similarity index 92% rename from core/src/main/java/bisq/core/payment/validation/FiatVolumeValidator.java rename to core/src/main/java/haveno/core/payment/validation/FiatVolumeValidator.java index c09e14a1..94223468 100644 --- a/core/src/main/java/bisq/core/payment/validation/FiatVolumeValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/FiatVolumeValidator.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.util.validation.MonetaryValidator; +package haveno.core.payment.validation; +import haveno.core.util.validation.MonetaryValidator; import javax.inject.Inject; public class FiatVolumeValidator extends MonetaryValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/HalCashValidator.java b/core/src/main/java/haveno/core/payment/validation/HalCashValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/HalCashValidator.java rename to core/src/main/java/haveno/core/payment/validation/HalCashValidator.java index fe13bcfa..716b3cac 100644 --- a/core/src/main/java/bisq/core/payment/validation/HalCashValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/HalCashValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class HalCashValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/IBANValidator.java b/core/src/main/java/haveno/core/payment/validation/IBANValidator.java similarity index 97% rename from core/src/main/java/bisq/core/payment/validation/IBANValidator.java rename to core/src/main/java/haveno/core/payment/validation/IBANValidator.java index 503b0363..3eadc7d8 100644 --- a/core/src/main/java/bisq/core/payment/validation/IBANValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/IBANValidator.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; +package haveno.core.payment.validation; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; import java.math.BigInteger; import java.util.Locale; diff --git a/core/src/main/java/bisq/core/payment/validation/InteracETransferAnswerValidator.java b/core/src/main/java/haveno/core/payment/validation/InteracETransferAnswerValidator.java similarity index 84% rename from core/src/main/java/bisq/core/payment/validation/InteracETransferAnswerValidator.java rename to core/src/main/java/haveno/core/payment/validation/InteracETransferAnswerValidator.java index 7f697bda..8145686e 100644 --- a/core/src/main/java/bisq/core/payment/validation/InteracETransferAnswerValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/InteracETransferAnswerValidator.java @@ -1,9 +1,8 @@ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +package haveno.core.payment.validation; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; import javax.inject.Inject; public class InteracETransferAnswerValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/InteracETransferQuestionValidator.java b/core/src/main/java/haveno/core/payment/validation/InteracETransferQuestionValidator.java similarity index 85% rename from core/src/main/java/bisq/core/payment/validation/InteracETransferQuestionValidator.java rename to core/src/main/java/haveno/core/payment/validation/InteracETransferQuestionValidator.java index 616e4692..bf9acc69 100644 --- a/core/src/main/java/bisq/core/payment/validation/InteracETransferQuestionValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/InteracETransferQuestionValidator.java @@ -1,9 +1,8 @@ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +package haveno.core.payment.validation; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; import javax.inject.Inject; public class InteracETransferQuestionValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/InteracETransferValidator.java b/core/src/main/java/haveno/core/payment/validation/InteracETransferValidator.java similarity index 96% rename from core/src/main/java/bisq/core/payment/validation/InteracETransferValidator.java rename to core/src/main/java/haveno/core/payment/validation/InteracETransferValidator.java index e124a68d..1e5bdced 100644 --- a/core/src/main/java/bisq/core/payment/validation/InteracETransferValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/InteracETransferValidator.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; +package haveno.core.payment.validation; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; import javax.inject.Inject; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/bisq/core/payment/validation/JapanBankAccountNameValidator.java b/core/src/main/java/haveno/core/payment/validation/JapanBankAccountNameValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/JapanBankAccountNameValidator.java rename to core/src/main/java/haveno/core/payment/validation/JapanBankAccountNameValidator.java index a6a3f491..540c5fbd 100644 --- a/core/src/main/java/bisq/core/payment/validation/JapanBankAccountNameValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/JapanBankAccountNameValidator.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.payment.JapanBankData; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +package haveno.core.payment.validation; +import haveno.core.payment.JapanBankData; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; import javax.inject.Inject; public final class JapanBankAccountNameValidator extends InputValidator diff --git a/core/src/main/java/bisq/core/payment/validation/JapanBankAccountNumberValidator.java b/core/src/main/java/haveno/core/payment/validation/JapanBankAccountNumberValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/JapanBankAccountNumberValidator.java rename to core/src/main/java/haveno/core/payment/validation/JapanBankAccountNumberValidator.java index 86882c31..364971c8 100644 --- a/core/src/main/java/bisq/core/payment/validation/JapanBankAccountNumberValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/JapanBankAccountNumberValidator.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; -import bisq.core.payment.JapanBankData; +import haveno.core.payment.JapanBankData; +import haveno.core.util.validation.InputValidator; public final class JapanBankAccountNumberValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/JapanBankBranchCodeValidator.java b/core/src/main/java/haveno/core/payment/validation/JapanBankBranchCodeValidator.java similarity index 88% rename from core/src/main/java/bisq/core/payment/validation/JapanBankBranchCodeValidator.java rename to core/src/main/java/haveno/core/payment/validation/JapanBankBranchCodeValidator.java index f9a90eff..e30b4ef4 100644 --- a/core/src/main/java/bisq/core/payment/validation/JapanBankBranchCodeValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/JapanBankBranchCodeValidator.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; -import bisq.core.payment.JapanBankData; +import haveno.core.payment.JapanBankData; +import haveno.core.util.validation.InputValidator; public final class JapanBankBranchCodeValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/JapanBankBranchNameValidator.java b/core/src/main/java/haveno/core/payment/validation/JapanBankBranchNameValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/JapanBankBranchNameValidator.java rename to core/src/main/java/haveno/core/payment/validation/JapanBankBranchNameValidator.java index 9750490f..3afbb0ea 100644 --- a/core/src/main/java/bisq/core/payment/validation/JapanBankBranchNameValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/JapanBankBranchNameValidator.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.payment.JapanBankData; - -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +package haveno.core.payment.validation; +import haveno.core.payment.JapanBankData; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; import javax.inject.Inject; public final class JapanBankBranchNameValidator extends InputValidator diff --git a/core/src/main/java/bisq/core/payment/validation/JapanBankTransferValidator.java b/core/src/main/java/haveno/core/payment/validation/JapanBankTransferValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/JapanBankTransferValidator.java rename to core/src/main/java/haveno/core/payment/validation/JapanBankTransferValidator.java index 1616db35..78395114 100644 --- a/core/src/main/java/bisq/core/payment/validation/JapanBankTransferValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/JapanBankTransferValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class JapanBankTransferValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/LengthValidator.java b/core/src/main/java/haveno/core/payment/validation/LengthValidator.java similarity index 89% rename from core/src/main/java/bisq/core/payment/validation/LengthValidator.java rename to core/src/main/java/haveno/core/payment/validation/LengthValidator.java index e5572b92..f7626de9 100644 --- a/core/src/main/java/bisq/core/payment/validation/LengthValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/LengthValidator.java @@ -1,7 +1,7 @@ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; public class LengthValidator extends InputValidator { private int minLength; diff --git a/core/src/main/java/bisq/core/payment/validation/MoneyBeamValidator.java b/core/src/main/java/haveno/core/payment/validation/MoneyBeamValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/MoneyBeamValidator.java rename to core/src/main/java/haveno/core/payment/validation/MoneyBeamValidator.java index bb99e904..c691d15e 100644 --- a/core/src/main/java/bisq/core/payment/validation/MoneyBeamValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/MoneyBeamValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class MoneyBeamValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/NationalAccountIdValidator.java b/core/src/main/java/haveno/core/payment/validation/NationalAccountIdValidator.java similarity index 88% rename from core/src/main/java/bisq/core/payment/validation/NationalAccountIdValidator.java rename to core/src/main/java/haveno/core/payment/validation/NationalAccountIdValidator.java index 9b47db52..2f915c23 100644 --- a/core/src/main/java/bisq/core/payment/validation/NationalAccountIdValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/NationalAccountIdValidator.java @@ -1,7 +1,7 @@ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Res; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Res; public class NationalAccountIdValidator extends BankValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/PercentageNumberValidator.java b/core/src/main/java/haveno/core/payment/validation/PercentageNumberValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/PercentageNumberValidator.java rename to core/src/main/java/haveno/core/payment/validation/PercentageNumberValidator.java index 0c99fe3e..9b6964cb 100644 --- a/core/src/main/java/bisq/core/payment/validation/PercentageNumberValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/PercentageNumberValidator.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.NumberValidator; +package haveno.core.payment.validation; import lombok.Setter; - +import haveno.core.locale.Res; +import haveno.core.util.validation.NumberValidator; import javax.annotation.Nullable; public class PercentageNumberValidator extends NumberValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/PerfectMoneyValidator.java b/core/src/main/java/haveno/core/payment/validation/PerfectMoneyValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/PerfectMoneyValidator.java rename to core/src/main/java/haveno/core/payment/validation/PerfectMoneyValidator.java index 9bad62b8..201b3bb8 100644 --- a/core/src/main/java/bisq/core/payment/validation/PerfectMoneyValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/PerfectMoneyValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class PerfectMoneyValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/PhoneNumberValidator.java b/core/src/main/java/haveno/core/payment/validation/PhoneNumberValidator.java similarity index 97% rename from core/src/main/java/bisq/core/payment/validation/PhoneNumberValidator.java rename to core/src/main/java/haveno/core/payment/validation/PhoneNumberValidator.java index 9a94ea7d..947ef8d7 100644 --- a/core/src/main/java/bisq/core/payment/validation/PhoneNumberValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/PhoneNumberValidator.java @@ -1,10 +1,8 @@ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; +package haveno.core.payment.validation; import lombok.Getter; - +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; import javax.annotation.Nullable; /** @@ -17,7 +15,7 @@ import javax.annotation.Nullable; * Area codes and mobile provider codes are not validated, but all numbers following * calling codes are included in the normalized number. *

- * @see bisq.core.payment.validation.CountryCallingCodes + * @see haveno.core.payment.validation.CountryCallingCodes */ public class PhoneNumberValidator extends InputValidator { /** diff --git a/core/src/main/java/bisq/core/payment/validation/PopmoneyValidator.java b/core/src/main/java/haveno/core/payment/validation/PopmoneyValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/PopmoneyValidator.java rename to core/src/main/java/haveno/core/payment/validation/PopmoneyValidator.java index 45054c92..2af6e408 100644 --- a/core/src/main/java/bisq/core/payment/validation/PopmoneyValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/PopmoneyValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class PopmoneyValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/PromptPayValidator.java b/core/src/main/java/haveno/core/payment/validation/PromptPayValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/PromptPayValidator.java rename to core/src/main/java/haveno/core/payment/validation/PromptPayValidator.java index 87b39a03..30011d95 100644 --- a/core/src/main/java/bisq/core/payment/validation/PromptPayValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/PromptPayValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class PromptPayValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/RevolutValidator.java b/core/src/main/java/haveno/core/payment/validation/RevolutValidator.java similarity index 97% rename from core/src/main/java/bisq/core/payment/validation/RevolutValidator.java rename to core/src/main/java/haveno/core/payment/validation/RevolutValidator.java index dacbcf77..7a2c8779 100644 --- a/core/src/main/java/bisq/core/payment/validation/RevolutValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/RevolutValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; public final class RevolutValidator extends LengthValidator { public RevolutValidator() { diff --git a/core/src/main/java/bisq/core/payment/validation/SecurityDepositValidator.java b/core/src/main/java/haveno/core/payment/validation/SecurityDepositValidator.java similarity index 91% rename from core/src/main/java/bisq/core/payment/validation/SecurityDepositValidator.java rename to core/src/main/java/haveno/core/payment/validation/SecurityDepositValidator.java index 9755f8dc..3e40616d 100644 --- a/core/src/main/java/bisq/core/payment/validation/SecurityDepositValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/SecurityDepositValidator.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.btc.wallet.Restrictions; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.util.FormattingUtils; -import bisq.core.util.ParsingUtils; -import bisq.core.util.validation.NumberValidator; +package haveno.core.payment.validation; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.util.FormattingUtils; +import haveno.core.util.ParsingUtils; +import haveno.core.util.validation.NumberValidator; import javax.inject.Inject; public class SecurityDepositValidator extends NumberValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/SepaIBANValidator.java b/core/src/main/java/haveno/core/payment/validation/SepaIBANValidator.java similarity index 84% rename from core/src/main/java/bisq/core/payment/validation/SepaIBANValidator.java rename to core/src/main/java/haveno/core/payment/validation/SepaIBANValidator.java index 11682f1d..8057ba07 100644 --- a/core/src/main/java/bisq/core/payment/validation/SepaIBANValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/SepaIBANValidator.java @@ -1,9 +1,8 @@ -package bisq.core.payment.validation; - -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; +package haveno.core.payment.validation; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/payment/validation/SwishValidator.java b/core/src/main/java/haveno/core/payment/validation/SwishValidator.java similarity index 97% rename from core/src/main/java/bisq/core/payment/validation/SwishValidator.java rename to core/src/main/java/haveno/core/payment/validation/SwishValidator.java index 358eba72..5e50953f 100644 --- a/core/src/main/java/bisq/core/payment/validation/SwishValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/SwishValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; public final class SwishValidator extends PhoneNumberValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/TransferwiseValidator.java b/core/src/main/java/haveno/core/payment/validation/TransferwiseValidator.java similarity index 92% rename from core/src/main/java/bisq/core/payment/validation/TransferwiseValidator.java rename to core/src/main/java/haveno/core/payment/validation/TransferwiseValidator.java index cec0fad5..4e7f870d 100644 --- a/core/src/main/java/bisq/core/payment/validation/TransferwiseValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/TransferwiseValidator.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.util.validation.InputValidator; +package haveno.core.payment.validation; +import haveno.core.util.validation.InputValidator; import javax.inject.Inject; public final class TransferwiseValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/USPostalMoneyOrderValidator.java b/core/src/main/java/haveno/core/payment/validation/USPostalMoneyOrderValidator.java similarity index 93% rename from core/src/main/java/bisq/core/payment/validation/USPostalMoneyOrderValidator.java rename to core/src/main/java/haveno/core/payment/validation/USPostalMoneyOrderValidator.java index c9253fef..c75f9d7d 100644 --- a/core/src/main/java/bisq/core/payment/validation/USPostalMoneyOrderValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/USPostalMoneyOrderValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class USPostalMoneyOrderValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/UpholdValidator.java b/core/src/main/java/haveno/core/payment/validation/UpholdValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/UpholdValidator.java rename to core/src/main/java/haveno/core/payment/validation/UpholdValidator.java index afbbe91d..cb37982c 100644 --- a/core/src/main/java/bisq/core/payment/validation/UpholdValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/UpholdValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class UpholdValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/WeChatPayValidator.java b/core/src/main/java/haveno/core/payment/validation/WeChatPayValidator.java similarity index 90% rename from core/src/main/java/bisq/core/payment/validation/WeChatPayValidator.java rename to core/src/main/java/haveno/core/payment/validation/WeChatPayValidator.java index 5f4bb208..aacc458d 100644 --- a/core/src/main/java/bisq/core/payment/validation/WeChatPayValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/WeChatPayValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; +package haveno.core.payment.validation; -import bisq.core.util.validation.InputValidator; +import haveno.core.util.validation.InputValidator; public final class WeChatPayValidator extends InputValidator { diff --git a/core/src/main/java/bisq/core/payment/validation/XmrValidator.java b/core/src/main/java/haveno/core/payment/validation/XmrValidator.java similarity index 96% rename from core/src/main/java/bisq/core/payment/validation/XmrValidator.java rename to core/src/main/java/haveno/core/payment/validation/XmrValidator.java index 7df7f14b..d47a3d40 100644 --- a/core/src/main/java/bisq/core/payment/validation/XmrValidator.java +++ b/core/src/main/java/haveno/core/payment/validation/XmrValidator.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.validation.NumberValidator; +package haveno.core.payment.validation; import javax.inject.Inject; - +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.validation.NumberValidator; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/main/java/bisq/core/presentation/BalancePresentation.java b/core/src/main/java/haveno/core/presentation/BalancePresentation.java similarity index 93% rename from core/src/main/java/bisq/core/presentation/BalancePresentation.java rename to core/src/main/java/haveno/core/presentation/BalancePresentation.java index d064f37d..5a363d14 100644 --- a/core/src/main/java/bisq/core/presentation/BalancePresentation.java +++ b/core/src/main/java/haveno/core/presentation/BalancePresentation.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.presentation; +package haveno.core.presentation; -import bisq.common.UserThread; -import bisq.core.btc.Balances; -import bisq.core.trade.HavenoUtils; +import haveno.common.UserThread; +import haveno.core.btc.Balances; +import haveno.core.trade.HavenoUtils; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/presentation/CorePresentationModule.java b/core/src/main/java/haveno/core/presentation/CorePresentationModule.java similarity index 91% rename from core/src/main/java/bisq/core/presentation/CorePresentationModule.java rename to core/src/main/java/haveno/core/presentation/CorePresentationModule.java index 4dc9bf71..8d21e9ea 100644 --- a/core/src/main/java/bisq/core/presentation/CorePresentationModule.java +++ b/core/src/main/java/haveno/core/presentation/CorePresentationModule.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.presentation; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.core.presentation; import com.google.inject.Singleton; +import haveno.common.app.AppModule; +import haveno.common.config.Config; public class CorePresentationModule extends AppModule { diff --git a/core/src/main/java/bisq/core/presentation/SupportTicketsPresentation.java b/core/src/main/java/haveno/core/presentation/SupportTicketsPresentation.java similarity index 92% rename from core/src/main/java/bisq/core/presentation/SupportTicketsPresentation.java rename to core/src/main/java/haveno/core/presentation/SupportTicketsPresentation.java index 43064759..69f01f8b 100644 --- a/core/src/main/java/bisq/core/presentation/SupportTicketsPresentation.java +++ b/core/src/main/java/haveno/core/presentation/SupportTicketsPresentation.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.presentation; - -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; +package haveno.core.presentation; import javax.inject.Inject; - +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/core/src/main/java/bisq/core/presentation/TradePresentation.java b/core/src/main/java/haveno/core/presentation/TradePresentation.java similarity index 93% rename from core/src/main/java/bisq/core/presentation/TradePresentation.java rename to core/src/main/java/haveno/core/presentation/TradePresentation.java index f3ffa04f..af90c8b8 100644 --- a/core/src/main/java/bisq/core/presentation/TradePresentation.java +++ b/core/src/main/java/haveno/core/presentation/TradePresentation.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.presentation; - -import bisq.common.UserThread; -import bisq.core.trade.TradeManager; +package haveno.core.presentation; +import haveno.common.UserThread; +import haveno.core.trade.TradeManager; import javax.inject.Inject; import javafx.beans.property.BooleanProperty; diff --git a/core/src/main/java/bisq/core/proto/CoreProtoResolver.java b/core/src/main/java/haveno/core/proto/CoreProtoResolver.java similarity index 75% rename from core/src/main/java/bisq/core/proto/CoreProtoResolver.java rename to core/src/main/java/haveno/core/proto/CoreProtoResolver.java index e1e53079..d4d34356 100644 --- a/core/src/main/java/bisq/core/proto/CoreProtoResolver.java +++ b/core/src/main/java/haveno/core/proto/CoreProtoResolver.java @@ -15,74 +15,72 @@ * along with Haveno. If not, see . */ -package bisq.core.proto; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.payment.payload.AchTransferAccountPayload; -import bisq.core.payment.payload.AdvancedCashAccountPayload; -import bisq.core.payment.payload.AliPayAccountPayload; -import bisq.core.payment.payload.AmazonGiftCardAccountPayload; -import bisq.core.payment.payload.AustraliaPayidAccountPayload; -import bisq.core.payment.payload.BizumAccountPayload; -import bisq.core.payment.payload.CapitualAccountPayload; -import bisq.core.payment.payload.CashAppAccountPayload; -import bisq.core.payment.payload.CashByMailAccountPayload; -import bisq.core.payment.payload.CashDepositAccountPayload; -import bisq.core.payment.payload.CelPayAccountPayload; -import bisq.core.payment.payload.ChaseQuickPayAccountPayload; -import bisq.core.payment.payload.ClearXchangeAccountPayload; -import bisq.core.payment.payload.CryptoCurrencyAccountPayload; -import bisq.core.payment.payload.DomesticWireTransferAccountPayload; -import bisq.core.payment.payload.F2FAccountPayload; -import bisq.core.payment.payload.FasterPaymentsAccountPayload; -import bisq.core.payment.payload.HalCashAccountPayload; -import bisq.core.payment.payload.ImpsAccountPayload; -import bisq.core.payment.payload.InstantCryptoCurrencyPayload; -import bisq.core.payment.payload.InteracETransferAccountPayload; -import bisq.core.payment.payload.JapanBankAccountPayload; -import bisq.core.payment.payload.MoneseAccountPayload; -import bisq.core.payment.payload.MoneyBeamAccountPayload; -import bisq.core.payment.payload.MoneyGramAccountPayload; -import bisq.core.payment.payload.NationalBankAccountPayload; -import bisq.core.payment.payload.NeftAccountPayload; -import bisq.core.payment.payload.NequiAccountPayload; -import bisq.core.payment.payload.OKPayAccountPayload; -import bisq.core.payment.payload.PaxumAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PayseraAccountPayload; -import bisq.core.payment.payload.PaytmAccountPayload; -import bisq.core.payment.payload.PerfectMoneyAccountPayload; -import bisq.core.payment.payload.PixAccountPayload; -import bisq.core.payment.payload.PopmoneyAccountPayload; -import bisq.core.payment.payload.PromptPayAccountPayload; -import bisq.core.payment.payload.RevolutAccountPayload; -import bisq.core.payment.payload.RtgsAccountPayload; -import bisq.core.payment.payload.SameBankAccountPayload; -import bisq.core.payment.payload.SatispayAccountPayload; -import bisq.core.payment.payload.SepaAccountPayload; -import bisq.core.payment.payload.SepaInstantAccountPayload; -import bisq.core.payment.payload.SpecificBanksAccountPayload; -import bisq.core.payment.payload.StrikeAccountPayload; -import bisq.core.payment.payload.SwiftAccountPayload; -import bisq.core.payment.payload.SwishAccountPayload; -import bisq.core.payment.payload.TikkieAccountPayload; -import bisq.core.payment.payload.TransferwiseAccountPayload; -import bisq.core.payment.payload.TransferwiseUsdAccountPayload; -import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload; -import bisq.core.payment.payload.UpholdAccountPayload; -import bisq.core.payment.payload.UpiAccountPayload; -import bisq.core.payment.payload.VenmoAccountPayload; -import bisq.core.payment.payload.VerseAccountPayload; -import bisq.core.payment.payload.WeChatPayAccountPayload; -import bisq.core.payment.payload.WesternUnionAccountPayload; -import bisq.core.trade.statistics.TradeStatistics2; -import bisq.core.trade.statistics.TradeStatistics3; - -import bisq.common.proto.ProtoResolver; -import bisq.common.proto.ProtobufferRuntimeException; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.proto; +import haveno.common.proto.ProtoResolver; +import haveno.common.proto.ProtobufferRuntimeException; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.payment.payload.AchTransferAccountPayload; +import haveno.core.payment.payload.AdvancedCashAccountPayload; +import haveno.core.payment.payload.AliPayAccountPayload; +import haveno.core.payment.payload.AmazonGiftCardAccountPayload; +import haveno.core.payment.payload.AustraliaPayidAccountPayload; +import haveno.core.payment.payload.BizumAccountPayload; +import haveno.core.payment.payload.CapitualAccountPayload; +import haveno.core.payment.payload.CashAppAccountPayload; +import haveno.core.payment.payload.CashByMailAccountPayload; +import haveno.core.payment.payload.CashDepositAccountPayload; +import haveno.core.payment.payload.CelPayAccountPayload; +import haveno.core.payment.payload.ChaseQuickPayAccountPayload; +import haveno.core.payment.payload.ClearXchangeAccountPayload; +import haveno.core.payment.payload.CryptoCurrencyAccountPayload; +import haveno.core.payment.payload.DomesticWireTransferAccountPayload; +import haveno.core.payment.payload.F2FAccountPayload; +import haveno.core.payment.payload.FasterPaymentsAccountPayload; +import haveno.core.payment.payload.HalCashAccountPayload; +import haveno.core.payment.payload.ImpsAccountPayload; +import haveno.core.payment.payload.InstantCryptoCurrencyPayload; +import haveno.core.payment.payload.InteracETransferAccountPayload; +import haveno.core.payment.payload.JapanBankAccountPayload; +import haveno.core.payment.payload.MoneseAccountPayload; +import haveno.core.payment.payload.MoneyBeamAccountPayload; +import haveno.core.payment.payload.MoneyGramAccountPayload; +import haveno.core.payment.payload.NationalBankAccountPayload; +import haveno.core.payment.payload.NeftAccountPayload; +import haveno.core.payment.payload.NequiAccountPayload; +import haveno.core.payment.payload.OKPayAccountPayload; +import haveno.core.payment.payload.PaxumAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PayseraAccountPayload; +import haveno.core.payment.payload.PaytmAccountPayload; +import haveno.core.payment.payload.PerfectMoneyAccountPayload; +import haveno.core.payment.payload.PixAccountPayload; +import haveno.core.payment.payload.PopmoneyAccountPayload; +import haveno.core.payment.payload.PromptPayAccountPayload; +import haveno.core.payment.payload.RevolutAccountPayload; +import haveno.core.payment.payload.RtgsAccountPayload; +import haveno.core.payment.payload.SameBankAccountPayload; +import haveno.core.payment.payload.SatispayAccountPayload; +import haveno.core.payment.payload.SepaAccountPayload; +import haveno.core.payment.payload.SepaInstantAccountPayload; +import haveno.core.payment.payload.SpecificBanksAccountPayload; +import haveno.core.payment.payload.StrikeAccountPayload; +import haveno.core.payment.payload.SwiftAccountPayload; +import haveno.core.payment.payload.SwishAccountPayload; +import haveno.core.payment.payload.TikkieAccountPayload; +import haveno.core.payment.payload.TransferwiseAccountPayload; +import haveno.core.payment.payload.TransferwiseUsdAccountPayload; +import haveno.core.payment.payload.USPostalMoneyOrderAccountPayload; +import haveno.core.payment.payload.UpholdAccountPayload; +import haveno.core.payment.payload.UpiAccountPayload; +import haveno.core.payment.payload.VenmoAccountPayload; +import haveno.core.payment.payload.VerseAccountPayload; +import haveno.core.payment.payload.WeChatPayAccountPayload; +import haveno.core.payment.payload.WesternUnionAccountPayload; +import haveno.core.trade.statistics.TradeStatistics2; +import haveno.core.trade.statistics.TradeStatistics3; import java.time.Clock; import lombok.Getter; diff --git a/core/src/main/java/bisq/core/proto/ProtoDevUtil.java b/core/src/main/java/haveno/core/proto/ProtoDevUtil.java similarity index 94% rename from core/src/main/java/bisq/core/proto/ProtoDevUtil.java rename to core/src/main/java/haveno/core/proto/ProtoDevUtil.java index 8808eb35..6e2c8b68 100644 --- a/core/src/main/java/bisq/core/proto/ProtoDevUtil.java +++ b/core/src/main/java/haveno/core/proto/ProtoDevUtil.java @@ -15,17 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.proto; - -import bisq.core.btc.model.AddressEntry; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.offer.AvailabilityResult; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOffer; -import bisq.core.trade.Trade; +package haveno.core.proto; +import haveno.core.btc.model.AddressEntry; +import haveno.core.offer.AvailabilityResult; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.trade.Trade; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java b/core/src/main/java/haveno/core/proto/network/CoreNetworkProtoResolver.java similarity index 76% rename from core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java rename to core/src/main/java/haveno/core/proto/network/CoreNetworkProtoResolver.java index 0e25a7a6..183ec538 100644 --- a/core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java +++ b/core/src/main/java/haveno/core/proto/network/CoreNetworkProtoResolver.java @@ -15,64 +15,61 @@ * along with Haveno. If not, see . */ -package bisq.core.proto.network; - -import bisq.core.alert.Alert; -import bisq.core.alert.PrivateNotificationMessage; -import bisq.core.filter.Filter; -import bisq.core.network.p2p.inventory.messages.GetInventoryRequest; -import bisq.core.network.p2p.inventory.messages.GetInventoryResponse; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.messages.OfferAvailabilityRequest; -import bisq.core.offer.messages.OfferAvailabilityResponse; -import bisq.core.offer.messages.SignOfferRequest; -import bisq.core.offer.messages.SignOfferResponse; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.mediation.mediator.Mediator; -import bisq.core.support.dispute.messages.DisputeClosedMessage; -import bisq.core.support.dispute.messages.DisputeOpenedMessage; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.messages.PaymentSentMessage; -import bisq.core.trade.messages.DepositRequest; -import bisq.core.trade.messages.DepositResponse; -import bisq.core.trade.messages.InitMultisigRequest; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.messages.MediatedPayoutTxPublishedMessage; -import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage; -import bisq.core.trade.messages.DepositsConfirmedMessage; -import bisq.core.trade.messages.PaymentReceivedMessage; -import bisq.core.trade.messages.RefreshTradeStateRequest; -import bisq.core.trade.messages.SignContractRequest; -import bisq.core.trade.messages.SignContractResponse; - -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.BundleOfEnvelopes; -import bisq.network.p2p.CloseConnectionMessage; -import bisq.network.p2p.PrefixedSealedAndSignedMessage; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; -import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; -import bisq.network.p2p.peers.keepalive.messages.Ping; -import bisq.network.p2p.peers.keepalive.messages.Pong; -import bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest; -import bisq.network.p2p.peers.peerexchange.messages.GetPeersResponse; -import bisq.network.p2p.storage.messages.AddDataMessage; -import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; -import bisq.network.p2p.storage.messages.RefreshOfferMessage; -import bisq.network.p2p.storage.messages.RemoveDataMessage; -import bisq.network.p2p.storage.messages.RemoveMailboxDataMessage; -import bisq.network.p2p.storage.payload.MailboxStoragePayload; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.ProtobufferRuntimeException; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.core.proto.network; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.ProtobufferRuntimeException; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.core.alert.Alert; +import haveno.core.alert.PrivateNotificationMessage; +import haveno.core.filter.Filter; +import haveno.core.network.p2p.inventory.messages.GetInventoryRequest; +import haveno.core.network.p2p.inventory.messages.GetInventoryResponse; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.messages.OfferAvailabilityRequest; +import haveno.core.offer.messages.OfferAvailabilityResponse; +import haveno.core.offer.messages.SignOfferRequest; +import haveno.core.offer.messages.SignOfferResponse; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.core.support.dispute.messages.DisputeClosedMessage; +import haveno.core.support.dispute.messages.DisputeOpenedMessage; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.messages.DepositRequest; +import haveno.core.trade.messages.DepositResponse; +import haveno.core.trade.messages.DepositsConfirmedMessage; +import haveno.core.trade.messages.InitMultisigRequest; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.messages.MediatedPayoutTxPublishedMessage; +import haveno.core.trade.messages.MediatedPayoutTxSignatureMessage; +import haveno.core.trade.messages.PaymentReceivedMessage; +import haveno.core.trade.messages.PaymentSentMessage; +import haveno.core.trade.messages.RefreshTradeStateRequest; +import haveno.core.trade.messages.SignContractRequest; +import haveno.core.trade.messages.SignContractResponse; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.BundleOfEnvelopes; +import haveno.network.p2p.CloseConnectionMessage; +import haveno.network.p2p.PrefixedSealedAndSignedMessage; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; +import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; +import haveno.network.p2p.peers.keepalive.messages.Ping; +import haveno.network.p2p.peers.keepalive.messages.Pong; +import haveno.network.p2p.peers.peerexchange.messages.GetPeersRequest; +import haveno.network.p2p.peers.peerexchange.messages.GetPeersResponse; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; +import haveno.network.p2p.storage.messages.RefreshOfferMessage; +import haveno.network.p2p.storage.messages.RemoveDataMessage; +import haveno.network.p2p.storage.messages.RemoveMailboxDataMessage; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java b/core/src/main/java/haveno/core/proto/persistable/CorePersistenceProtoResolver.java similarity index 76% rename from core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java rename to core/src/main/java/haveno/core/proto/persistable/CorePersistenceProtoResolver.java index 4af4a7f8..e83acbb4 100644 --- a/core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java +++ b/core/src/main/java/haveno/core/proto/persistable/CorePersistenceProtoResolver.java @@ -15,40 +15,37 @@ * along with Haveno. If not, see . */ -package bisq.core.proto.persistable; - -import bisq.core.account.sign.SignedWitnessStore; -import bisq.core.account.witness.AccountAgeWitnessStore; -import bisq.core.btc.model.AddressEntryList; -import bisq.core.btc.model.EncryptedConnectionList; -import bisq.core.btc.model.XmrAddressEntryList; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.SignedOfferList; -import bisq.core.payment.PaymentAccountList; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.dispute.arbitration.ArbitrationDisputeList; -import bisq.core.support.dispute.mediation.MediationDisputeList; -import bisq.core.support.dispute.refund.RefundDisputeList; -import bisq.core.trade.TradableList; -import bisq.core.trade.statistics.TradeStatistics2Store; -import bisq.core.trade.statistics.TradeStatistics3Store; -import bisq.core.user.PreferencesPayload; -import bisq.core.user.UserPayload; -import bisq.network.p2p.mailbox.IgnoredMailboxMap; -import bisq.network.p2p.mailbox.MailboxMessageList; -import bisq.network.p2p.peers.peerexchange.PeerList; -import bisq.network.p2p.storage.persistence.RemovedPayloadsMap; -import bisq.network.p2p.storage.persistence.SequenceNumberMap; - -import bisq.common.proto.ProtobufferRuntimeException; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.NavigationPath; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistenceProtoResolver; +package haveno.core.proto.persistable; import com.google.inject.Provider; - +import haveno.common.proto.ProtobufferRuntimeException; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.NavigationPath; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.core.account.sign.SignedWitnessStore; +import haveno.core.account.witness.AccountAgeWitnessStore; +import haveno.core.btc.model.AddressEntryList; +import haveno.core.btc.model.EncryptedConnectionList; +import haveno.core.btc.model.XmrAddressEntryList; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.SignedOfferList; +import haveno.core.payment.PaymentAccountList; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.dispute.arbitration.ArbitrationDisputeList; +import haveno.core.support.dispute.mediation.MediationDisputeList; +import haveno.core.support.dispute.refund.RefundDisputeList; +import haveno.core.trade.TradableList; +import haveno.core.trade.statistics.TradeStatistics2Store; +import haveno.core.trade.statistics.TradeStatistics3Store; +import haveno.core.user.PreferencesPayload; +import haveno.core.user.UserPayload; +import haveno.network.p2p.mailbox.IgnoredMailboxMap; +import haveno.network.p2p.mailbox.MailboxMessageList; +import haveno.network.p2p.peers.peerexchange.PeerList; +import haveno.network.p2p.storage.persistence.RemovedPayloadsMap; +import haveno.network.p2p.storage.persistence.SequenceNumberMap; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/provider/FeeHttpClient.java b/core/src/main/java/haveno/core/provider/FeeHttpClient.java similarity index 89% rename from core/src/main/java/bisq/core/provider/FeeHttpClient.java rename to core/src/main/java/haveno/core/provider/FeeHttpClient.java index 55d1792a..137e7352 100644 --- a/core/src/main/java/bisq/core/provider/FeeHttpClient.java +++ b/core/src/main/java/haveno/core/provider/FeeHttpClient.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.provider; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.http.HttpClientImpl; +package haveno.core.provider; import javax.inject.Inject; import javax.inject.Singleton; - +import haveno.network.Socks5ProxyProvider; +import haveno.network.http.HttpClientImpl; import javax.annotation.Nullable; @Singleton diff --git a/core/src/main/java/bisq/core/provider/HttpClientProvider.java b/core/src/main/java/haveno/core/provider/HttpClientProvider.java similarity index 95% rename from core/src/main/java/bisq/core/provider/HttpClientProvider.java rename to core/src/main/java/haveno/core/provider/HttpClientProvider.java index 1244ac54..19172dc3 100644 --- a/core/src/main/java/bisq/core/provider/HttpClientProvider.java +++ b/core/src/main/java/haveno/core/provider/HttpClientProvider.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.provider; - -import bisq.network.http.HttpClient; +package haveno.core.provider; +import haveno.network.http.HttpClient; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/provider/MempoolHttpClient.java b/core/src/main/java/haveno/core/provider/MempoolHttpClient.java similarity index 85% rename from core/src/main/java/bisq/core/provider/MempoolHttpClient.java rename to core/src/main/java/haveno/core/provider/MempoolHttpClient.java index 7c342632..678a7318 100644 --- a/core/src/main/java/bisq/core/provider/MempoolHttpClient.java +++ b/core/src/main/java/haveno/core/provider/MempoolHttpClient.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.provider; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.http.HttpClientImpl; - -import bisq.common.app.Version; +package haveno.core.provider; +import haveno.common.app.Version; +import haveno.network.Socks5ProxyProvider; +import haveno.network.http.HttpClientImpl; import javax.inject.Inject; import javax.inject.Singleton; @@ -40,6 +38,6 @@ public class MempoolHttpClient extends HttpClientImpl { public String getTxDetails(String txId) throws IOException { super.shutDown(); // close any prior incomplete request String api = "/" + txId; - return get(api, "User-Agent", "bisq/" + Version.VERSION); + return get(api, "User-Agent", "haveno/" + Version.VERSION); } } diff --git a/core/src/main/java/bisq/core/provider/PriceHttpClient.java b/core/src/main/java/haveno/core/provider/PriceHttpClient.java similarity index 89% rename from core/src/main/java/bisq/core/provider/PriceHttpClient.java rename to core/src/main/java/haveno/core/provider/PriceHttpClient.java index 11e69442..e1682543 100644 --- a/core/src/main/java/bisq/core/provider/PriceHttpClient.java +++ b/core/src/main/java/haveno/core/provider/PriceHttpClient.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.provider; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.http.HttpClientImpl; +package haveno.core.provider; import javax.inject.Inject; import javax.inject.Singleton; - +import haveno.network.Socks5ProxyProvider; +import haveno.network.http.HttpClientImpl; import javax.annotation.Nullable; @Singleton diff --git a/core/src/main/java/bisq/core/provider/ProvidersRepository.java b/core/src/main/java/haveno/core/provider/ProvidersRepository.java similarity index 98% rename from core/src/main/java/bisq/core/provider/ProvidersRepository.java rename to core/src/main/java/haveno/core/provider/ProvidersRepository.java index 3cb33954..7b08fcaa 100644 --- a/core/src/main/java/bisq/core/provider/ProvidersRepository.java +++ b/core/src/main/java/haveno/core/provider/ProvidersRepository.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.provider; - -import bisq.common.config.Config; +package haveno.core.provider; import com.google.inject.Inject; - +import haveno.common.config.Config; import javax.inject.Named; import java.util.Collections; diff --git a/core/src/main/java/bisq/core/provider/fee/FeeProvider.java b/core/src/main/java/haveno/core/provider/fee/FeeProvider.java similarity index 84% rename from core/src/main/java/bisq/core/provider/fee/FeeProvider.java rename to core/src/main/java/haveno/core/provider/fee/FeeProvider.java index 6dfedd4c..1dbe59e7 100644 --- a/core/src/main/java/bisq/core/provider/fee/FeeProvider.java +++ b/core/src/main/java/haveno/core/provider/fee/FeeProvider.java @@ -15,23 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.fee; - -import bisq.core.provider.FeeHttpClient; -import bisq.core.provider.HttpClientProvider; -import bisq.core.provider.ProvidersRepository; - -import bisq.network.http.HttpClient; - -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.util.Tuple2; +package haveno.core.provider.fee; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.google.inject.Inject; - +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.util.Tuple2; +import haveno.core.provider.FeeHttpClient; +import haveno.core.provider.HttpClientProvider; +import haveno.core.provider.ProvidersRepository; +import haveno.network.http.HttpClient; import java.io.IOException; import java.util.HashMap; @@ -48,7 +44,7 @@ public class FeeProvider extends HttpClientProvider { } public Tuple2, Map> getFees() throws IOException { - String json = httpClient.get("getFees", "User-Agent", "bisq/" + Version.VERSION); + String json = httpClient.get("getFees", "User-Agent", "haveno/" + Version.VERSION); LinkedTreeMap linkedTreeMap = new Gson().fromJson(json, LinkedTreeMap.class); Map tsMap = new HashMap<>(); diff --git a/core/src/main/java/bisq/core/provider/fee/FeeRequest.java b/core/src/main/java/haveno/core/provider/fee/FeeRequest.java similarity index 95% rename from core/src/main/java/bisq/core/provider/fee/FeeRequest.java rename to core/src/main/java/haveno/core/provider/fee/FeeRequest.java index bc3bc7dc..f5e63540 100644 --- a/core/src/main/java/bisq/core/provider/fee/FeeRequest.java +++ b/core/src/main/java/haveno/core/provider/fee/FeeRequest.java @@ -15,10 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.fee; - -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.core.provider.fee; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -26,7 +23,8 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; import java.util.Map; import org.slf4j.Logger; diff --git a/core/src/main/java/bisq/core/provider/mempool/MempoolRequest.java b/core/src/main/java/haveno/core/provider/mempool/MempoolRequest.java similarity index 94% rename from core/src/main/java/bisq/core/provider/mempool/MempoolRequest.java rename to core/src/main/java/haveno/core/provider/mempool/MempoolRequest.java index 558b60bc..1bbb8ee0 100644 --- a/core/src/main/java/bisq/core/provider/mempool/MempoolRequest.java +++ b/core/src/main/java/haveno/core/provider/mempool/MempoolRequest.java @@ -15,14 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.mempool; - -import bisq.core.provider.MempoolHttpClient; -import bisq.core.user.Preferences; - -import bisq.network.Socks5ProxyProvider; - -import bisq.common.util.Utilities; +package haveno.core.provider.mempool; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -30,7 +23,10 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.util.Utilities; +import haveno.core.provider.MempoolHttpClient; +import haveno.core.user.Preferences; +import haveno.network.Socks5ProxyProvider; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/core/src/main/java/bisq/core/provider/mempool/MempoolService.java b/core/src/main/java/haveno/core/provider/mempool/MempoolService.java similarity index 97% rename from core/src/main/java/bisq/core/provider/mempool/MempoolService.java rename to core/src/main/java/haveno/core/provider/mempool/MempoolService.java index c9d4f52f..17b0ad36 100644 --- a/core/src/main/java/bisq/core/provider/mempool/MempoolService.java +++ b/core/src/main/java/haveno/core/provider/mempool/MempoolService.java @@ -15,22 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.mempool; - -import bisq.core.filter.FilterManager; -import bisq.core.offer.OfferPayload; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; - -import bisq.network.Socks5ProxyProvider; - -import bisq.common.UserThread; -import bisq.common.config.Config; +package haveno.core.provider.mempool; import org.bitcoinj.core.Coin; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.core.filter.FilterManager; +import haveno.core.offer.OfferPayload; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.network.Socks5ProxyProvider; import javax.inject.Singleton; import com.google.common.util.concurrent.FutureCallback; diff --git a/core/src/main/java/bisq/core/provider/mempool/TxValidator.java b/core/src/main/java/haveno/core/provider/mempool/TxValidator.java similarity index 98% rename from core/src/main/java/bisq/core/provider/mempool/TxValidator.java rename to core/src/main/java/haveno/core/provider/mempool/TxValidator.java index 298b6c8b..b8fff7de 100644 --- a/core/src/main/java/bisq/core/provider/mempool/TxValidator.java +++ b/core/src/main/java/haveno/core/provider/mempool/TxValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.mempool; +package haveno.core.provider.mempool; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/bisq/core/provider/price/MarketPrice.java b/core/src/main/java/haveno/core/provider/price/MarketPrice.java similarity index 97% rename from core/src/main/java/bisq/core/provider/price/MarketPrice.java rename to core/src/main/java/haveno/core/provider/price/MarketPrice.java index c0a2f397..6e1e6507 100644 --- a/core/src/main/java/bisq/core/provider/price/MarketPrice.java +++ b/core/src/main/java/haveno/core/provider/price/MarketPrice.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.price; +package haveno.core.provider.price; import java.time.Instant; diff --git a/core/src/main/java/bisq/core/provider/price/PriceFeedService.java b/core/src/main/java/haveno/core/provider/price/PriceFeedService.java similarity index 95% rename from core/src/main/java/bisq/core/provider/price/PriceFeedService.java rename to core/src/main/java/haveno/core/provider/price/PriceFeedService.java index de778707..1d096b00 100644 --- a/core/src/main/java/bisq/core/provider/price/PriceFeedService.java +++ b/core/src/main/java/haveno/core/provider/price/PriceFeedService.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.price; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.monetary.Price; -import bisq.core.provider.PriceHttpClient; -import bisq.core.provider.ProvidersRepository; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.user.Preferences; - -import bisq.network.http.HttpClient; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.handlers.FaultHandler; -import bisq.common.util.MathUtils; +package haveno.core.provider.price; import com.google.inject.Inject; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.handlers.FaultHandler; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.monetary.Price; +import haveno.core.provider.PriceHttpClient; +import haveno.core.provider.ProvidersRepository; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.user.Preferences; +import haveno.network.http.HttpClient; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; @@ -277,7 +274,7 @@ public class PriceFeedService { return cache.getOrDefault(currencyCode, null); } - private void setBisqMarketPrice(String currencyCode, Price price) { + private void setHavenoMarketPrice(String currencyCode, Price price) { if (!cache.containsKey(currencyCode) || !cache.get(currencyCode).isExternallyProvidedPrice()) { cache.put(currencyCode, new MarketPrice(currencyCode, MathUtils.scaleDownByPowerOf10(price.getValue(), CurrencyUtil.isCryptoCurrency(currencyCode) ? 8 : 4), @@ -321,7 +318,7 @@ public class PriceFeedService { return new Date(epochInMillisAtLastRequest); } - public void applyLatestBisqMarketPrice(Set tradeStatisticsSet) { + public void applyLatestHavenoMarketPrice(Set tradeStatisticsSet) { // takes about 10 ms for 5000 items Map> mapByCurrencyCode = new HashMap<>(); tradeStatisticsSet.forEach(e -> { @@ -341,7 +338,7 @@ public class PriceFeedService { .forEach(list -> { list.sort(Comparator.comparing(TradeStatistics3::getDate)); TradeStatistics3 tradeStatistics = list.get(list.size() - 1); - setBisqMarketPrice(tradeStatistics.getCurrency(), tradeStatistics.getTradePrice()); + setHavenoMarketPrice(tradeStatistics.getCurrency(), tradeStatistics.getTradePrice()); }); } diff --git a/core/src/main/java/bisq/core/provider/price/PriceProvider.java b/core/src/main/java/haveno/core/provider/price/PriceProvider.java similarity index 92% rename from core/src/main/java/bisq/core/provider/price/PriceProvider.java rename to core/src/main/java/haveno/core/provider/price/PriceProvider.java index 708022a4..a759b1e2 100644 --- a/core/src/main/java/bisq/core/provider/price/PriceProvider.java +++ b/core/src/main/java/haveno/core/provider/price/PriceProvider.java @@ -15,19 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.price; - -import bisq.core.provider.HttpClientProvider; - -import bisq.network.http.HttpClient; -import bisq.network.p2p.P2PService; - -import bisq.common.app.Version; -import bisq.common.util.MathUtils; +package haveno.core.provider.price; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; - +import haveno.common.app.Version; +import haveno.common.util.MathUtils; +import haveno.core.provider.HttpClientProvider; +import haveno.network.http.HttpClient; +import haveno.network.p2p.P2PService; import java.io.IOException; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/provider/price/PriceRequest.java b/core/src/main/java/haveno/core/provider/price/PriceRequest.java similarity index 96% rename from core/src/main/java/bisq/core/provider/price/PriceRequest.java rename to core/src/main/java/haveno/core/provider/price/PriceRequest.java index a4f236d6..86c8299d 100644 --- a/core/src/main/java/bisq/core/provider/price/PriceRequest.java +++ b/core/src/main/java/haveno/core/provider/price/PriceRequest.java @@ -15,10 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.price; - -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.core.provider.price; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -26,7 +23,8 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/bisq/core/provider/price/PriceRequestException.java b/core/src/main/java/haveno/core/provider/price/PriceRequestException.java similarity index 96% rename from core/src/main/java/bisq/core/provider/price/PriceRequestException.java rename to core/src/main/java/haveno/core/provider/price/PriceRequestException.java index fc3deb2e..e0839dd8 100644 --- a/core/src/main/java/bisq/core/provider/price/PriceRequestException.java +++ b/core/src/main/java/haveno/core/provider/price/PriceRequestException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.price; +package haveno.core.provider.price; import javax.annotation.Nullable; diff --git a/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java b/core/src/main/java/haveno/core/setup/CoreNetworkCapabilities.java similarity index 91% rename from core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java rename to core/src/main/java/haveno/core/setup/CoreNetworkCapabilities.java index 09cd333b..8ce1c9c3 100644 --- a/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java +++ b/core/src/main/java/haveno/core/setup/CoreNetworkCapabilities.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.setup; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.config.Config; +package haveno.core.setup; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.config.Config; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/setup/CorePersistedDataHost.java b/core/src/main/java/haveno/core/setup/CorePersistedDataHost.java similarity index 71% rename from core/src/main/java/bisq/core/setup/CorePersistedDataHost.java rename to core/src/main/java/haveno/core/setup/CorePersistedDataHost.java index 5139be0f..5f733330 100644 --- a/core/src/main/java/bisq/core/setup/CorePersistedDataHost.java +++ b/core/src/main/java/haveno/core/setup/CorePersistedDataHost.java @@ -15,30 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.core.setup; - -import bisq.core.btc.model.AddressEntryList; -import bisq.core.btc.model.EncryptedConnectionList; -import bisq.core.btc.model.XmrAddressEntryList; -import bisq.core.offer.OpenOfferManager; -import bisq.core.support.dispute.arbitration.ArbitrationDisputeListService; -import bisq.core.support.dispute.mediation.MediationDisputeListService; -import bisq.core.support.dispute.refund.RefundDisputeListService; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.TradeManager; -import bisq.core.trade.failed.FailedTradesManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.network.p2p.mailbox.IgnoredMailboxService; -import bisq.network.p2p.mailbox.MailboxMessageService; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.persistence.RemovedPayloadsService; - -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.core.setup; import com.google.inject.Injector; - +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.core.btc.model.AddressEntryList; +import haveno.core.btc.model.EncryptedConnectionList; +import haveno.core.btc.model.XmrAddressEntryList; +import haveno.core.offer.OpenOfferManager; +import haveno.core.support.dispute.arbitration.ArbitrationDisputeListService; +import haveno.core.support.dispute.mediation.MediationDisputeListService; +import haveno.core.support.dispute.refund.RefundDisputeListService; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.TradeManager; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.network.p2p.mailbox.IgnoredMailboxService; +import haveno.network.p2p.mailbox.MailboxMessageService; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.persistence.RemovedPayloadsService; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/setup/CoreSetup.java b/core/src/main/java/haveno/core/setup/CoreSetup.java similarity index 87% rename from core/src/main/java/bisq/core/setup/CoreSetup.java rename to core/src/main/java/haveno/core/setup/CoreSetup.java index 72e08086..40aeaa47 100644 --- a/core/src/main/java/bisq/core/setup/CoreSetup.java +++ b/core/src/main/java/haveno/core/setup/CoreSetup.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.setup; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; - -import bisq.common.config.Config; +package haveno.core.setup; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/support/SupportManager.java b/core/src/main/java/haveno/core/support/SupportManager.java similarity index 94% rename from core/src/main/java/bisq/core/support/SupportManager.java rename to core/src/main/java/haveno/core/support/SupportManager.java index 6ae6672b..ca38ca2b 100644 --- a/core/src/main/java/bisq/core/support/SupportManager.java +++ b/core/src/main/java/haveno/core/support/SupportManager.java @@ -15,32 +15,30 @@ * along with Haveno. If not, see . */ -package bisq.core.support; - -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.api.CoreNotificationService; -import bisq.core.locale.Res; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.messages.ChatMessage; -import bisq.core.support.messages.SupportMessage; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.protocol.TradeProtocol; -import bisq.core.trade.protocol.TradeProtocol.MailboxMessageComparator; -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.SendMailboxMessageListener; -import bisq.network.p2p.mailbox.MailboxMessage; -import bisq.network.p2p.mailbox.MailboxMessageService; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.support; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.api.CoreNotificationService; +import haveno.core.locale.Res; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.messages.ChatMessage; +import haveno.core.support.messages.SupportMessage; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.protocol.TradeProtocol; +import haveno.core.trade.protocol.TradeProtocol.MailboxMessageComparator; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.SendMailboxMessageListener; +import haveno.network.p2p.mailbox.MailboxMessage; +import haveno.network.p2p.mailbox.MailboxMessageService; import java.util.Comparator; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/bisq/core/support/SupportSession.java b/core/src/main/java/haveno/core/support/SupportSession.java similarity index 92% rename from core/src/main/java/bisq/core/support/SupportSession.java rename to core/src/main/java/haveno/core/support/SupportSession.java index 44290d97..024dcffa 100644 --- a/core/src/main/java/bisq/core/support/SupportSession.java +++ b/core/src/main/java/haveno/core/support/SupportSession.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support; - -import bisq.core.support.messages.ChatMessage; - -import bisq.common.crypto.PubKeyRing; +package haveno.core.support; +import haveno.common.crypto.PubKeyRing; +import haveno.core.support.messages.ChatMessage; import javafx.collections.ObservableList; /** diff --git a/core/src/main/java/bisq/core/support/SupportType.java b/core/src/main/java/haveno/core/support/SupportType.java similarity index 94% rename from core/src/main/java/bisq/core/support/SupportType.java rename to core/src/main/java/haveno/core/support/SupportType.java index ab9781d1..7ed75507 100644 --- a/core/src/main/java/bisq/core/support/SupportType.java +++ b/core/src/main/java/haveno/core/support/SupportType.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.support; +package haveno.core.support; -import bisq.common.proto.ProtoUtil; +import haveno.common.proto.ProtoUtil; public enum SupportType { ARBITRATION, // Need to be at index 0 to be the fallback for old clients diff --git a/core/src/main/java/bisq/core/support/dispute/Attachment.java b/core/src/main/java/haveno/core/support/dispute/Attachment.java similarity index 94% rename from core/src/main/java/bisq/core/support/dispute/Attachment.java rename to core/src/main/java/haveno/core/support/dispute/Attachment.java index 31e9f8a0..8160ed17 100644 --- a/core/src/main/java/bisq/core/support/dispute/Attachment.java +++ b/core/src/main/java/haveno/core/support/dispute/Attachment.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.common.proto.network.NetworkPayload; +package haveno.core.support.dispute; import com.google.protobuf.ByteString; - +import haveno.common.proto.network.NetworkPayload; import lombok.Value; @Value diff --git a/core/src/main/java/bisq/core/support/dispute/Dispute.java b/core/src/main/java/haveno/core/support/dispute/Dispute.java similarity index 97% rename from core/src/main/java/bisq/core/support/dispute/Dispute.java rename to core/src/main/java/haveno/core/support/dispute/Dispute.java index f1db16de..a33f52d3 100644 --- a/core/src/main/java/bisq/core/support/dispute/Dispute.java +++ b/core/src/main/java/haveno/core/support/dispute/Dispute.java @@ -15,25 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.core.locale.Res; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.SupportType; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.Contract; -import bisq.common.UserThread; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.CollectionUtils; -import bisq.common.util.ExtraDataMapValidator; -import bisq.common.util.Utilities; +package haveno.core.support.dispute; import com.google.protobuf.ByteString; - +import haveno.common.UserThread; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.CollectionUtils; +import haveno.common.util.ExtraDataMapValidator; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.SupportType; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.Contract; import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; import javafx.beans.property.ObjectProperty; diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeAlreadyOpenException.java b/core/src/main/java/haveno/core/support/dispute/DisputeAlreadyOpenException.java similarity index 95% rename from core/src/main/java/bisq/core/support/dispute/DisputeAlreadyOpenException.java rename to core/src/main/java/haveno/core/support/dispute/DisputeAlreadyOpenException.java index b5ac92e4..d2cf320d 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeAlreadyOpenException.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeAlreadyOpenException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; +package haveno.core.support.dispute; public class DisputeAlreadyOpenException extends Exception { public DisputeAlreadyOpenException() { diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeList.java b/core/src/main/java/haveno/core/support/dispute/DisputeList.java similarity index 87% rename from core/src/main/java/bisq/core/support/dispute/DisputeList.java rename to core/src/main/java/haveno/core/support/dispute/DisputeList.java index f4c87673..19301587 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeList.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeList.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.common.proto.persistable.PersistableListAsObservable; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.support.dispute; +import haveno.common.proto.persistable.PersistableListAsObservable; +import haveno.common.proto.persistable.PersistablePayload; import java.util.Collection; import lombok.ToString; diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeListService.java b/core/src/main/java/haveno/core/support/dispute/DisputeListService.java similarity index 96% rename from core/src/main/java/bisq/core/support/dispute/DisputeListService.java rename to core/src/main/java/haveno/core/support/dispute/DisputeListService.java index 75d7e401..9b9f28f2 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeListService.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeListService.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.core.trade.Contract; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.UserThread; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.core.support.dispute; +import haveno.common.UserThread; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.core.trade.Contract; +import haveno.network.p2p.NodeAddress; import org.fxmisc.easybind.EasyBind; import javafx.beans.property.IntegerProperty; diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeManager.java b/core/src/main/java/haveno/core/support/dispute/DisputeManager.java similarity index 97% rename from core/src/main/java/bisq/core/support/dispute/DisputeManager.java rename to core/src/main/java/haveno/core/support/dispute/DisputeManager.java index e6d33b50..cad6ae50 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeManager.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeManager.java @@ -15,47 +15,46 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.api.CoreNotificationService; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOfferManager; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.SupportManager; -import bisq.core.support.dispute.DisputeResult.Winner; -import bisq.core.support.dispute.messages.DisputeClosedMessage; -import bisq.core.support.dispute.messages.DisputeOpenedMessage; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.protocol.TradePeer; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.SendMailboxMessageListener; -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.handlers.FaultHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.util.MathUtils; -import bisq.common.util.Tuple2; +package haveno.core.support.dispute; +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.handlers.FaultHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.util.MathUtils; +import haveno.common.util.Tuple2; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.api.CoreNotificationService; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOfferManager; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.SupportManager; +import haveno.core.support.dispute.DisputeResult.Winner; +import haveno.core.support.dispute.messages.DisputeClosedMessage; +import haveno.core.support.dispute.messages.DisputeOpenedMessage; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.protocol.TradePeer; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.SendMailboxMessageListener; import org.bitcoinj.utils.Fiat; import javafx.beans.property.IntegerProperty; diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeMessageDeliveryFailedException.java b/core/src/main/java/haveno/core/support/dispute/DisputeMessageDeliveryFailedException.java similarity index 95% rename from core/src/main/java/bisq/core/support/dispute/DisputeMessageDeliveryFailedException.java rename to core/src/main/java/haveno/core/support/dispute/DisputeMessageDeliveryFailedException.java index 87aad778..0c2ead42 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeMessageDeliveryFailedException.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeMessageDeliveryFailedException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; +package haveno.core.support.dispute; public class DisputeMessageDeliveryFailedException extends Exception { public DisputeMessageDeliveryFailedException() { diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeResult.java b/core/src/main/java/haveno/core/support/dispute/DisputeResult.java similarity index 97% rename from core/src/main/java/bisq/core/support/dispute/DisputeResult.java rename to core/src/main/java/haveno/core/support/dispute/DisputeResult.java index d1e81aa2..6118eed9 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeResult.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeResult.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.core.support.messages.ChatMessage; - -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.util.Utilities; +package haveno.core.support.dispute; import com.google.protobuf.ByteString; - +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.util.Utilities; +import haveno.core.support.messages.ChatMessage; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeSession.java b/core/src/main/java/haveno/core/support/dispute/DisputeSession.java similarity index 93% rename from core/src/main/java/bisq/core/support/dispute/DisputeSession.java rename to core/src/main/java/haveno/core/support/dispute/DisputeSession.java index c2a18980..bfe04381 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeSession.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeSession.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.core.support.SupportSession; -import bisq.core.support.messages.ChatMessage; - -import bisq.common.crypto.PubKeyRing; +package haveno.core.support.dispute; +import haveno.common.crypto.PubKeyRing; +import haveno.core.support.SupportSession; +import haveno.core.support.messages.ChatMessage; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeSummaryVerification.java b/core/src/main/java/haveno/core/support/dispute/DisputeSummaryVerification.java similarity index 89% rename from core/src/main/java/bisq/core/support/dispute/DisputeSummaryVerification.java rename to core/src/main/java/haveno/core/support/dispute/DisputeSummaryVerification.java index 9155b00a..86312096 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeSummaryVerification.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeSummaryVerification.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; - -import bisq.core.locale.Res; -import bisq.core.support.dispute.agent.DisputeAgent; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Hash; -import bisq.common.crypto.Sig; -import bisq.common.util.Utilities; +package haveno.core.support.dispute; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Hash; +import haveno.common.crypto.Sig; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.support.dispute.agent.DisputeAgent; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.network.p2p.NodeAddress; import java.security.KeyPair; import java.security.PublicKey; diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeValidation.java b/core/src/main/java/haveno/core/support/dispute/DisputeValidation.java similarity index 96% rename from core/src/main/java/bisq/core/support/dispute/DisputeValidation.java rename to core/src/main/java/haveno/core/support/dispute/DisputeValidation.java index 2f2d6111..b8e88328 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeValidation.java +++ b/core/src/main/java/haveno/core/support/dispute/DisputeValidation.java @@ -15,22 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute; +package haveno.core.support.dispute; -import bisq.core.support.SupportType; -import bisq.core.trade.Contract; -import bisq.core.trade.Trade; -import bisq.core.util.JsonUtil; -import bisq.core.util.validation.RegexValidatorFactory; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.config.Config; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Hash; -import bisq.common.crypto.Sig; -import bisq.common.util.Tuple3; - +import haveno.common.config.Config; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Hash; +import haveno.common.crypto.Sig; +import haveno.common.util.Tuple3; +import haveno.core.support.SupportType; +import haveno.core.trade.Contract; +import haveno.core.trade.Trade; +import haveno.core.util.JsonUtil; +import haveno.core.util.validation.RegexValidatorFactory; +import haveno.network.p2p.NodeAddress; import org.bitcoinj.core.Address; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgent.java b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgent.java similarity index 92% rename from core/src/main/java/bisq/core/support/dispute/agent/DisputeAgent.java rename to core/src/main/java/haveno/core/support/dispute/agent/DisputeAgent.java index 416083c3..50d1c410 100644 --- a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgent.java +++ b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgent.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.agent; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.storage.payload.ExpirablePayload; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.util.ExtraDataMapValidator; -import bisq.common.util.Utilities; +package haveno.core.support.dispute.agent; +import haveno.common.crypto.PubKeyRing; +import haveno.common.util.ExtraDataMapValidator; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.storage.payload.ExpirablePayload; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.PublicKey; import java.util.List; diff --git a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentLookupMap.java b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentLookupMap.java similarity index 89% rename from core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentLookupMap.java rename to core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentLookupMap.java index ff103f01..d0a53f93 100644 --- a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentLookupMap.java +++ b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentLookupMap.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.agent; - -import bisq.core.locale.Res; +package haveno.core.support.dispute.agent; import lombok.extern.slf4j.Slf4j; - +import haveno.core.locale.Res; import javax.annotation.Nullable; @Slf4j @@ -35,10 +33,10 @@ public class DisputeAgentLookupMap { switch (fullAddress) { case "7hkpotiyaukuzcfy6faihjaols5r2mkysz7bm3wrhhbpbphzz3zbwyqd.onion:9999": return "leo816"; - case "wizbisqzd7ku25di7p2ztsajioabihlnyp5lq5av66tmu7do2dke2tid.onion:9999": + case "wizhavenozd7ku25di7p2ztsajioabihlnyp5lq5av66tmu7do2dke2tid.onion:9999": return "wiz"; case "apbp7ubuyezav4hy.onion:9999": - return "bisq_knight"; + return "haveno_knight"; case "a56olqlmmpxrn5q34itq5g5tb5d3fg7vxekpbceq7xqvfl3cieocgsyd.onion:9999": return "huey735"; case "3z5jnirlccgxzoxc6zwkcgwj66bugvqplzf6z2iyd5oxifiaorhnanqd.onion:9999": @@ -54,8 +52,8 @@ public class DisputeAgentLookupMap { public static String getMatrixLinkForAgent(String onion) { // when a new mediator starts or an onion address changes, mediator name won't be known until // the table above is updated in the software. - // as a stopgap measure, replace unknown ones with a link to the Bisq team - String agentName = getMatrixUserName(onion).replaceAll(Res.get("shared.na"), "bisq"); + // as a stopgap measure, replace unknown ones with a link to the Haveno team + String agentName = getMatrixUserName(onion).replaceAll(Res.get("shared.na"), "haveno"); return "https://matrix.to/#/@" + agentName + ":matrix.org"; } } diff --git a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentManager.java b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentManager.java similarity index 95% rename from core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentManager.java rename to core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentManager.java index 01b03f54..e9235418 100644 --- a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentManager.java +++ b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentManager.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.agent; - -import bisq.core.filter.FilterManager; -import bisq.core.user.User; - -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.HashMapChangedListener; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.crypto.KeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.util.Utilities; +package haveno.core.support.dispute.agent; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.crypto.KeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.util.Utilities; +import haveno.core.filter.FilterManager; +import haveno.core.user.User; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.HashMapChangedListener; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; diff --git a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentService.java b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentService.java similarity index 91% rename from core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentService.java rename to core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentService.java index 5c85bdae..51a9d2e5 100644 --- a/core/src/main/java/bisq/core/support/dispute/agent/DisputeAgentService.java +++ b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentService.java @@ -15,20 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.agent; - -import bisq.core.filter.FilterManager; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.HashMapChangedListener; - -import bisq.common.app.DevEnv; -import bisq.common.config.Config; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.util.Utilities; +package haveno.core.support.dispute.agent; +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.util.Utilities; +import haveno.core.filter.FilterManager; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.HashMapChangedListener; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java b/core/src/main/java/haveno/core/support/dispute/agent/MultipleHolderNameDetection.java similarity index 95% rename from core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java rename to core/src/main/java/haveno/core/support/dispute/agent/MultipleHolderNameDetection.java index 0b8d9046..1340d9ad 100644 --- a/core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java +++ b/core/src/main/java/haveno/core/support/dispute/agent/MultipleHolderNameDetection.java @@ -15,22 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.agent; - -import bisq.core.locale.Res; -import bisq.core.payment.payload.PayloadWithHolderName; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.user.DontShowAgainLookup; - -import bisq.common.crypto.Hash; -import bisq.common.crypto.PubKeyRing; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.core.support.dispute.agent; +import haveno.common.crypto.Hash; +import haveno.common.crypto.PubKeyRing; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.payment.payload.PayloadWithHolderName; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.user.DontShowAgainLookup; import javafx.collections.ListChangeListener; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeList.java b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationDisputeList.java similarity index 90% rename from core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeList.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationDisputeList.java index c0881935..2c648598 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeList.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationDisputeList.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration; - -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; - -import bisq.common.proto.ProtoUtil; +package haveno.core.support.dispute.arbitration; import com.google.protobuf.Message; - +import haveno.common.proto.ProtoUtil; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeListService.java b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationDisputeListService.java similarity index 91% rename from core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeListService.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationDisputeListService.java index 43c1800c..93f63fcd 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeListService.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationDisputeListService.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration; - -import bisq.core.support.dispute.DisputeListService; - -import bisq.common.persistence.PersistenceManager; +package haveno.core.support.dispute.arbitration; +import haveno.common.persistence.PersistenceManager; +import haveno.core.support.dispute.DisputeListService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java similarity index 94% rename from core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java index ef0f7037..8e4d890a 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java @@ -15,42 +15,40 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration; +package haveno.core.support.dispute.arbitration; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.api.CoreNotificationService; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.DisputeSummaryVerification; -import bisq.core.support.dispute.DisputeResult.Winner; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.messages.DisputeClosedMessage; -import bisq.core.support.dispute.messages.DisputeOpenedMessage; -import bisq.core.support.messages.ChatMessage; -import bisq.core.support.messages.SupportMessage; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; - -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; import common.utils.GenUtils; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.api.CoreNotificationService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.DisputeSummaryVerification; +import haveno.core.support.dispute.DisputeResult.Winner; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.messages.DisputeClosedMessage; +import haveno.core.support.dispute.messages.DisputeOpenedMessage; +import haveno.core.support.messages.ChatMessage; +import haveno.core.support.messages.SupportMessage; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationSession.java b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationSession.java similarity index 86% rename from core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationSession.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationSession.java index f949ecbe..4fd84e62 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationSession.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationSession.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration; - -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; +package haveno.core.support.dispute.arbitration; import lombok.extern.slf4j.Slf4j; - +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; import javax.annotation.Nullable; @Slf4j diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/TraderDataItem.java b/core/src/main/java/haveno/core/support/dispute/arbitration/TraderDataItem.java similarity index 90% rename from core/src/main/java/bisq/core/support/dispute/arbitration/TraderDataItem.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/TraderDataItem.java index 32ad3503..45348ae6 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/TraderDataItem.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/TraderDataItem.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.payment.payload.PaymentAccountPayload; +package haveno.core.support.dispute.arbitration; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.payment.payload.PaymentAccountPayload; import java.math.BigInteger; import java.security.PublicKey; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/Arbitrator.java similarity index 93% rename from core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/Arbitrator.java index 088ddb56..3129754a 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/Arbitrator.java @@ -15,18 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration.arbitrator; - -import bisq.core.support.dispute.agent.DisputeAgent; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.CollectionUtils; +package haveno.core.support.dispute.arbitration.arbitrator; import com.google.protobuf.ByteString; - +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.CollectionUtils; +import haveno.core.support.dispute.agent.DisputeAgent; +import haveno.network.p2p.NodeAddress; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java similarity index 92% rename from core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java index d487ec17..1b7ebee3 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration.arbitrator; - -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.agent.DisputeAgentManager; -import bisq.core.user.User; - -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.core.support.dispute.arbitration.arbitrator; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.agent.DisputeAgentManager; +import haveno.core.user.User; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import javax.inject.Inject; import javax.inject.Singleton; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorService.java b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorService.java similarity index 89% rename from core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorService.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorService.java index 239cf698..87947b81 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorService.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorService.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration.arbitrator; - -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.agent.DisputeAgentService; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; +package haveno.core.support.dispute.arbitration.arbitrator; import com.google.inject.Singleton; - +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.agent.DisputeAgentService; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/messages/ArbitrationMessage.java b/core/src/main/java/haveno/core/support/dispute/arbitration/messages/ArbitrationMessage.java similarity index 84% rename from core/src/main/java/bisq/core/support/dispute/arbitration/messages/ArbitrationMessage.java rename to core/src/main/java/haveno/core/support/dispute/arbitration/messages/ArbitrationMessage.java index cf654be9..6f14f833 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/messages/ArbitrationMessage.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/messages/ArbitrationMessage.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.arbitration.messages; +package haveno.core.support.dispute.arbitration.messages; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.messages.DisputeMessage; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.messages.DisputeMessage; abstract class ArbitrationMessage extends DisputeMessage { ArbitrationMessage(String messageVersion, String uid, SupportType supportType) { diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/MediationDisputeList.java b/core/src/main/java/haveno/core/support/dispute/mediation/MediationDisputeList.java similarity index 89% rename from core/src/main/java/bisq/core/support/dispute/mediation/MediationDisputeList.java rename to core/src/main/java/haveno/core/support/dispute/mediation/MediationDisputeList.java index 0cd70ddf..c0d08b9f 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/MediationDisputeList.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/MediationDisputeList.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation; - -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; - -import bisq.common.proto.ProtoUtil; +package haveno.core.support.dispute.mediation; import com.google.protobuf.Message; - +import haveno.common.proto.ProtoUtil; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/MediationDisputeListService.java b/core/src/main/java/haveno/core/support/dispute/mediation/MediationDisputeListService.java similarity index 91% rename from core/src/main/java/bisq/core/support/dispute/mediation/MediationDisputeListService.java rename to core/src/main/java/haveno/core/support/dispute/mediation/MediationDisputeListService.java index 12e15c16..6fbb1d61 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/MediationDisputeListService.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/MediationDisputeListService.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation; - -import bisq.core.support.dispute.DisputeListService; - -import bisq.common.persistence.PersistenceManager; +package haveno.core.support.dispute.mediation; +import haveno.common.persistence.PersistenceManager; +import haveno.core.support.dispute.DisputeListService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java b/core/src/main/java/haveno/core/support/dispute/mediation/MediationManager.java similarity index 88% rename from core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java rename to core/src/main/java/haveno/core/support/dispute/mediation/MediationManager.java index 259ca368..a52de0d6 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/MediationManager.java @@ -15,45 +15,41 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation; - -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.api.CoreNotificationService; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.messages.DisputeClosedMessage; -import bisq.core.support.dispute.messages.DisputeOpenedMessage; -import bisq.core.support.messages.ChatMessage; -import bisq.core.support.messages.SupportMessage; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.protocol.DisputeProtocol; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.core.support.dispute.mediation; import com.google.inject.Inject; import com.google.inject.Singleton; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.api.CoreNotificationService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.messages.DisputeClosedMessage; +import haveno.core.support.dispute.messages.DisputeOpenedMessage; +import haveno.core.support.messages.ChatMessage; +import haveno.core.support.messages.SupportMessage; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.protocol.DisputeProtocol; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import java.math.BigInteger; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/MediationResultState.java b/core/src/main/java/haveno/core/support/dispute/mediation/MediationResultState.java similarity index 94% rename from core/src/main/java/bisq/core/support/dispute/mediation/MediationResultState.java rename to core/src/main/java/haveno/core/support/dispute/mediation/MediationResultState.java index 8675484f..123cd916 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/MediationResultState.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/MediationResultState.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation; +package haveno.core.support.dispute.mediation; -import bisq.common.proto.ProtoUtil; +import haveno.common.proto.ProtoUtil; public enum MediationResultState { UNDEFINED_MEDIATION_RESULT, diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/MediationSession.java b/core/src/main/java/haveno/core/support/dispute/mediation/MediationSession.java similarity index 86% rename from core/src/main/java/bisq/core/support/dispute/mediation/MediationSession.java rename to core/src/main/java/haveno/core/support/dispute/mediation/MediationSession.java index cf191b52..31ac8cde 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/MediationSession.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/MediationSession.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation; - -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; +package haveno.core.support.dispute.mediation; import lombok.extern.slf4j.Slf4j; - +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; import javax.annotation.Nullable; @Slf4j diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java b/core/src/main/java/haveno/core/support/dispute/mediation/mediator/Mediator.java similarity index 93% rename from core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java rename to core/src/main/java/haveno/core/support/dispute/mediation/mediator/Mediator.java index 958210b8..90146289 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/mediator/Mediator.java @@ -15,18 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation.mediator; - -import bisq.core.support.dispute.agent.DisputeAgent; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.CollectionUtils; +package haveno.core.support.dispute.mediation.mediator; import com.google.protobuf.ByteString; - +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.CollectionUtils; +import haveno.core.support.dispute.agent.DisputeAgent; +import haveno.network.p2p.NodeAddress; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorManager.java b/core/src/main/java/haveno/core/support/dispute/mediation/mediator/MediatorManager.java similarity index 92% rename from core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorManager.java rename to core/src/main/java/haveno/core/support/dispute/mediation/mediator/MediatorManager.java index 86be05ae..23972ffd 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorManager.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/mediator/MediatorManager.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation.mediator; - -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.agent.DisputeAgentManager; -import bisq.core.user.User; - -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.crypto.KeyRing; +package haveno.core.support.dispute.mediation.mediator; +import haveno.common.crypto.KeyRing; +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.agent.DisputeAgentManager; +import haveno.core.user.User; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import javax.inject.Singleton; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorService.java b/core/src/main/java/haveno/core/support/dispute/mediation/mediator/MediatorService.java similarity index 89% rename from core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorService.java rename to core/src/main/java/haveno/core/support/dispute/mediation/mediator/MediatorService.java index 46571670..227a5e8e 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorService.java +++ b/core/src/main/java/haveno/core/support/dispute/mediation/mediator/MediatorService.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.mediation.mediator; - -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.agent.DisputeAgentService; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; +package haveno.core.support.dispute.mediation.mediator; import com.google.inject.Singleton; - +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.agent.DisputeAgentService; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/support/dispute/messages/DisputeClosedMessage.java b/core/src/main/java/haveno/core/support/dispute/messages/DisputeClosedMessage.java similarity index 95% rename from core/src/main/java/bisq/core/support/dispute/messages/DisputeClosedMessage.java rename to core/src/main/java/haveno/core/support/dispute/messages/DisputeClosedMessage.java index 153349b7..46f3f9d3 100644 --- a/core/src/main/java/bisq/core/support/dispute/messages/DisputeClosedMessage.java +++ b/core/src/main/java/haveno/core/support/dispute/messages/DisputeClosedMessage.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.messages; +package haveno.core.support.dispute.messages; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.DisputeResult; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.Version; -import bisq.common.proto.ProtoUtil; +import haveno.common.app.Version; +import haveno.common.proto.ProtoUtil; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.DisputeResult; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/support/dispute/messages/DisputeMessage.java b/core/src/main/java/haveno/core/support/dispute/messages/DisputeMessage.java similarity index 88% rename from core/src/main/java/bisq/core/support/dispute/messages/DisputeMessage.java rename to core/src/main/java/haveno/core/support/dispute/messages/DisputeMessage.java index ea9f505e..dbbaaf83 100644 --- a/core/src/main/java/bisq/core/support/dispute/messages/DisputeMessage.java +++ b/core/src/main/java/haveno/core/support/dispute/messages/DisputeMessage.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.messages; - -import bisq.core.support.SupportType; -import bisq.core.support.messages.SupportMessage; +package haveno.core.support.dispute.messages; +import haveno.core.support.SupportType; +import haveno.core.support.messages.SupportMessage; import java.util.concurrent.TimeUnit; public abstract class DisputeMessage extends SupportMessage { diff --git a/core/src/main/java/bisq/core/support/dispute/messages/DisputeOpenedMessage.java b/core/src/main/java/haveno/core/support/dispute/messages/DisputeOpenedMessage.java similarity index 93% rename from core/src/main/java/bisq/core/support/dispute/messages/DisputeOpenedMessage.java rename to core/src/main/java/haveno/core/support/dispute/messages/DisputeOpenedMessage.java index ff6ab28b..fe746b5b 100644 --- a/core/src/main/java/bisq/core/support/dispute/messages/DisputeOpenedMessage.java +++ b/core/src/main/java/haveno/core/support/dispute/messages/DisputeOpenedMessage.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.messages; - -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.trade.messages.PaymentSentMessage; -import bisq.network.p2p.NodeAddress; +package haveno.core.support.dispute.messages; +import haveno.common.app.Version; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.trade.messages.PaymentSentMessage; +import haveno.network.p2p.NodeAddress; import java.util.Optional; - -import bisq.common.app.Version; - import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeList.java b/core/src/main/java/haveno/core/support/dispute/refund/RefundDisputeList.java similarity index 90% rename from core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeList.java rename to core/src/main/java/haveno/core/support/dispute/refund/RefundDisputeList.java index f03443cc..206a234b 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeList.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/RefundDisputeList.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund; - -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; - -import bisq.common.proto.ProtoUtil; +package haveno.core.support.dispute.refund; import com.google.protobuf.Message; - +import haveno.common.proto.ProtoUtil; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeListService.java b/core/src/main/java/haveno/core/support/dispute/refund/RefundDisputeListService.java similarity index 91% rename from core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeListService.java rename to core/src/main/java/haveno/core/support/dispute/refund/RefundDisputeListService.java index b45f7680..47c7d84c 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeListService.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/RefundDisputeListService.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund; - -import bisq.core.support.dispute.DisputeListService; - -import bisq.common.persistence.PersistenceManager; +package haveno.core.support.dispute.refund; +import haveno.common.persistence.PersistenceManager; +import haveno.core.support.dispute.DisputeListService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java b/core/src/main/java/haveno/core/support/dispute/refund/RefundManager.java similarity index 87% rename from core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java rename to core/src/main/java/haveno/core/support/dispute/refund/RefundManager.java index 5d98c3b5..a0a80042 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/RefundManager.java @@ -15,40 +15,37 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund; - -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.api.CoreNotificationService; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.messages.DisputeClosedMessage; -import bisq.core.support.dispute.messages.DisputeOpenedMessage; -import bisq.core.support.messages.ChatMessage; -import bisq.core.support.messages.SupportMessage; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.core.support.dispute.refund; import com.google.inject.Inject; import com.google.inject.Singleton; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.api.CoreNotificationService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.messages.DisputeClosedMessage; +import haveno.core.support.dispute.messages.DisputeOpenedMessage; +import haveno.core.support.messages.ChatMessage; +import haveno.core.support.messages.SupportMessage; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import java.util.Optional; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/support/dispute/refund/RefundResultState.java b/core/src/main/java/haveno/core/support/dispute/refund/RefundResultState.java similarity index 93% rename from core/src/main/java/bisq/core/support/dispute/refund/RefundResultState.java rename to core/src/main/java/haveno/core/support/dispute/refund/RefundResultState.java index 6fa03083..15e54bf9 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/RefundResultState.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/RefundResultState.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund; +package haveno.core.support.dispute.refund; -import bisq.common.proto.ProtoUtil; +import haveno.common.proto.ProtoUtil; // todo public enum RefundResultState { diff --git a/core/src/main/java/bisq/core/support/dispute/refund/RefundSession.java b/core/src/main/java/haveno/core/support/dispute/refund/RefundSession.java similarity index 87% rename from core/src/main/java/bisq/core/support/dispute/refund/RefundSession.java rename to core/src/main/java/haveno/core/support/dispute/refund/RefundSession.java index 9bf46475..3be35294 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/RefundSession.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/RefundSession.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund; - -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; +package haveno.core.support.dispute.refund; import lombok.extern.slf4j.Slf4j; - +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; import javax.annotation.Nullable; @Slf4j diff --git a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java b/core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgent.java similarity index 90% rename from core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java rename to core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgent.java index fd6e01e4..7f5ecb53 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgent.java @@ -15,21 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund.refundagent; - -import bisq.core.support.dispute.agent.DisputeAgent; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.CollectionUtils; +package haveno.core.support.dispute.refund.refundagent; import com.google.protobuf.ByteString; - +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.CollectionUtils; +import haveno.core.support.dispute.agent.DisputeAgent; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentManager.java b/core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgentManager.java similarity index 92% rename from core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentManager.java rename to core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgentManager.java index 97b0022e..1a388700 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentManager.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgentManager.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund.refundagent; - -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.agent.DisputeAgentManager; -import bisq.core.user.User; - -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.crypto.KeyRing; +package haveno.core.support.dispute.refund.refundagent; +import haveno.common.crypto.KeyRing; +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.agent.DisputeAgentManager; +import haveno.core.user.User; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentService.java b/core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgentService.java similarity index 89% rename from core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentService.java rename to core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgentService.java index 718e8900..db124ccf 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentService.java +++ b/core/src/main/java/haveno/core/support/dispute/refund/refundagent/RefundAgentService.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.support.dispute.refund.refundagent; - -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.agent.DisputeAgentService; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; +package haveno.core.support.dispute.refund.refundagent; import com.google.inject.Singleton; - +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.agent.DisputeAgentService; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/support/messages/ChatMessage.java b/core/src/main/java/haveno/core/support/messages/ChatMessage.java similarity index 97% rename from core/src/main/java/bisq/core/support/messages/ChatMessage.java rename to core/src/main/java/haveno/core/support/messages/ChatMessage.java index da4c8bfe..74dc7a30 100644 --- a/core/src/main/java/bisq/core/support/messages/ChatMessage.java +++ b/core/src/main/java/haveno/core/support/messages/ChatMessage.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.support.messages; - -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Attachment; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeResult; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.Version; -import bisq.common.util.Utilities; +package haveno.core.support.messages; +import haveno.common.app.Version; +import haveno.common.util.Utilities; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Attachment; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeResult; +import haveno.network.p2p.NodeAddress; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyStringProperty; diff --git a/core/src/main/java/bisq/core/support/messages/SupportMessage.java b/core/src/main/java/haveno/core/support/messages/SupportMessage.java similarity index 88% rename from core/src/main/java/bisq/core/support/messages/SupportMessage.java rename to core/src/main/java/haveno/core/support/messages/SupportMessage.java index fed9ae73..f7e71519 100644 --- a/core/src/main/java/bisq/core/support/messages/SupportMessage.java +++ b/core/src/main/java/haveno/core/support/messages/SupportMessage.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.support.messages; - -import bisq.core.support.SupportType; - -import bisq.network.p2p.UidMessage; -import bisq.network.p2p.mailbox.MailboxMessage; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.support.messages; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.support.SupportType; +import haveno.network.p2p.UidMessage; +import haveno.network.p2p.mailbox.MailboxMessage; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/core/src/main/java/bisq/core/support/traderchat/TradeChatSession.java b/core/src/main/java/haveno/core/support/traderchat/TradeChatSession.java similarity index 92% rename from core/src/main/java/bisq/core/support/traderchat/TradeChatSession.java rename to core/src/main/java/haveno/core/support/traderchat/TradeChatSession.java index 68ae1a7d..90d2da3a 100644 --- a/core/src/main/java/bisq/core/support/traderchat/TradeChatSession.java +++ b/core/src/main/java/haveno/core/support/traderchat/TradeChatSession.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.support.traderchat; - -import bisq.core.support.SupportSession; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.Trade; +package haveno.core.support.traderchat; +import haveno.core.support.SupportSession; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.Trade; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/core/src/main/java/bisq/core/support/traderchat/TraderChatManager.java b/core/src/main/java/haveno/core/support/traderchat/TraderChatManager.java similarity index 89% rename from core/src/main/java/bisq/core/support/traderchat/TraderChatManager.java rename to core/src/main/java/haveno/core/support/traderchat/TraderChatManager.java index 37452cc3..3e23aedf 100644 --- a/core/src/main/java/bisq/core/support/traderchat/TraderChatManager.java +++ b/core/src/main/java/haveno/core/support/traderchat/TraderChatManager.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.support.traderchat; - -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.api.CoreNotificationService; -import bisq.core.locale.Res; -import bisq.core.support.SupportManager; -import bisq.core.support.SupportType; -import bisq.core.support.messages.ChatMessage; -import bisq.core.support.messages.SupportMessage; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; - -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.PubKeyRingProvider; +package haveno.core.support.traderchat; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.PubKeyRingProvider; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.api.CoreNotificationService; +import haveno.core.locale.Res; +import haveno.core.support.SupportManager; +import haveno.core.support.SupportType; +import haveno.core.support.messages.ChatMessage; +import haveno.core.support.messages.SupportMessage; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/trade/ArbitratorTrade.java b/core/src/main/java/haveno/core/trade/ArbitratorTrade.java similarity index 91% rename from core/src/main/java/bisq/core/trade/ArbitratorTrade.java rename to core/src/main/java/haveno/core/trade/ArbitratorTrade.java index de64f989..0edcc1b7 100644 --- a/core/src/main/java/bisq/core/trade/ArbitratorTrade.java +++ b/core/src/main/java/haveno/core/trade/ArbitratorTrade.java @@ -1,14 +1,11 @@ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.ProtoUtil; +package haveno.core.trade; +import haveno.common.proto.ProtoUtil; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.NodeAddress; import java.math.BigInteger; import java.util.UUID; diff --git a/core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java b/core/src/main/java/haveno/core/trade/BuyerAsMakerTrade.java similarity index 93% rename from core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java rename to core/src/main/java/haveno/core/trade/BuyerAsMakerTrade.java index a205329b..fd9b077b 100644 --- a/core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java +++ b/core/src/main/java/haveno/core/trade/BuyerAsMakerTrade.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.ProtoUtil; +package haveno.core.trade; +import haveno.common.proto.ProtoUtil; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.NodeAddress; import java.math.BigInteger; import java.util.UUID; diff --git a/core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java b/core/src/main/java/haveno/core/trade/BuyerAsTakerTrade.java similarity index 93% rename from core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java rename to core/src/main/java/haveno/core/trade/BuyerAsTakerTrade.java index 76c4fcd1..0b8d14d6 100644 --- a/core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java +++ b/core/src/main/java/haveno/core/trade/BuyerAsTakerTrade.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.ProtoUtil; +package haveno.core.trade; +import haveno.common.proto.ProtoUtil; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.NodeAddress; import java.math.BigInteger; import java.util.UUID; diff --git a/core/src/main/java/bisq/core/trade/BuyerTrade.java b/core/src/main/java/haveno/core/trade/BuyerTrade.java similarity index 90% rename from core/src/main/java/bisq/core/trade/BuyerTrade.java rename to core/src/main/java/haveno/core/trade/BuyerTrade.java index 6db586c1..01bf0a23 100644 --- a/core/src/main/java/bisq/core/trade/BuyerTrade.java +++ b/core/src/main/java/haveno/core/trade/BuyerTrade.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.NodeAddress; +package haveno.core.trade; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; diff --git a/core/src/main/java/bisq/core/trade/CleanupMailboxMessages.java b/core/src/main/java/haveno/core/trade/CleanupMailboxMessages.java similarity index 91% rename from core/src/main/java/bisq/core/trade/CleanupMailboxMessages.java rename to core/src/main/java/haveno/core/trade/CleanupMailboxMessages.java index a600d629..a4cb639f 100644 --- a/core/src/main/java/bisq/core/trade/CleanupMailboxMessages.java +++ b/core/src/main/java/haveno/core/trade/CleanupMailboxMessages.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.trade.messages.TradeMessage; - -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.mailbox.MailboxMessage; -import bisq.network.p2p.mailbox.MailboxMessageService; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.trade; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.trade.messages.TradeMessage; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.mailbox.MailboxMessage; +import haveno.network.p2p.mailbox.MailboxMessageService; import javax.inject.Inject; import java.util.List; diff --git a/core/src/main/java/bisq/core/trade/CleanupMailboxMessagesService.java b/core/src/main/java/haveno/core/trade/CleanupMailboxMessagesService.java similarity index 91% rename from core/src/main/java/bisq/core/trade/CleanupMailboxMessagesService.java rename to core/src/main/java/haveno/core/trade/CleanupMailboxMessagesService.java index 63d67b77..f953bde3 100644 --- a/core/src/main/java/bisq/core/trade/CleanupMailboxMessagesService.java +++ b/core/src/main/java/haveno/core/trade/CleanupMailboxMessagesService.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.trade.Trade; -import bisq.core.trade.messages.TradeMessage; -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.mailbox.MailboxMessage; -import bisq.network.p2p.mailbox.MailboxMessageService; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.trade; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.TradeMessage; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.mailbox.MailboxMessage; +import haveno.network.p2p.mailbox.MailboxMessageService; import javax.inject.Inject; import java.util.List; diff --git a/core/src/main/java/bisq/core/trade/ClosedTradableFormatter.java b/core/src/main/java/haveno/core/trade/ClosedTradableFormatter.java similarity index 88% rename from core/src/main/java/bisq/core/trade/ClosedTradableFormatter.java rename to core/src/main/java/haveno/core/trade/ClosedTradableFormatter.java index 3e634551..80a63774 100644 --- a/core/src/main/java/bisq/core/trade/ClosedTradableFormatter.java +++ b/core/src/main/java/haveno/core/trade/ClosedTradableFormatter.java @@ -15,15 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Volume; -import bisq.core.offer.OpenOffer; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.core.trade; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Monetary; @@ -33,22 +25,29 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; +import static haveno.core.trade.ClosedTradableUtil.*; +import static haveno.core.trade.Trade.DisputeState.DISPUTE_CLOSED; +import static haveno.core.trade.Trade.DisputeState.MEDIATION_CLOSED; +import static haveno.core.trade.Trade.DisputeState.REFUND_REQUEST_CLOSED; +import static haveno.core.util.FormattingUtils.BTC_FORMATTER_KEY; +import static haveno.core.util.FormattingUtils.formatPercentagePrice; +import static haveno.core.util.FormattingUtils.formatToPercentWithSymbol; +import static haveno.core.util.VolumeUtil.formatVolume; +import static haveno.core.util.VolumeUtil.formatVolumeWithCode; + +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Volume; +import haveno.core.offer.OpenOffer; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.core.trade.ClosedTradableUtil.*; -import static bisq.core.trade.Trade.DisputeState.DISPUTE_CLOSED; -import static bisq.core.trade.Trade.DisputeState.MEDIATION_CLOSED; -import static bisq.core.trade.Trade.DisputeState.REFUND_REQUEST_CLOSED; -import static bisq.core.util.FormattingUtils.BTC_FORMATTER_KEY; -import static bisq.core.util.FormattingUtils.formatPercentagePrice; -import static bisq.core.util.FormattingUtils.formatToPercentWithSymbol; -import static bisq.core.util.VolumeUtil.formatVolume; -import static bisq.core.util.VolumeUtil.formatVolumeWithCode; - @Slf4j @Singleton public class ClosedTradableFormatter { @@ -150,7 +149,7 @@ public class ClosedTradableFormatter { return ""; } - if (isBisqV1Trade(tradable)) { + if (isHavenoV1Trade(tradable)) { Trade trade = castToTrade(tradable); if (trade.isCompleted() || trade.isPayoutPublished()) { return Res.get("portfolio.closed.completed"); diff --git a/core/src/main/java/bisq/core/trade/ClosedTradableManager.java b/core/src/main/java/haveno/core/trade/ClosedTradableManager.java similarity index 91% rename from core/src/main/java/bisq/core/trade/ClosedTradableManager.java rename to core/src/main/java/haveno/core/trade/ClosedTradableManager.java index 849b2599..1e9ceb98 100644 --- a/core/src/main/java/bisq/core/trade/ClosedTradableManager.java +++ b/core/src/main/java/haveno/core/trade/ClosedTradableManager.java @@ -15,28 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; +package haveno.core.trade; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOffer; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.KeyRing; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; -import bisq.common.util.Tuple2; +import static haveno.core.offer.OpenOffer.State.CANCELED; +import static haveno.core.trade.ClosedTradableUtil.castToTradeModel; +import static haveno.core.trade.ClosedTradableUtil.isOpenOffer; +import static haveno.core.util.AveragePriceUtil.getAveragePriceTuple; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; import com.google.inject.Inject; - +import haveno.common.crypto.KeyRing; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.common.util.Tuple2; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOffer; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.network.p2p.NodeAddress; import com.google.common.collect.ImmutableList; import javafx.collections.ObservableList; @@ -54,11 +55,6 @@ import java.util.stream.Stream; import lombok.extern.slf4j.Slf4j; -import static bisq.core.offer.OpenOffer.State.CANCELED; -import static bisq.core.trade.ClosedTradableUtil.castToTradeModel; -import static bisq.core.trade.ClosedTradableUtil.isOpenOffer; -import static bisq.core.util.AveragePriceUtil.getAveragePriceTuple; - /** * Manages closed trades or offers. * BsqSwap trades are once confirmed moved in the closed trades domain as well. diff --git a/core/src/main/java/bisq/core/trade/ClosedTradableUtil.java b/core/src/main/java/haveno/core/trade/ClosedTradableUtil.java similarity index 92% rename from core/src/main/java/bisq/core/trade/ClosedTradableUtil.java rename to core/src/main/java/haveno/core/trade/ClosedTradableUtil.java index dc60ab0a..acb4eaff 100644 --- a/core/src/main/java/bisq/core/trade/ClosedTradableUtil.java +++ b/core/src/main/java/haveno/core/trade/ClosedTradableUtil.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.offer.OpenOffer; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; +package haveno.core.trade; import org.bitcoinj.core.Coin; - +import haveno.core.offer.OpenOffer; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -61,7 +59,7 @@ public class ClosedTradableUtil { return tradable instanceof OpenOffer; } - public static boolean isBisqV1Trade(Tradable tradable) { + public static boolean isHavenoV1Trade(Tradable tradable) { return tradable instanceof Trade; } diff --git a/core/src/main/java/bisq/core/trade/Contract.java b/core/src/main/java/haveno/core/trade/Contract.java similarity index 96% rename from core/src/main/java/bisq/core/trade/Contract.java rename to core/src/main/java/haveno/core/trade/Contract.java index f651830d..a1953c06 100644 --- a/core/src/main/java/bisq/core/trade/Contract.java +++ b/core/src/main/java/haveno/core/trade/Contract.java @@ -15,24 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; +package haveno.core.trade; -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.OfferPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.util.JsonUtil; -import bisq.core.util.VolumeUtil; - -import bisq.network.p2p.NodeAddress; import com.google.protobuf.ByteString; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.util.JsonExclude; -import bisq.common.util.Utilities; - +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.util.JsonExclude; +import haveno.common.util.Utilities; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.OfferPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.util.JsonUtil; +import haveno.core.util.VolumeUtil; +import haveno.network.p2p.NodeAddress; import org.apache.commons.lang3.StringUtils; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/HavenoUtils.java b/core/src/main/java/haveno/core/trade/HavenoUtils.java similarity index 96% rename from core/src/main/java/bisq/core/trade/HavenoUtils.java rename to core/src/main/java/haveno/core/trade/HavenoUtils.java index aef977c4..b8e746ce 100644 --- a/core/src/main/java/bisq/core/trade/HavenoUtils.java +++ b/core/src/main/java/haveno/core/trade/HavenoUtils.java @@ -15,29 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.messages.PaymentReceivedMessage; -import bisq.core.trade.messages.PaymentSentMessage; -import bisq.core.util.JsonUtil; -import bisq.network.p2p.NodeAddress; - -import bisq.common.config.Config; -import bisq.common.crypto.Hash; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.util.Utilities; +package haveno.core.trade; import org.bitcoinj.core.Coin; import com.google.common.base.CaseFormat; import com.google.common.base.Charsets; - +import haveno.common.config.Config; +import haveno.common.crypto.Hash; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.util.Utilities; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.messages.PaymentReceivedMessage; +import haveno.core.trade.messages.PaymentSentMessage; +import haveno.core.util.JsonUtil; +import haveno.network.p2p.NodeAddress; import java.text.DecimalFormat; import java.text.SimpleDateFormat; diff --git a/core/src/main/java/bisq/core/trade/MakerTrade.java b/core/src/main/java/haveno/core/trade/MakerTrade.java similarity index 96% rename from core/src/main/java/bisq/core/trade/MakerTrade.java rename to core/src/main/java/haveno/core/trade/MakerTrade.java index 6c17d758..dabf6140 100644 --- a/core/src/main/java/bisq/core/trade/MakerTrade.java +++ b/core/src/main/java/haveno/core/trade/MakerTrade.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; +package haveno.core.trade; public interface MakerTrade { } diff --git a/core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java b/core/src/main/java/haveno/core/trade/SellerAsMakerTrade.java similarity index 93% rename from core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java rename to core/src/main/java/haveno/core/trade/SellerAsMakerTrade.java index a08726dc..4ea22574 100644 --- a/core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java +++ b/core/src/main/java/haveno/core/trade/SellerAsMakerTrade.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.ProtoUtil; +package haveno.core.trade; +import haveno.common.proto.ProtoUtil; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.NodeAddress; import java.math.BigInteger; import java.util.UUID; diff --git a/core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java b/core/src/main/java/haveno/core/trade/SellerAsTakerTrade.java similarity index 93% rename from core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java rename to core/src/main/java/haveno/core/trade/SellerAsTakerTrade.java index 364a7696..ef3de2c9 100644 --- a/core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java +++ b/core/src/main/java/haveno/core/trade/SellerAsTakerTrade.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.ProtoUtil; +package haveno.core.trade; +import haveno.common.proto.ProtoUtil; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.NodeAddress; import java.math.BigInteger; import java.util.UUID; diff --git a/core/src/main/java/bisq/core/trade/SellerTrade.java b/core/src/main/java/haveno/core/trade/SellerTrade.java similarity index 90% rename from core/src/main/java/bisq/core/trade/SellerTrade.java rename to core/src/main/java/haveno/core/trade/SellerTrade.java index 28a30375..2ebe73af 100644 --- a/core/src/main/java/bisq/core/trade/SellerTrade.java +++ b/core/src/main/java/haveno/core/trade/SellerTrade.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.network.p2p.NodeAddress; +package haveno.core.trade; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.trade.protocol.ProcessModel; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; diff --git a/core/src/main/java/bisq/core/trade/TakerTrade.java b/core/src/main/java/haveno/core/trade/TakerTrade.java similarity index 96% rename from core/src/main/java/bisq/core/trade/TakerTrade.java rename to core/src/main/java/haveno/core/trade/TakerTrade.java index 9513e2ef..8ef0aa30 100644 --- a/core/src/main/java/bisq/core/trade/TakerTrade.java +++ b/core/src/main/java/haveno/core/trade/TakerTrade.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; +package haveno.core.trade; public interface TakerTrade { } diff --git a/core/src/main/java/bisq/core/trade/Tradable.java b/core/src/main/java/haveno/core/trade/Tradable.java similarity index 90% rename from core/src/main/java/bisq/core/trade/Tradable.java rename to core/src/main/java/haveno/core/trade/Tradable.java index eed872b7..0b16df4d 100644 --- a/core/src/main/java/bisq/core/trade/Tradable.java +++ b/core/src/main/java/haveno/core/trade/Tradable.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.trade; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.network.p2p.NodeAddress; import org.bitcoinj.core.Coin; import java.math.BigInteger; diff --git a/core/src/main/java/bisq/core/trade/TradableList.java b/core/src/main/java/haveno/core/trade/TradableList.java similarity index 92% rename from core/src/main/java/bisq/core/trade/TradableList.java rename to core/src/main/java/haveno/core/trade/TradableList.java index 65987a8b..51839015 100644 --- a/core/src/main/java/bisq/core/trade/TradableList.java +++ b/core/src/main/java/haveno/core/trade/TradableList.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.OpenOffer; -import bisq.core.proto.CoreProtoResolver; - -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.ProtobufferRuntimeException; -import bisq.common.proto.persistable.PersistableListAsObservable; +package haveno.core.trade; import com.google.protobuf.Message; - +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.ProtobufferRuntimeException; +import haveno.common.proto.persistable.PersistableListAsObservable; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.OpenOffer; +import haveno.core.proto.CoreProtoResolver; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java similarity index 98% rename from core/src/main/java/bisq/core/trade/Trade.java rename to core/src/main/java/haveno/core/trade/Trade.java index ca2bff07..785e64c9 100644 --- a/core/src/main/java/bisq/core/trade/Trade.java +++ b/core/src/main/java/haveno/core/trade/Trade.java @@ -15,44 +15,44 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; +package haveno.core.trade; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.proto.network.CoreNetworkProtoResolver; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.mediation.MediationResultState; -import bisq.core.support.dispute.refund.RefundResultState; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.protocol.ProcessModel; -import bisq.core.trade.protocol.ProcessModelServiceProvider; -import bisq.core.trade.protocol.TradeListener; -import bisq.core.trade.protocol.TradeProtocol; -import bisq.core.trade.protocol.TradePeer; -import bisq.core.trade.txproof.AssetTxProofResult; -import bisq.core.util.VolumeUtil; -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.common.UserThread; -import bisq.common.crypto.Encryption; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.taskrunner.Model; -import bisq.common.util.Utilities; import com.google.common.base.Preconditions; import com.google.protobuf.ByteString; import com.google.protobuf.Message; +import haveno.common.UserThread; +import haveno.common.crypto.Encryption; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.taskrunner.Model; +import haveno.common.util.Utilities; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.proto.network.CoreNetworkProtoResolver; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.mediation.MediationResultState; +import haveno.core.support.dispute.refund.RefundResultState; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.messages.TradeMessage; +import haveno.core.trade.protocol.ProcessModel; +import haveno.core.trade.protocol.ProcessModelServiceProvider; +import haveno.core.trade.protocol.TradeListener; +import haveno.core.trade.protocol.TradePeer; +import haveno.core.trade.protocol.TradeProtocol; +import haveno.core.trade.txproof.AssetTxProofResult; +import haveno.core.util.VolumeUtil; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import org.bitcoinj.core.Coin; import org.fxmisc.easybind.EasyBind; import org.fxmisc.easybind.Subscription; diff --git a/core/src/main/java/bisq/core/trade/TradeDataValidation.java b/core/src/main/java/haveno/core/trade/TradeDataValidation.java similarity index 98% rename from core/src/main/java/bisq/core/trade/TradeDataValidation.java rename to core/src/main/java/haveno/core/trade/TradeDataValidation.java index 1524e180..f277b6e8 100644 --- a/core/src/main/java/bisq/core/trade/TradeDataValidation.java +++ b/core/src/main/java/haveno/core/trade/TradeDataValidation.java @@ -15,11 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.offer.Offer; -import bisq.core.support.dispute.Dispute; +package haveno.core.trade; import org.bitcoinj.core.Address; import org.bitcoinj.core.NetworkParameters; @@ -39,6 +35,10 @@ import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.offer.Offer; +import haveno.core.support.dispute.Dispute; + @Slf4j public class TradeDataValidation { diff --git a/core/src/main/java/bisq/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java similarity index 94% rename from core/src/main/java/bisq/core/trade/TradeManager.java rename to core/src/main/java/haveno/core/trade/TradeManager.java index c7edbb7a..75ca375c 100644 --- a/core/src/main/java/bisq/core/trade/TradeManager.java +++ b/core/src/main/java/haveno/core/trade/TradeManager.java @@ -15,65 +15,64 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; +package haveno.core.trade; -import bisq.core.api.AccountServiceListener; -import bisq.core.api.CoreAccountService; -import bisq.core.api.CoreNotificationService; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferBookService; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.offer.SignedOffer; -import bisq.core.offer.availability.OfferAvailabilityModel; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.trade.Trade.DisputeState; -import bisq.core.trade.Trade.Phase; -import bisq.core.trade.failed.FailedTradesManager; -import bisq.core.trade.handlers.TradeResultHandler; -import bisq.core.trade.messages.DepositRequest; -import bisq.core.trade.messages.DepositResponse; -import bisq.core.trade.messages.InitMultisigRequest; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.messages.SignContractRequest; -import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.protocol.ArbitratorProtocol; -import bisq.core.trade.protocol.MakerProtocol; -import bisq.core.trade.protocol.ProcessModel; -import bisq.core.trade.protocol.ProcessModelServiceProvider; -import bisq.core.trade.protocol.TakerProtocol; -import bisq.core.trade.protocol.TradeProtocol; -import bisq.core.trade.protocol.TradeProtocolFactory; -import bisq.core.trade.protocol.TraderProtocol; -import bisq.core.trade.statistics.ReferralIdService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.User; -import bisq.core.util.Validator; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.DecryptedDirectMessageListener; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.network.TorNetworkNode; import com.google.common.collect.ImmutableList; -import bisq.common.ClockWatcher; -import bisq.common.UserThread; -import bisq.common.crypto.KeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.FaultHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.persistable.PersistedDataHost; - +import haveno.common.ClockWatcher; +import haveno.common.UserThread; +import haveno.common.crypto.KeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.FaultHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.core.api.AccountServiceListener; +import haveno.core.api.CoreAccountService; +import haveno.core.api.CoreNotificationService; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferBookService; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.offer.SignedOffer; +import haveno.core.offer.availability.OfferAvailabilityModel; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.trade.Trade.DisputeState; +import haveno.core.trade.Trade.Phase; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.core.trade.handlers.TradeResultHandler; +import haveno.core.trade.messages.DepositRequest; +import haveno.core.trade.messages.DepositResponse; +import haveno.core.trade.messages.InitMultisigRequest; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.messages.SignContractRequest; +import haveno.core.trade.messages.SignContractResponse; +import haveno.core.trade.protocol.ArbitratorProtocol; +import haveno.core.trade.protocol.MakerProtocol; +import haveno.core.trade.protocol.ProcessModel; +import haveno.core.trade.protocol.ProcessModelServiceProvider; +import haveno.core.trade.protocol.TakerProtocol; +import haveno.core.trade.protocol.TradeProtocol; +import haveno.core.trade.protocol.TradeProtocolFactory; +import haveno.core.trade.protocol.TraderProtocol; +import haveno.core.trade.statistics.ReferralIdService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.User; +import haveno.core.util.Validator; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.DecryptedDirectMessageListener; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.network.TorNetworkNode; import org.bitcoinj.core.Coin; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/trade/TradeModule.java b/core/src/main/java/haveno/core/trade/TradeModule.java similarity index 75% rename from core/src/main/java/bisq/core/trade/TradeModule.java rename to core/src/main/java/haveno/core/trade/TradeModule.java index c74a3d75..95817493 100644 --- a/core/src/main/java/bisq/core/trade/TradeModule.java +++ b/core/src/main/java/haveno/core/trade/TradeModule.java @@ -15,22 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.sign.SignedWitnessStorageService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.account.witness.AccountAgeWitnessStorageService; -import bisq.core.trade.failed.FailedTradesManager; -import bisq.core.trade.statistics.ReferralIdService; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.core.trade; import com.google.inject.Singleton; +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.sign.SignedWitnessStorageService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.account.witness.AccountAgeWitnessStorageService; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.core.trade.statistics.ReferralIdService; -import static bisq.common.config.Config.DUMP_STATISTICS; import static com.google.inject.name.Names.named; +import static haveno.common.config.Config.DUMP_STATISTICS; public class TradeModule extends AppModule { diff --git a/core/src/main/java/bisq/core/trade/TradeTxException.java b/core/src/main/java/haveno/core/trade/TradeTxException.java similarity index 96% rename from core/src/main/java/bisq/core/trade/TradeTxException.java rename to core/src/main/java/haveno/core/trade/TradeTxException.java index 7b81e8a0..78f8a74e 100644 --- a/core/src/main/java/bisq/core/trade/TradeTxException.java +++ b/core/src/main/java/haveno/core/trade/TradeTxException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; +package haveno.core.trade; public class TradeTxException extends Exception { public TradeTxException(String message) { diff --git a/core/src/main/java/bisq/core/trade/TradeUtil.java b/core/src/main/java/haveno/core/trade/TradeUtil.java similarity index 94% rename from core/src/main/java/bisq/core/trade/TradeUtil.java rename to core/src/main/java/haveno/core/trade/TradeUtil.java index b278424e..2ba807d5 100644 --- a/core/src/main/java/bisq/core/trade/TradeUtil.java +++ b/core/src/main/java/haveno/core/trade/TradeUtil.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; - -import bisq.common.crypto.KeyRing; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.core.trade; +import haveno.common.crypto.KeyRing; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; import javax.inject.Inject; import javax.inject.Singleton; @@ -35,10 +33,10 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.core.locale.CurrencyUtil.getCurrencyPair; -import static bisq.core.locale.CurrencyUtil.isFiatCurrency; -import static bisq.core.util.FormattingUtils.formatDurationAsWords; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.core.locale.CurrencyUtil.getCurrencyPair; +import static haveno.core.locale.CurrencyUtil.isFiatCurrency; +import static haveno.core.util.FormattingUtils.formatDurationAsWords; import static java.lang.String.format; /** diff --git a/core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java b/core/src/main/java/haveno/core/trade/failed/FailedTradesManager.java similarity index 91% rename from core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java rename to core/src/main/java/haveno/core/trade/failed/FailedTradesManager.java index 971777ad..cbe58ff9 100644 --- a/core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java +++ b/core/src/main/java/haveno/core/trade/failed/FailedTradesManager.java @@ -15,22 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.failed; - -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.CleanupMailboxMessages; -import bisq.core.trade.TradableList; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeUtil; -import bisq.common.crypto.KeyRing; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.core.trade.failed; import com.google.inject.Inject; - +import haveno.common.crypto.KeyRing; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.CleanupMailboxMessages; +import haveno.core.trade.TradableList; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeUtil; import javafx.collections.ObservableList; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/trade/handlers/TradeResultHandler.java b/core/src/main/java/haveno/core/trade/handlers/TradeResultHandler.java similarity index 91% rename from core/src/main/java/bisq/core/trade/handlers/TradeResultHandler.java rename to core/src/main/java/haveno/core/trade/handlers/TradeResultHandler.java index 2b2dc0be..7dd80e18 100644 --- a/core/src/main/java/bisq/core/trade/handlers/TradeResultHandler.java +++ b/core/src/main/java/haveno/core/trade/handlers/TradeResultHandler.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.handlers; +package haveno.core.trade.handlers; -import bisq.core.trade.Trade; +import haveno.core.trade.Trade; public interface TradeResultHandler { void handleResult(Trade trade); diff --git a/core/src/main/java/bisq/core/trade/handlers/TransactionResultHandler.java b/core/src/main/java/haveno/core/trade/handlers/TransactionResultHandler.java similarity index 95% rename from core/src/main/java/bisq/core/trade/handlers/TransactionResultHandler.java rename to core/src/main/java/haveno/core/trade/handlers/TransactionResultHandler.java index f6886d15..33c31dc8 100644 --- a/core/src/main/java/bisq/core/trade/handlers/TransactionResultHandler.java +++ b/core/src/main/java/haveno/core/trade/handlers/TransactionResultHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.handlers; +package haveno.core.trade.handlers; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/bisq/core/trade/messages/DepositRequest.java b/core/src/main/java/haveno/core/trade/messages/DepositRequest.java similarity index 96% rename from core/src/main/java/bisq/core/trade/messages/DepositRequest.java rename to core/src/main/java/haveno/core/trade/messages/DepositRequest.java index 9c06ea2b..884f76f0 100644 --- a/core/src/main/java/bisq/core/trade/messages/DepositRequest.java +++ b/core/src/main/java/haveno/core/trade/messages/DepositRequest.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; +package haveno.core.trade.messages; -import bisq.core.proto.CoreProtoResolver; - -import bisq.network.p2p.DirectMessage; import com.google.protobuf.ByteString; +import haveno.common.proto.ProtoUtil; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.DirectMessage; import java.util.Optional; import javax.annotation.Nullable; -import bisq.common.proto.ProtoUtil; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/messages/DepositResponse.java b/core/src/main/java/haveno/core/trade/messages/DepositResponse.java similarity index 92% rename from core/src/main/java/bisq/core/trade/messages/DepositResponse.java rename to core/src/main/java/haveno/core/trade/messages/DepositResponse.java index c7d8a693..4e9db26e 100644 --- a/core/src/main/java/bisq/core/trade/messages/DepositResponse.java +++ b/core/src/main/java/haveno/core/trade/messages/DepositResponse.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.core.proto.CoreProtoResolver; - -import bisq.network.p2p.DirectMessage; -import bisq.network.p2p.NodeAddress; +package haveno.core.trade.messages; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.DirectMessage; +import haveno.network.p2p.NodeAddress; import java.util.Optional; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/messages/DepositsConfirmedMessage.java b/core/src/main/java/haveno/core/trade/messages/DepositsConfirmedMessage.java similarity index 93% rename from core/src/main/java/bisq/core/trade/messages/DepositsConfirmedMessage.java rename to core/src/main/java/haveno/core/trade/messages/DepositsConfirmedMessage.java index f6fd6119..9e9d9f6a 100644 --- a/core/src/main/java/bisq/core/trade/messages/DepositsConfirmedMessage.java +++ b/core/src/main/java/haveno/core/trade/messages/DepositsConfirmedMessage.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; +package haveno.core.trade.messages; -import bisq.core.proto.CoreProtoResolver; - -import bisq.network.p2p.NodeAddress; import com.google.protobuf.ByteString; +import haveno.common.app.Version; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.Utilities; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.NodeAddress; import java.util.Optional; import javax.annotation.Nullable; - -import bisq.common.app.Version; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.Utilities; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/messages/InitMultisigRequest.java b/core/src/main/java/haveno/core/trade/messages/InitMultisigRequest.java similarity index 94% rename from core/src/main/java/bisq/core/trade/messages/InitMultisigRequest.java rename to core/src/main/java/haveno/core/trade/messages/InitMultisigRequest.java index bb6352ea..eb43d0bc 100644 --- a/core/src/main/java/bisq/core/trade/messages/InitMultisigRequest.java +++ b/core/src/main/java/haveno/core/trade/messages/InitMultisigRequest.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.core.proto.CoreProtoResolver; - -import bisq.network.p2p.DirectMessage; -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; +package haveno.core.trade.messages; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.DirectMessage; +import haveno.network.p2p.NodeAddress; import java.util.Optional; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/trade/messages/InitTradeRequest.java b/core/src/main/java/haveno/core/trade/messages/InitTradeRequest.java similarity index 96% rename from core/src/main/java/bisq/core/trade/messages/InitTradeRequest.java rename to core/src/main/java/haveno/core/trade/messages/InitTradeRequest.java index ad3f6580..7abc1fc0 100644 --- a/core/src/main/java/bisq/core/trade/messages/InitTradeRequest.java +++ b/core/src/main/java/haveno/core/trade/messages/InitTradeRequest.java @@ -15,19 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.core.proto.CoreProtoResolver; - -import bisq.network.p2p.DirectMessage; -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.Utilities; +package haveno.core.trade.messages; import com.google.protobuf.ByteString; - +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.Utilities; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.DirectMessage; +import haveno.network.p2p.NodeAddress; import java.util.Optional; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxPublishedMessage.java b/core/src/main/java/haveno/core/trade/messages/MediatedPayoutTxPublishedMessage.java similarity index 94% rename from core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxPublishedMessage.java rename to core/src/main/java/haveno/core/trade/messages/MediatedPayoutTxPublishedMessage.java index dec8aa4a..dc4c8728 100644 --- a/core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxPublishedMessage.java +++ b/core/src/main/java/haveno/core/trade/messages/MediatedPayoutTxPublishedMessage.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.util.Utilities; +package haveno.core.trade.messages; import com.google.protobuf.ByteString; - +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxSignatureMessage.java b/core/src/main/java/haveno/core/trade/messages/MediatedPayoutTxSignatureMessage.java similarity index 96% rename from core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxSignatureMessage.java rename to core/src/main/java/haveno/core/trade/messages/MediatedPayoutTxSignatureMessage.java index ee2dd6f8..b2039583 100644 --- a/core/src/main/java/bisq/core/trade/messages/MediatedPayoutTxSignatureMessage.java +++ b/core/src/main/java/haveno/core/trade/messages/MediatedPayoutTxSignatureMessage.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.Version; -import bisq.common.util.Utilities; +package haveno.core.trade.messages; import com.google.protobuf.ByteString; - +import haveno.common.app.Version; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.Value; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/messages/PaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/messages/PaymentReceivedMessage.java similarity index 96% rename from core/src/main/java/bisq/core/trade/messages/PaymentReceivedMessage.java rename to core/src/main/java/haveno/core/trade/messages/PaymentReceivedMessage.java index 7db0325c..0f242d5c 100644 --- a/core/src/main/java/bisq/core/trade/messages/PaymentReceivedMessage.java +++ b/core/src/main/java/haveno/core/trade/messages/PaymentReceivedMessage.java @@ -15,14 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.witness.AccountAgeWitness; -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.Version; -import bisq.common.proto.ProtoUtil; +package haveno.core.trade.messages; import java.util.Optional; @@ -34,6 +27,11 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; import com.google.protobuf.ByteString; +import haveno.common.app.Version; +import haveno.common.proto.ProtoUtil; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.network.p2p.NodeAddress; @Slf4j @EqualsAndHashCode(callSuper = true) diff --git a/core/src/main/java/bisq/core/trade/messages/PaymentSentMessage.java b/core/src/main/java/haveno/core/trade/messages/PaymentSentMessage.java similarity index 97% rename from core/src/main/java/bisq/core/trade/messages/PaymentSentMessage.java rename to core/src/main/java/haveno/core/trade/messages/PaymentSentMessage.java index 49dd4e94..0882219b 100644 --- a/core/src/main/java/bisq/core/trade/messages/PaymentSentMessage.java +++ b/core/src/main/java/haveno/core/trade/messages/PaymentSentMessage.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; +package haveno.core.trade.messages; -import bisq.network.p2p.NodeAddress; import com.google.protobuf.ByteString; -import bisq.common.app.Version; -import bisq.common.proto.ProtoUtil; -import bisq.core.account.witness.AccountAgeWitness; - +import haveno.common.app.Version; +import haveno.common.proto.ProtoUtil; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.network.p2p.NodeAddress; import java.util.Optional; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/trade/messages/RefreshTradeStateRequest.java b/core/src/main/java/haveno/core/trade/messages/RefreshTradeStateRequest.java similarity index 97% rename from core/src/main/java/bisq/core/trade/messages/RefreshTradeStateRequest.java rename to core/src/main/java/haveno/core/trade/messages/RefreshTradeStateRequest.java index aa049a78..3a529f82 100644 --- a/core/src/main/java/bisq/core/trade/messages/RefreshTradeStateRequest.java +++ b/core/src/main/java/haveno/core/trade/messages/RefreshTradeStateRequest.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.network.p2p.NodeAddress; +package haveno.core.trade.messages; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/messages/SignContractRequest.java b/core/src/main/java/haveno/core/trade/messages/SignContractRequest.java similarity index 95% rename from core/src/main/java/bisq/core/trade/messages/SignContractRequest.java rename to core/src/main/java/haveno/core/trade/messages/SignContractRequest.java index 03360848..5cd8a007 100644 --- a/core/src/main/java/bisq/core/trade/messages/SignContractRequest.java +++ b/core/src/main/java/haveno/core/trade/messages/SignContractRequest.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.core.proto.CoreProtoResolver; - -import bisq.network.p2p.DirectMessage; +package haveno.core.trade.messages; import java.util.Optional; import javax.annotation.Nullable; import com.google.protobuf.ByteString; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.Utilities; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.Utilities; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.DirectMessage; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/messages/SignContractResponse.java b/core/src/main/java/haveno/core/trade/messages/SignContractResponse.java similarity index 94% rename from core/src/main/java/bisq/core/trade/messages/SignContractResponse.java rename to core/src/main/java/haveno/core/trade/messages/SignContractResponse.java index be740dda..7b40e61f 100644 --- a/core/src/main/java/bisq/core/trade/messages/SignContractResponse.java +++ b/core/src/main/java/haveno/core/trade/messages/SignContractResponse.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; +package haveno.core.trade.messages; -import bisq.core.proto.CoreProtoResolver; - -import bisq.network.p2p.DirectMessage; -import bisq.network.p2p.NodeAddress; import com.google.protobuf.ByteString; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; - +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.DirectMessage; +import haveno.network.p2p.NodeAddress; import java.util.Optional; import javax.annotation.Nullable; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/trade/messages/TradeMailboxMessage.java b/core/src/main/java/haveno/core/trade/messages/TradeMailboxMessage.java similarity index 93% rename from core/src/main/java/bisq/core/trade/messages/TradeMailboxMessage.java rename to core/src/main/java/haveno/core/trade/messages/TradeMailboxMessage.java index e112413d..42b6857e 100644 --- a/core/src/main/java/bisq/core/trade/messages/TradeMailboxMessage.java +++ b/core/src/main/java/haveno/core/trade/messages/TradeMailboxMessage.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.network.p2p.mailbox.MailboxMessage; +package haveno.core.trade.messages; +import haveno.network.p2p.mailbox.MailboxMessage; import java.util.concurrent.TimeUnit; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/trade/messages/TradeMessage.java b/core/src/main/java/haveno/core/trade/messages/TradeMessage.java similarity index 90% rename from core/src/main/java/bisq/core/trade/messages/TradeMessage.java rename to core/src/main/java/haveno/core/trade/messages/TradeMessage.java index fa2b08db..c1057298 100644 --- a/core/src/main/java/bisq/core/trade/messages/TradeMessage.java +++ b/core/src/main/java/haveno/core/trade/messages/TradeMessage.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.messages; - -import bisq.network.p2p.UidMessage; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.core.trade.messages; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.UidMessage; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/core/src/main/java/bisq/core/trade/protocol/ArbitratorProtocol.java b/core/src/main/java/haveno/core/trade/protocol/ArbitratorProtocol.java similarity index 79% rename from core/src/main/java/bisq/core/trade/protocol/ArbitratorProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/ArbitratorProtocol.java index f908340e..9958cc2b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/ArbitratorProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/ArbitratorProtocol.java @@ -1,23 +1,23 @@ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.DepositRequest; -import bisq.core.trade.messages.DepositResponse; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.ArbitratorProcessDepositRequest; -import bisq.core.trade.protocol.tasks.ArbitratorProcessReserveTx; -import bisq.core.trade.protocol.tasks.ArbitratorSendInitTradeOrMultisigRequests; -import bisq.core.trade.protocol.tasks.ProcessInitTradeRequest; -import bisq.core.trade.protocol.tasks.SendDepositsConfirmedMessageToBuyer; -import bisq.core.trade.protocol.tasks.SendDepositsConfirmedMessageToSeller; -import bisq.core.trade.protocol.tasks.TradeTask; -import bisq.core.util.Validator; -import bisq.network.p2p.NodeAddress; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.DepositRequest; +import haveno.core.trade.messages.DepositResponse; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.messages.SignContractResponse; +import haveno.core.trade.messages.TradeMessage; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.ArbitratorProcessDepositRequest; +import haveno.core.trade.protocol.tasks.ArbitratorProcessReserveTx; +import haveno.core.trade.protocol.tasks.ArbitratorSendInitTradeOrMultisigRequests; +import haveno.core.trade.protocol.tasks.ProcessInitTradeRequest; +import haveno.core.trade.protocol.tasks.SendDepositsConfirmedMessageToBuyer; +import haveno.core.trade.protocol.tasks.SendDepositsConfirmedMessageToSeller; +import haveno.core.trade.protocol.tasks.TradeTask; +import haveno.core.util.Validator; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/BuyerAsMakerProtocol.java similarity index 85% rename from core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/BuyerAsMakerProtocol.java index e50aa79e..f6a6e351 100644 --- a/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/BuyerAsMakerProtocol.java @@ -15,16 +15,16 @@ e * This file is part of Haveno. * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.BuyerAsMakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.MakerSendInitTradeRequest; -import bisq.core.trade.protocol.tasks.ProcessInitTradeRequest; -import bisq.network.p2p.NodeAddress; -import bisq.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.trade.BuyerAsMakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.MakerSendInitTradeRequest; +import haveno.core.trade.protocol.tasks.ProcessInitTradeRequest; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/BuyerAsTakerProtocol.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/BuyerAsTakerProtocol.java index 85beeb1b..12e254ce 100644 --- a/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/BuyerAsTakerProtocol.java @@ -15,18 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.offer.Offer; -import bisq.core.trade.BuyerAsTakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.handlers.TradeResultHandler; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.TakerReserveTradeFunds; -import bisq.core.trade.protocol.tasks.TakerSendInitTradeRequestToArbitrator; -import bisq.common.handlers.ErrorMessageHandler; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.offer.Offer; +import haveno.core.trade.BuyerAsTakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.handlers.TradeResultHandler; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.TakerReserveTradeFunds; +import haveno.core.trade.protocol.tasks.TakerSendInitTradeRequestToArbitrator; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java similarity index 87% rename from core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java index 4b04f748..7299b08e 100644 --- a/core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java @@ -15,21 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.BuyerPreparePaymentSentMessage; -import bisq.core.trade.protocol.tasks.BuyerSendPaymentSentMessageToArbitrator; -import bisq.core.trade.protocol.tasks.BuyerSendPaymentSentMessageToSeller; -import bisq.core.trade.protocol.tasks.SendDepositsConfirmedMessageToArbitrator; -import bisq.core.trade.protocol.tasks.TradeTask; -import bisq.network.p2p.NodeAddress; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.SignContractResponse; +import haveno.core.trade.messages.TradeMessage; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.BuyerPreparePaymentSentMessage; +import haveno.core.trade.protocol.tasks.BuyerSendPaymentSentMessageToArbitrator; +import haveno.core.trade.protocol.tasks.BuyerSendPaymentSentMessageToSeller; +import haveno.core.trade.protocol.tasks.SendDepositsConfirmedMessageToArbitrator; +import haveno.core.trade.protocol.tasks.TradeTask; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/DisputeProtocol.java b/core/src/main/java/haveno/core/trade/protocol/DisputeProtocol.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/DisputeProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/DisputeProtocol.java index 3660e4de..73cfe009 100644 --- a/core/src/main/java/bisq/core/trade/protocol/DisputeProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/DisputeProtocol.java @@ -15,26 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; - -import bisq.core.trade.Trade; -import bisq.core.trade.messages.MediatedPayoutTxPublishedMessage; -import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage; -import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.mediation.FinalizeMediatedPayoutTx; -import bisq.core.trade.protocol.tasks.mediation.ProcessMediatedPayoutSignatureMessage; -import bisq.core.trade.protocol.tasks.mediation.ProcessMediatedPayoutTxPublishedMessage; -import bisq.core.trade.protocol.tasks.mediation.SendMediatedPayoutSignatureMessage; -import bisq.core.trade.protocol.tasks.mediation.SendMediatedPayoutTxPublishedMessage; -import bisq.core.trade.protocol.tasks.mediation.SetupMediatedPayoutTxListener; -import bisq.core.trade.protocol.tasks.mediation.SignMediatedPayoutTx; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.core.trade.protocol; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.MediatedPayoutTxPublishedMessage; +import haveno.core.trade.messages.MediatedPayoutTxSignatureMessage; +import haveno.core.trade.messages.TradeMessage; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.mediation.FinalizeMediatedPayoutTx; +import haveno.core.trade.protocol.tasks.mediation.ProcessMediatedPayoutSignatureMessage; +import haveno.core.trade.protocol.tasks.mediation.ProcessMediatedPayoutTxPublishedMessage; +import haveno.core.trade.protocol.tasks.mediation.SendMediatedPayoutSignatureMessage; +import haveno.core.trade.protocol.tasks.mediation.SendMediatedPayoutTxPublishedMessage; +import haveno.core.trade.protocol.tasks.mediation.SetupMediatedPayoutTxListener; +import haveno.core.trade.protocol.tasks.mediation.SignMediatedPayoutTx; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java b/core/src/main/java/haveno/core/trade/protocol/FluentProtocol.java similarity index 98% rename from core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/FluentProtocol.java index 7021954a..12691104 100644 --- a/core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/FluentProtocol.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; - -import bisq.core.trade.Trade; -import bisq.core.trade.messages.TradeMessage; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.taskrunner.Task; +package haveno.core.trade.protocol; +import haveno.common.taskrunner.Task; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.TradeMessage; +import haveno.network.p2p.NodeAddress; import java.text.MessageFormat; import java.util.HashSet; @@ -35,8 +32,8 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.core.util.Validator.isTradeIdValid; import static com.google.common.base.Preconditions.checkArgument; +import static haveno.core.util.Validator.isTradeIdValid; // Main class. Contains the condition and setup, if condition is valid it will execute the // taskRunner and the optional runnable. diff --git a/core/src/main/java/bisq/core/trade/protocol/MakerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/MakerProtocol.java similarity index 83% rename from core/src/main/java/bisq/core/trade/protocol/MakerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/MakerProtocol.java index 5c2f1c86..1272968d 100644 --- a/core/src/main/java/bisq/core/trade/protocol/MakerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/MakerProtocol.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.messages.InitTradeRequest; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.network.p2p.NodeAddress; public interface MakerProtocol extends TraderProtocol { void handleInitTradeRequest(InitTradeRequest message, NodeAddress taker, ErrorMessageHandler errorMessageHandler); diff --git a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java b/core/src/main/java/haveno/core/trade/protocol/ProcessModel.java similarity index 91% rename from core/src/main/java/bisq/core/trade/protocol/ProcessModel.java rename to core/src/main/java/haveno/core/trade/protocol/ProcessModel.java index 989a2d6a..2239f0ea 100644 --- a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java +++ b/core/src/main/java/haveno/core/trade/protocol/ProcessModel.java @@ -15,45 +15,42 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.model.RawTransactionInput; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.filter.FilterManager; -import bisq.core.network.MessageState; -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.messages.DisputeClosedMessage; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.messages.PaymentReceivedMessage; -import bisq.core.trade.messages.PaymentSentMessage; -import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.statistics.ReferralIdService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.User; - -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.common.app.Version; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.taskrunner.Model; +package haveno.core.trade.protocol; import com.google.protobuf.ByteString; - +import haveno.common.app.Version; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.taskrunner.Model; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.model.RawTransactionInput; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.filter.FilterManager; +import haveno.core.network.MessageState; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.messages.DisputeClosedMessage; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.messages.PaymentReceivedMessage; +import haveno.core.trade.messages.PaymentSentMessage; +import haveno.core.trade.messages.TradeMessage; +import haveno.core.trade.statistics.ReferralIdService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.User; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/bisq/core/trade/protocol/ProcessModelServiceProvider.java b/core/src/main/java/haveno/core/trade/protocol/ProcessModelServiceProvider.java similarity index 80% rename from core/src/main/java/bisq/core/trade/protocol/ProcessModelServiceProvider.java rename to core/src/main/java/haveno/core/trade/protocol/ProcessModelServiceProvider.java index af077dc6..e4fb62fd 100644 --- a/core/src/main/java/bisq/core/trade/protocol/ProcessModelServiceProvider.java +++ b/core/src/main/java/haveno/core/trade/protocol/ProcessModelServiceProvider.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.filter.FilterManager; -import bisq.core.offer.OpenOfferManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; -import bisq.core.trade.statistics.ReferralIdService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; - -import bisq.common.crypto.KeyRing; +package haveno.core.trade.protocol; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.filter.FilterManager; +import haveno.core.offer.OpenOfferManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.core.trade.statistics.ReferralIdService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.User; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import lombok.Getter; diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/SellerAsMakerProtocol.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/SellerAsMakerProtocol.java index 370ca016..6ebd8021 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/SellerAsMakerProtocol.java @@ -15,18 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.SellerAsMakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.MakerSendInitTradeRequest; -import bisq.core.trade.protocol.tasks.ProcessInitTradeRequest; -import bisq.network.p2p.NodeAddress; -import bisq.common.handlers.ErrorMessageHandler; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.trade.SellerAsMakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.MakerSendInitTradeRequest; +import haveno.core.trade.protocol.tasks.ProcessInitTradeRequest; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/SellerAsTakerProtocol.java similarity index 87% rename from core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/SellerAsTakerProtocol.java index 701f56e9..cb42c51b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/SellerAsTakerProtocol.java @@ -15,17 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.SellerAsTakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.handlers.TradeResultHandler; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.TakerReserveTradeFunds; -import bisq.core.trade.protocol.tasks.TakerSendInitTradeRequestToArbitrator; -import bisq.common.handlers.ErrorMessageHandler; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.trade.SellerAsTakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.handlers.TradeResultHandler; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.TakerReserveTradeFunds; +import haveno.core.trade.protocol.tasks.TakerSendInitTradeRequestToArbitrator; import lombok.extern.slf4j.Slf4j; // TODO (woodser): remove unused request handling diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java similarity index 85% rename from core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java index 6dcc31af..d45576fb 100644 --- a/core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java @@ -15,22 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.core.trade.SellerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.SellerPreparePaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.SellerSendPaymentReceivedMessageToArbitrator; -import bisq.core.trade.protocol.tasks.SellerSendPaymentReceivedMessageToBuyer; -import bisq.core.trade.protocol.tasks.SendDepositsConfirmedMessageToArbitrator; -import bisq.core.trade.protocol.tasks.SendDepositsConfirmedMessageToBuyer; -import bisq.core.trade.protocol.tasks.TradeTask; -import bisq.network.p2p.NodeAddress; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.trade.SellerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.SignContractResponse; +import haveno.core.trade.messages.TradeMessage; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.SellerPreparePaymentReceivedMessage; +import haveno.core.trade.protocol.tasks.SellerSendPaymentReceivedMessageToArbitrator; +import haveno.core.trade.protocol.tasks.SellerSendPaymentReceivedMessageToBuyer; +import haveno.core.trade.protocol.tasks.SendDepositsConfirmedMessageToArbitrator; +import haveno.core.trade.protocol.tasks.SendDepositsConfirmedMessageToBuyer; +import haveno.core.trade.protocol.tasks.TradeTask; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/TakerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/TakerProtocol.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/TakerProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/TakerProtocol.java index fb14adf0..01089097 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TakerProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/TakerProtocol.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.core.trade.handlers.TradeResultHandler; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.trade.handlers.TradeResultHandler; public interface TakerProtocol extends TraderProtocol { void onTakeOffer(TradeResultHandler tradeResultHandler, ErrorMessageHandler errorMessageHandler); diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeListener.java b/core/src/main/java/haveno/core/trade/protocol/TradeListener.java similarity index 62% rename from core/src/main/java/bisq/core/trade/protocol/TradeListener.java rename to core/src/main/java/haveno/core/trade/protocol/TradeListener.java index 9b88017b..86cdc14f 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradeListener.java +++ b/core/src/main/java/haveno/core/trade/protocol/TradeListener.java @@ -1,8 +1,8 @@ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.messages.TradeMessage; -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.NodeAddress; +import haveno.core.trade.messages.TradeMessage; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.NodeAddress; /** * Receives notifications of decrypted, verified trade and ack messages. diff --git a/core/src/main/java/bisq/core/trade/protocol/TradePeer.java b/core/src/main/java/haveno/core/trade/protocol/TradePeer.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/TradePeer.java rename to core/src/main/java/haveno/core/trade/protocol/TradePeer.java index c30b40d2..f5b5fd99 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradePeer.java +++ b/core/src/main/java/haveno/core/trade/protocol/TradePeer.java @@ -15,19 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.btc.model.RawTransactionInput; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.proto.CoreProtoResolver; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.trade.protocol; import com.google.protobuf.ByteString; import com.google.protobuf.Message; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.btc.model.RawTransactionInput; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.proto.CoreProtoResolver; +import haveno.network.p2p.NodeAddress; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java b/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java similarity index 93% rename from core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java index 3682a395..a07e8aa2 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java @@ -15,58 +15,56 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; - -import bisq.core.support.dispute.messages.DisputeClosedMessage; -import bisq.core.support.dispute.messages.DisputeOpenedMessage; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.SellerTrade; -import bisq.core.trade.handlers.TradeResultHandler; -import bisq.core.trade.messages.PaymentSentMessage; -import bisq.core.trade.messages.DepositRequest; -import bisq.core.trade.messages.DepositResponse; -import bisq.core.trade.messages.DepositsConfirmedMessage; -import bisq.core.trade.messages.InitMultisigRequest; -import bisq.core.trade.messages.PaymentReceivedMessage; -import bisq.core.trade.messages.SignContractRequest; -import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.messages.TradeMessage; -import bisq.core.trade.protocol.tasks.RemoveOffer; -import bisq.core.trade.protocol.tasks.ProcessPaymentSentMessage; -import bisq.core.trade.protocol.tasks.TradeTask; -import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; -import bisq.core.trade.protocol.FluentProtocol.Condition; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.ResendDisputeClosedMessageWithPayout; -import bisq.core.trade.protocol.tasks.MaybeSendSignContractRequest; -import bisq.core.trade.protocol.tasks.ProcessDepositResponse; -import bisq.core.trade.protocol.tasks.ProcessDepositsConfirmedMessage; -import bisq.core.trade.protocol.tasks.ProcessInitMultisigRequest; -import bisq.core.trade.protocol.tasks.ProcessPaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.ProcessSignContractRequest; -import bisq.core.trade.protocol.tasks.ProcessSignContractResponse; -import bisq.core.util.Validator; - -import bisq.network.p2p.AckMessage; -import bisq.network.p2p.AckMessageSourceType; -import bisq.network.p2p.DecryptedDirectMessageListener; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendMailboxMessageListener; -import bisq.network.p2p.mailbox.MailboxMessage; -import bisq.network.p2p.mailbox.MailboxMessageService; -import bisq.network.p2p.messaging.DecryptedMailboxListener; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.crypto.PubKeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.taskrunner.Task; +package haveno.core.trade.protocol; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.crypto.PubKeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.taskrunner.Task; +import haveno.core.support.dispute.messages.DisputeClosedMessage; +import haveno.core.support.dispute.messages.DisputeOpenedMessage; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.SellerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.handlers.TradeResultHandler; +import haveno.core.trade.messages.DepositRequest; +import haveno.core.trade.messages.DepositResponse; +import haveno.core.trade.messages.DepositsConfirmedMessage; +import haveno.core.trade.messages.InitMultisigRequest; +import haveno.core.trade.messages.PaymentReceivedMessage; +import haveno.core.trade.messages.PaymentSentMessage; +import haveno.core.trade.messages.SignContractRequest; +import haveno.core.trade.messages.SignContractResponse; +import haveno.core.trade.messages.TradeMessage; +import haveno.core.trade.protocol.FluentProtocol.Condition; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.MaybeSendSignContractRequest; +import haveno.core.trade.protocol.tasks.ProcessDepositResponse; +import haveno.core.trade.protocol.tasks.ProcessDepositsConfirmedMessage; +import haveno.core.trade.protocol.tasks.ProcessInitMultisigRequest; +import haveno.core.trade.protocol.tasks.ProcessPaymentReceivedMessage; +import haveno.core.trade.protocol.tasks.ProcessPaymentSentMessage; +import haveno.core.trade.protocol.tasks.ProcessSignContractRequest; +import haveno.core.trade.protocol.tasks.ProcessSignContractResponse; +import haveno.core.trade.protocol.tasks.RemoveOffer; +import haveno.core.trade.protocol.tasks.ResendDisputeClosedMessageWithPayout; +import haveno.core.trade.protocol.tasks.TradeTask; +import haveno.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; +import haveno.core.util.Validator; +import haveno.network.p2p.AckMessage; +import haveno.network.p2p.AckMessageSourceType; +import haveno.network.p2p.DecryptedDirectMessageListener; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendMailboxMessageListener; +import haveno.network.p2p.mailbox.MailboxMessage; +import haveno.network.p2p.mailbox.MailboxMessageService; +import haveno.network.p2p.messaging.DecryptedMailboxListener; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java b/core/src/main/java/haveno/core/trade/protocol/TradeProtocolFactory.java similarity index 84% rename from core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java rename to core/src/main/java/haveno/core/trade/protocol/TradeProtocolFactory.java index 02c34db8..642ea33b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java +++ b/core/src/main/java/haveno/core/trade/protocol/TradeProtocolFactory.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.BuyerAsMakerTrade; -import bisq.core.trade.BuyerAsTakerTrade; -import bisq.core.trade.SellerAsMakerTrade; -import bisq.core.trade.SellerAsTakerTrade; -import bisq.core.trade.Trade; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.BuyerAsMakerTrade; +import haveno.core.trade.BuyerAsTakerTrade; +import haveno.core.trade.SellerAsMakerTrade; +import haveno.core.trade.SellerAsTakerTrade; +import haveno.core.trade.Trade; public class TradeProtocolFactory { public static TradeProtocol getNewTradeProtocol(Trade trade) { diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java b/core/src/main/java/haveno/core/trade/protocol/TradeTaskRunner.java similarity index 82% rename from core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java rename to core/src/main/java/haveno/core/trade/protocol/TradeTaskRunner.java index b173d65b..55903e63 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java +++ b/core/src/main/java/haveno/core/trade/protocol/TradeTaskRunner.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.Trade; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.taskrunner.TaskRunner; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; public class TradeTaskRunner extends TaskRunner { diff --git a/core/src/main/java/bisq/core/trade/protocol/TraderProtocol.java b/core/src/main/java/haveno/core/trade/protocol/TraderProtocol.java similarity index 83% rename from core/src/main/java/bisq/core/trade/protocol/TraderProtocol.java rename to core/src/main/java/haveno/core/trade/protocol/TraderProtocol.java index 67ce4bfa..78040f0d 100644 --- a/core/src/main/java/bisq/core/trade/protocol/TraderProtocol.java +++ b/core/src/main/java/haveno/core/trade/protocol/TraderProtocol.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol; +package haveno.core.trade.protocol; -import bisq.core.trade.messages.DepositResponse; -import bisq.core.trade.messages.SignContractResponse; -import bisq.network.p2p.NodeAddress; +import haveno.core.trade.messages.DepositResponse; +import haveno.core.trade.messages.SignContractResponse; +import haveno.network.p2p.NodeAddress; public interface TraderProtocol { public void handleSignContractResponse(SignContractResponse message, NodeAddress peer); diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ApplyFilter.java similarity index 85% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ApplyFilter.java index 8438abc5..dc35582c 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ApplyFilter.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.filter.FilterManager; -import bisq.core.trade.Trade; -import bisq.network.p2p.NodeAddress; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.filter.FilterManager; +import haveno.core.trade.Trade; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkNotNull; @@ -54,8 +52,8 @@ public class ApplyFilter extends TradeTask { failed("Payment method is banned.\n" + "Payment method=" + trade.getOffer().getPaymentMethod().getId()); } else if (filterManager.requireUpdateToNewVersionForTrading()) { - failed("Your version of Bisq is not compatible for trading anymore. " + - "Please update to the latest Bisq version at https://bisq.network/downloads."); + failed("Your version of Haveno is not compatible for trading anymore. " + + "Please update to the latest Haveno version at https://haveno.network/downloads."); } else { complete(); } diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java similarity index 94% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java index 97fce089..5f9d733b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java @@ -15,22 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.app.Version; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.offer.Offer; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.DepositRequest; -import bisq.core.trade.messages.DepositResponse; -import bisq.core.trade.protocol.TradePeer; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendDirectMessageListener; import common.utils.JsonUtils; - +import haveno.common.app.Version; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.Offer; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.DepositRequest; +import haveno.core.trade.messages.DepositResponse; +import haveno.core.trade.protocol.TradePeer; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendDirectMessageListener; import java.math.BigInteger; import java.util.Arrays; import java.util.Date; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java index c5ea3cbb..5b7a8801 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.protocol.TradePeer; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.protocol.TradePeer; import java.math.BigInteger; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java index 6a7f0acc..704e1aca 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.app.Version; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.InitMultisigRequest; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.network.p2p.SendDirectMessageListener; +import haveno.common.app.Version; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitMultisigRequest; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.network.p2p.SendDirectMessageListener; import java.util.Date; import java.util.UUID; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java similarity index 98% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java index 19e77392..72f600e8 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerPreparePaymentSentMessage.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; import com.google.common.base.Preconditions; - +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; import java.math.BigInteger; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java similarity index 90% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java index 69359c26..2dab6887 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java @@ -15,23 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.network.MessageState; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.PaymentSentMessage; -import bisq.core.trade.messages.TradeMailboxMessage; -import bisq.core.util.JsonUtil; -import bisq.network.p2p.NodeAddress; +package haveno.core.trade.protocol.tasks; import com.google.common.base.Charsets; - -import bisq.common.Timer; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.taskrunner.TaskRunner; - +import haveno.common.Timer; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.network.MessageState; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.PaymentSentMessage; +import haveno.core.trade.messages.TradeMailboxMessage; +import haveno.core.util.JsonUtil; +import haveno.network.p2p.NodeAddress; import javafx.beans.value.ChangeListener; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; @@ -125,7 +122,7 @@ public abstract class BuyerSendPaymentSentMessage extends SendMailboxMessageTask protected void setStateStoredInMailbox() { trade.setStateIfValidTransitionTo(Trade.State.BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG); processModel.getTradeManager().requestPersistence(); - // TODO: schedule repeat sending like bisq? + // TODO: schedule repeat sending like haveno? } @Override diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToArbitrator.java b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToArbitrator.java similarity index 89% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToArbitrator.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToArbitrator.java index 1e8214fa..16959e17 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToArbitrator.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToArbitrator.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToSeller.java b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToSeller.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToSeller.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToSeller.java index 236fd86b..343e4e55 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToSeller.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessageToSeller.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.core.trade.messages.TradeMessage; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.TradeMessage; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendInitTradeRequest.java b/core/src/main/java/haveno/core/trade/protocol/tasks/MakerSendInitTradeRequest.java similarity index 91% rename from core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendInitTradeRequest.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/MakerSendInitTradeRequest.java index 23b7bd47..ebf5402e 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSendInitTradeRequest.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/MakerSendInitTradeRequest.java @@ -15,23 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.offer.Offer; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.network.p2p.SendDirectMessageListener; - -import bisq.common.app.Version; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.app.Version; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.offer.Offer; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.network.p2p.SendDirectMessageListener; import java.util.UUID; import lombok.extern.slf4j.Slf4j; -import static bisq.core.util.Validator.checkTradeId; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.core.util.Validator.checkTradeId; @Slf4j public class MakerSendInitTradeRequest extends TradeTask { diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetLockTime.java b/core/src/main/java/haveno/core/trade/protocol/tasks/MakerSetLockTime.java similarity index 89% rename from core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetLockTime.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/MakerSetLockTime.java index 35afdde3..a58a6f09 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/MakerSetLockTime.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/MakerSetLockTime.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.btc.wallet.Restrictions; -import bisq.core.trade.Trade; -import bisq.common.config.Config; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.config.Config; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.trade.Trade; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/MaybeSendSignContractRequest.java b/core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java similarity index 93% rename from core/src/main/java/bisq/core/trade/protocol/tasks/MaybeSendSignContractRequest.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java index 59ec3b0e..7a40863b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/MaybeSendSignContractRequest.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/MaybeSendSignContractRequest.java @@ -15,18 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.common.app.Version; -import bisq.common.crypto.Sig; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.MakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.Trade.State; -import bisq.core.trade.messages.SignContractRequest; -import bisq.network.p2p.SendDirectMessageListener; +package haveno.core.trade.protocol.tasks; import java.util.ArrayList; import java.util.Date; @@ -34,7 +23,16 @@ import java.util.List; import java.util.UUID; import com.google.common.base.Charsets; - +import haveno.common.app.Version; +import haveno.common.crypto.Sig; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.MakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.Trade.State; +import haveno.core.trade.messages.SignContractRequest; +import haveno.network.p2p.SendDirectMessageListener; import lombok.extern.slf4j.Slf4j; import monero.daemon.model.MoneroOutput; import monero.wallet.model.MoneroTxWallet; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessDepositResponse.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java similarity index 90% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessDepositResponse.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java index c5fdc548..37eb3aee 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessDepositResponse.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.DepositResponse; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.DepositResponse; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessDepositsConfirmedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositsConfirmedMessage.java similarity index 91% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessDepositsConfirmedMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositsConfirmedMessage.java index 10786670..550f3a4c 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessDepositsConfirmedMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositsConfirmedMessage.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.DepositsConfirmedMessage; -import bisq.core.trade.protocol.TradePeer; -import bisq.core.util.Validator; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.DepositsConfirmedMessage; +import haveno.core.trade.protocol.TradePeer; +import haveno.core.util.Validator; import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessInitMultisigRequest.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java similarity index 94% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessInitMultisigRequest.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java index f46e845f..e82d426f 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessInitMultisigRequest.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java @@ -15,32 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.MakerTrade; -import bisq.core.trade.TakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.InitMultisigRequest; -import bisq.core.trade.protocol.TradePeer; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendDirectMessageListener; - -import bisq.common.app.Version; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.app.Version; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.MakerTrade; +import haveno.core.trade.TakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitMultisigRequest; +import haveno.core.trade.protocol.TradePeer; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendDirectMessageListener; import java.util.Arrays; import java.util.Date; import java.util.UUID; import lombok.extern.slf4j.Slf4j; -import static bisq.core.util.Validator.checkTradeId; import static com.google.common.base.Preconditions.checkNotNull; - - +import static haveno.core.util.Validator.checkTradeId; import monero.wallet.MoneroWallet; import monero.wallet.model.MoneroMultisigInitResult; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessInitTradeRequest.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitTradeRequest.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessInitTradeRequest.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitTradeRequest.java index 18bf158d..70c9afb5 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessInitTradeRequest.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitTradeRequest.java @@ -15,27 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.exceptions.TradePriceOutOfToleranceException; -import bisq.core.offer.Offer; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.MakerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.core.trade.protocol.TradePeer; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; import com.google.common.base.Charsets; - +import haveno.common.taskrunner.TaskRunner; +import haveno.core.exceptions.TradePriceOutOfToleranceException; +import haveno.core.offer.Offer; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.MakerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.core.trade.protocol.TradePeer; import lombok.extern.slf4j.Slf4j; -import static bisq.core.util.Validator.checkTradeId; -import static bisq.core.util.Validator.nonEmptyStringOf; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.core.util.Validator.checkTradeId; +import static haveno.core.util.Validator.nonEmptyStringOf; import java.math.BigInteger; import java.util.Date; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java similarity index 94% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java index 9f965cb3..5a8a647f 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java @@ -15,19 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.core.account.sign.SignedWitness; -import bisq.core.support.dispute.Dispute; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.PaymentReceivedMessage; -import bisq.core.util.Validator; import common.utils.GenUtils; -import bisq.common.taskrunner.TaskRunner; - +import haveno.common.taskrunner.TaskRunner; +import haveno.core.account.sign.SignedWitness; +import haveno.core.support.dispute.Dispute; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.PaymentReceivedMessage; +import haveno.core.util.Validator; import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkArgument; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessPaymentSentMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentSentMessage.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessPaymentSentMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentSentMessage.java index db95360c..c77be464 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessPaymentSentMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentSentMessage.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; import static com.google.common.base.Preconditions.checkNotNull; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.PaymentSentMessage; -import bisq.core.util.Validator; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.PaymentSentMessage; +import haveno.core.util.Validator; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessSignContractRequest.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractRequest.java similarity index 90% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessSignContractRequest.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractRequest.java index a6c0855f..4951f2ab 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessSignContractRequest.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractRequest.java @@ -15,35 +15,33 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; import static com.google.common.base.Preconditions.checkNotNull; -import bisq.common.app.Version; -import bisq.common.crypto.Encryption; -import bisq.common.crypto.Hash; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.ScryptUtil; -import bisq.common.crypto.Sig; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.Contract; -import bisq.core.trade.Trade; -import bisq.core.trade.Trade.State; -import bisq.core.trade.messages.SignContractRequest; -import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.protocol.TradePeer; -import bisq.core.util.JsonUtil; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendDirectMessageListener; - import java.util.Date; import java.util.UUID; import javax.crypto.SecretKey; import com.google.common.base.Charsets; - +import haveno.common.app.Version; +import haveno.common.crypto.Encryption; +import haveno.common.crypto.Hash; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.ScryptUtil; +import haveno.common.crypto.Sig; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.Contract; +import haveno.core.trade.Trade; +import haveno.core.trade.Trade.State; +import haveno.core.trade.messages.SignContractRequest; +import haveno.core.trade.messages.SignContractResponse; +import haveno.core.trade.protocol.TradePeer; +import haveno.core.util.JsonUtil; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendDirectMessageListener; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessSignContractResponse.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractResponse.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ProcessSignContractResponse.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractResponse.java index d342558c..b75bb29e 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ProcessSignContractResponse.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessSignContractResponse.java @@ -15,18 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.app.Version; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.DepositRequest; -import bisq.core.trade.messages.SignContractResponse; -import bisq.core.trade.protocol.TradePeer; -import bisq.network.p2p.SendDirectMessageListener; +import haveno.common.app.Version; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.DepositRequest; +import haveno.core.trade.messages.SignContractResponse; +import haveno.core.trade.protocol.TradePeer; +import haveno.network.p2p.SendDirectMessageListener; import java.util.Date; import java.util.UUID; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/PublishTradeStatistics.java b/core/src/main/java/haveno/core/trade/protocol/tasks/PublishTradeStatistics.java similarity index 88% rename from core/src/main/java/bisq/core/trade/protocol/tasks/PublishTradeStatistics.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/PublishTradeStatistics.java index 9bf16fac..a7731404 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/PublishTradeStatistics.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/PublishTradeStatistics.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.trade.Trade; -import bisq.core.trade.statistics.TradeStatistics2; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.TorNetworkNode; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.trade.Trade; +import haveno.core.trade.statistics.TradeStatistics2; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.TorNetworkNode; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/RemoveOffer.java b/core/src/main/java/haveno/core/trade/protocol/tasks/RemoveOffer.java similarity index 90% rename from core/src/main/java/bisq/core/trade/protocol/tasks/RemoveOffer.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/RemoveOffer.java index 21e74c2d..c5b8a3f5 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/RemoveOffer.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/RemoveOffer.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.MakerTrade; -import bisq.core.trade.Trade; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.MakerTrade; +import haveno.core.trade.Trade; import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ResendDisputeClosedMessageWithPayout.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ResendDisputeClosedMessageWithPayout.java similarity index 90% rename from core/src/main/java/bisq/core/trade/protocol/tasks/ResendDisputeClosedMessageWithPayout.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/ResendDisputeClosedMessageWithPayout.java index 9961d3c0..662dff50 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ResendDisputeClosedMessageWithPayout.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ResendDisputeClosedMessageWithPayout.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.support.dispute.Dispute; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.DepositsConfirmedMessage; -import bisq.core.trade.protocol.TradePeer; -import bisq.core.util.Validator; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.support.dispute.Dispute; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.DepositsConfirmedMessage; +import haveno.core.trade.protocol.TradePeer; +import haveno.core.util.Validator; import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java similarity index 95% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java index a81a64ba..03137084 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; import lombok.extern.slf4j.Slf4j; import monero.wallet.model.MoneroTxWallet; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishDepositTx.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPublishDepositTx.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishDepositTx.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SellerPublishDepositTx.java index dd847046..b6ebcc13 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishDepositTx.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPublishDepositTx.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishTradeStatistics.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPublishTradeStatistics.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishTradeStatistics.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SellerPublishTradeStatistics.java index f0d3a260..32535b8d 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPublishTradeStatistics.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPublishTradeStatistics.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java similarity index 91% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java index 18410e61..4abeff07 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessage.java @@ -15,19 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.PaymentReceivedMessage; -import bisq.core.trade.messages.TradeMailboxMessage; -import bisq.core.util.JsonUtil; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; @@ -35,6 +23,17 @@ import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Charsets; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.PaymentReceivedMessage; +import haveno.core.trade.messages.TradeMailboxMessage; +import haveno.core.util.JsonUtil; +import haveno.network.p2p.NodeAddress; @Slf4j @EqualsAndHashCode(callSuper = true) diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToArbitrator.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToArbitrator.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToArbitrator.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToArbitrator.java index e04dcaec..3d9f466b 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToArbitrator.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToArbitrator.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToBuyer.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToBuyer.java similarity index 84% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToBuyer.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToBuyer.java index 23f55be8..f9d98e8f 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToBuyer.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerSendPaymentReceivedMessageToBuyer.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.core.trade.messages.PaymentReceivedMessage; -import bisq.core.trade.messages.TradeMailboxMessage; -import bisq.core.trade.messages.TradeMessage; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.PaymentReceivedMessage; +import haveno.core.trade.messages.TradeMailboxMessage; +import haveno.core.trade.messages.TradeMessage; +import haveno.network.p2p.NodeAddress; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java similarity index 90% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java index 614fd61e..5ac1555c 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.DepositsConfirmedMessage; -import bisq.core.trade.messages.TradeMailboxMessage; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.DepositsConfirmedMessage; +import haveno.core.trade.messages.TradeMailboxMessage; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; /** diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToArbitrator.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToArbitrator.java similarity index 87% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToArbitrator.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToArbitrator.java index 4f6cd4aa..baaa6ae9 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToArbitrator.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToArbitrator.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; /** diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToBuyer.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToBuyer.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToBuyer.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToBuyer.java index 4302d455..5795ce89 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToBuyer.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToBuyer.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; /** diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToSeller.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToSeller.java similarity index 86% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToSeller.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToSeller.java index 594de810..efdf9a99 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SendDepositsConfirmedMessageToSeller.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessageToSeller.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.network.p2p.NodeAddress; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; /** diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SendMailboxMessageTask.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java similarity index 91% rename from core/src/main/java/bisq/core/trade/protocol/tasks/SendMailboxMessageTask.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java index 1425775d..a8db771e 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/SendMailboxMessageTask.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.core.trade.messages.TradeMailboxMessage; -import bisq.core.trade.messages.TradeMessage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendMailboxMessageListener; -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.TradeMailboxMessage; +import haveno.core.trade.messages.TradeMessage; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendMailboxMessageListener; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerReserveTradeFunds.java b/core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/TakerReserveTradeFunds.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java index 7e3a4cc4..b56e82cb 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerReserveTradeFunds.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java @@ -15,12 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.offer.OfferDirection; -import bisq.core.trade.Trade; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.offer.OfferDirection; +import haveno.core.trade.Trade; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java b/core/src/main/java/haveno/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java similarity index 91% rename from core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java index 588b38eb..7e9739f9 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/TakerSendInitTradeRequestToArbitrator.java @@ -15,22 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; +package haveno.core.trade.protocol.tasks; -import bisq.core.offer.availability.DisputeAgentSelection; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.InitTradeRequest; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendDirectMessageListener; +import haveno.common.app.Version; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.offer.availability.DisputeAgentSelection; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.InitTradeRequest; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendDirectMessageListener; import java.util.HashSet; import java.util.Set; -import bisq.common.app.Version; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.taskrunner.TaskRunner; - - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerVerifyMakerFeePayment.java b/core/src/main/java/haveno/core/trade/protocol/tasks/TakerVerifyMakerFeePayment.java similarity index 92% rename from core/src/main/java/bisq/core/trade/protocol/tasks/TakerVerifyMakerFeePayment.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/TakerVerifyMakerFeePayment.java index a4cee671..2952d1b0 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/TakerVerifyMakerFeePayment.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/TakerVerifyMakerFeePayment.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/TradeTask.java b/core/src/main/java/haveno/core/trade/protocol/tasks/TradeTask.java similarity index 90% rename from core/src/main/java/bisq/core/trade/protocol/tasks/TradeTask.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/TradeTask.java index 02bf7c7c..b7e0b8d1 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/TradeTask.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/TradeTask.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.trade.Trade; -import bisq.core.trade.protocol.ProcessModel; - -import bisq.common.taskrunner.Task; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.taskrunner.Task; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.protocol.ProcessModel; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/VerifyPeersAccountAgeWitness.java b/core/src/main/java/haveno/core/trade/protocol/tasks/VerifyPeersAccountAgeWitness.java similarity index 88% rename from core/src/main/java/bisq/core/trade/protocol/tasks/VerifyPeersAccountAgeWitness.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/VerifyPeersAccountAgeWitness.java index f0d3e604..91280148 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/VerifyPeersAccountAgeWitness.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/VerifyPeersAccountAgeWitness.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.protocol.TradePeer; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.offer.Offer; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.protocol.TradePeer; import java.util.Date; import java.util.concurrent.atomic.AtomicReference; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java index 6cd9dc89..90d44128 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks.mediation; - -import bisq.core.trade.Trade; -import bisq.core.trade.protocol.tasks.TradeTask; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks.mediation; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.protocol.tasks.TradeTask; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java similarity index 84% rename from core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java index f8f27937..aaee1e55 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutSignatureMessage.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks.mediation; - -import bisq.core.support.dispute.mediation.MediationResultState; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage; -import bisq.core.trade.protocol.tasks.TradeTask; -import bisq.core.util.Validator; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks.mediation; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.support.dispute.mediation.MediationResultState; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.MediatedPayoutTxSignatureMessage; +import haveno.core.trade.protocol.tasks.TradeTask; +import haveno.core.util.Validator; import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java similarity index 94% rename from core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java index 5b366c2a..aced5329 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks.mediation; - -import bisq.core.trade.Trade; -import bisq.core.trade.protocol.tasks.TradeTask; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks.mediation; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.protocol.tasks.TradeTask; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SendMediatedPayoutSignatureMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SendMediatedPayoutSignatureMessage.java similarity index 89% rename from core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SendMediatedPayoutSignatureMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SendMediatedPayoutSignatureMessage.java index a07ab332..f14c137c 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SendMediatedPayoutSignatureMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SendMediatedPayoutSignatureMessage.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks.mediation; - -import bisq.core.support.dispute.mediation.MediationResultState; -import bisq.core.trade.Contract; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage; -import bisq.core.trade.protocol.tasks.TradeTask; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.SendMailboxMessageListener; - -import bisq.common.crypto.PubKeyRing; -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks.mediation; +import haveno.common.crypto.PubKeyRing; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.support.dispute.mediation.MediationResultState; +import haveno.core.trade.Contract; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.MediatedPayoutTxSignatureMessage; +import haveno.core.trade.protocol.tasks.TradeTask; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.SendMailboxMessageListener; import java.util.UUID; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java similarity index 89% rename from core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java index 5a5b6fd2..bd7775d8 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SendMediatedPayoutTxPublishedMessage.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks.mediation; - -import bisq.core.support.dispute.mediation.MediationResultState; -import bisq.core.trade.Trade; -import bisq.core.trade.messages.TradeMailboxMessage; -import bisq.core.trade.protocol.tasks.SendMailboxMessageTask; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks.mediation; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.support.dispute.mediation.MediationResultState; +import haveno.core.trade.Trade; +import haveno.core.trade.messages.TradeMailboxMessage; +import haveno.core.trade.protocol.tasks.SendMailboxMessageTask; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SetupMediatedPayoutTxListener.java b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SetupMediatedPayoutTxListener.java similarity index 87% rename from core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SetupMediatedPayoutTxListener.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SetupMediatedPayoutTxListener.java index 28da0c16..85d3d140 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SetupMediatedPayoutTxListener.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SetupMediatedPayoutTxListener.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks.mediation; +package haveno.core.trade.protocol.tasks.mediation; -import bisq.common.taskrunner.TaskRunner; -import bisq.core.trade.Trade; -import bisq.core.trade.protocol.tasks.TradeTask; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.protocol.tasks.TradeTask; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java similarity index 96% rename from core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java rename to core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java index f231d1a0..9e33e08e 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java +++ b/core/src/main/java/haveno/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.protocol.tasks.mediation; - -import bisq.core.trade.Trade; -import bisq.core.trade.protocol.tasks.TradeTask; - -import bisq.common.taskrunner.TaskRunner; +package haveno.core.trade.protocol.tasks.mediation; +import haveno.common.taskrunner.TaskRunner; +import haveno.core.trade.Trade; +import haveno.core.trade.protocol.tasks.TradeTask; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/statistics/ReferralId.java b/core/src/main/java/haveno/core/trade/statistics/ReferralId.java similarity index 92% rename from core/src/main/java/bisq/core/trade/statistics/ReferralId.java rename to core/src/main/java/haveno/core/trade/statistics/ReferralId.java index dde8ea50..e6789f2e 100644 --- a/core/src/main/java/bisq/core/trade/statistics/ReferralId.java +++ b/core/src/main/java/haveno/core/trade/statistics/ReferralId.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; +package haveno.core.trade.statistics; /** - * Those are random ids which can be assigned to a market maker or API provider who generates trade volume for Bisq. + * Those are random ids which can be assigned to a market maker or API provider who generates trade volume for Haveno. * * The assignment process is that a partner requests a referralId from the core developers and if accepted they get * assigned an ID. With the ID we can quantify the generated trades from that partner from analysing the trade diff --git a/core/src/main/java/bisq/core/trade/statistics/ReferralIdService.java b/core/src/main/java/haveno/core/trade/statistics/ReferralIdService.java similarity index 96% rename from core/src/main/java/bisq/core/trade/statistics/ReferralIdService.java rename to core/src/main/java/haveno/core/trade/statistics/ReferralIdService.java index 3d548f46..61bc5ef1 100644 --- a/core/src/main/java/bisq/core/trade/statistics/ReferralIdService.java +++ b/core/src/main/java/haveno/core/trade/statistics/ReferralIdService.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.core.user.Preferences; +package haveno.core.trade.statistics; import javax.inject.Inject; - +import haveno.core.user.Preferences; import java.util.Arrays; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics2.java similarity index 93% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatistics2.java index 9c8a6f4c..92d99851 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics2.java @@ -15,36 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.AltcoinExchangeRate; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.util.JsonUtil; -import bisq.core.util.VolumeUtil; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.crypto.Hash; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.CollectionUtils; -import bisq.common.util.ExtraDataMapValidator; -import bisq.common.util.JsonExclude; -import bisq.common.util.Utilities; +package haveno.core.trade.statistics; import com.google.protobuf.ByteString; - +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.crypto.Hash; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.CollectionUtils; +import haveno.common.util.ExtraDataMapValidator; +import haveno.common.util.JsonExclude; +import haveno.common.util.Utilities; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.AltcoinExchangeRate; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.util.JsonUtil; +import haveno.core.util.VolumeUtil; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.Fiat; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2StorageService.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics2StorageService.java similarity index 92% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatistics2StorageService.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatistics2StorageService.java index e9203148..b7162b3b 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2StorageService.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics2StorageService.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.persistence.MapStoreService; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; +package haveno.core.trade.statistics; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.persistence.MapStoreService; import javax.inject.Inject; import javax.inject.Named; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics2Store.java similarity index 95% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatistics2Store.java index 0c1ef7e1..ed71d3b7 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics2Store.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore; +package haveno.core.trade.statistics; import com.google.protobuf.Message; - +import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java similarity index 93% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java index 9ed981a7..a34ab68a 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java @@ -15,35 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.AltcoinExchangeRate; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.trade.Trade; -import bisq.core.util.JsonUtil; -import bisq.core.util.VolumeUtil; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; -import bisq.network.p2p.storage.payload.DateSortedTruncatablePayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.crypto.Hash; -import bisq.common.proto.ProtoUtil; -import bisq.common.util.CollectionUtils; -import bisq.common.util.ExtraDataMapValidator; -import bisq.common.util.JsonExclude; -import bisq.common.util.Utilities; +package haveno.core.trade.statistics; import com.google.protobuf.ByteString; - +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.crypto.Hash; +import haveno.common.proto.ProtoUtil; +import haveno.common.util.CollectionUtils; +import haveno.common.util.ExtraDataMapValidator; +import haveno.common.util.JsonExclude; +import haveno.common.util.Utilities; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.AltcoinExchangeRate; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.trade.Trade; +import haveno.core.util.JsonUtil; +import haveno.core.util.VolumeUtil; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; +import haveno.network.p2p.storage.payload.DateSortedTruncatablePayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.Fiat; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3StorageService.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3StorageService.java similarity index 90% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatistics3StorageService.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatistics3StorageService.java index ec5eb4f1..12d23ec4 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3StorageService.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3StorageService.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.persistence.HistoricalDataStoreService; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; +package haveno.core.trade.statistics; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.persistence.HistoricalDataStoreService; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3Store.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3Store.java similarity index 94% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatistics3Store.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatistics3Store.java index 6a3ec6b2..fefc6505 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3Store.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3Store.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore; +package haveno.core.trade.statistics; import com.google.protobuf.Message; - +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatisticsConverter.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatisticsConverter.java similarity index 93% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatisticsConverter.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatisticsConverter.java index d7cc50f3..254bded1 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatisticsConverter.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatisticsConverter.java @@ -15,23 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.core.offer.availability.DisputeAgentSelection; - -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; - -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.file.FileUtil; -import bisq.common.util.Utilities; +package haveno.core.trade.statistics; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.common.util.Utilities; +import haveno.core.offer.availability.DisputeAgentSelection; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; import javax.inject.Named; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatisticsForJson.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatisticsForJson.java similarity index 94% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatisticsForJson.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatisticsForJson.java index 1eaabaec..87ce90fa 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatisticsForJson.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatisticsForJson.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; - -import bisq.common.util.MathUtils; +package haveno.core.trade.statistics; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatisticsManager.java similarity index 92% rename from core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java rename to core/src/main/java/haveno/core/trade/statistics/TradeStatisticsManager.java index 1a34a0f2..43e0efc7 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java +++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatisticsManager.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.statistics; - -import bisq.core.locale.CurrencyTuple; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.Trade; -import bisq.core.util.JsonUtil; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; - -import bisq.common.config.Config; -import bisq.common.file.JsonFileManager; -import bisq.common.util.Utilities; +package haveno.core.trade.statistics; import com.google.inject.Inject; - +import haveno.common.config.Config; +import haveno.common.file.JsonFileManager; +import haveno.common.util.Utilities; +import haveno.core.locale.CurrencyTuple; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.Trade; +import haveno.core.util.JsonUtil; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; import javax.inject.Named; import javax.inject.Singleton; @@ -100,7 +97,7 @@ public class TradeStatisticsManager { return; } observableTradeStatisticsSet.add(tradeStatistics); - priceFeedService.applyLatestBisqMarketPrice(observableTradeStatisticsSet); + priceFeedService.applyLatestHavenoMarketPrice(observableTradeStatisticsSet); maybeDumpStatistics(); } }); @@ -111,7 +108,7 @@ public class TradeStatisticsManager { .filter(TradeStatistics3::isValid) .collect(Collectors.toSet()); observableTradeStatisticsSet.addAll(set); - priceFeedService.applyLatestBisqMarketPrice(observableTradeStatisticsSet); + priceFeedService.applyLatestHavenoMarketPrice(observableTradeStatisticsSet); maybeDumpStatistics(); } diff --git a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofHttpClient.java b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofHttpClient.java similarity index 91% rename from core/src/main/java/bisq/core/trade/txproof/AssetTxProofHttpClient.java rename to core/src/main/java/haveno/core/trade/txproof/AssetTxProofHttpClient.java index 72c2227b..814077f9 100644 --- a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofHttpClient.java +++ b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofHttpClient.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof; +package haveno.core.trade.txproof; -import bisq.network.http.HttpClient; +import haveno.network.http.HttpClient; public interface AssetTxProofHttpClient extends HttpClient { } diff --git a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofModel.java b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofModel.java similarity index 95% rename from core/src/main/java/bisq/core/trade/txproof/AssetTxProofModel.java rename to core/src/main/java/haveno/core/trade/txproof/AssetTxProofModel.java index 58fe71f1..af262c25 100644 --- a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofModel.java +++ b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof; +package haveno.core.trade.txproof; public interface AssetTxProofModel { } diff --git a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofParser.java b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofParser.java similarity index 95% rename from core/src/main/java/bisq/core/trade/txproof/AssetTxProofParser.java rename to core/src/main/java/haveno/core/trade/txproof/AssetTxProofParser.java index d1311404..78f95e27 100644 --- a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofParser.java +++ b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofParser.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof; +package haveno.core.trade.txproof; public interface AssetTxProofParser { R parse(T model, String jsonTxt); diff --git a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofRequest.java b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofRequest.java similarity index 92% rename from core/src/main/java/bisq/core/trade/txproof/AssetTxProofRequest.java rename to core/src/main/java/haveno/core/trade/txproof/AssetTxProofRequest.java index 7da8414c..35e95a85 100644 --- a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofRequest.java +++ b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofRequest.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof; - -import bisq.common.handlers.FaultHandler; +package haveno.core.trade.txproof; +import haveno.common.handlers.FaultHandler; import java.util.function.Consumer; public interface AssetTxProofRequest { diff --git a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofRequestsPerTrade.java b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofRequestsPerTrade.java similarity index 91% rename from core/src/main/java/bisq/core/trade/txproof/AssetTxProofRequestsPerTrade.java rename to core/src/main/java/haveno/core/trade/txproof/AssetTxProofRequestsPerTrade.java index cd4ab796..cb0d2a19 100644 --- a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofRequestsPerTrade.java +++ b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofRequestsPerTrade.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof; - -import bisq.common.handlers.FaultHandler; +package haveno.core.trade.txproof; +import haveno.common.handlers.FaultHandler; import java.util.function.Consumer; public interface AssetTxProofRequestsPerTrade { diff --git a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofResult.java b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofResult.java similarity index 98% rename from core/src/main/java/bisq/core/trade/txproof/AssetTxProofResult.java rename to core/src/main/java/haveno/core/trade/txproof/AssetTxProofResult.java index 819d423d..e25c270a 100644 --- a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofResult.java +++ b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofResult.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof; +package haveno.core.trade.txproof; import lombok.Getter; diff --git a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofService.java b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofService.java similarity index 95% rename from core/src/main/java/bisq/core/trade/txproof/AssetTxProofService.java rename to core/src/main/java/haveno/core/trade/txproof/AssetTxProofService.java index 1b99c5e9..da7996cc 100644 --- a/core/src/main/java/bisq/core/trade/txproof/AssetTxProofService.java +++ b/core/src/main/java/haveno/core/trade/txproof/AssetTxProofService.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof; +package haveno.core.trade.txproof; public interface AssetTxProofService { void onAllServicesInitialized(); diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofHttpClient.java b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofHttpClient.java similarity index 83% rename from core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofHttpClient.java rename to core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofHttpClient.java index 11c90742..3c17fe58 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofHttpClient.java +++ b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofHttpClient.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof.xmr; - -import bisq.core.trade.txproof.AssetTxProofHttpClient; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.http.HttpClientImpl; +package haveno.core.trade.txproof.xmr; +import haveno.core.trade.txproof.AssetTxProofHttpClient; +import haveno.network.Socks5ProxyProvider; +import haveno.network.http.HttpClientImpl; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofModel.java similarity index 91% rename from core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java rename to core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofModel.java index b9270430..9d1eb2e8 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java +++ b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofModel.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof.xmr; - -import bisq.core.monetary.Volume; -import bisq.core.payment.payload.AssetAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.trade.Trade; -import bisq.core.trade.txproof.AssetTxProofModel; -import bisq.core.user.AutoConfirmSettings; - -import bisq.common.app.DevEnv; +package haveno.core.trade.txproof.xmr; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.app.DevEnv; +import haveno.core.monetary.Volume; +import haveno.core.payment.payload.AssetAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.trade.Trade; +import haveno.core.trade.txproof.AssetTxProofModel; +import haveno.core.user.AutoConfirmSettings; import java.util.Date; import lombok.Value; diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofParser.java similarity index 98% rename from core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java rename to core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofParser.java index bd74d5ed..34dd1f7f 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java +++ b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofParser.java @@ -15,20 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof.xmr; - -import bisq.core.trade.txproof.AssetTxProofParser; - -import bisq.asset.CryptoNoteUtils; - -import bisq.common.app.DevEnv; +package haveno.core.trade.txproof.xmr; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; - +import haveno.asset.CryptoNoteUtils; +import haveno.common.app.DevEnv; +import haveno.core.trade.txproof.AssetTxProofParser; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofRequest.java b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofRequest.java similarity index 95% rename from core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofRequest.java rename to core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofRequest.java index 8c5c95e8..81c87dae 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofRequest.java +++ b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofRequest.java @@ -15,22 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof.xmr; - -import bisq.core.trade.txproof.AssetTxProofHttpClient; -import bisq.core.trade.txproof.AssetTxProofParser; -import bisq.core.trade.txproof.AssetTxProofRequest; - -import bisq.network.Socks5ProxyProvider; - -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.handlers.FaultHandler; -import bisq.common.util.Utilities; +package haveno.core.trade.txproof.xmr; import com.google.gson.GsonBuilder; import com.google.gson.JsonParser; - +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.handlers.FaultHandler; +import haveno.common.util.Utilities; +import haveno.core.trade.txproof.AssetTxProofHttpClient; +import haveno.core.trade.txproof.AssetTxProofParser; +import haveno.core.trade.txproof.AssetTxProofRequest; +import haveno.network.Socks5ProxyProvider; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -211,7 +207,7 @@ class XmrTxProofRequest implements AssetTxProofRequest "&viewkey=" + model.getTxKey() + "&txprove=1"; log.info("Param {} for {}", param, this); - String json = httpClient.get(param, "User-Agent", "bisq/" + Version.VERSION); + String json = httpClient.get(param, "User-Agent", "haveno/" + Version.VERSION); try { String prettyJson = new GsonBuilder().setPrettyPrinting().create().toJson(new JsonParser().parse(json)); log.info("Response json from {}\n{}", this, prettyJson); diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofRequestsPerTrade.java b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofRequestsPerTrade.java similarity index 96% rename from core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofRequestsPerTrade.java rename to core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofRequestsPerTrade.java index a93fd6c2..e7ec9fe2 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofRequestsPerTrade.java +++ b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofRequestsPerTrade.java @@ -15,23 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof.xmr; - -import bisq.core.filter.FilterManager; -import bisq.core.locale.Res; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.txproof.AssetTxProofRequestsPerTrade; -import bisq.core.trade.txproof.AssetTxProofResult; -import bisq.core.user.AutoConfirmSettings; - -import bisq.network.Socks5ProxyProvider; - -import bisq.common.handlers.FaultHandler; +package haveno.core.trade.txproof.xmr; +import haveno.common.handlers.FaultHandler; +import haveno.core.filter.FilterManager; +import haveno.core.locale.Res; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.txproof.AssetTxProofRequestsPerTrade; +import haveno.core.trade.txproof.AssetTxProofResult; +import haveno.core.user.AutoConfirmSettings; +import haveno.network.Socks5ProxyProvider; import javafx.beans.value.ChangeListener; import javafx.collections.ListChangeListener; diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofService.java similarity index 94% rename from core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java rename to core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofService.java index 22604c48..7eb9a867 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java +++ b/core/src/main/java/haveno/core/trade/txproof/xmr/XmrTxProofService.java @@ -15,30 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.core.trade.txproof.xmr; - -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.filter.FilterManager; -import bisq.core.locale.Res; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.SellerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.failed.FailedTradesManager; -import bisq.core.trade.protocol.SellerProtocol; -import bisq.core.trade.txproof.AssetTxProofResult; -import bisq.core.trade.txproof.AssetTxProofService; -import bisq.core.user.AutoConfirmSettings; -import bisq.core.user.Preferences; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; - -import bisq.common.app.DevEnv; +package haveno.core.trade.txproof.xmr; +import haveno.common.app.DevEnv; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.filter.FilterManager; +import haveno.core.locale.Res; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.SellerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.core.trade.protocol.SellerProtocol; +import haveno.core.trade.txproof.AssetTxProofResult; +import haveno.core.trade.txproof.AssetTxProofService; +import haveno.core.user.AutoConfirmSettings; +import haveno.core.user.Preferences; +import haveno.network.Socks5ProxyProvider; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/user/AutoConfirmSettings.java b/core/src/main/java/haveno/core/user/AutoConfirmSettings.java similarity index 98% rename from core/src/main/java/bisq/core/user/AutoConfirmSettings.java rename to core/src/main/java/haveno/core/user/AutoConfirmSettings.java index 586a9864..f5e8d476 100644 --- a/core/src/main/java/bisq/core/user/AutoConfirmSettings.java +++ b/core/src/main/java/haveno/core/user/AutoConfirmSettings.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.user; import com.google.protobuf.Message; - +import haveno.common.proto.persistable.PersistablePayload; import org.bitcoinj.core.Coin; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/user/BlockChainExplorer.java b/core/src/main/java/haveno/core/user/BlockChainExplorer.java similarity index 94% rename from core/src/main/java/bisq/core/user/BlockChainExplorer.java rename to core/src/main/java/haveno/core/user/BlockChainExplorer.java index 688fcf79..f1aa0ed7 100644 --- a/core/src/main/java/bisq/core/user/BlockChainExplorer.java +++ b/core/src/main/java/haveno/core/user/BlockChainExplorer.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.core.user; import com.google.protobuf.Message; +import haveno.common.proto.persistable.PersistablePayload; public final class BlockChainExplorer implements PersistablePayload { public final String name; diff --git a/core/src/main/java/bisq/core/user/Cookie.java b/core/src/main/java/haveno/core/user/Cookie.java similarity index 97% rename from core/src/main/java/bisq/core/user/Cookie.java rename to core/src/main/java/haveno/core/user/Cookie.java index e265174d..de918b8a 100644 --- a/core/src/main/java/bisq/core/user/Cookie.java +++ b/core/src/main/java/haveno/core/user/Cookie.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.common.proto.ProtoUtil; +package haveno.core.user; +import haveno.common.proto.ProtoUtil; import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/user/CookieKey.java b/core/src/main/java/haveno/core/user/CookieKey.java similarity index 97% rename from core/src/main/java/bisq/core/user/CookieKey.java rename to core/src/main/java/haveno/core/user/CookieKey.java index 4fcd409e..8276cfda 100644 --- a/core/src/main/java/bisq/core/user/CookieKey.java +++ b/core/src/main/java/haveno/core/user/CookieKey.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.user; +package haveno.core.user; // Used for persistence of Cookie. Entries must not be changes or removed. Only adding entries is permitted. public enum CookieKey { diff --git a/core/src/main/java/bisq/core/user/DontShowAgainLookup.java b/core/src/main/java/haveno/core/user/DontShowAgainLookup.java similarity index 97% rename from core/src/main/java/bisq/core/user/DontShowAgainLookup.java rename to core/src/main/java/haveno/core/user/DontShowAgainLookup.java index 40d74c8c..c1ed8d9d 100644 --- a/core/src/main/java/bisq/core/user/DontShowAgainLookup.java +++ b/core/src/main/java/haveno/core/user/DontShowAgainLookup.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.user; +package haveno.core.user; public class DontShowAgainLookup { diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/haveno/core/user/Preferences.java similarity index 96% rename from core/src/main/java/bisq/core/user/Preferences.java rename to core/src/main/java/haveno/core/user/Preferences.java index 6204d13a..b09224f7 100644 --- a/core/src/main/java/bisq/core/user/Preferences.java +++ b/core/src/main/java/haveno/core/user/Preferences.java @@ -15,30 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.core.btc.nodes.BtcNodes; -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.xmr.MoneroNodeSettings; - -import bisq.network.p2p.network.BridgeAddressProvider; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; -import bisq.common.util.Utilities; +package haveno.core.user; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.common.util.Utilities; +import haveno.core.btc.nodes.BtcNodes; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.xmr.MoneroNodeSettings; +import haveno.network.p2p.network.BridgeAddressProvider; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -81,8 +78,8 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid new BlockChainExplorer("mempool.space Tor V3", "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/tx/", "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/address/"), new BlockChainExplorer("mempool.emzy.de (@emzy)", "https://mempool.emzy.de/tx/", "https://mempool.emzy.de/address/"), new BlockChainExplorer("mempool.emzy.de Tor V3", "http://mempool4t6mypeemozyterviq3i5de4kpoua65r3qkn5i3kknu5l2cad.onion/tx/", "http://mempool4t6mypeemozyterviq3i5de4kpoua65r3qkn5i3kknu5l2cad.onion/address/"), - new BlockChainExplorer("mempool.bisq.services (@devinbileck)", "https://mempool.bisq.services/tx/", "https://mempool.bisq.services/address/"), - new BlockChainExplorer("mempool.bisq.services Tor V3", "http://mempoolusb2f67qi7mz2it7n5e77a6komdzx6wftobcduxszkdfun2yd.onion/tx/", "http://mempoolusb2f67qi7mz2it7n5e77a6komdzx6wftobcduxszkdfun2yd.onion/address/"), + new BlockChainExplorer("mempool.haveno.services (@devinbileck)", "https://mempool.haveno.services/tx/", "https://mempool.haveno.services/address/"), + new BlockChainExplorer("mempool.haveno.services Tor V3", "http://mempoolusb2f67qi7mz2it7n5e77a6komdzx6wftobcduxszkdfun2yd.onion/tx/", "http://mempoolusb2f67qi7mz2it7n5e77a6komdzx6wftobcduxszkdfun2yd.onion/address/"), new BlockChainExplorer("Blockstream.info", "https://blockstream.info/tx/", "https://blockstream.info/address/"), new BlockChainExplorer("Blockstream.info Tor V3", "http://explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion/tx/", "http://explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion/address/"), new BlockChainExplorer("OXT", "https://oxt.me/transaction/", "https://oxt.me/address/"), @@ -129,7 +126,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid private static final ArrayList TX_BROADCAST_SERVICES_CLEAR_NET = new ArrayList<>(Arrays.asList( "https://mempool.space/api/tx", // @wiz "https://mempool.emzy.de/api/tx", // @emzy - "https://mempool.bisq.services/api/tx" // @devinbileck + "https://mempool.haveno.services/api/tx" // @devinbileck )); private static final ArrayList TX_BROADCAST_SERVICES = new ArrayList<>(Arrays.asList( diff --git a/core/src/main/java/bisq/core/user/PreferencesPayload.java b/core/src/main/java/haveno/core/user/PreferencesPayload.java similarity index 96% rename from core/src/main/java/bisq/core/user/PreferencesPayload.java rename to core/src/main/java/haveno/core/user/PreferencesPayload.java index 6824dafc..5350a0bc 100644 --- a/core/src/main/java/bisq/core/user/PreferencesPayload.java +++ b/core/src/main/java/haveno/core/user/PreferencesPayload.java @@ -15,20 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.core.locale.Country; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.xmr.MoneroNodeSettings; - -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.core.user; import com.google.protobuf.Message; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.core.locale.Country; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.xmr.MoneroNodeSettings; + +import static haveno.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent; import com.google.common.collect.Maps; @@ -45,8 +45,6 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent; - @Slf4j @Data @AllArgsConstructor diff --git a/core/src/main/java/bisq/core/user/User.java b/core/src/main/java/haveno/core/user/User.java similarity index 96% rename from core/src/main/java/bisq/core/user/User.java rename to core/src/main/java/haveno/core/user/User.java index ff7171ac..a0baec9d 100644 --- a/core/src/main/java/bisq/core/user/User.java +++ b/core/src/main/java/haveno/core/user/User.java @@ -15,25 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.core.alert.Alert; -import bisq.core.filter.Filter; -import bisq.core.locale.LanguageUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.notifications.alerts.market.MarketAlertFilter; -import bisq.core.notifications.alerts.price.PriceAlertFilter; -import bisq.core.payment.PaymentAccount; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.mediation.mediator.Mediator; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.KeyRing; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.core.user; +import haveno.common.crypto.KeyRing; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.core.alert.Alert; +import haveno.core.filter.Filter; +import haveno.core.locale.LanguageUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.notifications.alerts.market.MarketAlertFilter; +import haveno.core.notifications.alerts.price.PriceAlertFilter; +import haveno.core.payment.PaymentAccount; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; +import haveno.network.p2p.NodeAddress; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/bisq/core/user/UserPayload.java b/core/src/main/java/haveno/core/user/UserPayload.java similarity index 92% rename from core/src/main/java/bisq/core/user/UserPayload.java rename to core/src/main/java/haveno/core/user/UserPayload.java index 31364d0c..aff15019 100644 --- a/core/src/main/java/bisq/core/user/UserPayload.java +++ b/core/src/main/java/haveno/core/user/UserPayload.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.core.alert.Alert; -import bisq.core.filter.Filter; -import bisq.core.notifications.alerts.market.MarketAlertFilter; -import bisq.core.notifications.alerts.price.PriceAlertFilter; -import bisq.core.payment.PaymentAccount; -import bisq.core.proto.CoreProtoResolver; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.mediation.mediator.Mediator; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; - -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.core.user; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.core.alert.Alert; +import haveno.core.filter.Filter; +import haveno.core.notifications.alerts.market.MarketAlertFilter; +import haveno.core.notifications.alerts.price.PriceAlertFilter; +import haveno.core.payment.PaymentAccount; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/core/src/main/java/bisq/core/util/AveragePriceUtil.java b/core/src/main/java/haveno/core/util/AveragePriceUtil.java similarity index 95% rename from core/src/main/java/bisq/core/util/AveragePriceUtil.java rename to core/src/main/java/haveno/core/util/AveragePriceUtil.java index 474e84d5..1d199fd2 100644 --- a/core/src/main/java/bisq/core/util/AveragePriceUtil.java +++ b/core/src/main/java/haveno/core/util/AveragePriceUtil.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.util; - -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; - -import bisq.common.util.MathUtils; -import bisq.common.util.Tuple2; +package haveno.core.util; +import haveno.common.util.MathUtils; +import haveno.common.util.Tuple2; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; import org.bitcoinj.utils.Fiat; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/util/FormattingUtils.java b/core/src/main/java/haveno/core/util/FormattingUtils.java similarity index 97% rename from core/src/main/java/bisq/core/util/FormattingUtils.java rename to core/src/main/java/haveno/core/util/FormattingUtils.java index d6658e71..f3c3c3c6 100644 --- a/core/src/main/java/bisq/core/util/FormattingUtils.java +++ b/core/src/main/java/haveno/core/util/FormattingUtils.java @@ -1,13 +1,11 @@ -package bisq.core.util; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; - -import bisq.common.util.MathUtils; +package haveno.core.util; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.Fiat; diff --git a/core/src/main/java/bisq/core/util/InlierUtil.java b/core/src/main/java/haveno/core/util/InlierUtil.java similarity index 97% rename from core/src/main/java/bisq/core/util/InlierUtil.java rename to core/src/main/java/haveno/core/util/InlierUtil.java index cc5921c7..5a9a3608 100644 --- a/core/src/main/java/bisq/core/util/InlierUtil.java +++ b/core/src/main/java/haveno/core/util/InlierUtil.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.util; - -import bisq.common.util.DoubleSummaryStatisticsWithStdDev; -import bisq.common.util.Tuple2; +package haveno.core.util; import javafx.collections.FXCollections; - +import haveno.common.util.DoubleSummaryStatisticsWithStdDev; +import haveno.common.util.Tuple2; import java.util.DoubleSummaryStatistics; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/bisq/core/util/JsonUtil.java b/core/src/main/java/haveno/core/util/JsonUtil.java similarity index 92% rename from core/src/main/java/bisq/core/util/JsonUtil.java rename to core/src/main/java/haveno/core/util/JsonUtil.java index 1a8165bd..04f5bb61 100644 --- a/core/src/main/java/bisq/core/util/JsonUtil.java +++ b/core/src/main/java/haveno/core/util/JsonUtil.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.util; +package haveno.core.util; -import bisq.common.util.JsonExclude; -import bisq.core.offer.OfferPayload; -import bisq.core.trade.Contract; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.GsonBuilder; +import haveno.common.util.JsonExclude; +import haveno.core.offer.OfferPayload; +import haveno.core.trade.Contract; public class JsonUtil { diff --git a/core/src/main/java/bisq/core/util/ParsingUtils.java b/core/src/main/java/haveno/core/util/ParsingUtils.java similarity index 95% rename from core/src/main/java/bisq/core/util/ParsingUtils.java rename to core/src/main/java/haveno/core/util/ParsingUtils.java index 6e30572c..629a8dd8 100644 --- a/core/src/main/java/bisq/core/util/ParsingUtils.java +++ b/core/src/main/java/haveno/core/util/ParsingUtils.java @@ -1,10 +1,8 @@ -package bisq.core.util; - -import bisq.core.monetary.Price; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.util.MathUtils; +package haveno.core.util; +import haveno.common.util.MathUtils; +import haveno.core.monetary.Price; +import haveno.core.util.coin.CoinFormatter; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.MonetaryFormat; diff --git a/core/src/main/java/bisq/core/util/PriceUtil.java b/core/src/main/java/haveno/core/util/PriceUtil.java similarity index 92% rename from core/src/main/java/bisq/core/util/PriceUtil.java rename to core/src/main/java/haveno/core/util/PriceUtil.java index 7813ff25..c8458b76 100644 --- a/core/src/main/java/bisq/core/util/PriceUtil.java +++ b/core/src/main/java/haveno/core/util/PriceUtil.java @@ -15,25 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.core.util; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.util.validation.AltcoinValidator; -import bisq.core.util.validation.FiatPriceValidator; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.MonetaryValidator; - -import bisq.common.util.MathUtils; +package haveno.core.util; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.util.validation.AltcoinValidator; +import haveno.core.util.validation.FiatPriceValidator; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.MonetaryValidator; import org.bitcoinj.utils.Fiat; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/util/SimpleMarkdownParser.java b/core/src/main/java/haveno/core/util/SimpleMarkdownParser.java similarity index 99% rename from core/src/main/java/bisq/core/util/SimpleMarkdownParser.java rename to core/src/main/java/haveno/core/util/SimpleMarkdownParser.java index 27341998..eb8eebd9 100644 --- a/core/src/main/java/bisq/core/util/SimpleMarkdownParser.java +++ b/core/src/main/java/haveno/core/util/SimpleMarkdownParser.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.util; +package haveno.core.util; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/bisq/core/util/Validator.java b/core/src/main/java/haveno/core/util/Validator.java similarity index 96% rename from core/src/main/java/bisq/core/util/Validator.java rename to core/src/main/java/haveno/core/util/Validator.java index 07af2ace..ae746e16 100644 --- a/core/src/main/java/bisq/core/util/Validator.java +++ b/core/src/main/java/haveno/core/util/Validator.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.util; - -import bisq.core.trade.messages.TradeMessage; +package haveno.core.util; import org.bitcoinj.core.Coin; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.core.trade.messages.TradeMessage; + /** * Utility class for validating domain data. */ diff --git a/core/src/main/java/bisq/core/util/VolumeUtil.java b/core/src/main/java/haveno/core/util/VolumeUtil.java similarity index 95% rename from core/src/main/java/bisq/core/util/VolumeUtil.java rename to core/src/main/java/haveno/core/util/VolumeUtil.java index 1c6808b9..a6e45f80 100644 --- a/core/src/main/java/bisq/core/util/VolumeUtil.java +++ b/core/src/main/java/haveno/core/util/VolumeUtil.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.util; - -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.AltcoinExchangeRate; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; +package haveno.core.util; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.Fiat; import org.bitcoinj.utils.MonetaryFormat; - +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.AltcoinExchangeRate; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/core/src/main/java/bisq/core/util/coin/CoinFormatter.java b/core/src/main/java/haveno/core/util/coin/CoinFormatter.java similarity index 93% rename from core/src/main/java/bisq/core/util/coin/CoinFormatter.java rename to core/src/main/java/haveno/core/util/coin/CoinFormatter.java index 2b65460e..7f9d5f96 100644 --- a/core/src/main/java/bisq/core/util/coin/CoinFormatter.java +++ b/core/src/main/java/haveno/core/util/coin/CoinFormatter.java @@ -1,4 +1,4 @@ -package bisq.core.util.coin; +package haveno.core.util.coin; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/bisq/core/util/coin/CoinUtil.java b/core/src/main/java/haveno/core/util/coin/CoinUtil.java similarity index 96% rename from core/src/main/java/bisq/core/util/coin/CoinUtil.java rename to core/src/main/java/haveno/core/util/coin/CoinUtil.java index 4dd599c1..e69a0b4b 100644 --- a/core/src/main/java/bisq/core/util/coin/CoinUtil.java +++ b/core/src/main/java/haveno/core/util/coin/CoinUtil.java @@ -15,20 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.util.coin; - -import bisq.core.btc.wallet.Restrictions; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.trade.HavenoUtils; -import bisq.common.util.MathUtils; +package haveno.core.util.coin; import org.bitcoinj.core.Coin; import com.google.common.annotations.VisibleForTesting; +import haveno.common.util.MathUtils; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.trade.HavenoUtils; -import static bisq.core.util.VolumeUtil.getAdjustedFiatVolume; import static com.google.common.base.Preconditions.checkArgument; +import static haveno.core.util.VolumeUtil.getAdjustedFiatVolume; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/core/src/main/java/bisq/core/util/coin/ImmutableCoinFormatter.java b/core/src/main/java/haveno/core/util/coin/ImmutableCoinFormatter.java similarity index 97% rename from core/src/main/java/bisq/core/util/coin/ImmutableCoinFormatter.java rename to core/src/main/java/haveno/core/util/coin/ImmutableCoinFormatter.java index c45afda9..55d0b0aa 100644 --- a/core/src/main/java/bisq/core/util/coin/ImmutableCoinFormatter.java +++ b/core/src/main/java/haveno/core/util/coin/ImmutableCoinFormatter.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.util.coin; - -import bisq.core.util.FormattingUtils; +package haveno.core.util.coin; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.MonetaryFormat; - +import haveno.core.util.FormattingUtils; import javax.inject.Inject; import lombok.Getter; diff --git a/core/src/main/java/bisq/core/util/validation/AltcoinValidator.java b/core/src/main/java/haveno/core/util/validation/AltcoinValidator.java similarity index 96% rename from core/src/main/java/bisq/core/util/validation/AltcoinValidator.java rename to core/src/main/java/haveno/core/util/validation/AltcoinValidator.java index 593c6f1d..a3d28424 100644 --- a/core/src/main/java/bisq/core/util/validation/AltcoinValidator.java +++ b/core/src/main/java/haveno/core/util/validation/AltcoinValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; +package haveno.core.util.validation; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java b/core/src/main/java/haveno/core/util/validation/BtcAddressValidator.java similarity index 93% rename from core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java rename to core/src/main/java/haveno/core/util/validation/BtcAddressValidator.java index 38241a62..c187a7f1 100644 --- a/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java +++ b/core/src/main/java/haveno/core/util/validation/BtcAddressValidator.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; - -import bisq.core.locale.Res; - -import bisq.common.config.Config; +package haveno.core.util.validation; +import haveno.common.config.Config; +import haveno.core.locale.Res; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; diff --git a/core/src/main/java/bisq/core/util/validation/FiatPriceValidator.java b/core/src/main/java/haveno/core/util/validation/FiatPriceValidator.java similarity index 96% rename from core/src/main/java/bisq/core/util/validation/FiatPriceValidator.java rename to core/src/main/java/haveno/core/util/validation/FiatPriceValidator.java index 3f7b162f..d14db6fa 100644 --- a/core/src/main/java/bisq/core/util/validation/FiatPriceValidator.java +++ b/core/src/main/java/haveno/core/util/validation/FiatPriceValidator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; +package haveno.core.util.validation; import javax.inject.Inject; diff --git a/core/src/main/java/bisq/core/util/validation/HexStringValidator.java b/core/src/main/java/haveno/core/util/validation/HexStringValidator.java similarity index 93% rename from core/src/main/java/bisq/core/util/validation/HexStringValidator.java rename to core/src/main/java/haveno/core/util/validation/HexStringValidator.java index ea5780ad..a8f45f0d 100644 --- a/core/src/main/java/bisq/core/util/validation/HexStringValidator.java +++ b/core/src/main/java/haveno/core/util/validation/HexStringValidator.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; - -import bisq.core.locale.Res; - -import bisq.common.util.Utilities; +package haveno.core.util.validation; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Setter; diff --git a/core/src/main/java/bisq/core/util/validation/InputValidator.java b/core/src/main/java/haveno/core/util/validation/InputValidator.java similarity index 98% rename from core/src/main/java/bisq/core/util/validation/InputValidator.java rename to core/src/main/java/haveno/core/util/validation/InputValidator.java index a64fcf03..c3dc2704 100644 --- a/core/src/main/java/bisq/core/util/validation/InputValidator.java +++ b/core/src/main/java/haveno/core/util/validation/InputValidator.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; - -import bisq.core.locale.Res; +package haveno.core.util.validation; +import haveno.core.locale.Res; import java.math.BigInteger; import java.util.Objects; diff --git a/core/src/main/java/bisq/core/util/validation/IntegerValidator.java b/core/src/main/java/haveno/core/util/validation/IntegerValidator.java similarity index 96% rename from core/src/main/java/bisq/core/util/validation/IntegerValidator.java rename to core/src/main/java/haveno/core/util/validation/IntegerValidator.java index 0387b30e..aa015256 100644 --- a/core/src/main/java/bisq/core/util/validation/IntegerValidator.java +++ b/core/src/main/java/haveno/core/util/validation/IntegerValidator.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; - -import bisq.core.locale.Res; +package haveno.core.util.validation; +import haveno.core.locale.Res; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/util/validation/MonetaryValidator.java b/core/src/main/java/haveno/core/util/validation/MonetaryValidator.java similarity index 96% rename from core/src/main/java/bisq/core/util/validation/MonetaryValidator.java rename to core/src/main/java/haveno/core/util/validation/MonetaryValidator.java index 2bfa5cff..30dcc82e 100644 --- a/core/src/main/java/bisq/core/util/validation/MonetaryValidator.java +++ b/core/src/main/java/haveno/core/util/validation/MonetaryValidator.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; +package haveno.core.util.validation; -import bisq.core.locale.Res; +import haveno.core.locale.Res; import javax.inject.Inject; public abstract class MonetaryValidator extends NumberValidator { diff --git a/core/src/main/java/bisq/core/util/validation/NumberValidator.java b/core/src/main/java/haveno/core/util/validation/NumberValidator.java similarity index 94% rename from core/src/main/java/bisq/core/util/validation/NumberValidator.java rename to core/src/main/java/haveno/core/util/validation/NumberValidator.java index 1afd94dc..89360e9f 100644 --- a/core/src/main/java/bisq/core/util/validation/NumberValidator.java +++ b/core/src/main/java/haveno/core/util/validation/NumberValidator.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; +package haveno.core.util.validation; -import bisq.core.locale.Res; -import bisq.core.util.ParsingUtils; +import haveno.core.locale.Res; +import haveno.core.util.ParsingUtils; /** * NumberValidator for validating basic number values. diff --git a/core/src/main/java/bisq/core/util/validation/RegexValidator.java b/core/src/main/java/haveno/core/util/validation/RegexValidator.java similarity index 92% rename from core/src/main/java/bisq/core/util/validation/RegexValidator.java rename to core/src/main/java/haveno/core/util/validation/RegexValidator.java index 2ee772f3..1446c614 100644 --- a/core/src/main/java/bisq/core/util/validation/RegexValidator.java +++ b/core/src/main/java/haveno/core/util/validation/RegexValidator.java @@ -1,6 +1,6 @@ -package bisq.core.util.validation; +package haveno.core.util.validation; -import bisq.core.locale.Res; +import haveno.core.locale.Res; public class RegexValidator extends InputValidator { private String pattern; diff --git a/core/src/main/java/bisq/core/util/validation/RegexValidatorFactory.java b/core/src/main/java/haveno/core/util/validation/RegexValidatorFactory.java similarity index 99% rename from core/src/main/java/bisq/core/util/validation/RegexValidatorFactory.java rename to core/src/main/java/haveno/core/util/validation/RegexValidatorFactory.java index 73094c24..0e3090ed 100644 --- a/core/src/main/java/bisq/core/util/validation/RegexValidatorFactory.java +++ b/core/src/main/java/haveno/core/util/validation/RegexValidatorFactory.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; +package haveno.core.util.validation; public class RegexValidatorFactory { public static RegexValidator addressRegexValidator() { diff --git a/core/src/main/java/bisq/core/util/validation/StringValidator.java b/core/src/main/java/haveno/core/util/validation/StringValidator.java similarity index 95% rename from core/src/main/java/bisq/core/util/validation/StringValidator.java rename to core/src/main/java/haveno/core/util/validation/StringValidator.java index bf2137fb..33a51883 100644 --- a/core/src/main/java/bisq/core/util/validation/StringValidator.java +++ b/core/src/main/java/haveno/core/util/validation/StringValidator.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; - -import bisq.core.locale.Res; +package haveno.core.util.validation; +import haveno.core.locale.Res; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/bisq/core/util/validation/UrlInputValidator.java b/core/src/main/java/haveno/core/util/validation/UrlInputValidator.java similarity index 95% rename from core/src/main/java/bisq/core/util/validation/UrlInputValidator.java rename to core/src/main/java/haveno/core/util/validation/UrlInputValidator.java index 7f111107..0915fb8f 100644 --- a/core/src/main/java/bisq/core/util/validation/UrlInputValidator.java +++ b/core/src/main/java/haveno/core/util/validation/UrlInputValidator.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.util.validation; - -import bisq.core.locale.Res; +package haveno.core.util.validation; import java.net.URL; import static com.google.common.base.Preconditions.checkArgument; +import haveno.core.locale.Res; + public class UrlInputValidator extends InputValidator { public UrlInputValidator() { diff --git a/core/src/main/java/bisq/core/xmr/MoneroNodeSettings.java b/core/src/main/java/haveno/core/xmr/MoneroNodeSettings.java similarity index 94% rename from core/src/main/java/bisq/core/xmr/MoneroNodeSettings.java rename to core/src/main/java/haveno/core/xmr/MoneroNodeSettings.java index 7b40b8b7..084186d0 100644 --- a/core/src/main/java/bisq/core/xmr/MoneroNodeSettings.java +++ b/core/src/main/java/haveno/core/xmr/MoneroNodeSettings.java @@ -14,10 +14,9 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.core.xmr; - -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.core.xmr; +import haveno.common.proto.persistable.PersistableEnvelope; import java.util.List; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/bisq/core/xmr/connection/MoneroConnectionModule.java b/core/src/main/java/haveno/core/xmr/connection/MoneroConnectionModule.java similarity index 65% rename from core/src/main/java/bisq/core/xmr/connection/MoneroConnectionModule.java rename to core/src/main/java/haveno/core/xmr/connection/MoneroConnectionModule.java index 682840c4..94b8dd43 100644 --- a/core/src/main/java/bisq/core/xmr/connection/MoneroConnectionModule.java +++ b/core/src/main/java/haveno/core/xmr/connection/MoneroConnectionModule.java @@ -1,11 +1,10 @@ -package bisq.core.xmr.connection; +package haveno.core.xmr.connection; -import bisq.common.app.AppModule; -import bisq.common.config.Config; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.model.EncryptedConnectionList; import com.google.inject.Singleton; - +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.model.EncryptedConnectionList; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/core/src/main/resources/btc_mainnet.seednodes b/core/src/main/resources/btc_mainnet.seednodes index eb2b0a4b..cfe18bec 100644 --- a/core/src/main/resources/btc_mainnet.seednodes +++ b/core/src/main/resources/btc_mainnet.seednodes @@ -8,7 +8,7 @@ devinsn3xuzxhj6pmammrxpydhwwmwp75qkksedo5dn2tlmu7jggo7id.onion:8000 (@devinbilec sn3emzy56u3mxzsr4geysc52feoq5qt7ja56km6gygwnszkshunn2sid.onion:8000 (@emzy) sn4emzywye3dhjouv7jig677qepg7fnusjidw74fbwneieruhmi7fuyd.onion:8000 (@emzy) sn5emzyvxuildv34n6jewfp2zeota4aq63fsl5yyilnvksezr3htveqd.onion:8000 (@emzy) -sn2bisqad7ncazupgbd3dcedqh5ptirgwofw63djwpdtftwhddo75oid.onion:8000 (@miker) +sn2havenoad7ncazupgbd3dcedqh5ptirgwofw63djwpdtftwhddo75oid.onion:8000 (@miker) sn3bsq3evqkpshdmc3sbdxafkhfnk7ctop44jsxbxyys5ridsaw5abyd.onion:8000 (@miker) sn4bsqpc7eb2ntvpsycxbzqt6fre72l4krp2fl5svphfh2eusrqtq3qd.onion:8000 (@miker) 5quyxpxheyvzmb2d.onion:8000 (@miker) diff --git a/core/src/main/resources/haveno.policy b/core/src/main/resources/haveno.policy index 71c75aa4..8231585f 100644 --- a/core/src/main/resources/haveno.policy +++ b/core/src/main/resources/haveno.policy @@ -44,7 +44,7 @@ grant { permission "java.util.PropertyPermission" "priceFeedProviders", "read"; permission "java.util.PropertyPermission" "maxMemory", "read"; - /* Why ??? no permission exceptions, no dependency in bisq nor in bitcoinj. Local problem? */ + /* Why ??? no permission exceptions, no dependency in haveno nor in bitcoinj. Local problem? */ permission "java.util.PropertyPermission" "com.google.appengine.runtime.environment", "read"; permission "java.lang.RuntimePermission" "accessDeclaredMembers"; @@ -93,15 +93,15 @@ grant { /* user data dir for Mac, Linux, Windows */ permission "java.io.FilePermission" "${user.home}${/}Library${/}Application Support${/}-", "read,write,delete"; - permission "java.io.FilePermission" "${user.home}${/}.local${/}share${/}bisq-", "read,write,delete"; - permission "java.io.FilePermission" "${appdata}${/}bisq-", "read,write,delete"; + permission "java.io.FilePermission" "${user.home}${/}.local${/}share${/}haveno-", "read,write,delete"; + permission "java.io.FilePermission" "${appdata}${/}haveno-", "read,write,delete"; /* temp dir Mac, Linux, Windows TODO */ permission "java.io.FilePermission" "/var/folders/-", "read,write,delete"; /* only for dev permission "java.io.FilePermission" "${user.home}${/}.m2${/}-", "read"; - permission "java.io.FilePermission" "/Users/me/dev/bitcoin_projects/bisq/-", "read"; + permission "java.io.FilePermission" "/Users/me/dev/bitcoin_projects/haveno/-", "read"; permission "java.lang.reflect.ReflectPermission" "suppressAccessChecks"; */ diff --git a/core/src/main/resources/help/canceloffer-help.txt b/core/src/main/resources/help/canceloffer-help.txt index 0155d9c1..82ef2ebf 100644 --- a/core/src/main/resources/help/canceloffer-help.txt +++ b/core/src/main/resources/help/canceloffer-help.txt @@ -11,7 +11,7 @@ canceloffer DESCRIPTION ----------- -Cancel an existing offer. The offer will be removed from other Bisq users' offer views, +Cancel an existing offer. The offer will be removed from other Haveno users' offer views, and paid transaction fees will be forfeited. OPTIONS @@ -22,5 +22,5 @@ OPTIONS EXAMPLES -------- To cancel an offer with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea: -$ ./bisq-cli --password=xyz --port=9998 canceloffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea +$ ./haveno-cli --password=xyz --port=9998 canceloffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea diff --git a/core/src/main/resources/help/confirmpaymentreceived-help.txt b/core/src/main/resources/help/confirmpaymentreceived-help.txt index 4e460b4b..e7ba06f7 100644 --- a/core/src/main/resources/help/confirmpaymentreceived-help.txt +++ b/core/src/main/resources/help/confirmpaymentreceived-help.txt @@ -24,4 +24,4 @@ EXAMPLES -------- A BTC seller has taken an offer with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea, and has recently received the required fiat payment from the buyer's fiat account: -$ ./bisq-cli --password=xyz --port=9998 confirmpaymentreceived --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea +$ ./haveno-cli --password=xyz --port=9998 confirmpaymentreceived --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea diff --git a/core/src/main/resources/help/confirmpaymentstarted-help.txt b/core/src/main/resources/help/confirmpaymentstarted-help.txt index d32c7647..6133f6cd 100644 --- a/core/src/main/resources/help/confirmpaymentstarted-help.txt +++ b/core/src/main/resources/help/confirmpaymentstarted-help.txt @@ -23,4 +23,4 @@ EXAMPLES -------- A BTC buyer has taken an offer with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea, and has recently initiated the required fiat payment to the seller's fiat account: -$ ./bisq-cli --password=xyz --port=9998 confirmpaymentsent --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea +$ ./haveno-cli --password=xyz --port=9998 confirmpaymentsent --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea diff --git a/core/src/main/resources/help/createoffer-help.txt b/core/src/main/resources/help/createoffer-help.txt index fcd4f3a7..dcf2f00d 100644 --- a/core/src/main/resources/help/createoffer-help.txt +++ b/core/src/main/resources/help/createoffer-help.txt @@ -50,7 +50,7 @@ OPTIONS The percentage of the BTC amount being traded for the security deposit, e.g., 60.0 (60%). --fee-currency - The wallet currency used to pay the Bisq trade maker fee (BTC). Default is BTC + The wallet currency used to pay the Haveno trade maker fee (BTC). Default is BTC EXAMPLES -------- @@ -59,8 +59,8 @@ To create a BUY 0.125 BTC with EUR offer at the current market price, using a payment account with ID 7413d263-225a-4f1b-837a-1e3094dc0d77, putting up a 30 percent security deposit, - and paying the Bisq maker trading fee in BTC: -$ ./bisq-cli --password=xyz --port=9998 createoffer --payment-account=7413d263-225a-4f1b-837a-1e3094dc0d77 \ + and paying the Haveno maker trading fee in BTC: +$ ./haveno-cli --password=xyz --port=9998 createoffer --payment-account=7413d263-225a-4f1b-837a-1e3094dc0d77 \ --direction=buy \ --currency-code=eur \ --amount=0.125 \ @@ -72,8 +72,8 @@ To create a SELL 0.006 BTC for USD offer at a fixed price of 40,000 USD, using a payment account with ID 7413d263-225a-4f1b-837a-1e3094dc0d77, putting up a 25 percent security deposit, - and paying the Bisq maker trading fee in BTC: -$ ./bisq-cli --password=xyz --port=9998 createoffer --payment-account=7413d263-225a-4f1b-837a-1e3094dc0d77 \ + and paying the Haveno maker trading fee in BTC: +$ ./haveno-cli --password=xyz --port=9998 createoffer --payment-account=7413d263-225a-4f1b-837a-1e3094dc0d77 \ --direction=sell \ --currency-code=usd \ --amount=0.006 \ diff --git a/core/src/main/resources/help/createpaymentacct-help.txt b/core/src/main/resources/help/createpaymentacct-help.txt index cdc837f7..aff5ea43 100644 --- a/core/src/main/resources/help/createpaymentacct-help.txt +++ b/core/src/main/resources/help/createpaymentacct-help.txt @@ -11,7 +11,7 @@ createpaymentacct DESCRIPTION ----------- -Create a Bisq trading account with a payment account form. +Create a Haveno trading account with a payment account form. The details of the payment account are defined in a manually edited json file generated by a getpaymentacctform command, e.g., @@ -34,13 +34,13 @@ by a getpaymentacctform command, e.g., EXAMPLES -------- To create a new SEPA payment account, find the payment-method-id for the getpaymentacctform command: -$ ./bisq-cli --password=xyz --port=9998 getpaymentmethods +$ ./haveno-cli --password=xyz --port=9998 getpaymentmethods Get a new, blank SEPA payment account form: -$ ./bisq-cli --password=xyz --port=9998 getpaymentacctform --payment-method-id=SEPA +$ ./haveno-cli --password=xyz --port=9998 getpaymentacctform --payment-method-id=SEPA The previous command created a json file named sepa_1610817857085.json. The timestamp in the file name is to ensure each generated file is uniquely named (you can rename the file). Manually edit the json file, and pass the file's path to the createpaymentacct command: -$ ./bisq-cli --password=xyz --port=9998 createpaymentacct --payment-account-form=sepa_1610817857085.json +$ ./haveno-cli --password=xyz --port=9998 createpaymentacct --payment-account-form=sepa_1610817857085.json diff --git a/core/src/main/resources/help/getaddressbalance-help.txt b/core/src/main/resources/help/getaddressbalance-help.txt index 279c5830..b2084cdf 100644 --- a/core/src/main/resources/help/getaddressbalance-help.txt +++ b/core/src/main/resources/help/getaddressbalance-help.txt @@ -11,7 +11,7 @@ getaddressbalance DESCRIPTION ----------- -Returns the balance of a BTC address in the Bisq server's wallet. +Returns the balance of a BTC address in the Haveno server's wallet. OPTIONS ------- @@ -20,4 +20,4 @@ OPTIONS EXAMPLES -------- -$ ./bisq-cli --password=xyz --port=9998 getaddressbalance --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 +$ ./haveno-cli --password=xyz --port=9998 getaddressbalance --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 diff --git a/core/src/main/resources/help/getbalance-help.txt b/core/src/main/resources/help/getbalance-help.txt index 4cb9425c..7d4b4b37 100644 --- a/core/src/main/resources/help/getbalance-help.txt +++ b/core/src/main/resources/help/getbalance-help.txt @@ -11,20 +11,20 @@ getbalance DESCRIPTION ----------- -Returns full balance information for Bisq BTC wallets. +Returns full balance information for Haveno BTC wallets. OPTIONS ------- --currency-code= - The three letter Bisq wallet crypto currency code. + The three letter Haveno wallet crypto currency code. EXAMPLES -------- Show full BTC wallet balance information: -$ ./bisq-cli --password=xyz --port=9998 getbalance +$ ./haveno-cli --password=xyz --port=9998 getbalance Show full wallet balance information: -$ ./bisq-cli --password=xyz --port=9998 getbalance --currency-code=bsq +$ ./haveno-cli --password=xyz --port=9998 getbalance --currency-code=bsq Show full BTC wallet balance information: -$ ./bisq-cli --password=xyz --port=9998 getbalance --currency-code=btc +$ ./haveno-cli --password=xyz --port=9998 getbalance --currency-code=btc diff --git a/core/src/main/resources/help/getbtcprice-help.txt b/core/src/main/resources/help/getbtcprice-help.txt index cd0e79f0..bb7c351e 100644 --- a/core/src/main/resources/help/getbtcprice-help.txt +++ b/core/src/main/resources/help/getbtcprice-help.txt @@ -22,9 +22,9 @@ OPTIONS EXAMPLES -------- Get the current BTC market price in Euros: -$ ./bisq-cli --password=xyz --port=9998 getbtcprice --currency-code=eur +$ ./haveno-cli --password=xyz --port=9998 getbtcprice --currency-code=eur Get the current BTC market price in Brazilian Reais: -$ ./bisq-cli --password=xyz --port=9998 getbtcprice --currency-code=brl +$ ./haveno-cli --password=xyz --port=9998 getbtcprice --currency-code=brl diff --git a/core/src/main/resources/help/getfundingaddresses-help.txt b/core/src/main/resources/help/getfundingaddresses-help.txt index 0d3e7ea6..42d2a96c 100644 --- a/core/src/main/resources/help/getfundingaddresses-help.txt +++ b/core/src/main/resources/help/getfundingaddresses-help.txt @@ -14,4 +14,4 @@ Returns a list of receiving BTC addresses. EXAMPLES -------- -$ ./bisq-cli --password=xyz --port=9998 getfundingaddresses +$ ./haveno-cli --password=xyz --port=9998 getfundingaddresses diff --git a/core/src/main/resources/help/getmyoffer-help.txt b/core/src/main/resources/help/getmyoffer-help.txt index 66cabd93..cda21083 100644 --- a/core/src/main/resources/help/getmyoffer-help.txt +++ b/core/src/main/resources/help/getmyoffer-help.txt @@ -21,5 +21,5 @@ OPTIONS EXAMPLES -------- To view your offer with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea: -$ ./bisq-cli --password=xyz --port=9998 getmyoffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea +$ ./haveno-cli --password=xyz --port=9998 getmyoffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea diff --git a/core/src/main/resources/help/getmyoffers-help.txt b/core/src/main/resources/help/getmyoffers-help.txt index 7d2c3d3e..5bc12b19 100644 --- a/core/src/main/resources/help/getmyoffers-help.txt +++ b/core/src/main/resources/help/getmyoffers-help.txt @@ -25,9 +25,9 @@ OPTIONS EXAMPLES -------- List all of your existing BUY offers for BRL: -$ ./bisq-cli --password=xyz --port=9998 getmyoffers --direction=buy --currency-code=brl +$ ./haveno-cli --password=xyz --port=9998 getmyoffers --direction=buy --currency-code=brl List all of your existing SELL offers for EUR: -$ ./bisq-cli --password=xyz --port=9998 getmyoffers --direction=sell --currency-code=eur +$ ./haveno-cli --password=xyz --port=9998 getmyoffers --direction=sell --currency-code=eur diff --git a/core/src/main/resources/help/getoffer-help.txt b/core/src/main/resources/help/getoffer-help.txt index a722f1f4..6193e3a6 100644 --- a/core/src/main/resources/help/getoffer-help.txt +++ b/core/src/main/resources/help/getoffer-help.txt @@ -22,5 +22,5 @@ OPTIONS EXAMPLES -------- To view an offer with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea: -$ ./bisq-cli --password=xyz --port=9998 getoffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea +$ ./haveno-cli --password=xyz --port=9998 getoffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea diff --git a/core/src/main/resources/help/getoffers-help.txt b/core/src/main/resources/help/getoffers-help.txt index c76c2dfb..df6c030e 100644 --- a/core/src/main/resources/help/getoffers-help.txt +++ b/core/src/main/resources/help/getoffers-help.txt @@ -29,11 +29,11 @@ EXAMPLES You have one Brazilian Real payment account with a face-to-face payment method type. To view available offers to BUY BTC with BRL, created by other users with the same face-to-fact account type: -$ ./bisq-cli --password=xyz --port=9998 getoffers --direction=buy --currency-code=brl +$ ./haveno-cli --password=xyz --port=9998 getoffers --direction=buy --currency-code=brl You have several EUR payment accounts, each with a different payment method type. To view available offers to SELL BTC with EUR, created by other users having at least one payment account that matches any of your own: -$ ./bisq-cli --password=xyz --port=9998 getoffers --direction=sell --currency-code=eur +$ ./haveno-cli --password=xyz --port=9998 getoffers --direction=sell --currency-code=eur diff --git a/core/src/main/resources/help/getpaymentacctform-help.txt b/core/src/main/resources/help/getpaymentacctform-help.txt index 5086728c..63ea78dc 100644 --- a/core/src/main/resources/help/getpaymentacctform-help.txt +++ b/core/src/main/resources/help/getpaymentacctform-help.txt @@ -32,13 +32,13 @@ EXAMPLES -------- To create a new CLEAR_X_CHANGE (Zelle) payment account, find the payment-method-id for the getpaymentacctform command: -$ ./bisq-cli --password=xyz --port=9998 getpaymentmethods +$ ./haveno-cli --password=xyz --port=9998 getpaymentmethods Get a new, blank CLEAR_X_CHANGE (Zelle) payment account form: -$ ./bisq-cli --password=xyz --port=9998 getpaymentacctform --payment-method-id=CLEAR_X_CHANGE_ID +$ ./haveno-cli --password=xyz --port=9998 getpaymentacctform --payment-method-id=CLEAR_X_CHANGE_ID The previous command created a json file named clear_x_change_1610818248040.json. The timestamp in the file name is to ensure each generated file is uniquely named (you can rename the file). Manually edit the json file, and pass the file's path to the createpaymentacct command: -$ ./bisq-cli --password=xyz --port=9998 createpaymentacct --payment-account-form=clear_x_change_1610818248040.json +$ ./haveno-cli --password=xyz --port=9998 createpaymentacct --payment-account-form=clear_x_change_1610818248040.json diff --git a/core/src/main/resources/help/getpaymentaccts-help.txt b/core/src/main/resources/help/getpaymentaccts-help.txt index f12b5bd4..c79d5ea0 100644 --- a/core/src/main/resources/help/getpaymentaccts-help.txt +++ b/core/src/main/resources/help/getpaymentaccts-help.txt @@ -14,4 +14,4 @@ Returns the list of user payment accounts. EXAMPLES -------- -$ ./bisq-cli --password=xyz --port=9998 getpaymentaccts +$ ./haveno-cli --password=xyz --port=9998 getpaymentaccts diff --git a/core/src/main/resources/help/getpaymentmethods-help.txt b/core/src/main/resources/help/getpaymentmethods-help.txt index b7f86054..1bd7ce48 100644 --- a/core/src/main/resources/help/getpaymentmethods-help.txt +++ b/core/src/main/resources/help/getpaymentmethods-help.txt @@ -14,4 +14,4 @@ Returns a list of currently supported fiat payment method IDs. EXAMPLES -------- -$ ./bisq-cli --password=xyz --port=9998 getpaymentmethods +$ ./haveno-cli --password=xyz --port=9998 getpaymentmethods diff --git a/core/src/main/resources/help/gettrade-help.txt b/core/src/main/resources/help/gettrade-help.txt index 4cf64584..c495c241 100644 --- a/core/src/main/resources/help/gettrade-help.txt +++ b/core/src/main/resources/help/gettrade-help.txt @@ -26,7 +26,7 @@ OPTIONS EXAMPLES -------- To see the summary of a trade with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea: -$ ./bisq-cli --password=xyz --port=9998 gettrade --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea +$ ./haveno-cli --password=xyz --port=9998 gettrade --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea To see the full contract for a trade with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea: -$ ./bisq-cli --password=xyz --port=9998 gettrade --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea --show-contract=true +$ ./haveno-cli --password=xyz --port=9998 gettrade --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea --show-contract=true diff --git a/core/src/main/resources/help/gettransaction-help.txt b/core/src/main/resources/help/gettransaction-help.txt index 3d16f3c2..44f513d0 100644 --- a/core/src/main/resources/help/gettransaction-help.txt +++ b/core/src/main/resources/help/gettransaction-help.txt @@ -11,7 +11,7 @@ gettransaction DESCRIPTION ----------- -Returns a very brief summary of a BTC transaction created by the Bisq server. +Returns a very brief summary of a BTC transaction created by the Haveno server. To see full transaction details, use a bitcoin-core client or an online block explorer. @@ -23,5 +23,5 @@ OPTIONS EXAMPLES -------- To see the summary of a transaction with ID 282dc2a5755219a49ee9f6d46a31a2cbaec6624beba96548180eccb1f004cdd8: -$ ./bisq-cli --password=xyz --port=9998 gettransaction \ +$ ./haveno-cli --password=xyz --port=9998 gettransaction \ --transaction-id=282dc2a5755219a49ee9f6d46a31a2cbaec6624beba96548180eccb1f004cdd8 diff --git a/core/src/main/resources/help/gettxfeerate-help.txt b/core/src/main/resources/help/gettxfeerate-help.txt index 3582d5dc..a9889a98 100644 --- a/core/src/main/resources/help/gettxfeerate-help.txt +++ b/core/src/main/resources/help/gettxfeerate-help.txt @@ -10,8 +10,8 @@ gettxfeerate DESCRIPTION ----------- -Returns the most recent bitcoin network transaction fee the Bisq server could find. +Returns the most recent bitcoin network transaction fee the Haveno server could find. EXAMPLES -------- -$ ./bisq-cli --password=xyz --port=9998 gettxfeerate +$ ./haveno-cli --password=xyz --port=9998 gettxfeerate diff --git a/core/src/main/resources/help/getversion-help.txt b/core/src/main/resources/help/getversion-help.txt index ce3b801d..1950e672 100644 --- a/core/src/main/resources/help/getversion-help.txt +++ b/core/src/main/resources/help/getversion-help.txt @@ -10,8 +10,8 @@ getversion DESCRIPTION ----------- -Returns the Bisq server version. +Returns the Haveno server version. EXAMPLES -------- -$ ./bisq-cli --password=xyz --port=9998 getversion +$ ./haveno-cli --password=xyz --port=9998 getversion diff --git a/core/src/main/resources/help/keepfunds-help.txt b/core/src/main/resources/help/keepfunds-help.txt index 4e8232df..caddadf7 100644 --- a/core/src/main/resources/help/keepfunds-help.txt +++ b/core/src/main/resources/help/keepfunds-help.txt @@ -2,7 +2,7 @@ keepfunds NAME ---- -keepfunds - keep BTC received during a trade in Bisq wallet +keepfunds - keep BTC received during a trade in Haveno wallet SYNOPSIS -------- @@ -12,8 +12,8 @@ keepfunds DESCRIPTION ----------- A BTC buyer completes the final step in the trade protocol by keeping received BTC in his -Bisq wallet. This step may not seem necessary from the buyer's perspective, but it is -necessary for correct transition of a trade's state to CLOSED, within the Bisq server. +Haveno wallet. This step may not seem necessary from the buyer's perspective, but it is +necessary for correct transition of a trade's state to CLOSED, within the Haveno server. The alternative way to close out the trade is to send the received BTC to an external BTC wallet, using the withdrawfunds command. @@ -27,5 +27,5 @@ EXAMPLES -------- A BTC seller has informed the buyer that fiat payment has been received for trade with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea, and locked BTC has been released to the buyer. -The BTC buyer closes out the trade by keeping the received BTC in her Bisq wallet: -$ ./bisq-cli --password=xyz --port=9998 keepfunds --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea +The BTC buyer closes out the trade by keeping the received BTC in her Haveno wallet: +$ ./haveno-cli --password=xyz --port=9998 keepfunds --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea diff --git a/core/src/main/resources/help/lockwallet-help.txt b/core/src/main/resources/help/lockwallet-help.txt index 58cb5668..c1d01c14 100644 --- a/core/src/main/resources/help/lockwallet-help.txt +++ b/core/src/main/resources/help/lockwallet-help.txt @@ -2,7 +2,7 @@ lockwallet NAME ---- -lockwallet - lock Bisq wallet +lockwallet - lock Haveno wallet SYNOPSIS -------- @@ -15,4 +15,4 @@ Locks an unlocked wallet before an unlockwallet timeout expires. EXAMPLES -------- Immediately lock an encrypted wallet set to automatically lock in the future: -$ ./bisq-cli --password=xyz --port=9998 lockwallet +$ ./haveno-cli --password=xyz --port=9998 lockwallet diff --git a/core/src/main/resources/help/removewalletpassword-help.txt b/core/src/main/resources/help/removewalletpassword-help.txt index 73b6d311..f1f396d5 100644 --- a/core/src/main/resources/help/removewalletpassword-help.txt +++ b/core/src/main/resources/help/removewalletpassword-help.txt @@ -2,7 +2,7 @@ removewalletpassword NAME ---- -removewalletpassword - remove a Bisq wallet's encryption password +removewalletpassword - remove a Haveno wallet's encryption password SYNOPSIS -------- @@ -12,8 +12,8 @@ removewalletpassword DESCRIPTION ----------- -Remove an encryption password from an encrypted Bisq wallet. +Remove an encryption password from an encrypted Haveno wallet. EXAMPLES -------- -$ ./bisq-cli --password=xyz --port=9998 removewalletpassword --wallet-password=mypassword +$ ./haveno-cli --password=xyz --port=9998 removewalletpassword --wallet-password=mypassword diff --git a/core/src/main/resources/help/sendbtc-help.txt b/core/src/main/resources/help/sendbtc-help.txt index 833612a6..f41469b8 100644 --- a/core/src/main/resources/help/sendbtc-help.txt +++ b/core/src/main/resources/help/sendbtc-help.txt @@ -14,7 +14,7 @@ sendbtc DESCRIPTION ----------- -Send BTC from your Bisq wallet to an external BTC address. +Send BTC from your Haveno wallet to an external BTC address. OPTIONS ------- @@ -37,15 +37,15 @@ EXAMPLES -------- Send 0.10 BTC to address bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 with a default transaction fee rate: -$ ./bisq-cli --password=xyz --port=9998 sendbtc --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 --amount=0.10 +$ ./haveno-cli --password=xyz --port=9998 sendbtc --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 --amount=0.10 Send 0.05 BTC to address bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 with a transaction fee rate of 10 sats/byte: -$ ./bisq-cli --password=xyz --port=9998 sendbtc --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 --amount=0.05 \ +$ ./haveno-cli --password=xyz --port=9998 sendbtc --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 --amount=0.05 \ --tx-fee-rate=10 Send 0.005 BTC to address bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 with a transaction fee rate of 40 sats/byte, and save a memo with the send transaction: -$ ./bisq-cli --password=xyz --port=9998 sendbtc --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 --amount=0.005 \ +$ ./haveno-cli --password=xyz --port=9998 sendbtc --address=bcrt1qygvsqmyt8jyhtp7l3zwqm7s7v3nar6vkc2luz3 --amount=0.005 \ --tx-fee-rate=40 \ --memo="note to self" diff --git a/core/src/main/resources/help/settxfeerate-help.txt b/core/src/main/resources/help/settxfeerate-help.txt index 557d7ee5..7fc06e8c 100644 --- a/core/src/main/resources/help/settxfeerate-help.txt +++ b/core/src/main/resources/help/settxfeerate-help.txt @@ -16,4 +16,4 @@ Sets the user's custom transaction fee rate preference. EXAMPLES -------- Set custom transaction fee rate to 25 sats/byte: -$ ./bisq-cli --password=xyz --port=9998 settxfeerate --tx-fee-rate=25 +$ ./haveno-cli --password=xyz --port=9998 settxfeerate --tx-fee-rate=25 diff --git a/core/src/main/resources/help/setwalletpassword-help.txt b/core/src/main/resources/help/setwalletpassword-help.txt index da372d98..a0ef7b06 100644 --- a/core/src/main/resources/help/setwalletpassword-help.txt +++ b/core/src/main/resources/help/setwalletpassword-help.txt @@ -2,7 +2,7 @@ setwalletpassword NAME ---- -setwalletpassword - set Bisq wallet password +setwalletpassword - set Haveno wallet password SYNOPSIS -------- @@ -12,14 +12,14 @@ setwalletpassword DESCRIPTION ----------- -Encrypts a Bisq wallet with a password. If the optional new wallet password option is +Encrypts a Haveno wallet with a password. If the optional new wallet password option is present, a new wallet password replaces the existing password EXAMPLES -------- -Encrypt an unencrypted Bisq wallet with a password: -$ ./bisq-cli --password=xyz --port=9998 setwalletpassword --wallet-password=mypassword +Encrypt an unencrypted Haveno wallet with a password: +$ ./haveno-cli --password=xyz --port=9998 setwalletpassword --wallet-password=mypassword -Set a new password on a Bisq wallet that is already encrypted: -$ ./bisq-cli --password=xyz --port=9998 setwalletpassword --wallet-password=myoldpassword \ +Set a new password on a Haveno wallet that is already encrypted: +$ ./haveno-cli --password=xyz --port=9998 setwalletpassword --wallet-password=myoldpassword \ --new-wallet-password=mynewpassword diff --git a/core/src/main/resources/help/stop-help.txt b/core/src/main/resources/help/stop-help.txt index ad28fc24..5207417b 100644 --- a/core/src/main/resources/help/stop-help.txt +++ b/core/src/main/resources/help/stop-help.txt @@ -18,5 +18,5 @@ OPTIONS EXAMPLES -------- To shutdown the server: -$ ./bisq-cli --password=xyz --port=9998 stop +$ ./haveno-cli --password=xyz --port=9998 stop diff --git a/core/src/main/resources/help/takeoffer-help.txt b/core/src/main/resources/help/takeoffer-help.txt index c7e4212f..126e55f1 100644 --- a/core/src/main/resources/help/takeoffer-help.txt +++ b/core/src/main/resources/help/takeoffer-help.txt @@ -13,7 +13,7 @@ takeoffer DESCRIPTION ----------- -Take an existing offer using a matching payment method. The Bisq trade fee can be paid in BTC. +Take an existing offer using a matching payment method. The Haveno trade fee can be paid in BTC. OPTIONS ------- @@ -25,13 +25,13 @@ OPTIONS The payment account's payment method must match that of the offer. --fee-currency - The wallet currency used to pay the Bisq trade taker fee (BTC). Default is BTC + The wallet currency used to pay the Haveno trade taker fee (BTC). Default is BTC EXAMPLES -------- To take an offer with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea using a payment account with ID fe20cdbd-22be-4b8a-a4b6-d2608ff09d6e, - and paying the Bisq trading fee in BTC: -$ ./bisq-cli --password=xyz --port=9998 takeoffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \ + and paying the Haveno trading fee in BTC: +$ ./haveno-cli --password=xyz --port=9998 takeoffer --offer-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \ --payment-account=fe20cdbd-22be-4b8a-a4b6-d2608ff09d6e \ -fee-currency=btc diff --git a/core/src/main/resources/help/unlockwallet-help.txt b/core/src/main/resources/help/unlockwallet-help.txt index 388117ca..96703b5f 100644 --- a/core/src/main/resources/help/unlockwallet-help.txt +++ b/core/src/main/resources/help/unlockwallet-help.txt @@ -2,7 +2,7 @@ unlockwallet NAME ---- -unlockwallet - unlock an encrypted Bisq wallet +unlockwallet - unlock an encrypted Haveno wallet SYNOPSIS -------- @@ -12,10 +12,10 @@ unlockwallet DESCRIPTION ----------- -Unlocks an encrypted Bisq wallet for a specified number of seconds. +Unlocks an encrypted Haveno wallet for a specified number of seconds. The timeout can be manually overridden with the lockwallet command. EXAMPLES -------- Unlock a wallet encrypted with the wallet-password "mypassword" for 30 seconds: -$ ./bisq-cli --password=xyz --port=9998 unlockwallet --wallet-password=mypassword --timeout=30 +$ ./haveno-cli --password=xyz --port=9998 unlockwallet --wallet-password=mypassword --timeout=30 diff --git a/core/src/main/resources/help/unsettxfeerate-help.txt b/core/src/main/resources/help/unsettxfeerate-help.txt index d3ec0f96..bf107546 100644 --- a/core/src/main/resources/help/unsettxfeerate-help.txt +++ b/core/src/main/resources/help/unsettxfeerate-help.txt @@ -15,4 +15,4 @@ Unsets (removes) the transaction fee rate user preference. EXAMPLES -------- Remove the user's custom transaction fee rate preference: -$ ./bisq-cli --password=xyz --port=9998 unsettxfeerate +$ ./haveno-cli --password=xyz --port=9998 unsettxfeerate diff --git a/core/src/main/resources/help/withdrawfunds-help.txt b/core/src/main/resources/help/withdrawfunds-help.txt index edc69ddd..6caf30ba 100644 --- a/core/src/main/resources/help/withdrawfunds-help.txt +++ b/core/src/main/resources/help/withdrawfunds-help.txt @@ -16,12 +16,12 @@ DESCRIPTION A BTC buyer completes the final step in the trade protocol by sending received BTC to an external BTC wallet. -The alternative way to close out the trade is to keep the received BTC in the Bisq wallet, +The alternative way to close out the trade is to keep the received BTC in the Haveno wallet, using the keepfunds command. The buyer needs to complete the trade protocol using the keepfunds or withdrawfunds or command. This step may not seem necessary from the buyer's perspective, but it is necessary for correct -transition of a trade's state to CLOSED, within the Bisq server. +transition of a trade's state to CLOSED, within the Haveno server. OPTIONS ------- @@ -40,11 +40,11 @@ EXAMPLES A BTC seller has informed the buyer that fiat payment has been received for trade with ID 83e8b2e2-51b6-4f39-a748-3ebd29c22aea, and locked BTC has been released to the buyer. The BTC buyer closes out the trade by sending the received BTC to an external BTC wallet: -$ ./bisq-cli --password=xyz --port=9998 withdrawfunds --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \ +$ ./haveno-cli --password=xyz --port=9998 withdrawfunds --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \ --address=2N5J6MyjAsWnashimGiNwoRzUXThsQzRmbv (bitcoin regtest address) A seller sends a trade's BTC proceeds to an external wallet, and includes an optional memo: -$ ./bisq-cli --password=xyz --port=9998 withdrawfunds --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \ +$ ./haveno-cli --password=xyz --port=9998 withdrawfunds --trade-id=83e8b2e2-51b6-4f39-a748-3ebd29c22aea \ --address=2N5J6MyjAsWnashimGiNwoRzUXThsQzRmbv \ --memo="note to self" diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index b26f25f6..e1c4d2b6 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -249,8 +249,8 @@ mainView.menu.settings=Settings mainView.menu.account=Account mainView.marketPriceWithProvider.label=Market price by {0} -mainView.marketPrice.bisqInternalPrice=Price of latest Haveno trade -mainView.marketPrice.tooltip.bisqInternalPrice=There is no market price from external price feed providers available.\n\ +mainView.marketPrice.havenoInternalPrice=Price of latest Haveno trade +mainView.marketPrice.tooltip.havenoInternalPrice=There is no market price from external price feed providers available.\n\ The displayed price is the latest Haveno trade price for that currency. mainView.marketPrice.tooltip=Market price is provided by {0}{1}\nLast update: {2}\nProvider node URL: {3} mainView.balance.available=Available balance @@ -678,7 +678,7 @@ portfolio.pending.step2_buyer.postal=Please send {0} by \"US Postal Money Order\ # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. \ Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. \ - See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n + See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -2158,8 +2158,8 @@ popup.info.shutDownWithOpenOffers=Haveno is being shut down, but there are open (i.e., make sure it doesn't go into standby mode...monitor standby is not a problem). popup.info.shutDownWithTradeInit={0}\n\ This trade has not finished initializing; shutting down now will probably make it corrupted. Please wait a minute and try again. -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\n\ - Please make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\n\ + Please make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. popup.info.p2pStatusIndicator.red={0}\n\n\ Your node has no connection to the P2P network. Haveno cannot operate in this state. popup.info.p2pStatusIndicator.yellow={0}\n\n\ @@ -2169,7 +2169,7 @@ popup.info.p2pStatusIndicator.green={0}\n\n\ popup.info.firewallSetupInfo=It appears this machine blocks incoming Tor connections. \ This can happen in VM environments such as Qubes/VirtualBox/Whonix. \n\n\ Please set up your environment to accept incoming Tor connections, otherwise no-one will be able to take your offers. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.warn.daoRequiresRestart=There was a problem with synchronizing the DAO state. You have to restart the application to fix the issue. popup.privateNotification.headline=Important private notification! @@ -2411,7 +2411,7 @@ password.deriveKey=Derive key from password password.walletDecrypted=Wallet successfully decrypted and password protection removed. password.wrongPw=You entered the wrong password.\n\nPlease try entering your password again, carefully checking for typos or spelling errors. password.walletEncrypted=Wallet successfully encrypted and password protection enabled. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=The 2 passwords you entered don't match. password.forgotPassword=Forgot password? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\n\ @@ -2436,8 +2436,8 @@ seed.warn.walletNotEmpty.emptyWallet=I will empty my wallets first seed.warn.notEncryptedAnymore=Your wallets are encrypted.\n\n\ After restore, the wallets will no longer be encrypted and you must set a new password.\n\n\ Do you want to proceed? -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\n\ -BIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\n\ +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\n\ +BIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\n\ Ideally you should specify the date your wallet seed was created.\n\n\n\ Are you sure you want to go ahead without specifying a wallet date? seed.restore.success=Wallets restored successfully with the new seed words.\n\nYou need to shut down and restart the application. @@ -2645,7 +2645,7 @@ payment.account.amazonGiftCard.addCountryInfo={0}\n\ This will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.swift.info.account=Carefully review the core guidelines for using SWIFT on Bisq:\n\ +payment.swift.info.account=Carefully review the core guidelines for using SWIFT on Haveno:\n\ \n\ - fill all fields completely and accurately \n\ - buyer must send payment in currency specified by the offer maker \n\ @@ -2674,7 +2674,7 @@ payment.imps.info.account=Please make sure to include your:\n\n\ These details should match your bank account that you will use for sending / receiving payments.\n\n\ Please be aware there is a maximum of Rs. 200,000 that can be sent per transaction. If you are trading over this amount multiple transactions will be needed. However be aware their is a maximum limit of Rs. 1,000,000 that can be sent per day.\n\n\ Some banks have different limits for their customers. -payment.imps.info.buyer=Please send payment only to the account details provided in Bisq.\n\n\ +payment.imps.info.buyer=Please send payment only to the account details provided in Haveno.\n\n\ The maximum trade size is Rs. 200,000 per transaction.\n\n\ If your trade is over Rs. 200,000 you will have to make multiple transfers. However, be aware there is a maximum limit of Rs. 1,000,000 that can be sent per day.\n\n\ Please note some banks have different limits for their customers. @@ -2688,7 +2688,7 @@ payment.neft.info.account=Please make sure to include your:\n\n\ These details should match your bank account that you will use for sending / receiving payments.\n\n\ Please be aware there is a maximum of Rs. 50,000 that can be sent per transaction. If you are trading over this amount multiple transactions will be needed.\n\n\ Please note some banks have different limits for their customers. -payment.neft.info.buyer=Please send payment only to the account details provided in Bisq.\n\n\ +payment.neft.info.buyer=Please send payment only to the account details provided in Haveno.\n\n\ The maximum trade size is Rs. 50,000 per transaction.\n\n\ If your trade is over Rs. 50,000 you will have to make multiple transfers.\n\n\ Please note some banks have different limits for their customers. @@ -2719,7 +2719,7 @@ When setting up your RTGS payment account please make sure to include your:\n\n\ ● IFSC number\n\n\ These details should match your bank account that you will use for sending / receiving payments.\n\n\ Please be aware there is a minimum trade amount of Rs. 200,000 that can be sent per transaction. If you are trading under this amount either the trade would get cancelled or both traders would have to agree on another payment method (eg IMPS or UPI). -payment.rtgs.info.buyer=Please send payment only to the account details provided in Bisq.\n\n\ +payment.rtgs.info.buyer=Please send payment only to the account details provided in Haveno.\n\n\ Please be aware there is a minimum trade amount of Rs. 200,000 that can be sent per transaction. If you are trading under this amount either the trade would get cancelled or both traders would have to agree on another payment method (eg IMPS or UPI). payment.rtgs.info.seller=Please be aware there is a minimum trade amount of Rs. 200,000 that can be sent per transaction. If you are trading under this amount either the trade would get cancelled or both traders would have to agree on another payment method (eg IMPS or UPI). @@ -2727,7 +2727,7 @@ payment.upi.info.account=Please make sure to include your Virtual Payment Addres For UPI there is a maximum limit of Rs. 100,000 that can be sent per transaction. \n\n\ If you intend to trade amount of over Rs. 100,000 per trade it is likely trades will have to take place over multiple transfers. \n\n\ Please note some banks have different limits for their customers. -payment.upi.info.buyer=Please send payment only to the VPA / UPI ID provided in Bisq. \n\n\ +payment.upi.info.buyer=Please send payment only to the VPA / UPI ID provided in Haveno. \n\n\ The maximum trade size is Rs. 100,000 per transaction. \n\n\ If your trade is over Rs. 100,000 you will have to make multiple transfers. \n\n\ Please note some banks have different limits for their customers. @@ -2773,12 +2773,12 @@ When users set up a Nequi account payment limits are set to a maximum of ~ 7,000 If you intend to trade amount of over 7,000,000 COP per trade you will need to complete KYC with Bancolombia and pay a fee \ of around 15,000 COP. After this all transactions will incur a 0.4% of tax. Please ensure you are aware of the latest taxes.\n\n\ Users should also be aware of account limits. If you trade over the above limits your trade might be cancelled and there could be a penalty. -payment.nequi.info.buyer=Please send payment only to the phone number provided in the BTC Seller's Bisq account.\n\n\ +payment.nequi.info.buyer=Please send payment only to the phone number provided in the BTC Seller's Haveno account.\n\n\ When users set up a Nequi account, payment limits are set to a maximum of ~ 7,000,000 COP that can be sent per month.\n\n\ If you intend to trade amount of over 7,000,000 COP per trade you will need to complete KYC with Bancolombia and pay a fee \ of around 15,000 COP. After this all transactions will incur a 0.4% of tax. Please ensure you are aware of the latest taxes.\n\n\ Users should also be aware of account limits. If you trade over the above limits your trade might be cancelled and there could be a penalty. -payment.nequi.info.seller=Please check that the payment received matches the phone number provided in the BTC Buyer's Bisq account.\n\n\ +payment.nequi.info.seller=Please check that the payment received matches the phone number provided in the BTC Buyer's Haveno account.\n\n\ When users set up a Nequi account, payment limits are set to a maximum of ~ 7,000,000 COP that can be sent per month.\n\n\ If you intend to trade amount of over 7,000,000 COP per trade you will need to complete KYC with Bancolombia and pay a fee \ of around 15,000 COP. After this all transactions will incur a 0.4% of tax. Please ensure you are aware of the latest taxes.\n\n\ @@ -2790,10 +2790,10 @@ The maximum amount of transactions you can send/receive using Bizum is €2,000 Bizum users can have a maximum of 150 operations per month.\n\n\ Each bank however may establish its own limits, within the above limits, for its clients.\n\n\ Users should also be aware of account limits. If you trade over the above limits your trade might be cancelled and there could be a penalty. -payment.bizum.info.buyer=Please send payment only to the BTC Seller's mobile phone number as provided in Bisq.\n\n\ +payment.bizum.info.buyer=Please send payment only to the BTC Seller's mobile phone number as provided in Haveno.\n\n\ The maximum trade size is €1,000 per payment. The maximum amount of transactions you can send using Bizum is €2,000 Euros per day.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. -payment.bizum.info.seller=Please make sure your payment is received from the BTC Buyer's mobile phone number as provided in Bisq.\n\n\ +payment.bizum.info.seller=Please make sure your payment is received from the BTC Buyer's mobile phone number as provided in Haveno.\n\n\ The maximum trade size is €1,000 per payment. The maximum amount of transactions you can receive using Bizum is €2,000 Euros per day.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. @@ -2801,30 +2801,30 @@ payment.pix.info.account=Please make sure to include your chosen Pix Key. There CPF (Natural Persons Register) or CNPJ (National Registry of Legal Entities), e-mail address, telephone number or a \ random key generated by the system called a universally unique identifier (UUID). A different key must be used for \ each Pix account you have. Individuals can create up to five keys for each account they own.\n\n\ -When trading on Bisq, BTC Buyers should use their Pix Keys as the payment description so that it is easy for the BTC Sellers to identify the payment as coming from themselves. -payment.pix.info.buyer=Please send payment only the Pix Key provided in the BTC Seller's Bisq account.\n\n\ +When trading on Haveno, BTC Buyers should use their Pix Keys as the payment description so that it is easy for the BTC Sellers to identify the payment as coming from themselves. +payment.pix.info.buyer=Please send payment only the Pix Key provided in the BTC Seller's Haveno account.\n\n\ Please use your Pix Key as the payment reference so that it is easy for the BTC Seller to identify the payment as coming from yourself. -payment.pix.info.seller=Please check that the payment received description matches the Pix Key provided in the BTC Buyer's Bisq account. +payment.pix.info.seller=Please check that the payment received description matches the Pix Key provided in the BTC Buyer's Haveno account. payment.pix.key=Pix Key (CPF, CNPJ, Email, Phone number or UUID) payment.monese.info.account=Monese is a bank app for users of GBP, EUR and RON*. Monese allows users to send money to \ other Monese accounts instantly and for free in any supported currency.\n\n\ *To open a RON account in Monese, you need to either live in Romania or have Romanian citizenship.\n\n\ -When setting up your Monese account in Bisq please make sure to include your name and phone number that matches your \ +When setting up your Monese account in Haveno please make sure to include your name and phone number that matches your \ Monese account. This will ensure that when you send funds they show from the correct account and when you receive \ funds they will be credited to your account. -payment.monese.info.buyer=Please send payment only to the phone number provided by the BTC Seller in their Bisq account. Please leave the payment description blank. -payment.monese.info.seller=BTC Sellers should expect to receive payment from the phone number / name shown in the BTC Buyer's Bisq account. +payment.monese.info.buyer=Please send payment only to the phone number provided by the BTC Seller in their Haveno account. Please leave the payment description blank. +payment.monese.info.seller=BTC Sellers should expect to receive payment from the phone number / name shown in the BTC Buyer's Haveno account. payment.satispay.info.account=To use Satispay you need a bank account (IBAN) in Italy and to be registered for the service.\n\n\ Satispay account limits are individually set. If you want to trade increased amounts you will need to contact Satispay \ support to increase your limits. Users should also be aware of account limits. If you trade over the above limits \ your trade might be cancelled and there could be a penalty. -payment.satispay.info.buyer=Please send payment only to the BTC Seller's mobile phone number as provided in Bisq.\n\n\ +payment.satispay.info.buyer=Please send payment only to the BTC Seller's mobile phone number as provided in Haveno.\n\n\ Satispay account limits are individually set. If you want to trade increased amounts you will need to contact Satispay \ support to increase your limits. Users should also be aware of account limits. If you trade over the above limits \ your trade might be cancelled and there could be a penalty. -payment.satispay.info.seller=Please make sure your payment is received from the BTC Buyer's mobile phone number / name as provided in Bisq.\n\n\ +payment.satispay.info.seller=Please make sure your payment is received from the BTC Buyer's mobile phone number / name as provided in Haveno.\n\n\ Satispay account limits are individually set. If you want to trade increased amounts you will need to contact Satispay \ support to increase your limits. Users should also be aware of account limits. If you trade over the above limits \ your trade might be cancelled and there could be a penalty. @@ -2842,7 +2842,7 @@ When the BTC Seller requests a Tikkie payment the maximum they can ask to receiv Each bank however may establish its own limits, within these limits, for its clients.\n\n\ Users should also be aware of account limits. If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.tikkie.info.seller=Please send a payment link to the BTC Seller in trader chat. Once the BTC \ - Buyer has sent you payment please check their IBAN detail match the details they have in Bisq.\n\n\ + Buyer has sent you payment please check their IBAN detail match the details they have in Haveno.\n\n\ When the BTC Seller requests a Tikkie payment the maximum they can ask to receive is €750 per Tikkie request. If the \ trade is over that amount the BTC Seller will have to sent multiple requests to total the trade amount. The maximum \ you can request in a day is €2,500.\n\n\ @@ -2850,27 +2850,27 @@ Each bank however may establish its own limits, within these limits, for its cli Users should also be aware of account limits. If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.verse.info.account=Verse is a multiple currency payment method that can send and receive payment in EUR, SEK, HUF, DKK, PLN.\n\n\ -When setting up your Verse account in Bisq please make sure to include the username that matches your username in your \ +When setting up your Verse account in Haveno please make sure to include the username that matches your username in your \ Verse account. This will ensure that when you send funds they show from the correct account and when you receive \ funds they will be credited to your account.\n\n\ Verse users are limited to sending or receiving €10,000 per year (or equivalent foreign currency amount) for \ accumulated payments made from or received into their payment account. This can be increased by Verse on request. -payment.verse.info.buyer=Please send payment only to the username provided by the BTC Seller in their Bisq account. \ +payment.verse.info.buyer=Please send payment only to the username provided by the BTC Seller in their Haveno account. \ Please leave the payment description blank.\n\n\ Verse users are limited to sending or receiving €10,000 per year (or equivalent foreign currency amount) for \ accumulated payments made from or received into their payment account. This can be increased by Verse on request. -payment.verse.info.seller=BTC Sellers should expect to receive payment from the username shown in the BTC Buyer's Bisq account.\n\n\ +payment.verse.info.seller=BTC Sellers should expect to receive payment from the username shown in the BTC Buyer's Haveno account.\n\n\ Verse users are limited to sending or receiving €10,000 per year (or equivalent foreign currency amount) for \ accumulated payments made from or received into their payment account. This can be increased by Verse on request. -payment.achTransfer.info.account=When adding ACH as a payment method in Bisq users should make sure they are aware what \ +payment.achTransfer.info.account=When adding ACH as a payment method in Haveno users should make sure they are aware what \ it will cost to send and receive an ACH transfer. payment.achTransfer.info.buyer=Please ensure you are aware of what it will cost you to send an ACH transfer.\n\n\ When paying, send only to the payment details provided in the BTC Seller's account using ACH transfer. payment.achTransfer.info.seller=Please ensure you are aware of what it will cost you to receive an ACH transfer.\n\n\ When receiving payment, please check that it is received from the BTC Buyer's account as an ACH transfer. -payment.domesticWire.info.account=When adding Domestic Wire Transfer as a payment method in Bisq users should make sure \ +payment.domesticWire.info.account=When adding Domestic Wire Transfer as a payment method in Haveno users should make sure \ they are aware what it will cost to send and receive a wire transfer. payment.domesticWire.info.buyer=Please ensure you are aware of what it will cost you to send a wire transfer.\n\n\ When paying, send only to the payment details provided in the BTC Seller's account. @@ -2878,7 +2878,7 @@ payment.domesticWire.info.seller=Please ensure you are aware of what it will cos When receiving payment, please check that it is received from the BTC Buyer's account. payment.strike.info.account=Please make sure to include your Strike username.\n\n\ -In Bisq, Strike is used for fiat to fiat payments only.\n\n\ +In Haveno, Strike is used for fiat to fiat payments only.\n\n\ Please make sure you are aware of the Strike limits:\n\n\ Users who have registered with only their email, name, and phone number have the following limits:\n\n\ ● $100 maximum per deposit\n\ @@ -2889,29 +2889,29 @@ Users can increase their limits by providing Strike with more information. These ● $1,000 maximum total deposits per week\n\ ● $1,000 maximum per payment\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. -payment.strike.info.buyer=Please send payment only to the BTC Seller's Strike username as provided in Bisq.\n\n\ +payment.strike.info.buyer=Please send payment only to the BTC Seller's Strike username as provided in Haveno.\n\n\ The maximum trade size is $1,000 per payment.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. -payment.strike.info.seller=Please make sure your payment is received from the BTC Buyer's Strike username as provided in Bisq.\n\n\ +payment.strike.info.seller=Please make sure your payment is received from the BTC Buyer's Strike username as provided in Haveno.\n\n\ The maximum trade size is $1,000 per payment.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.transferwiseUsd.info.account=Due to US banking regulation, sending and receiving USD payments has more restrictions \ - than most other currencies. For this reason USD was not added to Bisq TransferWise payment method.\n\n\ -The TransferWise-USD payment method allows Bisq users to trade in USD.\n\n\ -Anyone with a Wise, formally TransferWise account, can add TransferWise-USD as a payment method in Bisq. This will \ + than most other currencies. For this reason USD was not added to Haveno TransferWise payment method.\n\n\ +The TransferWise-USD payment method allows Haveno users to trade in USD.\n\n\ +Anyone with a Wise, formally TransferWise account, can add TransferWise-USD as a payment method in Haveno. This will \ allow them to buy and sell BTC with USD.\n\n\ -When trading on Bisq BTC Buyers should not use any reference for reason for payment. If reason for payment is required \ +When trading on Haveno BTC Buyers should not use any reference for reason for payment. If reason for payment is required \ they should only use the full name of the TransferWise-USD account owner. -payment.transferwiseUsd.info.buyer=Please send payment only to the email address in the BTC Seller's Bisq TransferWise-USD account. -payment.transferwiseUsd.info.seller=Please check that the payment received matches the BTC Buyer's name of the TransferWise-USD account in Bisq. +payment.transferwiseUsd.info.buyer=Please send payment only to the email address in the BTC Seller's Haveno TransferWise-USD account. +payment.transferwiseUsd.info.seller=Please check that the payment received matches the BTC Buyer's name of the TransferWise-USD account in Haveno. -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\ +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\ \n\ - BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n\ - BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\ \n\ -In the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\n\ +In the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\n\ Failure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\n\ In all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\n\ If you do not understand these requirements, do not trade using USPMO on Haveno. diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index 0c0a0f82..4e0d03cc 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -103,14 +103,14 @@ shared.faq=Navštívit stránku FAQ shared.yesCancel=Ano, zrušit shared.nextStep=Další krok shared.selectTradingAccount=Vyberte obchodní účet -shared.fundFromSavingsWalletButton=Přesunout finance z Bisq peněženky +shared.fundFromSavingsWalletButton=Přesunout finance z Haveno peněženky shared.fundFromExternalWalletButton=Otevřít vaši externí peněženku pro financování shared.openDefaultWalletFailed=Nepodařilo se otevřít aplikaci bitcoinové peněženky. Jste si jisti, že máte nějakou nainstalovanou? shared.belowInPercent=% pod tržní cenou shared.aboveInPercent=% nad tržní cenou shared.enterPercentageValue=Zadejte % hodnotu shared.OR=NEBO -shared.notEnoughFunds=Ve své peněžence Bisq nemáte pro tuto transakci dostatek prostředků — je potřeba {0}, ale k dispozici je pouze {1}.\n\nPřidejte prostředky z externí peněženky nebo financujte svou peněženku Bisq v části Prostředky > Přijmout prostředky. +shared.notEnoughFunds=Ve své peněžence Haveno nemáte pro tuto transakci dostatek prostředků — je potřeba {0}, ale k dispozici je pouze {1}.\n\nPřidejte prostředky z externí peněženky nebo financujte svou peněženku Haveno v části Prostředky > Přijmout prostředky. shared.waitingForFunds=Čekání na finance... shared.TheBTCBuyer=BTC kupující shared.You=Vy @@ -125,7 +125,7 @@ shared.notUsedYet=Ještě nepoužito shared.date=Datum shared.sendFundsDetailsWithFee=Odesílání: {0}\nZ adresy: {1}\nNa přijímací adresu: {2}.\nPožadovaný poplatek za těžbu je: {3} ({4} satoshi/vbyte)\nTransakční vsize: {5} vKb\n\nPříjemce obdrží: {6}\n\nOpravdu chcete tuto částku vybrat? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq zjistil, že tato transakce by vytvořila drobné mince, které jsou pod limitem drobných mincí (a není to povoleno pravidly pro bitcoinový konsenzus). Místo toho budou tyto drobné mince ({0} satoshi {1}) přidány k poplatku za těžbu.\n\n\n +shared.sendFundsDetailsDust=Haveno zjistil, že tato transakce by vytvořila drobné mince, které jsou pod limitem drobných mincí (a není to povoleno pravidly pro bitcoinový konsenzus). Místo toho budou tyto drobné mince ({0} satoshi {1}) přidány k poplatku za těžbu.\n\n\n shared.copyToClipboard=Kopírovat do schránky shared.language=Jazyk shared.country=Země @@ -235,8 +235,8 @@ mainView.menu.settings=Nastavení mainView.menu.account=Účet mainView.marketPriceWithProvider.label=Tržní cena {0} -mainView.marketPrice.bisqInternalPrice=Cena posledního Bisq obchodu -mainView.marketPrice.tooltip.bisqInternalPrice=Neexistují tržní ceny od externích poskytovatelů cenových feedů.\nZobrazená cena je nejnovější obchodní cena Bisq pro tuto měnu. +mainView.marketPrice.havenoInternalPrice=Cena posledního Haveno obchodu +mainView.marketPrice.tooltip.havenoInternalPrice=Neexistují tržní ceny od externích poskytovatelů cenových feedů.\nZobrazená cena je nejnovější obchodní cena Haveno pro tuto měnu. mainView.marketPrice.tooltip=Tržní cena je poskytována {0}{1}\nPoslední aktualizace: {2}\nURL uzlu poskytovatele: {3} mainView.balance.available=Dostupný zůstatek mainView.balance.reserved=Rezervováno v nabídkách @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizace s {0} v bloku: {1} / {2} mainView.footer.btcInfo.synchronizedWith=Synchronizováno s {0} v bloku {1} mainView.footer.btcInfo.connectingTo=Připojování mainView.footer.btcInfo.connectionFailed=Připojení se nezdařilo -mainView.footer.p2pInfo=Bitcoin síťové nody: {0} / Bisq síťové nody: {1} +mainView.footer.p2pInfo=Bitcoin síťové nody: {0} / Haveno síťové nody: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Připojování do sítě Tor... mainView.bootstrapState.torNodeCreated=(2/4) Tor node vytvořen @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Iniciační data přijata mainView.bootstrapWarning.noSeedNodesAvailable=Žádné seed nody nejsou k dispozici mainView.bootstrapWarning.noNodesAvailable=Žádné seed ani peer nody k dispozici -mainView.bootstrapWarning.bootstrappingToP2PFailed=Zavádění do sítě Bisq se nezdařilo +mainView.bootstrapWarning.bootstrappingToP2PFailed=Zavádění do sítě Haveno se nezdařilo mainView.p2pNetworkWarnMsg.noNodesAvailable=Pro vyžádání dat nejsou k dispozici žádné seed ani peer nody.\nZkontrolujte připojení k internetu nebo zkuste aplikaci restartovat. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Připojení k síti Bisq selhalo (nahlášená chyba: {0}).\nZkontrolujte připojení k internetu nebo zkuste aplikaci restartovat. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Připojení k síti Haveno selhalo (nahlášená chyba: {0}).\nZkontrolujte připojení k internetu nebo zkuste aplikaci restartovat. mainView.walletServiceErrorMsg.timeout=Připojení k síti Bitcoin selhalo kvůli vypršení časového limitu. mainView.walletServiceErrorMsg.connectionError=Připojení k síti Bitcoin selhalo kvůli chybě {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=Připojení k síti Bitcoin selha mainView.walletServiceErrorMsg.rejectedTxException=Transakce byla ze sítě zamítnuta.\n\n{0} mainView.networkWarning.allConnectionsLost=Ztratili jste připojení ke všem {0} síťovým peer nodům.\nMožná jste ztratili připojení k internetu nebo byl váš počítač v pohotovostním režimu. -mainView.networkWarning.localhostBitcoinLost=Ztratili jste připojení k Bitcoinovému localhost nodu.\nRestartujte aplikaci Bisq a připojte se k jiným Bitcoinovým nodům nebo restartujte Bitcoinový localhost node. +mainView.networkWarning.localhostBitcoinLost=Ztratili jste připojení k Bitcoinovému localhost nodu.\nRestartujte aplikaci Haveno a připojte se k jiným Bitcoinovým nodům nebo restartujte Bitcoinový localhost node. mainView.version.update=(Dostupná aktualizace) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=Povolená částka obchod offerbook.warning.wrongTradeProtocol=Tato nabídka vyžaduje jinou verzi protokolu než ta, která byla použita ve vaší verzi softwaru.\n\nZkontrolujte, zda máte nainstalovanou nejnovější verzi, jinak uživatel, který nabídku vytvořil, použil starší verzi.\n\nUživatelé nemohou obchodovat s nekompatibilní verzí obchodního protokolu. offerbook.warning.userIgnored=Do seznamu ignorovaných uživatelů jste přidali onion adresu tohoto uživatele. -offerbook.warning.offerBlocked=Tato nabídka byla blokována vývojáři Bisq.\nPravděpodobně existuje neošetřená chyba způsobující problémy při přijetí této nabídky. -offerbook.warning.currencyBanned=Měna použitá v této nabídce byla blokována vývojáři Bisq.\nDalší informace naleznete na fóru Bisq. -offerbook.warning.paymentMethodBanned=Vývojáři Bisq zablokovali způsob platby použitý v této nabídce.\nDalší informace naleznete na fóru Bisq. -offerbook.warning.nodeBlocked=Onion adresa tohoto obchodníka byla zablokována vývojáři Bisq.\nPravděpodobně existuje neošetřená chyba způsobující problémy při přijímání nabídek od tohoto obchodníka. -offerbook.warning.requireUpdateToNewVersion=Vaše verze Bisq již není kompatibilní pro obchodování. Aktualizujte prosím na nejnovější verzi Bisq na adrese [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Tato nabídka byla blokována vývojáři Haveno.\nPravděpodobně existuje neošetřená chyba způsobující problémy při přijetí této nabídky. +offerbook.warning.currencyBanned=Měna použitá v této nabídce byla blokována vývojáři Haveno.\nDalší informace naleznete na fóru Haveno. +offerbook.warning.paymentMethodBanned=Vývojáři Haveno zablokovali způsob platby použitý v této nabídce.\nDalší informace naleznete na fóru Haveno. +offerbook.warning.nodeBlocked=Onion adresa tohoto obchodníka byla zablokována vývojáři Haveno.\nPravděpodobně existuje neošetřená chyba způsobující problémy při přijímání nabídek od tohoto obchodníka. +offerbook.warning.requireUpdateToNewVersion=Vaše verze Haveno již není kompatibilní pro obchodování. Aktualizujte prosím na nejnovější verzi Haveno na adrese [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=Tuto nabídku nemůžete přijmout, protože jste ji již dříve využili. Je možné, že váš předchozí pokus o přijetí nabídky vyústil v neúspěšný obchod. offerbook.info.sellAtMarketPrice=Budete prodávat za tržní cenu (aktualizováno každou minutu). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Financujte svou nabídku createOffer.fundsBox.offerFee=Obchodní poplatek createOffer.fundsBox.networkFee=Poplatek za těžbu createOffer.fundsBox.placeOfferSpinnerInfo=Probíhá publikování nabídky ... -createOffer.fundsBox.paymentLabel=Bisq obchod s ID {0} +createOffer.fundsBox.paymentLabel=Haveno obchod s ID {0} createOffer.fundsBox.fundsStructure=(kauce {0}, obchodní poplatek {1}, poplatek za těžbu {2}) createOffer.success.headline=Vaše nabídka byla publikována createOffer.success.info=Otevřené nabídky můžete spravovat na stránce \"Portfolio/Moje otevřené nabídky\". @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Přehled: Umístěte nabídku {0} monero createOffer.createOfferFundWalletInfo.headline=Financujte svou nabídku # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Výše obchodu: {0}\n -createOffer.createOfferFundWalletInfo.msg=Do této nabídky musíte vložit {0}.\n\nTyto prostředky jsou rezervovány ve vaší lokální peněžence a budou uzamčeny na vkladové multisig adrese, jakmile někdo příjme vaši nabídku.\n\nČástka je součtem:\n{1}- Vaše kauce: {2}\n- Obchodní poplatek: {3}\n- Poplatek za těžbu: {4}\n\nPři financování obchodu si můžete vybrat ze dvou možností:\n- Použijte svou peněženku Bisq (pohodlné, ale transakce mohou být propojitelné) NEBO\n- Přenos z externí peněženky (potenciálně více soukromé)\n\nPo uzavření tohoto vyskakovacího okna se zobrazí všechny možnosti a podrobnosti financování. +createOffer.createOfferFundWalletInfo.msg=Do této nabídky musíte vložit {0}.\n\nTyto prostředky jsou rezervovány ve vaší lokální peněžence a budou uzamčeny na vkladové multisig adrese, jakmile někdo příjme vaši nabídku.\n\nČástka je součtem:\n{1}- Vaše kauce: {2}\n- Obchodní poplatek: {3}\n- Poplatek za těžbu: {4}\n\nPři financování obchodu si můžete vybrat ze dvou možností:\n- Použijte svou peněženku Haveno (pohodlné, ale transakce mohou být propojitelné) NEBO\n- Přenos z externí peněženky (potenciálně více soukromé)\n\nPo uzavření tohoto vyskakovacího okna se zobrazí všechny možnosti a podrobnosti financování. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Při zadávání nabídky došlo k chybě:\n\n{0}\n\nPeněženku ještě neopustily žádné finanční prostředky.\nRestartujte aplikaci a zkontrolujte síťové připojení. createOffer.setAmountPrice=Nastavit množství a cenu -createOffer.warnCancelOffer=Tuto nabídku jste již financovali.\nPokud ji nyní zrušíte, budou vaše prostředky přesunuty do lokální peněženky Bisq a jsou k dispozici pro výběr na obrazovce \"Prostředky/Odeslat prostředky\".\nOpravdu ji chcete zrušit? +createOffer.warnCancelOffer=Tuto nabídku jste již financovali.\nPokud ji nyní zrušíte, budou vaše prostředky přesunuty do lokální peněženky Haveno a jsou k dispozici pro výběr na obrazovce \"Prostředky/Odeslat prostředky\".\nOpravdu ji chcete zrušit? createOffer.timeoutAtPublishing=Při zveřejnění nabídky došlo k vypršení časového limitu. createOffer.errorInfo=\n\nTvůrčí poplatek je již zaplacen. V nejhorším případě jste tento poplatek ztratili.\nZkuste prosím restartovat aplikaci a zkontrolovat síťové připojení, abyste zjistili, zda můžete problém vyřešit. createOffer.tooLowSecDeposit.warning=Nastavili jste kauci na nižší hodnotu, než je doporučená výchozí hodnota {0}.\nOpravdu chcete použít nižší kauci? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Částka k prodeji takeOffer.fundsBox.offerFee=Obchodní poplatek takeOffer.fundsBox.networkFee=Celkové poplatky za těžbu takeOffer.fundsBox.takeOfferSpinnerInfo=Probíhá využití nabídky... -takeOffer.fundsBox.paymentLabel=Bisq obchod s ID {0} +takeOffer.fundsBox.paymentLabel=Haveno obchod s ID {0} takeOffer.fundsBox.fundsStructure=(kauce {0}, obchodní poplatek {1}, poplatek za těžbu {2}) takeOffer.success.headline=Úspěšně jste přijali nabídku. takeOffer.success.info=Stav vašeho obchodu můžete vidět v \"Portfolio/Otevřené obchody\". @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=Tuto nabídku nemůžete vzít, protože použív takeOffer.takeOfferFundWalletInfo.headline=Financujte svůj obchod # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Výše obchodu: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Abyste mohli tuto nabídku využít, musíte vložit {0}.\n\nČástka je součtem:\n{1} - Vaší kauce: {2}\n- Obchodního poplatku: {3}\n- Celkového poplatku za těžbu: {4}\n\nPři financování obchodu si můžete vybrat ze dvou možností:\n- Použijte svou peněženku Bisq (pohodlné, ale transakce mohou být propojitelné) NEBO\n- Platba z externí peněženky (potenciálně více soukromé)\n\nPo uzavření tohoto vyskakovacího okna se zobrazí všechny možnosti a podrobnosti financování. +takeOffer.takeOfferFundWalletInfo.msg=Abyste mohli tuto nabídku využít, musíte vložit {0}.\n\nČástka je součtem:\n{1} - Vaší kauce: {2}\n- Obchodního poplatku: {3}\n- Celkového poplatku za těžbu: {4}\n\nPři financování obchodu si můžete vybrat ze dvou možností:\n- Použijte svou peněženku Haveno (pohodlné, ale transakce mohou být propojitelné) NEBO\n- Platba z externí peněženky (potenciálně více soukromé)\n\nPo uzavření tohoto vyskakovacího okna se zobrazí všechny možnosti a podrobnosti financování. takeOffer.alreadyPaidInFunds=Pokud jste již prostředky zaplatili, můžete je vybrat na obrazovce \"Prostředky/Odeslat prostředky\". takeOffer.paymentInfo=Informace o platbě takeOffer.setAmountPrice=Nastavit částku -takeOffer.alreadyFunded.askCancel=Tuto nabídku jste již financovali.\nPokud ji nyní zrušíte, budou vaše prostředky přesunuty do lokální peněženky Bisq a jsou k dispozici pro výběr na obrazovce \"Prostředky/Odeslat prostředky\".\nOpravdu ji chcete zrušit? +takeOffer.alreadyFunded.askCancel=Tuto nabídku jste již financovali.\nPokud ji nyní zrušíte, budou vaše prostředky přesunuty do lokální peněženky Haveno a jsou k dispozici pro výběr na obrazovce \"Prostředky/Odeslat prostředky\".\nOpravdu ji chcete zrušit? takeOffer.failed.offerNotAvailable=Žádost o nabídku se nezdařila, protože nabídka již není k dispozici. Možná, že mezitím nabídku přijal jiný obchodník. takeOffer.failed.offerTaken=Tuto nabídku nemůžete přijmout, protože ji již přijal jiný obchodník. takeOffer.failed.offerRemoved=Tuto nabídku nemůžete přijmout, protože mezitím byla nabídka odstraněna. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Potvrdit: Upravit nabídku editOffer.publishOffer=Publikování vaší nabídky. editOffer.failed=Úprava nabídky se nezdařila:\n{0} editOffer.success=Vaše nabídka byla úspěšně upravena. -editOffer.invalidDeposit=Kauce kupujícího není v rámci omezení definovaných Bisq DAO a nemůže být dále upravována. +editOffer.invalidDeposit=Kauce kupujícího není v rámci omezení definovaných Haveno DAO a nemůže být dále upravována. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=Vkladová transakce není stále potvrzen # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Váš obchod má alespoň jedno potvrzení blockchainu.\n\n -portfolio.pending.step2_buyer.refTextWarn=Důležité: když vyplňujete platební informace, nechte pole \"důvod platby\" prázdné. NEPOUŽÍVEJTE ID obchodu ani jiné poznámky jako např. 'bitcoin', 'BTC' nebo 'Bisq'. Můžete se se svým obchodním partnerem domluvit pomocí chatu na identifikaci platby, která bude vyhovovat oběma. +portfolio.pending.step2_buyer.refTextWarn=Důležité: když vyplňujete platební informace, nechte pole \"důvod platby\" prázdné. NEPOUŽÍVEJTE ID obchodu ani jiné poznámky jako např. 'bitcoin', 'BTC' nebo 'Haveno'. Můžete se se svým obchodním partnerem domluvit pomocí chatu na identifikaci platby, která bude vyhovovat oběma. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=Pokud vaše banka účtuje poplatky za převod, musíte tyto poplatky uhradit vy. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=DŮLEŽITÉ POŽADAVKY:\nPo pro # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Zašlete prosím {0} prodejci BTC pomocí \"US Postal Money Order\".\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Zašlete prosím {0} prodejci BTC v poštovní zásilce (\"Cash by Mail\"). Konkrétní instrukce naleznete v obchodní smlouvě. V případě pochybností se můžete zeptat protistrany pomocí obchodního chatu. Více informací naleznete na Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Zašlete prosím {0} prodejci BTC v poštovní zásilce (\"Cash by Mail\"). Konkrétní instrukce naleznete v obchodní smlouvě. V případě pochybností se můžete zeptat protistrany pomocí obchodního chatu. Více informací naleznete na Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Prosím uhraďte {0} pomocí zvolené platební metody prodejci BTC. V dalším kroku naleznete detaily o účtu prodejce.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Pošlete MTCN a úč portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Musíte odeslat MTCN (sledovací číslo) a fotografii dokladu e-mailem prodejci BTC.\nDoklad musí jasně uvádět celé jméno prodávajícího, město, zemi a částku. E-mail prodejce je: {0}.\n\nOdeslali jste MTCN a smlouvu prodejci? portfolio.pending.step2_buyer.halCashInfo.headline=Pošlete HalCash kód portfolio.pending.step2_buyer.halCashInfo.msg=Musíte odeslat jak textovou zprávu s kódem HalCash tak i obchodní ID ({0}) prodejci BTC.\nMobilní číslo prodejce je {1}.\n\nPoslali jste kód prodejci? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Některé banky mohou ověřovat jméno příjemce. Účty Faster Payments vytvořené u starých klientů Bisq neposkytují jméno příjemce, proto si jej (v případě potřeby) vyžádejte pomocí obchodního chatu. +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Některé banky mohou ověřovat jméno příjemce. Účty Faster Payments vytvořené u starých klientů Haveno neposkytují jméno příjemce, proto si jej (v případě potřeby) vyžádejte pomocí obchodního chatu. portfolio.pending.step2_buyer.confirmStart.headline=Potvrďte, že jste zahájili platbu portfolio.pending.step2_buyer.confirmStart.msg=Zahájili jste platbu {0} vašemu obchodnímu partnerovi? portfolio.pending.step2_buyer.confirmStart.yes=Ano, zahájil jsem platbu portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=Neposkytli jste doklad o platbě -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=Nezadali jste ID transakce a klíč transakce.\n\nNeposkytnutím těchto údajů nemůže peer použít funkci automatického potvrzení k uvolnění BTC, jakmile bude přijat XMR.\nKromě toho Bisq vyžaduje, aby odesílatel transakce XMR mohl tyto informace poskytnout mediátorovi nebo rozhodci v případě sporu.\nDalší podrobnosti na wiki Bisq: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=Nezadali jste ID transakce a klíč transakce.\n\nNeposkytnutím těchto údajů nemůže peer použít funkci automatického potvrzení k uvolnění BTC, jakmile bude přijat XMR.\nKromě toho Haveno vyžaduje, aby odesílatel transakce XMR mohl tyto informace poskytnout mediátorovi nebo rozhodci v případě sporu.\nDalší podrobnosti na wiki Haveno: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Vstup není 32 bajtová hexadecimální hodnota portfolio.pending.step2_buyer.confirmStart.warningButton=Ignorovat a přesto pokračovat portfolio.pending.step2_seller.waitPayment.headline=Počkejte na platbu @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=Kupující BTC dosud neprovedl platbu {0}.\n portfolio.pending.step2_seller.openForDispute=Kupující BTC ještě nezačal s platbou!\nMax. povolené období pro obchod vypršelo.\nMůžete počkat déle a dát obchodnímu partnerovi více času nebo požádat o pomoc mediátora. tradeChat.chatWindowTitle=Okno chatu pro obchod s ID ''{0}'' tradeChat.openChat=Otevřít chatovací okno -tradeChat.rules=Můžete komunikovat se svým obchodním partnerem a vyřešit případné problémy s tímto obchodem.\nOdpovídat v chatu není povinné.\nPokud obchodník poruší některé z níže uvedených pravidel, zahajte spor a nahlaste jej mediátorovi nebo rozhodci.\n\nPravidla chatu:\n\t● Neposílejte žádné odkazy (riziko malwaru). Můžete odeslat ID transakce a jméno block exploreru.\n\t● Neposílejte seed slova, soukromé klíče, hesla nebo jiné citlivé informace!\n\t● Nepodporujte obchodování mimo Bisq (bez zabezpečení).\n\t● Nezapojujte se do žádných forem podvodů v oblasti sociálního inženýrství.\n\t● Pokud partner nereaguje a dává přednost nekomunikovat prostřednictvím chatu, respektujte jeho rozhodnutí.\n\t● Soustřeďte konverzaci pouze na obchod. Tento chat není náhradou messengeru.\n\t● Udržujte konverzaci přátelskou a uctivou. +tradeChat.rules=Můžete komunikovat se svým obchodním partnerem a vyřešit případné problémy s tímto obchodem.\nOdpovídat v chatu není povinné.\nPokud obchodník poruší některé z níže uvedených pravidel, zahajte spor a nahlaste jej mediátorovi nebo rozhodci.\n\nPravidla chatu:\n\t● Neposílejte žádné odkazy (riziko malwaru). Můžete odeslat ID transakce a jméno block exploreru.\n\t● Neposílejte seed slova, soukromé klíče, hesla nebo jiné citlivé informace!\n\t● Nepodporujte obchodování mimo Haveno (bez zabezpečení).\n\t● Nezapojujte se do žádných forem podvodů v oblasti sociálního inženýrství.\n\t● Pokud partner nereaguje a dává přednost nekomunikovat prostřednictvím chatu, respektujte jeho rozhodnutí.\n\t● Soustřeďte konverzaci pouze na obchod. Tento chat není náhradou messengeru.\n\t● Udržujte konverzaci přátelskou a uctivou. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Nedefinováno @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=Vrácená kauce portfolio.pending.step5_buyer.withdrawBTC=Vyberte své bitcoiny portfolio.pending.step5_buyer.amount=Částka k výběru portfolio.pending.step5_buyer.withdrawToAddress=Adresa výběru -portfolio.pending.step5_buyer.moveToBisqWallet=Uchovat prostředky v peněžence Bisq +portfolio.pending.step5_buyer.moveToHavenoWallet=Uchovat prostředky v peněžence Haveno portfolio.pending.step5_buyer.withdrawExternal=Vybrat do externí peněženky portfolio.pending.step5_buyer.alreadyWithdrawn=Vaše finanční prostředky již byly vybrány.\nZkontrolujte historii transakcí. portfolio.pending.step5_buyer.confirmWithdrawal=Potvrďte žádost o výběr @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=Přijali jste tradeFeedbackWindow.title=Gratulujeme k dokončení obchodu tradeFeedbackWindow.msg.part1=Rádi bychom od vás slyšeli o vašich zkušenostech. Pomůže nám to vylepšit software a vyhladit všechny nejasnosti. Pokud chcete poskytnout zpětnou vazbu, vyplňte prosím tento krátký dotazník (není nutná registrace) na: -tradeFeedbackWindow.msg.part2=Pokud máte nějaké dotazy nebo máte nějaké problémy, obraťte se prosím na ostatní uživatele a přispěvatele prostřednictvím fóra Bisq na: -tradeFeedbackWindow.msg.part3=Děkujeme, že používáte Bisq! +tradeFeedbackWindow.msg.part2=Pokud máte nějaké dotazy nebo máte nějaké problémy, obraťte se prosím na ostatní uživatele a přispěvatele prostřednictvím fóra Haveno na: +tradeFeedbackWindow.msg.part3=Děkujeme, že používáte Haveno! portfolio.pending.role=Moje role portfolio.pending.tradeInformation=Obchodní informace @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=Po prvním potvrzení na blockchainu začíná portfolio.pending.tradePeriodWarning=Pokud je tato lhůta překročena, mohou oba obchodníci zahájit spor. portfolio.pending.tradeNotCompleted=Obchod nebyl dokončen včas (do {0}) portfolio.pending.tradeProcess=Obchodní proces -portfolio.pending.openAgainDispute.msg=Pokud si nejste jisti, že zpráva pro mediátora nebo rozhodce dorazila (např. Pokud jste nedostali odpověď po 1 dni), neváhejte znovu zahájit spor s Cmd/Ctrl+o. Můžete také požádat o další pomoc na fóru Bisq na adrese [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=Pokud si nejste jisti, že zpráva pro mediátora nebo rozhodce dorazila (např. Pokud jste nedostali odpověď po 1 dni), neváhejte znovu zahájit spor s Cmd/Ctrl+o. Můžete také požádat o další pomoc na fóru Haveno na adrese [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Otevřete spor znovu portfolio.pending.openSupportTicket.headline=Otevřít úkol pro podporu portfolio.pending.openSupportTicket.msg=Použijte tuto funkci pouze v naléhavých případech, pokud nevidíte tlačítko \"Otevřít podporu\" nebo \"Otevřít spor\".\n\nKdyž otevřete dotaz podporu, obchod bude přerušen a zpracován mediátorem nebo rozhodcem. portfolio.pending.timeLockNotOver=Než budete moci zahájit rozhodčí spor, musíte počkat do ≈{0} ({1} dalších bloků). -portfolio.pending.error.depositTxNull=Vkladová operace je nulová. Nemůžete otevřít spor bez platné vkladové transakce. Přejděte do \"Nastavení/Informace o síti\" a proveďte resynchronizaci SPV.\n\nPro další pomoc prosím kontaktujte podpůrný kanál v Bisq Keybase týmu. +portfolio.pending.error.depositTxNull=Vkladová operace je nulová. Nemůžete otevřít spor bez platné vkladové transakce. Přejděte do \"Nastavení/Informace o síti\" a proveďte resynchronizaci SPV.\n\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu. portfolio.pending.mediationResult.error.depositTxNull=Vkladová transakce je nulová. Obchod můžete přesunout do neúspěšných obchodů. portfolio.pending.mediationResult.error.delayedPayoutTxNull=Odložená výplatní transakce je nulová. Obchod můžete přesunout do neúspěšných obchodů. -portfolio.pending.error.depositTxNotConfirmed=Vkladová transakce není potvrzena. Nemůžete zahájit rozhodčí spor s nepotvrzenou vkladovou transakcí. Počkejte prosím, až bude potvrzena, nebo přejděte do \"Nastavení/Informace o síti\" a proveďte resynchronizaci SPV.\n\nPro další pomoc prosím kontaktujte podpůrný kanál v Bisq Keybase týmu. +portfolio.pending.error.depositTxNotConfirmed=Vkladová transakce není potvrzena. Nemůžete zahájit rozhodčí spor s nepotvrzenou vkladovou transakcí. Počkejte prosím, až bude potvrzena, nebo přejděte do \"Nastavení/Informace o síti\" a proveďte resynchronizaci SPV.\n\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu. portfolio.pending.support.headline.getHelp=Potřebujete pomoc? -portfolio.pending.support.text.getHelp=Pokud máte nějaké problémy, můžete zkusit kontaktovat obchodníka v obchodním chatu nebo požádat komunitu Bisq na adrese https://bisq.community. Pokud váš problém stále není vyřešen, můžete požádat mediátora o další pomoc. +portfolio.pending.support.text.getHelp=Pokud máte nějaké problémy, můžete zkusit kontaktovat obchodníka v obchodním chatu nebo požádat komunitu Haveno na adrese https://haveno.community. Pokud váš problém stále není vyřešen, můžete požádat mediátora o další pomoc. portfolio.pending.support.button.getHelp=Otevřít obchodní chat portfolio.pending.support.headline.halfPeriodOver=Zkontrolujte platbu portfolio.pending.support.headline.periodOver=Obchodní období skončilo @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=Chybí poplatek příjemce portfolio.pending.failedTrade.missingDepositTx=Vkladová transakce (transakce 2-of-2 multisig) chybí.\n\nBez tohoto tx nelze obchod dokončit. Nebyly uzamčeny žádné prostředky, ale byl zaplacen váš obchodní poplatek. Zde můžete požádat o vrácení obchodního poplatku: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nKlidně můžete přesunout tento obchod do neúspěšných obchodů. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=Odložená výplatní transakce chybí, ale prostředky byly uzamčeny v vkladové transakci.\n\nNezasílejte prosím fiat nebo altcoin platbu prodejci BTC, protože bez odložené platby tx nelze zahájit arbitráž. Místo toho otevřete mediační úkol pomocí Cmd/Ctrl+o. Mediátor by měl navrhnout, aby oba partneři dostali zpět celou částku svých bezpečnostních vkladů (přičemž prodejce také obdrží plnou částku obchodu). Tímto způsobem nehrozí žádné bezpečnostní riziko a jsou ztraceny pouze obchodní poplatky.\n\nO vrácení ztracených obchodních poplatků můžete požádat zde: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=Odložená výplatní transakce chybí, ale prostředky byly v depozitní transakci uzamčeny.\n\nPokud kupujícímu chybí také odložená výplatní transakce, bude poučen, aby platbu NEPOSLAL a místo toho otevřel mediační úkol. Měli byste také otevřít mediační úkol pomocí Cmd/Ctrl+o.\n\nPokud kupující ještě neposlal platbu, měl by zprostředkovatel navrhnout, aby oba partneři dostali zpět celou částku svých bezpečnostních vkladů (přičemž prodejce také obdrží plnou částku obchodu). Jinak by částka obchodu měla jít kupujícímu.\n\nO vrácení ztracených obchodních poplatků můžete požádat zde: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=Během provádění obchodního protokolu došlo k chybě.\n\nChyba: {0}\n\nJe možné, že tato chyba není kritická a obchod lze dokončit normálně. Pokud si nejste jisti, otevřete si mediační úkol a získejte radu od mediátorů Bisq.\n\nPokud byla chyba kritická a obchod nelze dokončit, možná jste ztratili obchodní poplatek. O vrácení ztracených obchodních poplatků požádejte zde: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=Během provádění obchodního protokolu došlo k chybě.\n\nChyba: {0}\n\nJe možné, že tato chyba není kritická a obchod lze dokončit normálně. Pokud si nejste jisti, otevřete si mediační úkol a získejte radu od mediátorů Haveno.\n\nPokud byla chyba kritická a obchod nelze dokončit, možná jste ztratili obchodní poplatek. O vrácení ztracených obchodních poplatků požádejte zde: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=Obchodní kontrakt není stanoven.\n\nObchod nelze dokončit a možná jste ztratili poplatek za obchodování. Pokud ano, můžete požádat o vrácení ztracených obchodních poplatků zde: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=Obchodní protokol narazil na některé problémy.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=Obchodní protokol narazil na vážný problém.\n\n{0}\n\nChcete obchod přesunout do neúspěšných obchodů?\n\nZ obrazovky neúspěšných obchodů nemůžete otevřít mediaci nebo arbitráž, ale můžete kdykoli přesunout neúspěšný obchod zpět na obrazovku otevřených obchodů. @@ -828,7 +828,7 @@ funds.tab.transactions=Transakce funds.deposit.unused=Nepoužito funds.deposit.usedInTx=Používá se v {0} transakcích -funds.deposit.fundHavenoWallet=Financovat Bisq peněženku +funds.deposit.fundHavenoWallet=Financovat Haveno peněženku funds.deposit.noAddresses=Dosud nebyly vygenerovány žádné adresy pro vklad funds.deposit.fundWallet=Financujte svou peněženku funds.deposit.withdrawFromWallet=Pošlete peníze z peněženky @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=Výběr z peněženky funds.tx.memo=Poznámka funds.tx.noTxAvailable=Není k dispozici žádná transakce funds.tx.revert=Vrátit -funds.tx.txSent=Transakce byla úspěšně odeslána na novou adresu v lokální peněžence Bisq. +funds.tx.txSent=Transakce byla úspěšně odeslána na novou adresu v lokální peněžence Haveno. funds.tx.direction.self=Posláno sobě funds.tx.dustAttackTx=Přijaté drobné -funds.tx.dustAttackTx.popup=Tato transakce odesílá do vaší peněženky velmi malou částku BTC a může se jednat o pokus společností provádějících analýzu blockchainu o špehování vaší peněženky.\n\nPoužijete-li tento transakční výstup ve výdajové transakci, zjistí, že jste pravděpodobně také vlastníkem jiné adresy (sloučení mincí).\n\nKvůli ochraně vašeho soukromí ignoruje peněženka Bisq takové drobné výstupy pro účely utrácení a na obrazovce zůstatku. Můžete nastavit hodnotu "drobnosti", kdy je výstup považován za drobné, v nastavení. +funds.tx.dustAttackTx.popup=Tato transakce odesílá do vaší peněženky velmi malou částku BTC a může se jednat o pokus společností provádějících analýzu blockchainu o špehování vaší peněženky.\n\nPoužijete-li tento transakční výstup ve výdajové transakci, zjistí, že jste pravděpodobně také vlastníkem jiné adresy (sloučení mincí).\n\nKvůli ochraně vašeho soukromí ignoruje peněženka Haveno takové drobné výstupy pro účely utrácení a na obrazovce zůstatku. Můžete nastavit hodnotu "drobnosti", kdy je výstup považován za drobné, v nastavení. #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=Odesílání zprávy... support.receiverNotOnline=Příjemce není online. Zpráva je uložena v jejich schránce. support.sendMessageError=Odeslání zprávy se nezdařilo. Chyba: {0} support.receiverNotKnown=Příjemce není znám -support.wrongVersion=Nabídka v tomto sporu byla vytvořena se starší verzí Bisq.\nTento spor nemůžete ukončit s touto verzí aplikace.\n\nPoužijte prosím starší verzi s verzí protokolu {0} +support.wrongVersion=Nabídka v tomto sporu byla vytvořena se starší verzí Haveno.\nTento spor nemůžete ukončit s touto verzí aplikace.\n\nPoužijte prosím starší verzi s verzí protokolu {0} support.openFile=Otevřete soubor, který chcete připojit (maximální velikost souboru: {0} kb) support.attachmentTooLarge=Celková velikost vašich příloh je {0} kb a překračuje maximální povolenou velikost zprávy {1} kB. support.maxSize=Max. povolená velikost souboru je {0} kB. @@ -953,15 +953,15 @@ support.sellerMaker=Prodejce BTC/Tvůrce support.buyerTaker=Kupující BTC/Příjemce support.sellerTaker=Prodávající BTC/Příjemce -support.backgroundInfo=Bisq není společnost, takže spory řeší jinak.\n\nObchodníci mohou v rámci aplikace komunikovat prostřednictvím zabezpečeného chatu na obrazovce otevřených obchodů a zkusit řešení sporů sami. Pokud to nestačí, může jim pomoci mediátor. Mediátor vyhodnotí situaci a navrhne vyúčtování obchodních prostředků. Pokud oba obchodníci přijmou tento návrh, je výplata dokončena a obchod je uzavřen. Pokud jeden nebo oba obchodníci nesouhlasí s výplatou navrhovanou mediátorem, mohou požádat o rozhodčí řízení. Rozhodce přehodnotí situaci a v odůvodněných případech vrátí osobně prostředky obchodníkovi zpět a požádá o vrácení této platby od Bisq DAO. -support.initialInfo=Do níže uvedeného textového pole zadejte popis problému. Přidejte co nejvíce informací k urychlení doby řešení sporu.\n\nZde je kontrolní seznam informací, které byste měli poskytnout:\n\t● Pokud kupujete BTC: Provedli jste převod Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba zahájena“?\n\t● Pokud jste prodejcem BTC: Obdrželi jste platbu Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba přijata“?\n\t● Kterou verzi Bisq používáte?\n\t● Jaký operační systém používáte?\n\t● Pokud se vyskytl problém s neúspěšnými transakcemi, zvažte přechod na nový datový adresář.\n\t Někdy dojde k poškození datového adresáře a vede to k podivným chybám.\n\t  Viz: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nSeznamte se prosím se základními pravidly procesu sporu:\n\t● Musíte odpovědět na požadavky {0} do 2 dnů.\n\t● Mediátoři reagují do 2 dnů. Rozhodci odpoví do 5 pracovních dnů.\n\t● Maximální doba sporu je 14 dní.\n\t● Musíte spolupracovat s {1} a poskytnout informace, které požaduje, aby jste vyřešili váš případ.\n\t● Při prvním spuštění aplikace jste přijali pravidla uvedena v dokumentu sporu v uživatelské smlouvě.\n\nDalší informace o procesu sporu naleznete na: {2} +support.backgroundInfo=Haveno není společnost, takže spory řeší jinak.\n\nObchodníci mohou v rámci aplikace komunikovat prostřednictvím zabezpečeného chatu na obrazovce otevřených obchodů a zkusit řešení sporů sami. Pokud to nestačí, může jim pomoci mediátor. Mediátor vyhodnotí situaci a navrhne vyúčtování obchodních prostředků. Pokud oba obchodníci přijmou tento návrh, je výplata dokončena a obchod je uzavřen. Pokud jeden nebo oba obchodníci nesouhlasí s výplatou navrhovanou mediátorem, mohou požádat o rozhodčí řízení. Rozhodce přehodnotí situaci a v odůvodněných případech vrátí osobně prostředky obchodníkovi zpět a požádá o vrácení této platby od Haveno DAO. +support.initialInfo=Do níže uvedeného textového pole zadejte popis problému. Přidejte co nejvíce informací k urychlení doby řešení sporu.\n\nZde je kontrolní seznam informací, které byste měli poskytnout:\n\t● Pokud kupujete BTC: Provedli jste převod Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba zahájena“?\n\t● Pokud jste prodejcem BTC: Obdrželi jste platbu Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba přijata“?\n\t● Kterou verzi Haveno používáte?\n\t● Jaký operační systém používáte?\n\t● Pokud se vyskytl problém s neúspěšnými transakcemi, zvažte přechod na nový datový adresář.\n\t Někdy dojde k poškození datového adresáře a vede to k podivným chybám.\n\t  Viz: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nSeznamte se prosím se základními pravidly procesu sporu:\n\t● Musíte odpovědět na požadavky {0} do 2 dnů.\n\t● Mediátoři reagují do 2 dnů. Rozhodci odpoví do 5 pracovních dnů.\n\t● Maximální doba sporu je 14 dní.\n\t● Musíte spolupracovat s {1} a poskytnout informace, které požaduje, aby jste vyřešili váš případ.\n\t● Při prvním spuštění aplikace jste přijali pravidla uvedena v dokumentu sporu v uživatelské smlouvě.\n\nDalší informace o procesu sporu naleznete na: {2} support.systemMsg=Systémová zpráva: {0} -support.youOpenedTicket=Otevřeli jste žádost o podporu.\n\n{0}\n\nVerze Bisq: {1} -support.youOpenedDispute=Otevřeli jste žádost o spor.\n\n{0}\n\nVerze Bisq: {1} -support.youOpenedDisputeForMediation=Vyžádali jste si mediaci.\n\n{0}\n\nBisq verze {1} -support.peerOpenedTicket=Váš obchodní partner požádal o podporu kvůli technickým problémům.\n\n{0}\n\nBisq verze: {1} -support.peerOpenedDispute=Váš obchodní partner požádal o spor.\n\n{0}\n\nBisq verze: {1} -support.peerOpenedDisputeForMediation=Váš obchodní partner požádal o mediaci.\n\n{0}\n\nBisq verze: {1} +support.youOpenedTicket=Otevřeli jste žádost o podporu.\n\n{0}\n\nVerze Haveno: {1} +support.youOpenedDispute=Otevřeli jste žádost o spor.\n\n{0}\n\nVerze Haveno: {1} +support.youOpenedDisputeForMediation=Vyžádali jste si mediaci.\n\n{0}\n\nHaveno verze {1} +support.peerOpenedTicket=Váš obchodní partner požádal o podporu kvůli technickým problémům.\n\n{0}\n\nHaveno verze: {1} +support.peerOpenedDispute=Váš obchodní partner požádal o spor.\n\n{0}\n\nHaveno verze: {1} +support.peerOpenedDisputeForMediation=Váš obchodní partner požádal o mediaci.\n\n{0}\n\nHaveno verze: {1} support.mediatorsDisputeSummary=Systémová zpráva: Shrnutí sporu mediátora:\n{0} support.mediatorsAddress=Adresa uzlu mediátora: {0} support.warning.disputesWithInvalidDonationAddress=Odložená výplatní transakce použila neplatnou adresu příjemce. Neshoduje se s žádnou z hodnot parametrů DAO pro platné dárcovské adresy.\n\nMůže to být pokus o podvod. Informujte prosím vývojáře o tomto incidentu a neuzavírejte tento případ, dokud nebude situace vyřešena!\n\nAdresa použitá ve sporu: {0}\n\nVšechny parametry pro darovací adresy DAO: {1}\n\nObchodní ID: {2} {3} @@ -975,7 +975,7 @@ support.info.disputeReOpened=Spor byl znovuotevřen. #################################################################### settings.tab.preferences=Preference settings.tab.network=Informace o síti -settings.tab.about=O Bisq +settings.tab.about=O Haveno setting.preferences.general=Základní nastavení setting.preferences.explorer=Bitcoin Explorer @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=Transakční URL settings.preferences.editCustomExplorer.addressUrl=Adresa URL settings.net.btcHeader=Bitcoinová síť -settings.net.p2pHeader=Síť Bisq +settings.net.p2pHeader=Síť Haveno settings.net.onionAddressLabel=Moje onion adresa settings.net.btcNodesLabel=Použijte vlastní Bitcoin Core node settings.net.bitcoinPeersLabel=Připojené peer uzly @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=Bitcoin Core nody, pro připojení settings.net.useProvidedNodesRadio=Použijte nabízené Bitcoin Core nody settings.net.usePublicNodesRadio=Použít veřejnou Bitcoinovou síť settings.net.useCustomNodesRadio=Použijte vlastní Bitcoin Core node -settings.net.warn.usePublicNodes=Používáte-li veřejnou bitcoinovou síť, jste vystaveni závažnému problému s ochranou soukromí způsobenému porušením návrhu a implementace bloom filtru, který se používá pro peněženky SPV, jako je BitcoinJ (použitý v Bisq). Každý full node, ke kterému jste připojeni, mohl zjistit, že všechny vaše adresy peněženky patří jedné entitě.\n\nPřečtěte si více o podrobnostech na adrese: [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nOpravdu chcete použít veřejné nody? +settings.net.warn.usePublicNodes=Používáte-li veřejnou bitcoinovou síť, jste vystaveni závažnému problému s ochranou soukromí způsobenému porušením návrhu a implementace bloom filtru, který se používá pro peněženky SPV, jako je BitcoinJ (použitý v Haveno). Každý full node, ke kterému jste připojeni, mohl zjistit, že všechny vaše adresy peněženky patří jedné entitě.\n\nPřečtěte si více o podrobnostech na adrese: [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nOpravdu chcete použít veřejné nody? settings.net.warn.usePublicNodes.useProvided=Ne, použijte nabízené nody settings.net.warn.usePublicNodes.usePublic=Ano, použít veřejnou síť settings.net.warn.useCustomNodes.B2XWarning=Ujistěte se, že váš bitcoinový node je důvěryhodný Bitcoin Core node!\n\nPřipojení k nodům, které nedodržují pravidla konsensu Bitcoin Core, může poškodit vaši peněženku a způsobit problémy v obchodním procesu.\n\nUživatelé, kteří se připojují k nodům, které porušují pravidla konsensu, odpovídají za případné škody, které z toho vyplývají. Jakékoli výsledné spory budou rozhodnuty ve prospěch druhého obchodníka. Uživatelům, kteří ignorují tyto varovné a ochranné mechanismy, nebude poskytována technická podpora! settings.net.warn.invalidBtcConfig=Připojení k bitcoinové síti selhalo, protože je vaše konfigurace neplatná.\n\nVaše konfigurace byla resetována, aby se místo toho použily poskytnuté bitcoinové uzly. Budete muset restartovat aplikaci. -settings.net.localhostBtcNodeInfo=Základní informace: Bisq při spuštění hledá místní Bitcoinový uzel. Pokud je nalezen, Bisq bude komunikovat se sítí Bitcoin výhradně skrze něj. +settings.net.localhostBtcNodeInfo=Základní informace: Haveno při spuštění hledá místní Bitcoinový uzel. Pokud je nalezen, Haveno bude komunikovat se sítí Bitcoin výhradně skrze něj. settings.net.p2PPeersLabel=Připojené uzly settings.net.onionAddressColumn=Onion adresa settings.net.creationDateColumn=Založeno @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Opravdu chcete provést synchronizaci SPV? Pokud b settings.net.reSyncSPVAfterRestart=Soubor řetězu SPV byl odstraněn. Prosím, buďte trpěliví. Resynchronizace se sítí může chvíli trvat. settings.net.reSyncSPVAfterRestartCompleted=Resynchronizace je nyní dokončena. Restartujte aplikaci. settings.net.reSyncSPVFailed=Nelze odstranit soubor řetězce SPV.\nChyba: {0} -setting.about.aboutBisq=O projektu Bisq -setting.about.about=Bisq je software s otevřeným zdrojovým kódem, který usnadňuje směnu bitcoinů s národními měnami (a jinými kryptoměnami) prostřednictvím decentralizované sítě typu peer-to-peer způsobem, který silně chrání soukromí uživatelů. Zjistěte více o Bisq na naší webové stránce projektu. -setting.about.web=Webová stránka Bisq +setting.about.aboutHaveno=O projektu Haveno +setting.about.about=Haveno je software s otevřeným zdrojovým kódem, který usnadňuje směnu bitcoinů s národními měnami (a jinými kryptoměnami) prostřednictvím decentralizované sítě typu peer-to-peer způsobem, který silně chrání soukromí uživatelů. Zjistěte více o Haveno na naší webové stránce projektu. +setting.about.web=Webová stránka Haveno setting.about.code=Zdrojový kód setting.about.agpl=AGPL Licence -setting.about.support=Podpořte Bisq -setting.about.def=Bisq není společnost - je to projekt otevřený komunitě. Pokud se chcete zapojit nebo podpořit Bisq, postupujte podle níže uvedených odkazů. +setting.about.support=Podpořte Haveno +setting.about.def=Haveno není společnost - je to projekt otevřený komunitě. Pokud se chcete zapojit nebo podpořit Haveno, postupujte podle níže uvedených odkazů. setting.about.contribute=Přispět setting.about.providers=Poskytovatelé dat -setting.about.apisWithFee=Bisq používá Bisq cenový index pro tržní ceny Fiat měn a Altcoinu a Bisq Mempool Nodes pro odhad poplatků za těžbu. -setting.about.apis=Bisq používá Bisq cenové indexy pro tržní ceny Fiat měn a Altcoinů. +setting.about.apisWithFee=Haveno používá Haveno cenový index pro tržní ceny Fiat měn a Altcoinu a Haveno Mempool Nodes pro odhad poplatků za těžbu. +setting.about.apis=Haveno používá Haveno cenové indexy pro tržní ceny Fiat měn a Altcoinů. setting.about.pricesProvided=Tržní ceny poskytované setting.about.feeEstimation.label=Odhad poplatků za těžbu poskytl setting.about.versionDetails=Podrobnosti o verzi @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' nebo ''alt + {0}'' nebo '' setting.about.shortcuts.menuNav=Procházet hlavní nabídku setting.about.shortcuts.menuNav.value=Pro pohyb v hlavním menu stiskněte: 'Ctrl' nebo 'alt' nebo 'cmd' s numerickou klávesou mezi '1-9' -setting.about.shortcuts.close=Zavřít Bisq +setting.about.shortcuts.close=Zavřít Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' nebo ''cmd + {0}'' nebo ''Ctrl + {1}'' nebo ''cmd + {1}'' setting.about.shortcuts.closePopup=Zavřete vyskakovací nebo dialogové okno @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Odeslat soukromé oznámení par setting.about.shortcuts.sendPrivateNotification.value=Otevřete informace o uživateli kliknutím na avatar a stiskněte: {0} setting.info.headline=Nová funkce automatického potvrzení XMR -setting.info.msg=Při prodeji BTC za XMR můžete pomocí funkce automatického potvrzení ověřit, že do vaší peněženky bylo odesláno správné množství XMR, takže Bisq může automaticky označit obchod jako dokončený, což zrychlí obchodování pro všechny.\n\nAutomatické potvrzení zkontroluje transakci XMR alespoň na 2 uzlech průzkumníka XMR pomocí klíče soukromé transakce poskytnutého odesílatelem XMR. Ve výchozím nastavení používá Bisq uzly průzkumníka spuštěné přispěvateli Bisq, ale pro maximální soukromí a zabezpečení doporučujeme spustit vlastní uzel průzkumníka XMR.\n\nMůžete také nastavit maximální částku BTC na obchod, která se má automaticky potvrdit, a také počet požadovaných potvrzení zde v Nastavení.\n\nZobrazit další podrobnosti (včetně toho, jak nastavit vlastní uzel průzkumníka) na Bisq wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=Při prodeji BTC za XMR můžete pomocí funkce automatického potvrzení ověřit, že do vaší peněženky bylo odesláno správné množství XMR, takže Haveno může automaticky označit obchod jako dokončený, což zrychlí obchodování pro všechny.\n\nAutomatické potvrzení zkontroluje transakci XMR alespoň na 2 uzlech průzkumníka XMR pomocí klíče soukromé transakce poskytnutého odesílatelem XMR. Ve výchozím nastavení používá Haveno uzly průzkumníka spuštěné přispěvateli Haveno, ale pro maximální soukromí a zabezpečení doporučujeme spustit vlastní uzel průzkumníka XMR.\n\nMůžete také nastavit maximální částku BTC na obchod, která se má automaticky potvrdit, a také počet požadovaných potvrzení zde v Nastavení.\n\nZobrazit další podrobnosti (včetně toho, jak nastavit vlastní uzel průzkumníka) na Haveno wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=Při prodeji BTC za XMR můžete pomocí funkce automatického account.tab.mediatorRegistration=Registrace mediátora account.tab.refundAgentRegistration=Registrace rozhodce pro vrácení peněz account.tab.signing=Podepisování -account.info.headline=Vítejte ve vašem účtu Bisq -account.info.msg=Zde můžete přidat obchodní účty pro národní měny & altcoiny a vytvořit zálohu dat vaší peněženky a účtu.\n\nPři prvním spuštění Bisq byla vytvořena nová bitcoinová peněženka.\n\nDůrazně doporučujeme zapsat si seed slova bitcoinových peněženek (viz záložka nahoře) a před financováním zvážit přidání hesla. Vklady a výběry bitcoinů jsou spravovány v sekci \ "Finance \".\n\nOchrana osobních údajů a zabezpečení: protože Bisq je decentralizovaná směnárna, všechna data jsou uložena ve vašem počítači. Neexistují žádné servery, takže nemáme přístup k vašim osobním informacím, vašim finančním prostředkům ani vaší IP adrese. Údaje, jako jsou čísla bankovních účtů, adresy altcoinů a bitcoinu atd., jsou sdíleny pouze s obchodním partnerem za účelem uskutečnění obchodů, které zahájíte (v případě sporu uvidí Prostředník nebo Rozhodce stejná data jako váš obchodní partner). +account.info.headline=Vítejte ve vašem účtu Haveno +account.info.msg=Zde můžete přidat obchodní účty pro národní měny & altcoiny a vytvořit zálohu dat vaší peněženky a účtu.\n\nPři prvním spuštění Haveno byla vytvořena nová bitcoinová peněženka.\n\nDůrazně doporučujeme zapsat si seed slova bitcoinových peněženek (viz záložka nahoře) a před financováním zvážit přidání hesla. Vklady a výběry bitcoinů jsou spravovány v sekci \ "Finance \".\n\nOchrana osobních údajů a zabezpečení: protože Haveno je decentralizovaná směnárna, všechna data jsou uložena ve vašem počítači. Neexistují žádné servery, takže nemáme přístup k vašim osobním informacím, vašim finančním prostředkům ani vaší IP adrese. Údaje, jako jsou čísla bankovních účtů, adresy altcoinů a bitcoinu atd., jsou sdíleny pouze s obchodním partnerem za účelem uskutečnění obchodů, které zahájíte (v případě sporu uvidí Prostředník nebo Rozhodce stejná data jako váš obchodní partner). account.menu.paymentAccount=Účty v národní měně account.menu.altCoinsAccountView=Altcoinové účty @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=Zde jsou zobrazeny celkové zůstatky v int account.menu.walletInfo.xpub.headLine=Veřejné klíče (xpub) account.menu.walletInfo.walletSelector={0} {1} peněženka account.menu.walletInfo.path.headLine=HD identifikátory klíčů -account.menu.walletInfo.path.info=Pokud importujete vaše seed slova do jiné peněženky (např. Electrum), budete muset nastavit také identifikátor klíčů (BIP32 path). Toto provádějte pouze ve výjimečných případech, např. pokud úplně ztratíte kontrolu nad Bisq peněženkou.\nMějte na paměti, že provádění transakcí pomocí jiných softwarových peněženek může snadno poškodit interní datové struktury systému Bisq, a znemožnit tak provádění obchodů.\n\nNIKDY neposílejte BSQ pomocí jiných softwarových peněženek než Bisq, protože byste tím velmi pravděpodobně vytvořili neplatnou BSQ transakci, a ztratili tak své BSQ. +account.menu.walletInfo.path.info=Pokud importujete vaše seed slova do jiné peněženky (např. Electrum), budete muset nastavit také identifikátor klíčů (BIP32 path). Toto provádějte pouze ve výjimečných případech, např. pokud úplně ztratíte kontrolu nad Haveno peněženkou.\nMějte na paměti, že provádění transakcí pomocí jiných softwarových peněženek může snadno poškodit interní datové struktury systému Haveno, a znemožnit tak provádění obchodů.\n\nNIKDY neposílejte BSQ pomocí jiných softwarových peněženek než Haveno, protože byste tím velmi pravděpodobně vytvořili neplatnou BSQ transakci, a ztratili tak své BSQ. account.menu.walletInfo.openDetails=Zobrazit detailní data peněženky a soukromé klíče @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration=Registrace {0} account.arbitratorRegistration.revoke=Odvolat account.arbitratorRegistration.info.msg=Upozorňujeme, že po odvolání musíte zůstat k dispozici 15 dní, protože mohou existovat obchody, pro které jste {0}. Max. povolené obchodní období je 8 dní a proces řešení sporu může trvat až 7 dní. account.arbitratorRegistration.warn.min1Language=Musíte nastavit alespoň 1 jazyk.\nPřidali jsme vám výchozí jazyk. -account.arbitratorRegistration.removedSuccess=Úspěšně jste odstranili svou registraci ze sítě Bisq. +account.arbitratorRegistration.removedSuccess=Úspěšně jste odstranili svou registraci ze sítě Haveno. account.arbitratorRegistration.removedFailed=Registraci se nepodařilo odebrat. {0} -account.arbitratorRegistration.registerSuccess=Úspěšně jste se zaregistrovali do sítě Bisq. +account.arbitratorRegistration.registerSuccess=Úspěšně jste se zaregistrovali do sítě Haveno. account.arbitratorRegistration.registerFailed=Registraci se nepodařilo dokončit. {0} account.altcoin.yourAltcoinAccounts=Vaše altcoinové účty account.altcoin.popup.wallet.msg=Ujistěte se, že dodržujete požadavky na používání peněženek {0}, jak je popsáno na webové stránce {1}.\nPoužití peněženek z centralizovaných směnáren, kde (a) nevlastníte své soukromé klíče nebo (b) které nepoužívají kompatibilní software peněženky, je riskantní: může to vést ke ztrátě obchodovaných prostředků!\nMediátor nebo rozhodce není specialista {2} a v takových případech nemůže pomoci. account.altcoin.popup.wallet.confirm=Rozumím a potvrzuji, že vím, jakou peněženku musím použít. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Obchodování s UPX na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání UPX musíte použít buď oficiální peněženku GUI uPlexa nebo CLI peněženku uPlexa s povoleným příznakem store-tx-info (výchozí hodnota v nových verzích). Ujistěte se, že máte přístup ke klíči tx, který může být vyžadován v případě sporu.\nuplexa-wallet-cli (použijte příkaz get_tx_key)\nuplexa-wallet-gui (přejděte na záložku historie a pro potvrzení platby klikněte na tlačítko (P))\n\nV normálním block exploreru není přenos ověřitelný.\n\nV případě sporu musíte rozhodci poskytnout následující údaje:\n- Soukromý klíč tx\n- Hash transakce\n- Veřejnou adresa příjemce\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke prohrání sporu. Odesílatel UPX odpovídá za zajištění ověření přenosu UPX rozhodci v případě sporu.\n\nNení požadováno žádné platební ID, pouze normální veřejná adresa.\nPokud si nejste jisti tímto procesem, vyhledejte další informace na discord kanálu uPlexa (https://discord.gg/vhdNSrV) nebo uPlexa Telegram Chatu (https://t.me/uplexaOfficial). +account.altcoin.popup.upx.msg=Obchodování s UPX na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání UPX musíte použít buď oficiální peněženku GUI uPlexa nebo CLI peněženku uPlexa s povoleným příznakem store-tx-info (výchozí hodnota v nových verzích). Ujistěte se, že máte přístup ke klíči tx, který může být vyžadován v případě sporu.\nuplexa-wallet-cli (použijte příkaz get_tx_key)\nuplexa-wallet-gui (přejděte na záložku historie a pro potvrzení platby klikněte na tlačítko (P))\n\nV normálním block exploreru není přenos ověřitelný.\n\nV případě sporu musíte rozhodci poskytnout následující údaje:\n- Soukromý klíč tx\n- Hash transakce\n- Veřejnou adresa příjemce\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke prohrání sporu. Odesílatel UPX odpovídá za zajištění ověření přenosu UPX rozhodci v případě sporu.\n\nNení požadováno žádné platební ID, pouze normální veřejná adresa.\nPokud si nejste jisti tímto procesem, vyhledejte další informace na discord kanálu uPlexa (https://discord.gg/vhdNSrV) nebo uPlexa Telegram Chatu (https://t.me/uplexaOfficial). # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Obchodování ARQ na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání ARQ musíte použít buď oficiální peněženku ArQmA GUI nebo peněženku ArQmA CLI s povoleným příznakem store-tx-info (výchozí hodnota v nových verzích). Ujistěte se, že máte přístup ke klíči tx, který může být vyžadován v případě sporu.\narqma-wallet-cli (použijte příkaz get_tx_key)\narqma-wallet-gui (přejděte na kartu historie a pro potvrzení platby klikněte na tlačítko (P))\n\nV normálním blok exploreru není přenos ověřitelný.\n\nV případě sporu musíte mediátorovi nebo rozhodci poskytnout následující údaje:\n- Soukromý klíč tx\n- Hash transakce\n- Veřejnou adresu příjemce\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke prohrání sporu. Odesílatel ARQ odpovídá za zajištění ověření převodu ARQ mediátorovi nebo rozhodci v případě sporu.\n\nNení požadováno žádné platební ID, pouze normální veřejná adresa.\nPokud si nejste jisti tímto procesem, navštivte discord kanál ArQmA (https://discord.gg/s9BQpJT) nebo fórum ArQmA (https://labs.arqma.com). +account.altcoin.popup.arq.msg=Obchodování ARQ na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání ARQ musíte použít buď oficiální peněženku ArQmA GUI nebo peněženku ArQmA CLI s povoleným příznakem store-tx-info (výchozí hodnota v nových verzích). Ujistěte se, že máte přístup ke klíči tx, který může být vyžadován v případě sporu.\narqma-wallet-cli (použijte příkaz get_tx_key)\narqma-wallet-gui (přejděte na kartu historie a pro potvrzení platby klikněte na tlačítko (P))\n\nV normálním blok exploreru není přenos ověřitelný.\n\nV případě sporu musíte mediátorovi nebo rozhodci poskytnout následující údaje:\n- Soukromý klíč tx\n- Hash transakce\n- Veřejnou adresu příjemce\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke prohrání sporu. Odesílatel ARQ odpovídá za zajištění ověření převodu ARQ mediátorovi nebo rozhodci v případě sporu.\n\nNení požadováno žádné platební ID, pouze normální veřejná adresa.\nPokud si nejste jisti tímto procesem, navštivte discord kanál ArQmA (https://discord.gg/s9BQpJT) nebo fórum ArQmA (https://labs.arqma.com). # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Obchodování s XMR na Bisq vyžaduje, abyste pochopili následující požadavek.\n\nPokud prodáváte XMR, musíte být schopni v případě sporu poskytnout mediátorovi nebo rozhodci následující informace:\n- transakční klíč (Tx klíč, Tx tajný klíč nebo Tx soukromý klíč)\n- ID transakce (Tx ID nebo Tx Hash)\n- cílová adresa (adresa příjemce)\n\nNa wiki najdete podrobnosti, kde najdete tyto informace v populárních peněženkách Monero:\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\n\nNeposkytnutí požadovaných údajů o transakci bude mít za následek ztrátu sporů.\n\nVšimněte si také, že Bisq nyní nabízí automatické potvrzení transakcí XMR, aby byly obchody rychlejší, ale musíte to povolit v Nastavení.\n\nDalší informace o funkci automatického potvrzení najdete na wiki:\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Obchodování s XMR na Haveno vyžaduje, abyste pochopili následující požadavek.\n\nPokud prodáváte XMR, musíte být schopni v případě sporu poskytnout mediátorovi nebo rozhodci následující informace:\n- transakční klíč (Tx klíč, Tx tajný klíč nebo Tx soukromý klíč)\n- ID transakce (Tx ID nebo Tx Hash)\n- cílová adresa (adresa příjemce)\n\nNa wiki najdete podrobnosti, kde najdete tyto informace v populárních peněženkách Monero:\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\n\nNeposkytnutí požadovaných údajů o transakci bude mít za následek ztrátu sporů.\n\nVšimněte si také, že Haveno nyní nabízí automatické potvrzení transakcí XMR, aby byly obchody rychlejší, ale musíte to povolit v Nastavení.\n\nDalší informace o funkci automatického potvrzení najdete na wiki:\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Obchodování MSR na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání MSR musíte použít buď oficiální peněženku Masari GUI, peněženku Masari CLI s povoleným příznakem store-tx-info (ve výchozím nastavení povoleno) nebo webovou peněženku Masari (https://wallet.getmasari.org). Ujistěte se, že máte přístup ke klíči tx, který může být vyžadován v případě sporu.\nmasari-wallet-cli (použijte příkaz get_tx_key)\nmasari-wallet-gui (přejděte na kartu historie a klikněte na tlačítko (P) pro potvrzení platby)\n\nWebová peněženka Masari (jděte do Účet -> Historie transakcí a zobrazte podrobností o odeslané transakci)\n\nOvěření lze provést v peněžence.\nmasari-wallet-cli: pomocí příkazu (check_tx_key).\nmasari-wallet-gui: na stránce Pokročilé > Dokázat/Ověřit.\nOvěření lze provést v block exploreru\nOtevřete Block explorer (https://explorer.getmasari.org), použijte vyhledávací lištu k nalezení hash transakce.\nJakmile je transakce nalezena, přejděte dolů do oblasti „Prokázat odesílání“ a podle potřeby vyplňte podrobnosti.\nV případě sporu musíte zprostředkovateli nebo rozhodci poskytnout následující údaje:\n- Soukromý klíč tx\n- Hash transakce\n- Veřejnou adresu příjemce\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke ztrátě sporu. Odesílatel MSR odpovídá za zajištění ověření přenosu MSR mediátorovi nebo rozhodci v případě sporu.\n\nNení požadováno žádné platební ID, pouze normální veřejná adresa.\nPokud si nejste jisti tímto procesem, požádejte o pomoc oficiální Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Obchodování MSR na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání MSR musíte použít buď oficiální peněženku Masari GUI, peněženku Masari CLI s povoleným příznakem store-tx-info (ve výchozím nastavení povoleno) nebo webovou peněženku Masari (https://wallet.getmasari.org). Ujistěte se, že máte přístup ke klíči tx, který může být vyžadován v případě sporu.\nmasari-wallet-cli (použijte příkaz get_tx_key)\nmasari-wallet-gui (přejděte na kartu historie a klikněte na tlačítko (P) pro potvrzení platby)\n\nWebová peněženka Masari (jděte do Účet -> Historie transakcí a zobrazte podrobností o odeslané transakci)\n\nOvěření lze provést v peněžence.\nmasari-wallet-cli: pomocí příkazu (check_tx_key).\nmasari-wallet-gui: na stránce Pokročilé > Dokázat/Ověřit.\nOvěření lze provést v block exploreru\nOtevřete Block explorer (https://explorer.getmasari.org), použijte vyhledávací lištu k nalezení hash transakce.\nJakmile je transakce nalezena, přejděte dolů do oblasti „Prokázat odesílání“ a podle potřeby vyplňte podrobnosti.\nV případě sporu musíte zprostředkovateli nebo rozhodci poskytnout následující údaje:\n- Soukromý klíč tx\n- Hash transakce\n- Veřejnou adresu příjemce\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke ztrátě sporu. Odesílatel MSR odpovídá za zajištění ověření přenosu MSR mediátorovi nebo rozhodci v případě sporu.\n\nNení požadováno žádné platební ID, pouze normální veřejná adresa.\nPokud si nejste jisti tímto procesem, požádejte o pomoc oficiální Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Obchodování BLUR na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání BLUR musíte použít Blur Network CLI nebo GUI peněženku.\n\nPoužíváte-li peněženku CLI, po odeslání transakce se zobrazí hash transakce (tx ID). Tyto informace si musíte uložit. Ihned po odeslání transakce musíte použít příkaz 'get_tx_key' pro načtení soukromého klíče transakce. Pokud tento krok neprovedete, pravděpodobně nebudete moci klíč získat později.\n\nPokud používáte peněženku GUI Blur Network, lze soukromý klíč transakce a ID transakce pohodlně nalézt na kartě Historie. Ihned po odeslání vyhledejte příslušnou transakci. Klikněte na "?" symbol v pravém dolním rohu pole obsahující transakci. Tyto informace si musíte uložit.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1.) ID transakce, 2.) soukromý klíč transakce a 3.) Adresu příjemce. Mediátor nebo rozhodce poté ověří přenos BLUR pomocí prohlížeče BLUR transakcí (https://blur.cash/#tx-viewer).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel BLUR 100% odpovědnosti za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Bisq. Nejprve vyhledejte pomoc na Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Obchodování BLUR na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání BLUR musíte použít Blur Network CLI nebo GUI peněženku.\n\nPoužíváte-li peněženku CLI, po odeslání transakce se zobrazí hash transakce (tx ID). Tyto informace si musíte uložit. Ihned po odeslání transakce musíte použít příkaz 'get_tx_key' pro načtení soukromého klíče transakce. Pokud tento krok neprovedete, pravděpodobně nebudete moci klíč získat později.\n\nPokud používáte peněženku GUI Blur Network, lze soukromý klíč transakce a ID transakce pohodlně nalézt na kartě Historie. Ihned po odeslání vyhledejte příslušnou transakci. Klikněte na "?" symbol v pravém dolním rohu pole obsahující transakci. Tyto informace si musíte uložit.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1.) ID transakce, 2.) soukromý klíč transakce a 3.) Adresu příjemce. Mediátor nebo rozhodce poté ověří přenos BLUR pomocí prohlížeče BLUR transakcí (https://blur.cash/#tx-viewer).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel BLUR 100% odpovědnosti za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Haveno. Nejprve vyhledejte pomoc na Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Obchodování Solo na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání Solo musíte použít peněženku CLI Solo Network.\n\nPoužíváte-li peněženku CLI, po odeslání přenosu se zobrazí hash transakce (tx ID). Tyto informace si musíte uložit. Ihned po odeslání převodu musíte použít příkaz 'get_tx_key' pro načtení soukromého klíče transakce. Pokud tento krok neprovedete, pravděpodobně nebudete moci klíč získat později.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1.) ID transakce, 2.) Soukromý klíč transakce a 3.) Adresu příjemce. Mediátor nebo rozhodce poté ověří převod Solo pomocí Solo Block Exploreru vyhledáním transakce a poté pomocí funkce „Prokažte odesílání“ (https://explorer.minesolo.com/).\n\nneposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese Solo odesílatel 100% odpovědnost za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Bisq. Nejprve vyhledejte pomoc na stránce Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Obchodování Solo na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání Solo musíte použít peněženku CLI Solo Network.\n\nPoužíváte-li peněženku CLI, po odeslání přenosu se zobrazí hash transakce (tx ID). Tyto informace si musíte uložit. Ihned po odeslání převodu musíte použít příkaz 'get_tx_key' pro načtení soukromého klíče transakce. Pokud tento krok neprovedete, pravděpodobně nebudete moci klíč získat později.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1.) ID transakce, 2.) Soukromý klíč transakce a 3.) Adresu příjemce. Mediátor nebo rozhodce poté ověří převod Solo pomocí Solo Block Exploreru vyhledáním transakce a poté pomocí funkce „Prokažte odesílání“ (https://explorer.minesolo.com/).\n\nneposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese Solo odesílatel 100% odpovědnost za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Haveno. Nejprve vyhledejte pomoc na stránce Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Obchodování CASH2 na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání CASH2 musíte použít peněženku Cash2 Wallet verze 3 nebo vyšší.\n\nPo odeslání transakce se zobrazí ID transakce. Tyto informace si musíte uložit. Ihned po odeslání transakce musíte použít příkaz 'getTxKey' v simplewallet a získat tajný klíč transakce.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1) ID transakce, 2) Tajný klíč transakce a 3) Adresu Cash2 příjemce. Mediátor nebo rozhodce poté ověří převod CASH2 pomocí průzkumníku Cash2 Block Explorer (https://blocks.cash2.org).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel CASH2 100% odpovědnost za ověření transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Bisq. Nejprve vyhledejte pomoc na Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Obchodování CASH2 na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání CASH2 musíte použít peněženku Cash2 Wallet verze 3 nebo vyšší.\n\nPo odeslání transakce se zobrazí ID transakce. Tyto informace si musíte uložit. Ihned po odeslání transakce musíte použít příkaz 'getTxKey' v simplewallet a získat tajný klíč transakce.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1) ID transakce, 2) Tajný klíč transakce a 3) Adresu Cash2 příjemce. Mediátor nebo rozhodce poté ověří převod CASH2 pomocí průzkumníku Cash2 Block Explorer (https://blocks.cash2.org).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel CASH2 100% odpovědnost za ověření transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Haveno. Nejprve vyhledejte pomoc na Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Obchodování s Qwertycoinem na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání QWC musíte použít oficiální QWC peněženku verze 5.1.3 nebo vyšší.\n\nPo odeslání transakce se zobrazí ID transakce. Tyto informace si musíte uložit. Ihned po odeslání transakce musíte použít příkaz 'get_Tx_Key' v simplewallet a získat tajný klíč transakce.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1) ID transakce, 2) Tajný klíč transakce a 3) Adresu QWC příjemce. Mediátor nebo rozhodce poté ověří přenos QWC pomocí Průzkumníka bloků QWC (https://explorer.qwertycoin.org).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel QWC 100% odpovědnost za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Bisq. Nejprve vyhledejte pomoc na stránce QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Obchodování s Qwertycoinem na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání QWC musíte použít oficiální QWC peněženku verze 5.1.3 nebo vyšší.\n\nPo odeslání transakce se zobrazí ID transakce. Tyto informace si musíte uložit. Ihned po odeslání transakce musíte použít příkaz 'get_Tx_Key' v simplewallet a získat tajný klíč transakce.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit následující: 1) ID transakce, 2) Tajný klíč transakce a 3) Adresu QWC příjemce. Mediátor nebo rozhodce poté ověří přenos QWC pomocí Průzkumníka bloků QWC (https://explorer.qwertycoin.org).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel QWC 100% odpovědnost za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Haveno. Nejprve vyhledejte pomoc na stránce QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Obchodování Dragonglass na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nVzhledem k tomu, že Dragonglass poskytuje soukromí, není transakce na veřejném blockchainu ověřitelná. V případě potřeby můžete svou platbu prokázat pomocí vašeho soukromého klíče TXN.\nSoukromý klíč TXN je jednorázový klíč automaticky generovaný pro každou transakci, ke které lze přistupovat pouze z vaší DRGL peněženky.\nBuď pomocí GUI peněženky DRGL (uvnitř dialogu s podrobnostmi o transakci) nebo pomocí simplewallet CLI Dragonglass (pomocí příkazu "get_tx_key").\n\nVerze DRGL „Oathkeeper“ a vyšší jsou požadovány pro obě možnosti.\n\nV případě sporu musíte mediátorovi nebo rozhodci poskytnout následující údaje:\n- TXN-soukromý klíč\n- Hash transakce\n- Veřejnou adresu příjemce\n\nOvěření platby lze provést pomocí výše uvedených údajů jako vstupů na adrese (http://drgl.info/#check_txn).\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke ztrátě sporu. Odesílatel Dragonglass odpovídá za ověření přenosu DRGL mediátorovi nebo rozhodci v případě sporu. Použití PaymentID není nutné.\n\nPokud si nejste jisti některou částí tohoto procesu, navštivte nápovědu pro Dragonglass na Discord (http://discord.drgl.info). +account.altcoin.popup.drgl.msg=Obchodování Dragonglass na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nVzhledem k tomu, že Dragonglass poskytuje soukromí, není transakce na veřejném blockchainu ověřitelná. V případě potřeby můžete svou platbu prokázat pomocí vašeho soukromého klíče TXN.\nSoukromý klíč TXN je jednorázový klíč automaticky generovaný pro každou transakci, ke které lze přistupovat pouze z vaší DRGL peněženky.\nBuď pomocí GUI peněženky DRGL (uvnitř dialogu s podrobnostmi o transakci) nebo pomocí simplewallet CLI Dragonglass (pomocí příkazu "get_tx_key").\n\nVerze DRGL „Oathkeeper“ a vyšší jsou požadovány pro obě možnosti.\n\nV případě sporu musíte mediátorovi nebo rozhodci poskytnout následující údaje:\n- TXN-soukromý klíč\n- Hash transakce\n- Veřejnou adresu příjemce\n\nOvěření platby lze provést pomocí výše uvedených údajů jako vstupů na adrese (http://drgl.info/#check_txn).\n\nPokud neposkytnete výše uvedená data nebo použijete nekompatibilní peněženku, dojde ke ztrátě sporu. Odesílatel Dragonglass odpovídá za ověření přenosu DRGL mediátorovi nebo rozhodci v případě sporu. Použití PaymentID není nutné.\n\nPokud si nejste jisti některou částí tohoto procesu, navštivte nápovědu pro Dragonglass na Discord (http://discord.drgl.info). # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Při použití Zcash můžete použít pouze transparentní adresy (začínající t), nikoli z-adresy (soukromé), protože mediátor nebo rozhodce by nemohl ověřit transakci pomocí z-adres. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Při použití Zcoinu můžete použít pouze transparentní (sledovatelné) adresy, nikoli nevysledovatelné adresy, protože mediátor nebo rozhodce by nemohl ověřit transakci s nevysledovatelnými adresami v blok exploreru. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN vyžaduje k vytvoření transakce interaktivní proces mezi odesílatelem a příjemcem. Nezapomeňte postupovat podle pokynů z webové stránky projektu GRIN, abyste spolehlivě odeslali a přijali GRIN (příjemce musí být online nebo alespoň online v určitém časovém rozmezí).\n\nBisq podporuje pouze formát URL peněženky Grinbox (Wallet713).\n\nOdesílatel GRIN je povinen prokázat, že GRIN úspěšně odeslal. Pokud peněženka nemůže tento důkaz poskytnout, bude potenciální spor vyřešen ve prospěch příjemce GRIN. Ujistěte se, že používáte nejnovější software Grinbox, který podporuje důkaz transakcí a že chápete proces přenosu a přijímání GRIN a také způsob, jak vytvořit důkaz.\n\nViz https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only pro více informací o nástroji Grinbox proof. +account.altcoin.popup.grin.msg=GRIN vyžaduje k vytvoření transakce interaktivní proces mezi odesílatelem a příjemcem. Nezapomeňte postupovat podle pokynů z webové stránky projektu GRIN, abyste spolehlivě odeslali a přijali GRIN (příjemce musí být online nebo alespoň online v určitém časovém rozmezí).\n\nHaveno podporuje pouze formát URL peněženky Grinbox (Wallet713).\n\nOdesílatel GRIN je povinen prokázat, že GRIN úspěšně odeslal. Pokud peněženka nemůže tento důkaz poskytnout, bude potenciální spor vyřešen ve prospěch příjemce GRIN. Ujistěte se, že používáte nejnovější software Grinbox, který podporuje důkaz transakcí a že chápete proces přenosu a přijímání GRIN a také způsob, jak vytvořit důkaz.\n\nViz https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only pro více informací o nástroji Grinbox proof. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM vyžaduje k vytvoření transakce interaktivní proces mezi odesílatelem a příjemcem.\n\nNezapomeňte postupovat podle pokynů na webové stránce projektu BEAM, abyste spolehlivě odeslali a přijali BEAM (příjemce musí být online nebo alespoň online během určitého časového období).\n\nOdesílatel BEAM je povinen prokázat, že úspěšně odeslali BEAM. Nezapomeňte použít software peněženku, která může takový důkaz předložit. Pokud peněženka nemůže poskytnout důkaz, bude potenciální spor vyřešen ve prospěch příjemce BEAM. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Trading ParsiCoin na Bisq vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání PARS musíte použít oficiální ParsiCoin peněženku verze 3.0.0 nebo vyšší.\n\nV Peněženka GUI (ParsiPay) si můžete zkontrolovat svůj Hash Transakce a Klíč Transakce v sekci Transakce.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit: 1) Hash Transakce, 2) Transakční Klíč a 3) Adresu PARS příjemce. Mediátor nebo rozhodce poté ověří přenos PARS pomocí Block exploreru ParsiCoin (http://explorer.parsicoin.net/#check_payment).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel ParsiCoin 100% odpovědnost za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Bisq. Nejprve vyhledejte pomoc na ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Trading ParsiCoin na Haveno vyžaduje, abyste pochopili a splnili následující požadavky:\n\nK odeslání PARS musíte použít oficiální ParsiCoin peněženku verze 3.0.0 nebo vyšší.\n\nV Peněženka GUI (ParsiPay) si můžete zkontrolovat svůj Hash Transakce a Klíč Transakce v sekci Transakce.\n\nV případě, že je nutné rozhodčí řízení, musíte mediátorovi nebo rozhodci předložit: 1) Hash Transakce, 2) Transakční Klíč a 3) Adresu PARS příjemce. Mediátor nebo rozhodce poté ověří přenos PARS pomocí Block exploreru ParsiCoin (http://explorer.parsicoin.net/#check_payment).\n\nNeposkytnutí požadovaných informací mediátorovi nebo rozhodci povede k prohrání sporu. Ve všech sporných případech nese odesílatel ParsiCoin 100% odpovědnost za ověřování transakcí mediátorovi nebo rozhodci.\n\nPokud těmto požadavkům nerozumíte, neobchodujte na Haveno. Nejprve vyhledejte pomoc na ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=Chcete-li obchodovat s burnt blackcoiny, musíte znát následující:\n\nBurnt blackcoiny jsou nevyčerpatelné. Aby je bylo možné obchodovat na Bisq, musí mít výstupní skripty podobu: OP_RETURN OP_PUSHDATA, následované přidruženými datovými bajty, které po hexadecimálním zakódování tvoří adresy. Například Burnt blackcoiny s adresou 666f6f („foo“ v UTF-8) budou mít následující skript:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nPro vytvoření Burnt blackcoinů lze použít příkaz „burn“ RPC, který je k dispozici v některých peněženkách.\n\nPro možné případy použití se můžete podívat na https://ibo.laboratorium.ee.\n\nVzhledem k tomu, že Burnt blackcoiny jsou nevyčerpatelné, nelze je znovu prodat. „Prodej“ Burnt blackcoinů znamená vypalování běžných blackcoinů (s přidruženými údaji rovnými cílové adrese).\n\nV případě sporu musí prodejce BLK poskytnout hash transakce. +account.altcoin.popup.blk-burnt.msg=Chcete-li obchodovat s burnt blackcoiny, musíte znát následující:\n\nBurnt blackcoiny jsou nevyčerpatelné. Aby je bylo možné obchodovat na Haveno, musí mít výstupní skripty podobu: OP_RETURN OP_PUSHDATA, následované přidruženými datovými bajty, které po hexadecimálním zakódování tvoří adresy. Například Burnt blackcoiny s adresou 666f6f („foo“ v UTF-8) budou mít následující skript:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nPro vytvoření Burnt blackcoinů lze použít příkaz „burn“ RPC, který je k dispozici v některých peněženkách.\n\nPro možné případy použití se můžete podívat na https://ibo.laboratorium.ee.\n\nVzhledem k tomu, že Burnt blackcoiny jsou nevyčerpatelné, nelze je znovu prodat. „Prodej“ Burnt blackcoinů znamená vypalování běžných blackcoinů (s přidruženými údaji rovnými cílové adrese).\n\nV případě sporu musí prodejce BLK poskytnout hash transakce. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Obchodování s L-BTC na Bisq vyžaduje, abyste pochopili následující skutečnosti:\n\nKdyž přijímáte L-BTC za obchod na Bisq, nemůžete použít mobilní peněženku Green od Blockstreamu ani jinou custodial peněženku nebo peněženku na burze. L-BTC musíte přijmout pouze do peněženky Liquid Elements Core nebo do jiné L-BTC peněženky, která vám umožní získat slepý klíč pro vaši slepou adresu L-BTC.\n\nV případě, že je nutné zprostředkování, nebo pokud dojde k obchodnímu sporu, musíte zprostředkujícímu mediátorovi Bisq nebo agentovi, který vrací peníze zaslat slepý klíč pro vaši L-BTC adresu, aby mohli ověřit podrobnosti vaší důvěrné transakce na svém vlastním Elements Core full-nodu.\n\nNeposkytnutí požadovaných informací zprostředkovateli nebo agentovi pro vrácení peněz povede ke prohrání sporu. Ve všech sporných případech nese příjemce L-BTC 100% břemeno odpovědnosti za poskytnutí kryptografického důkazu zprostředkovateli nebo agentovi pro vrácení peněz.\n\nPokud těmto požadavkům nerozumíte, neobchodujte s L-BTC na Bisq. +account.altcoin.popup.liquidbitcoin.msg=Obchodování s L-BTC na Haveno vyžaduje, abyste pochopili následující skutečnosti:\n\nKdyž přijímáte L-BTC za obchod na Haveno, nemůžete použít mobilní peněženku Green od Blockstreamu ani jinou custodial peněženku nebo peněženku na burze. L-BTC musíte přijmout pouze do peněženky Liquid Elements Core nebo do jiné L-BTC peněženky, která vám umožní získat slepý klíč pro vaši slepou adresu L-BTC.\n\nV případě, že je nutné zprostředkování, nebo pokud dojde k obchodnímu sporu, musíte zprostředkujícímu mediátorovi Haveno nebo agentovi, který vrací peníze zaslat slepý klíč pro vaši L-BTC adresu, aby mohli ověřit podrobnosti vaší důvěrné transakce na svém vlastním Elements Core full-nodu.\n\nNeposkytnutí požadovaných informací zprostředkovateli nebo agentovi pro vrácení peněz povede ke prohrání sporu. Ve všech sporných případech nese příjemce L-BTC 100% břemeno odpovědnosti za poskytnutí kryptografického důkazu zprostředkovateli nebo agentovi pro vrácení peněz.\n\nPokud těmto požadavkům nerozumíte, neobchodujte s L-BTC na Haveno. account.fiat.yourFiatAccounts=Vaše účty v národní měně @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=Nenastavili jste si heslo k peněžence, které by ch account.seed.warn.noPw.yes=Ano, a už se mě znovu nezeptat account.seed.enterPw=Chcete-li zobrazit seed slova, zadejte heslo account.seed.restore.info=Před použitím obnovení ze seed slov si vytvořte zálohu. Uvědomte si, že obnova peněženky je pouze pro naléhavé případy a může způsobit problémy s interní databází peněženky.\nNení to způsob, jak použít zálohu! K obnovení předchozího stavu aplikace použijte zálohu z adresáře dat aplikace.\n\nPo obnovení se aplikace automaticky vypne. Po restartování aplikace se bude znovu synchronizovat s bitcoinovou sítí. To může chvíli trvat a může spotřebovat hodně CPU, zejména pokud byla peněženka starší a měla mnoho transakcí. Vyhněte se přerušování tohoto procesu, jinak budete možná muset znovu odstranit soubor řetězu SPV nebo opakovat proces obnovy. -account.seed.restore.ok=Dobře, proveďte obnovu a vypněte Bisq +account.seed.restore.ok=Dobře, proveďte obnovu a vypněte Haveno #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=Upozorněte, pokud bude cena BTC pod account.notifications.priceAlert.setButton=Nastavit upozornění na cenu account.notifications.priceAlert.removeButton=Odstraňte upozornění na cenu account.notifications.trade.message.title=Obchodní stav se změnil -account.notifications.trade.message.msg.conf=Vkladová transakce pro obchod s ID {0} je potvrzena. Otevřete prosím svou aplikaci Bisq a začněte s platbou. +account.notifications.trade.message.msg.conf=Vkladová transakce pro obchod s ID {0} je potvrzena. Otevřete prosím svou aplikaci Haveno a začněte s platbou. account.notifications.trade.message.msg.started=Kupující BTC zahájil platbu za obchod s ID {0}. account.notifications.trade.message.msg.completed=Obchod s ID {0} je dokončen. account.notifications.offer.message.title=Vaše nabídka byla přijata @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Typ nabídky account.notifications.marketAlert.message.title=Upozornění na nabídku account.notifications.marketAlert.message.msg.below=pod account.notifications.marketAlert.message.msg.above=nad -account.notifications.marketAlert.message.msg=Do nabídky Bisq byla zveřejněna nová nabídka ''{0} {1}'' s cenou {2} ({3} {4} tržní cena) a způsob platby ''{5}''.\nID nabídky: {6}. +account.notifications.marketAlert.message.msg=Do nabídky Haveno byla zveřejněna nová nabídka ''{0} {1}'' s cenou {2} ({3} {4} tržní cena) a způsob platby ''{5}''.\nID nabídky: {6}. account.notifications.priceAlert.message.title=Upozornění na cenu pro {0} account.notifications.priceAlert.message.msg=Vaše upozornění na cenu bylo aktivováno. Aktuální {0} cena je {1} {2} -account.notifications.noWebCamFound.warning=Nebyla nalezena žádná webkamera.\n\nPoužijte e-mailu k odeslání tokenu a šifrovacího klíče z vašeho mobilního telefonu do aplikace Bisq. +account.notifications.noWebCamFound.warning=Nebyla nalezena žádná webkamera.\n\nPoužijte e-mailu k odeslání tokenu a šifrovacího klíče z vašeho mobilního telefonu do aplikace Haveno. account.notifications.priceAlert.warning.highPriceTooLow=Vyšší cena musí být větší než nižší cena. account.notifications.priceAlert.warning.lowerPriceTooHigh=Nižší cena musí být nižší než vyšší cena. @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=Ověřování podpisu ... displayUpdateDownloadWindow.button.label=Stáhněte si instalační program a ověřte podpis displayUpdateDownloadWindow.button.downloadLater=Stáhnout později displayUpdateDownloadWindow.button.ignoreDownload=Ignorovat tuto verzi -displayUpdateDownloadWindow.headline=K dispozici je nová aktualizace Bisq! +displayUpdateDownloadWindow.headline=K dispozici je nová aktualizace Haveno! displayUpdateDownloadWindow.download.failed.headline=Stahování selhalo displayUpdateDownloadWindow.download.failed=Stažení se nezdařilo.\nStáhněte a ručně ověřte na adrese [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Nelze určit správný instalační program. Stáhněte a ručně ověřte na adrese [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Uzavřít bez jakékoli výplaty disputeSummaryWindow.close.noPayout.text=Chcete zavřít bez výplaty? emptyWalletWindow.headline={0} nouzový nástroj peněženky -emptyWalletWindow.info=Použijte jej pouze v naléhavých případech, pokud nemůžete získat přístup k vašim prostředkům z uživatelského rozhraní.\n\nUpozorňujeme, že při použití tohoto nástroje budou všechny otevřené nabídky automaticky uzavřeny.\n\nPřed použitím tohoto nástroje si prosím zálohujte datový adresář. Můžete to udělat na obrazovce \"Účet/Záloha\".\n\nNahlaste nám svůj problém a nahlaste zprávu o chybě na GitHubu nebo na fóru Bisq, abychom mohli prozkoumat, co způsobilo problém. +emptyWalletWindow.info=Použijte jej pouze v naléhavých případech, pokud nemůžete získat přístup k vašim prostředkům z uživatelského rozhraní.\n\nUpozorňujeme, že při použití tohoto nástroje budou všechny otevřené nabídky automaticky uzavřeny.\n\nPřed použitím tohoto nástroje si prosím zálohujte datový adresář. Můžete to udělat na obrazovce \"Účet/Záloha\".\n\nNahlaste nám svůj problém a nahlaste zprávu o chybě na GitHubu nebo na fóru Haveno, abychom mohli prozkoumat, co způsobilo problém. emptyWalletWindow.balance=Váš zůstatek v peněžence emptyWalletWindow.address=Vaše cílová adresa emptyWalletWindow.button=Pošlete všechny prostředky @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=Datum vzniku offerDetailsWindow.makersOnion=Onion adresa tvůrce qRCodeWindow.headline=QR Kód -qRCodeWindow.msg=Použijte tento QR kód k financování vaší peněženky Bisq z vaší externí peněženky. +qRCodeWindow.msg=Použijte tento QR kód k financování vaší peněženky Haveno z vaší externí peněženky. qRCodeWindow.request=Žádost o platbu:\n{0} selectDepositTxWindow.headline=Vyberte vkladovou transakci ke sporu @@ -1562,7 +1562,7 @@ popup.headline.error=Chyba popup.doNotShowAgain=Znovu nezobrazovat popup.reportError.log=Otevřít log popup.reportError.gitHub=Nahlaste problém na GitHub -popup.reportError={0}\n\nChcete-li nám pomoci vylepšit software, nahlaste tuto chybu otevřením nového problému na adrese https://github.com/bisq-network/bisq/issues.\nVýše uvedená chybová zpráva bude zkopírována do schránky po kliknutí na některé z níže uvedených tlačítek.\nUsnadníte ladění, pokud zahrnete soubor bisq.log stisknutím tlačítka „Otevřít log soubor“, uložením kopie a připojením ke zprávě o chybě. +popup.reportError={0}\n\nChcete-li nám pomoci vylepšit software, nahlaste tuto chybu otevřením nového problému na adrese https://github.com/bisq-network/bisq/issues.\nVýše uvedená chybová zpráva bude zkopírována do schránky po kliknutí na některé z níže uvedených tlačítek.\nUsnadníte ladění, pokud zahrnete soubor haveno.log stisknutím tlačítka „Otevřít log soubor“, uložením kopie a připojením ke zprávě o chybě. popup.error.tryRestart=Zkuste prosím restartovat aplikaci a zkontrolovat síťové připojení, abyste zjistili, zda můžete problém vyřešit. popup.error.takeOfferRequestFailed=Když se někdo pokusil využít jednu z vašich nabídek, došlo k chybě:\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=Vkladová transakce uzavřeného obcho error.closedTradeWithNoDepositTx=Vkladová transakce uzavřeného obchodu s obchodním ID {0} je nulová.\n\nChcete-li vyčistit seznam uzavřených obchodů, restartujte aplikaci. popup.warning.walletNotInitialized=Peněženka ještě není inicializována -popup.warning.osxKeyLoggerWarning=V souladu s přísnějšími bezpečnostními opatřeními v systému macOS 10.14 a novějších způsobí spuštění aplikace Java (Bisq používá Javu) upozornění na vyskakovací okno v systému MacOS („Bisq by chtěl přijímat stisknutí kláves z jakékoli aplikace“).\n\nChcete-li se tomuto problému vyhnout, otevřete své Nastavení macOS a přejděte do části "Zabezpečení a soukromí" -> "Soukromí" -> "Sledování vstupu" a ze seznamu na pravé straně odeberte „Bisq“.\n\nBisq upgraduje na novější verzi Java, aby se tomuto problému vyhnul, jakmile budou vyřešena technická omezení (balíček Java Packager pro požadovanou verzi Java ještě není dodán). -popup.warning.wrongVersion=Pravděpodobně máte nesprávnou verzi Bisq pro tento počítač.\nArchitektura vašeho počítače je: {0}.\nBinární kód Bisq, který jste nainstalovali, je: {1}.\nVypněte prosím a znovu nainstalujte správnou verzi ({2}). -popup.warning.incompatibleDB=Zjistili jsme nekompatibilní soubory databáze!\n\nTyto databázové soubory nejsou kompatibilní s naší aktuální kódovou základnou:\n{0}\n\nVytvořili jsme zálohu poškozených souborů a aplikovali jsme výchozí hodnoty na novou verzi databáze.\n\nZáloha se nachází na adrese:\n{1}/db/backup_of_corrupted_data.\n\nZkontrolujte, zda máte nainstalovanou nejnovější verzi Bisq.\nMůžete si jej stáhnout na adrese: [HYPERLINK:https://bisq.network/downloads].\n\nRestartujte aplikaci. -popup.warning.startupFailed.twoInstances=Bisq již běží. Nemůžete spustit dvě instance Bisq. +popup.warning.osxKeyLoggerWarning=V souladu s přísnějšími bezpečnostními opatřeními v systému macOS 10.14 a novějších způsobí spuštění aplikace Java (Haveno používá Javu) upozornění na vyskakovací okno v systému MacOS („Haveno by chtěl přijímat stisknutí kláves z jakékoli aplikace“).\n\nChcete-li se tomuto problému vyhnout, otevřete své Nastavení macOS a přejděte do části "Zabezpečení a soukromí" -> "Soukromí" -> "Sledování vstupu" a ze seznamu na pravé straně odeberte „Haveno“.\n\nHaveno upgraduje na novější verzi Java, aby se tomuto problému vyhnul, jakmile budou vyřešena technická omezení (balíček Java Packager pro požadovanou verzi Java ještě není dodán). +popup.warning.wrongVersion=Pravděpodobně máte nesprávnou verzi Haveno pro tento počítač.\nArchitektura vašeho počítače je: {0}.\nBinární kód Haveno, který jste nainstalovali, je: {1}.\nVypněte prosím a znovu nainstalujte správnou verzi ({2}). +popup.warning.incompatibleDB=Zjistili jsme nekompatibilní soubory databáze!\n\nTyto databázové soubory nejsou kompatibilní s naší aktuální kódovou základnou:\n{0}\n\nVytvořili jsme zálohu poškozených souborů a aplikovali jsme výchozí hodnoty na novou verzi databáze.\n\nZáloha se nachází na adrese:\n{1}/db/backup_of_corrupted_data.\n\nZkontrolujte, zda máte nainstalovanou nejnovější verzi Haveno.\nMůžete si jej stáhnout na adrese: [HYPERLINK:https://bisq.network/downloads].\n\nRestartujte aplikaci. +popup.warning.startupFailed.twoInstances=Haveno již běží. Nemůžete spustit dvě instance Haveno. popup.warning.tradePeriod.halfReached=Váš obchod s ID {0} dosáhl poloviny max. povoleného obchodního období a stále není dokončen.\n\nObdobí obchodování končí {1}\n\nDalší informace o stavu obchodu naleznete na adrese \"Portfolio/Otevřené obchody\". popup.warning.tradePeriod.ended=Váš obchod s ID {0} dosáhl max. povoleného obchodního období a není dokončen.\n\nObdobí obchodování skončilo {1}\n\nZkontrolujte prosím svůj obchod v sekci "Portfolio/Otevřené obchody\", abyste kontaktovali mediátora. popup.warning.noTradingAccountSetup.headline=Nemáte nastaven obchodní účet @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=Nejsou k dispozici žádní mediátoři. popup.warning.notFullyConnected=Musíte počkat, až budete plně připojeni k síti.\nTo může při spuštění trvat až 2 minuty. popup.warning.notSufficientConnectionsToBtcNetwork=Musíte počkat, až budete mít alespoň {0} připojení k bitcoinové síti. popup.warning.downloadNotComplete=Musíte počkat, až bude stahování chybějících bitcoinových bloků kompletní. -popup.warning.chainNotSynced=Výška blockchainu peněženky Bisq není správně synchronizována. Pokud jste aplikaci spustili nedávno, počkejte, dokud nebude zveřejněn jeden blok bitcoinů.\n\nVýšku blockchainu můžete zkontrolovat v Nastavení/Informace o síti. Pokud projde více než jeden blok a tento problém přetrvává, asi být zastaven, v takovém případě byste měli provést SPV resynchonizaci. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=Výška blockchainu peněženky Haveno není správně synchronizována. Pokud jste aplikaci spustili nedávno, počkejte, dokud nebude zveřejněn jeden blok bitcoinů.\n\nVýšku blockchainu můžete zkontrolovat v Nastavení/Informace o síti. Pokud projde více než jeden blok a tento problém přetrvává, asi být zastaven, v takovém případě byste měli provést SPV resynchonizaci. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Opravdu chcete tuto nabídku odebrat?\nPokud tuto nabídku odstraníte, ztratí se poplatek tvůrce {0}. popup.warning.tooLargePercentageValue=Nelze nastavit procento 100% nebo větší. popup.warning.examplePercentageValue=Zadejte procento jako číslo \"5.4\" pro 5.4% @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=Jeden z {0} uzlů byl zabanován. # suppress inspection "UnusedProperty" popup.warning.priceRelay=cenové relé popup.warning.seed=seed -popup.warning.mandatoryUpdate.trading=Aktualizujte prosím na nejnovější verzi Bisq. Byla vydána povinná aktualizace, která zakazuje obchodování se starými verzemi. Další informace naleznete na fóru Bisq. -popup.warning.noFilter="We did not receive a filter object from the seed nodes." Toto je neočekávaná situace. Prosím upozorněte vývojáře Bisq. +popup.warning.mandatoryUpdate.trading=Aktualizujte prosím na nejnovější verzi Haveno. Byla vydána povinná aktualizace, která zakazuje obchodování se starými verzemi. Další informace naleznete na fóru Haveno. +popup.warning.noFilter="We did not receive a filter object from the seed nodes." Toto je neočekávaná situace. Prosím upozorněte vývojáře Haveno. popup.warning.burnBTC=Tato transakce není možná, protože poplatky za těžbu {0} by přesáhly částku převodu {1}. Počkejte prosím, dokud nebudou poplatky za těžbu opět nízké nebo dokud nenahromadíte více BTC k převodu. -popup.warning.openOffer.makerFeeTxRejected=Transakční poplatek tvůrce za nabídku s ID {0} byl bitcoinovou sítí odmítnut.\nID transakce = {1}.\nNabídka byla odstraněna, aby se předešlo dalším problémům.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Bisq Keybase týmu. +popup.warning.openOffer.makerFeeTxRejected=Transakční poplatek tvůrce za nabídku s ID {0} byl bitcoinovou sítí odmítnut.\nID transakce = {1}.\nNabídka byla odstraněna, aby se předešlo dalším problémům.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu. popup.warning.trade.txRejected.tradeFee=obchodní poplatek popup.warning.trade.txRejected.deposit=vklad -popup.warning.trade.txRejected=Bitcoinová síť odmítla {0} transakci pro obchod s ID {1}.\nID transakce = {2}\nObchod byl přesunut do neúspěšných obchodů.\nPřejděte do části \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Bisq Keybase týmu. +popup.warning.trade.txRejected=Bitcoinová síť odmítla {0} transakci pro obchod s ID {1}.\nID transakce = {2}\nObchod byl přesunut do neúspěšných obchodů.\nPřejděte do části \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu. -popup.warning.openOfferWithInvalidMakerFeeTx=Transakční poplatek tvůrce za nabídku s ID {0} je neplatný.\nID transakce = {1}.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Bisq Keybase týmu. +popup.warning.openOfferWithInvalidMakerFeeTx=Transakční poplatek tvůrce za nabídku s ID {0} je neplatný.\nID transakce = {1}.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Haveno Keybase týmu. -popup.info.securityDepositInfo=Aby oba obchodníci dodržovali obchodní protokol, musí oba obchodníci zaplatit kauci.\n\nTento vklad je uložen ve vaší obchodní peněžence, dokud nebude váš obchod úspěšně dokončen a poté vám bude vrácen.\n\nPoznámka: Pokud vytváříte novou nabídku, musí program Bisq běžet, aby ji převzal jiný obchodník. Chcete-li zachovat své nabídky online, udržujte Bisq spuštěný a ujistěte se, že tento počítač zůstává online (tj. Zkontrolujte, zda se nepřepne do pohotovostního režimu...pohotovostní režim monitoru je v pořádku). +popup.info.securityDepositInfo=Aby oba obchodníci dodržovali obchodní protokol, musí oba obchodníci zaplatit kauci.\n\nTento vklad je uložen ve vaší obchodní peněžence, dokud nebude váš obchod úspěšně dokončen a poté vám bude vrácen.\n\nPoznámka: Pokud vytváříte novou nabídku, musí program Haveno běžet, aby ji převzal jiný obchodník. Chcete-li zachovat své nabídky online, udržujte Haveno spuštěný a ujistěte se, že tento počítač zůstává online (tj. Zkontrolujte, zda se nepřepne do pohotovostního režimu...pohotovostní režim monitoru je v pořádku). popup.info.cashDepositInfo=Ujistěte se, že ve své oblasti máte pobočku banky, abyste mohli provést hotovostní vklad.\nID banky prodávajícího (BIC/SWIFT) je: {0}. popup.info.cashDepositInfo.confirm=Potvrzuji, že mohu provést vklad -popup.info.shutDownWithOpenOffers=Bisq se vypíná, ale existují otevřené nabídky.\n\nTyto nabídky nebudou dostupné v síti P2P, pokud bude Bisq vypnutý, ale budou znovu publikovány do sítě P2P při příštím spuštění Bisq.\n\nChcete-li zachovat své nabídky online, udržujte Bisq spuštěný a ujistěte se, že tento počítač zůstává online (tj. Ujistěte se, že nepřejde do pohotovostního režimu...pohotovostní režim monitoru není problém). -popup.info.qubesOSSetupInfo=Zdá se, že používáte Bisq na Qubes OS.\n\nUjistěte se, že je vaše Bisq qube nastaveno podle našeho průvodce nastavením na [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade z verze {0} na verzi {1} není podporován. Použijte prosím nejnovější verzi Bisq. +popup.info.shutDownWithOpenOffers=Haveno se vypíná, ale existují otevřené nabídky.\n\nTyto nabídky nebudou dostupné v síti P2P, pokud bude Haveno vypnutý, ale budou znovu publikovány do sítě P2P při příštím spuštění Haveno.\n\nChcete-li zachovat své nabídky online, udržujte Haveno spuštěný a ujistěte se, že tento počítač zůstává online (tj. Ujistěte se, že nepřejde do pohotovostního režimu...pohotovostní režim monitoru není problém). +popup.info.qubesOSSetupInfo=Zdá se, že používáte Haveno na Qubes OS.\n\nUjistěte se, že je vaše Haveno qube nastaveno podle našeho průvodce nastavením na [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade z verze {0} na verzi {1} není podporován. Použijte prosím nejnovější verzi Haveno. popup.privateNotification.headline=Důležité soukromé oznámení! popup.securityRecommendation.headline=Důležité bezpečnostní doporučení popup.securityRecommendation.msg=Chtěli bychom vám připomenout, abyste zvážili použití ochrany heslem pro vaši peněženku, pokud jste ji již neaktivovali.\n\nDůrazně se také doporučuje zapsat seed slova peněženky. Tato seed slova jsou jako hlavní heslo pro obnovení vaší bitcoinové peněženky.\nV sekci "Seed peněženky" naleznete další informace.\n\nDále byste měli zálohovat úplnou složku dat aplikace v sekci \"Záloha\". -popup.bitcoinLocalhostNode.msg=Bisq detekoval Bitcoin Core node běžící na tomto systému (na localhostu).\n\nProsím ujistěte se, že:\n- tento node je plně synchronizován před spuštěním Bisq\n- prořezávání je vypnuto ('prune=0' v bitcoin.conf)\n- Bloomovy filtry jsou zapnuty ('peerbloomfilters=1' v bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detekoval Bitcoin Core node běžící na tomto systému (na localhostu).\n\nProsím ujistěte se, že:\n- tento node je plně synchronizován před spuštěním Haveno\n- prořezávání je vypnuto ('prune=0' v bitcoin.conf)\n- Bloomovy filtry jsou zapnuty ('peerbloomfilters=1' v bitcoin.conf) popup.shutDownInProgress.headline=Probíhá vypínání popup.shutDownInProgress.msg=Vypnutí aplikace může trvat několik sekund.\nProsím, nepřerušujte tento proces. @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=Aktualizace obchodní peněženky notification.walletUpdate.msg=Vaše obchodní peněženka má dostatečné finanční prostředky.\nČástka: {0} notification.takeOffer.walletUpdate.msg=Vaše obchodní peněženka již byla dostatečně financována z předchozího pokusu o nabídku.\nČástka: {0} notification.tradeCompleted.headline=Obchod dokončen -notification.tradeCompleted.msg=Prostředky můžete nyní vybrat do své externí bitcoinové peněženky nebo je převést do peněženky Bisq. +notification.tradeCompleted.msg=Prostředky můžete nyní vybrat do své externí bitcoinové peněženky nebo je převést do peněženky Haveno. #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=Prostředky můžete nyní vybrat do své extern systemTray.show=Otevřít okno aplikace systemTray.hide=Skrýt okno aplikace -systemTray.info=Informace o Bisq +systemTray.info=Informace o Haveno systemTray.exit=Odejít -systemTray.tooltip=Bisq: Decentralizovaná směnárna bitcoinů +systemTray.tooltip=Haveno: Decentralizovaná směnárna bitcoinů #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=Odvozuji klíč z hesla password.walletDecrypted=Peněženka úspěšně dešifrována a ochrana heslem byla odstraněna. password.wrongPw=Zadali jste nesprávné heslo.\n\nZkuste prosím zadat heslo znovu a pečlivě zkontrolujte překlepy nebo pravopisné chyby. password.walletEncrypted=Peněženka úspěšně šifrována a ochrana heslem povolena. -password.walletEncryptionFailed=Heslo peněženky nelze nastavit. Možná jste importovali počáteční slova, která neodpovídají databázi peněženky. Kontaktujte vývojáře na Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Heslo peněženky nelze nastavit. Možná jste importovali počáteční slova, která neodpovídají databázi peněženky. Kontaktujte vývojáře na Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=Zadaná 2 hesla se neshodují. password.forgotPassword=Zapomněli jste heslo? password.backupReminder=Pamatujte, že při nastavování hesla do peněženky budou odstraněny všechny automaticky vytvořené zálohy z nezašifrované peněženky.\n\nPřed nastavením hesla se důrazně doporučuje provést zálohu adresáře aplikace a zapsat si počáteční slova! @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=Vaše bitcoinová peněženka není prázdná.\n\nT seed.warn.walletNotEmpty.restore=Chci přesto obnovit seed.warn.walletNotEmpty.emptyWallet=Nejprve vyprázdním své peněženky seed.warn.notEncryptedAnymore=Vaše peněženky jsou šifrovány.\n\nPo obnovení již nebudou peněženky šifrovány a musíte nastavit nové heslo.\n\nChcete pokračovat? -seed.warn.walletDateEmpty=Protože jste nezadali datum peněženky, bude muset bisq skenovat blockchain od roku 2013.10.09 (datum spuštění BIP39).\n\nPeněženky BIP39 byly poprvé představeny v bisq dne 2017.06.28 (verze v0.5). Tímto datem můžete ušetřit čas.\n\nV ideálním případě byste měli určit datum, kdy byl vytvořen váš seed peněženky.\n\n\nOpravdu chcete pokračovat bez zadání data peněženky? +seed.warn.walletDateEmpty=Protože jste nezadali datum peněženky, bude muset haveno skenovat blockchain od roku 2013.10.09 (datum spuštění BIP39).\n\nPeněženky BIP39 byly poprvé představeny v haveno dne 2017.06.28 (verze v0.5). Tímto datem můžete ušetřit čas.\n\nV ideálním případě byste měli určit datum, kdy byl vytvořen váš seed peněženky.\n\n\nOpravdu chcete pokračovat bez zadání data peněženky? seed.restore.success=Peněženky byly úspěšně obnoveny pomocí nových seed slov.\n\nMusíte vypnout a restartovat aplikaci. seed.restore.error=Při obnově peněženek pomocí seed slov došlo k chybě. {0} seed.restore.openOffers.warn=Máte otevřené nabídky, které budou odstraněny, pokud obnovíte ze seedu.\nJste si jisti, že chcete pokračovat? @@ -1949,17 +1949,17 @@ payment.accountType=Typ účtu payment.checking=Kontrola payment.savings=Úspory payment.personalId=Číslo občanského průkazu -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle je služba převodu peněz, která funguje nejlépe *prostřednictvím* jiné banky.\n\n1. Na této stránce zjistěte, zda (a jak) vaše banka spolupracuje se Zelle:\n[HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Zaznamenejte si zvláštní limity převodů - limity odesílání se liší podle banky a banky často určují samostatné denní, týdenní a měsíční limity.\n\n3. Pokud vaše banka s Zelle nepracuje, můžete ji stále používat prostřednictvím mobilní aplikace Zelle, ale vaše limity převodu budou mnohem nižší.\n\n4. Název uvedený na vašem účtu Bisq MUSÍ odpovídat názvu vašeho účtu Zelle/bankovního účtu.\n\nPokud nemůžete dokončit transakci Zelle, jak je uvedeno ve vaší obchodní smlouvě, můžete ztratit část (nebo vše) ze svého bezpečnostního vkladu.\n\nVzhledem k poněkud vyššímu riziku zpětného zúčtování společnosti Zelle se prodejcům doporučuje kontaktovat nepodepsané kupující prostřednictvím e-mailu nebo SMS, aby ověřili, že kupující skutečně vlastní účet Zelle uvedený v Bisq. -payment.fasterPayments.newRequirements.info=Některé banky začaly ověřovat celé jméno příjemce pro převody Faster Payments. Váš současný účet Faster Payments nepožadoval celé jméno.\n\nZvažte prosím znovu vytvoření svého Faster Payments účtu v Bisqu, abyste mohli budoucím kupujícím {0} poskytnout celé jméno.\n\nPři opětovném vytvoření účtu nezapomeňte zkopírovat přesný kód řazení, číslo účtu a hodnoty soli (salt) pro ověření věku ze starého účtu do nového účtu. Tím zajistíte zachování stáří a stavu vašeho stávajícího účtu. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle je služba převodu peněz, která funguje nejlépe *prostřednictvím* jiné banky.\n\n1. Na této stránce zjistěte, zda (a jak) vaše banka spolupracuje se Zelle:\n[HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Zaznamenejte si zvláštní limity převodů - limity odesílání se liší podle banky a banky často určují samostatné denní, týdenní a měsíční limity.\n\n3. Pokud vaše banka s Zelle nepracuje, můžete ji stále používat prostřednictvím mobilní aplikace Zelle, ale vaše limity převodu budou mnohem nižší.\n\n4. Název uvedený na vašem účtu Haveno MUSÍ odpovídat názvu vašeho účtu Zelle/bankovního účtu.\n\nPokud nemůžete dokončit transakci Zelle, jak je uvedeno ve vaší obchodní smlouvě, můžete ztratit část (nebo vše) ze svého bezpečnostního vkladu.\n\nVzhledem k poněkud vyššímu riziku zpětného zúčtování společnosti Zelle se prodejcům doporučuje kontaktovat nepodepsané kupující prostřednictvím e-mailu nebo SMS, aby ověřili, že kupující skutečně vlastní účet Zelle uvedený v Haveno. +payment.fasterPayments.newRequirements.info=Některé banky začaly ověřovat celé jméno příjemce pro převody Faster Payments. Váš současný účet Faster Payments nepožadoval celé jméno.\n\nZvažte prosím znovu vytvoření svého Faster Payments účtu v Havenou, abyste mohli budoucím kupujícím {0} poskytnout celé jméno.\n\nPři opětovném vytvoření účtu nezapomeňte zkopírovat přesný kód řazení, číslo účtu a hodnoty soli (salt) pro ověření věku ze starého účtu do nového účtu. Tím zajistíte zachování stáří a stavu vašeho stávajícího účtu. payment.moneyGram.info=Při používání MoneyGram musí BTC kupující zaslat autorizační číslo a fotografii potvrzení e-mailem prodejci BTC. Potvrzení musí jasně uvádět celé jméno prodejce, zemi, stát a částku. E-mail prodávajícího se kupujícímu zobrazí během procesu obchodování. payment.westernUnion.info=Při používání služby Western Union musí kupující BTC zaslat prodejci BTC e-mailem MTCN (sledovací číslo) a fotografii potvrzení. Potvrzení musí jasně uvádět celé jméno prodejce, město, zemi a částku. E-mail prodávajícího se kupujícímu zobrazí během procesu obchodování. payment.halCash.info=Při používání HalCash musí kupující BTC poslat prodejci BTC kód HalCash prostřednictvím textové zprávy z mobilního telefonu.\n\nUjistěte se, že nepřekračujete maximální částku, kterou vám banka umožňuje odesílat pomocí HalCash. Min. částka za výběr je 10 EUR a max. částka je 600 EUR. Pro opakované výběry je to 3000 EUR za příjemce za den a 6000 EUR za příjemce za měsíc. Zkontrolujte prosím tyto limity u své banky, abyste se ujistili, že používají stejné limity, jaké jsou zde uvedeny.\n\nČástka pro výběr musí být násobkem 10 EUR, protože z bankomatu nemůžete vybrat jiné částky. Uživatelské rozhraní na obrazovce vytvořit-nabídku and přijmout-nabídku upraví částku BTC tak, aby částka EUR byla správná. Nemůžete použít tržní cenu, protože částka v EURECH se mění s měnícími se cenami.\n\nV případě sporu musí kupující BTC poskytnout důkaz, že zaslal EURA. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Uvědomte si, že u všech bankovních převodů existuje určité riziko zpětného zúčtování. Aby se toto riziko zmírnilo, stanoví Bisq limity pro jednotlivé obchody na základě odhadované úrovně rizika zpětného zúčtování pro použitou platební metodu.\n\nU této platební metody je váš limit pro jednotlivé obchody pro nákup a prodej {2}.\n\nToto omezení se vztahuje pouze na velikost jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Uvědomte si, že u všech bankovních převodů existuje určité riziko zpětného zúčtování. Aby se toto riziko zmírnilo, stanoví Haveno limity pro jednotlivé obchody na základě odhadované úrovně rizika zpětného zúčtování pro použitou platební metodu.\n\nU této platební metody je váš limit pro jednotlivé obchody pro nákup a prodej {2}.\n\nToto omezení se vztahuje pouze na velikost jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=Aby se omezilo riziko zpětného zúčtování, Bisq stanoví limity pro jednotlivé obchody pro tento typ platebního účtu na základě následujících 2 faktorů:\n\n1. Obecné riziko zpětného zúčtování pro platební metodu\n2. Stav podepisování účtu\n\nTento platební účet ještě není podepsán, takže je omezen na nákup {0} za obchod. Po podpisu se limity nákupu zvýší následovně:\n\n● Před podpisem a 30 dní po podpisu bude váš limit nákupu podle obchodu {0}\n● 30 dní po podpisu bude váš limit nákupu podle obchodu {1}\n● 60 dní po podpisu bude váš limit nákupu podle obchodu {2}\n\nPodpisy účtu neovlivňují prodejní limity. Můžete okamžitě prodat {2} v jednom obchodu.\n\nTato omezení platí pouze pro objem jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=Aby se omezilo riziko zpětného zúčtování, Haveno stanoví limity pro jednotlivé obchody pro tento typ platebního účtu na základě následujících 2 faktorů:\n\n1. Obecné riziko zpětného zúčtování pro platební metodu\n2. Stav podepisování účtu\n\nTento platební účet ještě není podepsán, takže je omezen na nákup {0} za obchod. Po podpisu se limity nákupu zvýší následovně:\n\n● Před podpisem a 30 dní po podpisu bude váš limit nákupu podle obchodu {0}\n● 30 dní po podpisu bude váš limit nákupu podle obchodu {1}\n● 60 dní po podpisu bude váš limit nákupu podle obchodu {2}\n\nPodpisy účtu neovlivňují prodejní limity. Můžete okamžitě prodat {2} v jednom obchodu.\n\nTato omezení platí pouze pro objem jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Potvrďte, že vám vaše banka umožňuje odesílat hotovostní vklady na účty jiných lidí. Například Bank of America a Wells Fargo již takové vklady nepovolují. @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Platba kartou Amazon eGift nyní vyžaduje také payment.account.amazonGiftCard.addCountryInfo={0}\nVáš stávající účet pro platbu kartou Amazon eGift ({1}) nemá nastavenou zemi.\nVyberte prosím zemi, ve které je možné vaše karty Amazon eGift uplatnit.\nTato aktualizace vašeho účtu nebude mít vliv na stáří tohoto účtu. payment.amazonGiftCard.upgrade.headLine=Aktualizace účtu pro platbu kartou Amazon eGift -payment.usPostalMoneyOrder.info=Obchodování pomocí amerických poštovních poukázek (USPMO) na Bisq vyžaduje, abyste rozuměli následujícímu:\n\n- Kupující BTC musí před odesláním napsat jméno prodejce BTC do polí plátce i příjemce a pořídit fotografii USPMO a obálku s dokladem o sledování ve vysokém rozlišení.\n- Kupující BTC musí odeslat USPMO prodejci BTC s potvrzením dodávky.\n\nV případě, že je nutná mediace, nebo pokud dojde k obchodnímu sporu, budete povinni poslat fotografie mediátorovi Bisq nebo zástupci pro vrácení peněz spolu s pořadovým číslem USPMO, číslem pošty a částkou dolaru, aby mohli ověřit podrobnosti na webu US Post Office.\n\nNeposkytnutí požadovaných informací mediátorovi nebo arbitrovi bude mít za následek ztrátu případu sporu.\n\nVe všech sporných případech nese odesílatel USPMO 100% břemeno odpovědnosti za poskytnutí důkazů mediátorovi nebo arbitrovi.\n\nPokud těmto požadavkům nerozumíte, neobchodujte pomocí USPMO na Bisq. +payment.usPostalMoneyOrder.info=Obchodování pomocí amerických poštovních poukázek (USPMO) na Haveno vyžaduje, abyste rozuměli následujícímu:\n\n- Kupující BTC musí před odesláním napsat jméno prodejce BTC do polí plátce i příjemce a pořídit fotografii USPMO a obálku s dokladem o sledování ve vysokém rozlišení.\n- Kupující BTC musí odeslat USPMO prodejci BTC s potvrzením dodávky.\n\nV případě, že je nutná mediace, nebo pokud dojde k obchodnímu sporu, budete povinni poslat fotografie mediátorovi Haveno nebo zástupci pro vrácení peněz spolu s pořadovým číslem USPMO, číslem pošty a částkou dolaru, aby mohli ověřit podrobnosti na webu US Post Office.\n\nNeposkytnutí požadovaných informací mediátorovi nebo arbitrovi bude mít za následek ztrátu případu sporu.\n\nVe všech sporných případech nese odesílatel USPMO 100% břemeno odpovědnosti za poskytnutí důkazů mediátorovi nebo arbitrovi.\n\nPokud těmto požadavkům nerozumíte, neobchodujte pomocí USPMO na Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=Kontaktní informace payment.cashByMail.contact.prompt=Obálka se jménem nebo pseudonymem by měla být adresována @@ -1996,7 +1996,7 @@ payment.japan.recipient=Jméno payment.australia.payid=PayID payment.payid=PayID spojené s finanční institucí. Jako e-mailová adresa nebo mobilní telefon. payment.payid.info=PayID jako telefonní číslo, e-mailová adresa nebo australské obchodní číslo (ABN), které můžete bezpečně propojit se svou bankou, družstevní záložnou nebo účtem stavební spořitelny. Musíte mít již vytvořený PayID u své australské finanční instituce. Odesílající i přijímající finanční instituce musí podporovat PayID. Další informace najdete na [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=Chcete-li platit dárkovou kartou Amazon eGift, budete muset prodejci BTC poslat kartu Amazon eGift přes svůj účet Amazon.\n\nBisq zobrazí e-mail nebo mobilní číslo prodejce BTC, kam bude potřeba odeslat tuto dárkovou kartu. Na kartě ve zprávě pro příjemce musí být uvedeno ID obchodu. Pro další detaily a rady viz wiki: [HYPERLINK:https://bisq.wiki/Amazon_eGift_card].\n\nZde jsou tři důležité poznámky:\n- Preferujte dárkové karty v hodnotě do 100 USD, protože Amazon může považovat nákupy karet s vyššími částkami jako podezřelé a zablokovat je.\n- Na kartě do zprávy pro příjemce můžete přidat i vlastní originální text (např. "Happy birthday Susan!") spolu s ID obchodu. (V takovém případě o tom informujte protistranu pomocí obchodovacího chatu, aby mohli s jistotou ověřit, že obdržená dárková karta pochází od vás.)\n- Karty Amazon eGift lze uplatnit pouze na té stránce Amazon, na které byly také koupeny (např. karta koupená na amazon.it může být uplatněna zase jen na amazon.it). +payment.amazonGiftCard.info=Chcete-li platit dárkovou kartou Amazon eGift, budete muset prodejci BTC poslat kartu Amazon eGift přes svůj účet Amazon.\n\nHaveno zobrazí e-mail nebo mobilní číslo prodejce BTC, kam bude potřeba odeslat tuto dárkovou kartu. Na kartě ve zprávě pro příjemce musí být uvedeno ID obchodu. Pro další detaily a rady viz wiki: [HYPERLINK:https://bisq.wiki/Amazon_eGift_card].\n\nZde jsou tři důležité poznámky:\n- Preferujte dárkové karty v hodnotě do 100 USD, protože Amazon může považovat nákupy karet s vyššími částkami jako podezřelé a zablokovat je.\n- Na kartě do zprávy pro příjemce můžete přidat i vlastní originální text (např. "Happy birthday Susan!") spolu s ID obchodu. (V takovém případě o tom informujte protistranu pomocí obchodovacího chatu, aby mohli s jistotou ověřit, že obdržená dárková karta pochází od vás.)\n- Karty Amazon eGift lze uplatnit pouze na té stránce Amazon, na které byly také koupeny (např. karta koupená na amazon.it může být uplatněna zase jen na amazon.it). # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 492e12da..322f34ff 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -103,14 +103,14 @@ shared.faq=Zur FAQ Seite shared.yesCancel=Ja, abbrechen shared.nextStep=Nächster Schritt shared.selectTradingAccount=Handelskonto auswählen -shared.fundFromSavingsWalletButton=Gelder aus Bisq-Wallet überweisen +shared.fundFromSavingsWalletButton=Gelder aus Haveno-Wallet überweisen shared.fundFromExternalWalletButton=Ihre externe Wallet zum Finanzieren öffnen shared.openDefaultWalletFailed=Das Öffnen des Standardprogramms für Bitcoin-Wallets ist fehlgeschlagen. Sind Sie sicher, dass Sie eines installiert haben? shared.belowInPercent=% unter dem Marktpreis shared.aboveInPercent=% über dem Marktpreis shared.enterPercentageValue=%-Wert eingeben shared.OR=ODER -shared.notEnoughFunds=Für diese Transaktion haben Sie nicht genug Gelder in Ihrem Bisq-Wallet—{0} werden benötigt, aber nur {1} sind verfügbar.\n\nBitte fügen Sie Gelder aus einer externen Wallet hinzu, oder senden Sie Gelder an Ihr Bisq-Wallet unter Gelder > Gelder erhalten. +shared.notEnoughFunds=Für diese Transaktion haben Sie nicht genug Gelder in Ihrem Haveno-Wallet—{0} werden benötigt, aber nur {1} sind verfügbar.\n\nBitte fügen Sie Gelder aus einer externen Wallet hinzu, oder senden Sie Gelder an Ihr Haveno-Wallet unter Gelder > Gelder erhalten. shared.waitingForFunds=Warte auf Gelder... shared.TheBTCBuyer=Der BTC-Käufer shared.You=Sie @@ -235,8 +235,8 @@ mainView.menu.settings=Einstellungen mainView.menu.account=Konto mainView.marketPriceWithProvider.label=Marktpreis von {0} -mainView.marketPrice.bisqInternalPrice=Preis des letzten Bisq-Handels -mainView.marketPrice.tooltip.bisqInternalPrice=Es ist kein Marktpreis von externen Marktpreis-Anbietern verfügbar.\nDer angezeigte Preis, ist der letzte Bisq-Handelspreis für diese Währung. +mainView.marketPrice.havenoInternalPrice=Preis des letzten Haveno-Handels +mainView.marketPrice.tooltip.havenoInternalPrice=Es ist kein Marktpreis von externen Marktpreis-Anbietern verfügbar.\nDer angezeigte Preis, ist der letzte Haveno-Handelspreis für diese Währung. mainView.marketPrice.tooltip=Marktpreis bereitgestellt von {0}{1}\nLetzte Aktualisierung: {2}\nURL des Knoten-Anbieters: {3} mainView.balance.available=Verfügbarer Betrag mainView.balance.reserved=In Angeboten reserviert @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronisierung mit {0} bei Block: {1 mainView.footer.btcInfo.synchronizedWith=Synchronisierung mit {0} bei Block {1} mainView.footer.btcInfo.connectingTo=Verbinde mit mainView.footer.btcInfo.connectionFailed=Verbindung fehlgeschlagen zu -mainView.footer.p2pInfo=Bitcoin Netzwerk Peers: {0} / Bisq Netzwerk Peers: {1} +mainView.footer.p2pInfo=Bitcoin Netzwerk Peers: {0} / Haveno Netzwerk Peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Verbinde mit Tor-Netzwerk... mainView.bootstrapState.torNodeCreated=(2/4) Tor-Knoten erstellt @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Anfangsdaten erhalten mainView.bootstrapWarning.noSeedNodesAvailable=Keine Seed-Knoten verfügbar mainView.bootstrapWarning.noNodesAvailable=Keine Seed-Knoten und Peers verfügbar -mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping zum Bisq-Netzwerk fehlgeschlagen +mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping zum Haveno-Netzwerk fehlgeschlagen mainView.p2pNetworkWarnMsg.noNodesAvailable=Es sind keine Seed-Knoten oder bestehenden Peers verfügbar, um Daten anzufordern.\nÜberprüfen Sie bitte Ihre Internetverbindung oder versuchen Sie die Anwendung neu zu starten. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Verbinden mit Bisq-Netzwerk fehlgeschlagen (gemeldeter Fehler: {0}).\nBitte überprüfen Sie Ihre Internetverbindungen oder versuchen Sie die Anwendung neu zu starten. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Verbinden mit Haveno-Netzwerk fehlgeschlagen (gemeldeter Fehler: {0}).\nBitte überprüfen Sie Ihre Internetverbindungen oder versuchen Sie die Anwendung neu zu starten. mainView.walletServiceErrorMsg.timeout=Verbindung mit Bitcoin-Netzwerk aufgrund einer Zeitüberschreitung fehlgeschlagen. mainView.walletServiceErrorMsg.connectionError=Verbindung mit Bitcoin-Netzwerk aufgrund eines Fehlers fehlgeschlagen: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=Verbindung mit Bitcoin-Netzwerk a mainView.walletServiceErrorMsg.rejectedTxException=Eine Transaktion wurde aus dem Netzwerk abgelehnt.\n\n{0} mainView.networkWarning.allConnectionsLost=Sie haben die Verbindung zu allen {0} Netzwerk-Peers verloren.\nMöglicherweise haben Sie Ihre Internetverbindung verloren oder Ihr Computer war im Standbymodus. -mainView.networkWarning.localhostBitcoinLost=Sie haben die Verbindung zum localhost Bitcoinknoten verloren.\nBitte starten Sie die Bisq Anwendung neu, um mit anderen Bitcoinknoten zu verbinden oder starten Sie den localhost Bitcoinknoten neu. +mainView.networkWarning.localhostBitcoinLost=Sie haben die Verbindung zum localhost Bitcoinknoten verloren.\nBitte starten Sie die Haveno Anwendung neu, um mit anderen Bitcoinknoten zu verbinden oder starten Sie den localhost Bitcoinknoten neu. mainView.version.update=(Update verfügbar) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=Der zulässige Trade-Betr offerbook.warning.wrongTradeProtocol=Dieses Angebot benötigt eine andere Protokollversion, als die Version Ihrer Software.\n\nBitte überprüfen Sie, ob Sie die aktuellste Version installiert haben. Andernfalls hat der Nutzer, der das Angebot erstellt hat, eine ältere Version benutzt.\n\nNutzer können nicht mit inkompatiblen Protokollversionen handeln. offerbook.warning.userIgnored=Sie haben die Onion-Adresse dieses Nutzers zu Ihrer Liste ignorierter Adressen hinzugefügt. -offerbook.warning.offerBlocked=Das Angebot wurde von den Bisq-Entwicklern blockiert.\nWahrscheinlich gibt es einen unbehobenen Bug, der Probleme beim Annehmen dieses Angebots verursacht. -offerbook.warning.currencyBanned=Die in diesem Handel verwendete Währung wurde von den Bisq-Entwicklern blockiert.\nBitte besuchen sie das Bisq-Forum für weitere Informationen. -offerbook.warning.paymentMethodBanned=Die in diesem Handel verwendete Zahlungsmethode wurde von den Bisq-Entwicklern blockiert.\nBitte besuchen sie das Bisq-Forum für weitere Informationen. -offerbook.warning.nodeBlocked=Die Onion-Adresse dieses Händlers wurde von den Bisq-Entwicklern blockiert.\nWahrscheinlich gibt es einen unbehobenen Bug, der Probleme beim Annehmen von Angeboten dieses Händlers verursacht. -offerbook.warning.requireUpdateToNewVersion=Ihre Bisq-Version ist nicht mehr zum Handeln geeignet.\nBitte updaten Sie Bisq auf die aktuellste Version unter [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Das Angebot wurde von den Haveno-Entwicklern blockiert.\nWahrscheinlich gibt es einen unbehobenen Bug, der Probleme beim Annehmen dieses Angebots verursacht. +offerbook.warning.currencyBanned=Die in diesem Handel verwendete Währung wurde von den Haveno-Entwicklern blockiert.\nBitte besuchen sie das Haveno-Forum für weitere Informationen. +offerbook.warning.paymentMethodBanned=Die in diesem Handel verwendete Zahlungsmethode wurde von den Haveno-Entwicklern blockiert.\nBitte besuchen sie das Haveno-Forum für weitere Informationen. +offerbook.warning.nodeBlocked=Die Onion-Adresse dieses Händlers wurde von den Haveno-Entwicklern blockiert.\nWahrscheinlich gibt es einen unbehobenen Bug, der Probleme beim Annehmen von Angeboten dieses Händlers verursacht. +offerbook.warning.requireUpdateToNewVersion=Ihre Haveno-Version ist nicht mehr zum Handeln geeignet.\nBitte updaten Sie Haveno auf die aktuellste Version unter [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=Sie können dieses Angebot nicht annehmen, weil Sie das früher schon getan haben. Es kann sein, dass Ihr vorheriger Annahme-Versuch zu einem fehlgeschlagenen Handel geführt hat. offerbook.info.sellAtMarketPrice=Sie verkaufen zum aktuellen Marktpreis (jede Minute aktualisiert). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Ihr Angebot finanzieren createOffer.fundsBox.offerFee=Handelsgebühr createOffer.fundsBox.networkFee=Mining-Gebühr createOffer.fundsBox.placeOfferSpinnerInfo=Das Angebot wird veröffentlicht ... -createOffer.fundsBox.paymentLabel=Bisq-Handel mit der ID {0} +createOffer.fundsBox.paymentLabel=Haveno-Handel mit der ID {0} createOffer.fundsBox.fundsStructure=({0} Kaution, {1} Handelsgebühr, {2} Mining-Gebühr) createOffer.success.headline=Ihr Angebot wurde veröffentlicht createOffer.success.info=Sie können Ihre offenen Angebote unter \"Portfolio/Meine offenen Angebote\" verwalten. @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Überprüfung: Anbieten moneros zu {0} createOffer.createOfferFundWalletInfo.headline=Ihr Angebot finanzieren # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Handelsbetrag: {0} \n -createOffer.createOfferFundWalletInfo.msg=Sie müssen zum Annehmen dieses Angebots {0} einzahlen.\n\nDiese Gelder werden in Ihrer lokalen Wallet reserviert und in die MultiSig-Kautionsadresse eingesperrt, wenn jemand Ihr Angebot annimmt.\n\nDer Betrag ist die Summe aus:\n{1}- Kaution: {2}\n- Handelsgebühr: {3}\n- Mining-Gebühr: {4}\n\nSie haben zwei Möglichkeiten, Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Bisq-Wallet (bequem, aber Transaktionen können nachverfolgbar sein) ODER\n- Von einer externen Wallet überweisen (möglicherweise vertraulicher)\n\nSie werden nach dem Schließen dieses Dialogs alle Finanzierungsmöglichkeiten und Details sehen. +createOffer.createOfferFundWalletInfo.msg=Sie müssen zum Annehmen dieses Angebots {0} einzahlen.\n\nDiese Gelder werden in Ihrer lokalen Wallet reserviert und in die MultiSig-Kautionsadresse eingesperrt, wenn jemand Ihr Angebot annimmt.\n\nDer Betrag ist die Summe aus:\n{1}- Kaution: {2}\n- Handelsgebühr: {3}\n- Mining-Gebühr: {4}\n\nSie haben zwei Möglichkeiten, Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Haveno-Wallet (bequem, aber Transaktionen können nachverfolgbar sein) ODER\n- Von einer externen Wallet überweisen (möglicherweise vertraulicher)\n\nSie werden nach dem Schließen dieses Dialogs alle Finanzierungsmöglichkeiten und Details sehen. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Es gab einen Fehler beim Erstellen des Angebots:\n\n{0}\n\nEs haben noch keine Gelder Ihre Wallet verlassen.\nBitte starten Sie Ihre Anwendung neu und überprüfen Sie Ihre Netzwerkverbindung. createOffer.setAmountPrice=Betrag und Preis festlegen -createOffer.warnCancelOffer=Sie haben das Angebot bereits finanziert.\nWenn Sie jetzt abbrechen, werden Ihre Gelder in Ihre lokale Bisq-Wallet verschoben und können unter \"Gelder/Gelder senden\" abgehoben werden.\nSind Sie sicher, dass Sie abbrechen wollen? +createOffer.warnCancelOffer=Sie haben das Angebot bereits finanziert.\nWenn Sie jetzt abbrechen, werden Ihre Gelder in Ihre lokale Haveno-Wallet verschoben und können unter \"Gelder/Gelder senden\" abgehoben werden.\nSind Sie sicher, dass Sie abbrechen wollen? createOffer.timeoutAtPublishing=Beim Veröffentlichen des Angebots ist eine Zeitüberschreitung aufgetreten. createOffer.errorInfo=\n\nDie Erstellungsgebühr wurde schon gezahlt. Im schlimmsten Fall haben Sie diese Gebühr verloren.\nVersuchen Sie bitte die Anwendung neu zu starten und überprüfen Sie Ihre Netzwerkverbindung um zu sehen, ob Sie das Problem beheben können. createOffer.tooLowSecDeposit.warning=Sie haben die Kaution auf einen niedrigeren Wert als den empfohlenen Standardwert von {0} gesetzt.\nSind Sie sicher, dass Sie eine niedrigere Kaution nutzen wollen? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Zu verkaufender Betrag takeOffer.fundsBox.offerFee=Handelsgebühr takeOffer.fundsBox.networkFee=Gesamte Mining-Gebühr takeOffer.fundsBox.takeOfferSpinnerInfo=Angebot wird angenommen ... -takeOffer.fundsBox.paymentLabel=Bisq-Handel mit der ID {0} +takeOffer.fundsBox.paymentLabel=Haveno-Handel mit der ID {0} takeOffer.fundsBox.fundsStructure=({0} Kaution, {1} Handelsgebühr, {2} Mining-Gebühr) takeOffer.success.headline=Sie haben erfolgreich ein Angebot angenommen. takeOffer.success.info=Sie können den Status Ihres Trades unter \"Portfolio/Offene Trades\" einsehen. @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=Sie können dieses Angebot nicht annehmen, da es takeOffer.takeOfferFundWalletInfo.headline=Ihren Handel finanzieren # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Handelsbetrag: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=Sie müssen zum Annehmen dieses Angebots {0} einzahlen.\n\nDer Betrag ist die Summe aus:\n{1}- Ihre Kaution: {2}\n- Handelsgebühr: {3}\n- Gesamte Mining-Gebühr: {4}\n\nSie haben zwei Möglichkeiten Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Bisq-Wallet (bequem, aber Transaktionen können nach verfolgbar sein) ODER\n- Von einer externen Wallet überweisen (möglicherweise vertraulicher)\n\nSie werden nach dem Schließen dieses Dialogs alle Finanzierungsmöglichkeiten und Details sehen. +takeOffer.takeOfferFundWalletInfo.msg=Sie müssen zum Annehmen dieses Angebots {0} einzahlen.\n\nDer Betrag ist die Summe aus:\n{1}- Ihre Kaution: {2}\n- Handelsgebühr: {3}\n- Gesamte Mining-Gebühr: {4}\n\nSie haben zwei Möglichkeiten Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Haveno-Wallet (bequem, aber Transaktionen können nach verfolgbar sein) ODER\n- Von einer externen Wallet überweisen (möglicherweise vertraulicher)\n\nSie werden nach dem Schließen dieses Dialogs alle Finanzierungsmöglichkeiten und Details sehen. takeOffer.alreadyPaidInFunds=Wenn Sie bereits Gelder gezahlt haben, können Sie diese unter \"Gelder/Gelder senden\" abheben. takeOffer.paymentInfo=Zahlungsinformationen takeOffer.setAmountPrice=Betrag festlegen -takeOffer.alreadyFunded.askCancel=Sie haben das Angebot bereits finanziert.\nWenn Sie jetzt abbrechen, werden Ihre Gelder in Ihre lokale Bisq-Wallet verschoben und können unter \"Gelder/Gelder senden\" abgehoben werden.\nSind Sie sicher, dass Sie abbrechen wollen? +takeOffer.alreadyFunded.askCancel=Sie haben das Angebot bereits finanziert.\nWenn Sie jetzt abbrechen, werden Ihre Gelder in Ihre lokale Haveno-Wallet verschoben und können unter \"Gelder/Gelder senden\" abgehoben werden.\nSind Sie sicher, dass Sie abbrechen wollen? takeOffer.failed.offerNotAvailable=Die Annahme des Angebots ist fehlgeschlagen, da das Angebot nicht mehr verfügbar ist. Möglicherweise hat zwischenzeitlich ein anderer Händler das Angebot angenommen. takeOffer.failed.offerTaken=Sie können dieses Angebot nicht annehmen, da es bereits von einem anderen Händler angenommen wurde. takeOffer.failed.offerRemoved=Sie können dieses Angebot nicht annehmen, da es inzwischen entfernt wurde. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Bestätigen: Angebot bearbeiten editOffer.publishOffer=Ihr Angebot wird veröffentlicht. editOffer.failed=Bearbeiten des Angebots fehlgeschlagen:\n{0} editOffer.success=Ihr Angebot wurde erfolgreich bearbeitet. -editOffer.invalidDeposit=Die Kaution des Käufers ist nicht in den, vom Bisq DAO definierten, Beschränkungen und können nicht mehr geändert werden. +editOffer.invalidDeposit=Die Kaution des Käufers ist nicht in den, vom Haveno DAO definierten, Beschränkungen und können nicht mehr geändert werden. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=Die Kautionstransaktion ist noch nicht be # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Ihr Handel hat mindestens eine Blockchain-Bestätigung erreicht.\n\n -portfolio.pending.step2_buyer.refTextWarn=Wichtig: Wenn Sie die Zahlung durchführen, lassen Sie das Feld \"Verwendungszweck\" leer. Geben Sie NICHT die Handels-ID oder einen anderen Text wie 'Bitcoin', 'BTC' oder 'Bisq' an. Sie können im Handels-Chat gerne besprechen ob ein alternativer \"Verwendungszweck\" für Sie beide zweckmäßig wäre. +portfolio.pending.step2_buyer.refTextWarn=Wichtig: Wenn Sie die Zahlung durchführen, lassen Sie das Feld \"Verwendungszweck\" leer. Geben Sie NICHT die Handels-ID oder einen anderen Text wie 'Bitcoin', 'BTC' oder 'Haveno' an. Sie können im Handels-Chat gerne besprechen ob ein alternativer \"Verwendungszweck\" für Sie beide zweckmäßig wäre. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=Sollte Ihre Bank irgendwelche Gebühren für die Überweisung erheben, müssen Sie diese Gebühren bezahlen. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=WICHTIGE VORAUSSETZUNG: \nNachd # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Bitte senden Sie {0} per \"US Postal Money Order\" an den BTC-Verkäufer.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Bitte schicken Sie {0} Bargeld per Post an den BTC Verkäufer. Genaue Anweisungen finden Sie im Handelsvertrag, oder Sie stellen über den Handels-Chat Fragen, wenn etwas unklar ist. Weitere Informationen über \"Bargeld per Post\" finden Sie im Bisq-Wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Bitte schicken Sie {0} Bargeld per Post an den BTC Verkäufer. Genaue Anweisungen finden Sie im Handelsvertrag, oder Sie stellen über den Handels-Chat Fragen, wenn etwas unklar ist. Weitere Informationen über \"Bargeld per Post\" finden Sie im Haveno-Wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Bitte zahlen Sie {0} mit der gewählten Zahlungsmethode an den BTC Verkäufer. Sie finden die Konto Details des Verkäufers im nächsten Fenster.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=MTCN und Quittung se portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Sie müssen die MTCN (Tracking-Nummer) und ein Foto der Quittung per E-Mail an den BTC-Verkäufer senden.\nDie Quittung muss den vollständigen Namen, die Stadt, das Land des Verkäufers und den Betrag deutlich zeigen. Die E-Mail-Adresse des Verkäufers lautet: {0}.\n\nHaben Sie die MTCN und Vertragt an den Verkäufer gesendet? portfolio.pending.step2_buyer.halCashInfo.headline=HalCash Code senden portfolio.pending.step2_buyer.halCashInfo.msg=Sie müssen eine SMS mit dem HalCash-Code sowie der Trade-ID ({0}) an den BTC-Verkäufer senden.\nDie Handynummer des Verkäufers lautet {1}.\n\nHaben Sie den Code an den Verkäufer gesendet? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Einige Banken könnten den Namen des Empfängers überprüfen. Faster Payments Konten, die in alten Bisq-Clients angelegt wurden, geben den Namen des Empfängers nicht an, also benutzen Sie bitte den Trade-Chat, um ihn zu erhalten (falls erforderlich). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Einige Banken könnten den Namen des Empfängers überprüfen. Faster Payments Konten, die in alten Haveno-Clients angelegt wurden, geben den Namen des Empfängers nicht an, also benutzen Sie bitte den Trade-Chat, um ihn zu erhalten (falls erforderlich). portfolio.pending.step2_buyer.confirmStart.headline=Bestätigen Sie, dass Sie die Zahlung begonnen haben portfolio.pending.step2_buyer.confirmStart.msg=Haben Sie die {0}-Zahlung an Ihren Handelspartner begonnen? portfolio.pending.step2_buyer.confirmStart.yes=Ja, ich habe die Zahlung begonnen portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=Sie haben keinen Zahlungsnachweis eingereicht. -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=Sie haben die Transaktions-ID und den Transaktionsschlüssel nicht eingegeben.\n\nWenn Sie diese Informationen nicht zur Verfügung stellen, kann Ihr Handelspartner die automatische Bestätigung nicht nutzen, um die BTC freizugeben sobald die XMR erhalten wurden.\nAußerdem setzt Bisq voraus, dass der Sender der XMR Transaktion diese Informationen im Falle eines Konflikts dem Vermittler oder der Schiedsperson mitteilen kann.\nWeitere Informationen finden Sie im Bisq Wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=Sie haben die Transaktions-ID und den Transaktionsschlüssel nicht eingegeben.\n\nWenn Sie diese Informationen nicht zur Verfügung stellen, kann Ihr Handelspartner die automatische Bestätigung nicht nutzen, um die BTC freizugeben sobald die XMR erhalten wurden.\nAußerdem setzt Haveno voraus, dass der Sender der XMR Transaktion diese Informationen im Falle eines Konflikts dem Vermittler oder der Schiedsperson mitteilen kann.\nWeitere Informationen finden Sie im Haveno Wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Die Eingabe ist kein 32 byte Hexadezimalwert portfolio.pending.step2_buyer.confirmStart.warningButton=Ignorieren und fortfahren portfolio.pending.step2_seller.waitPayment.headline=Auf Zahlung warten @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=Der BTC-Käufer hat die {0}-Zahlung noch nic portfolio.pending.step2_seller.openForDispute=Der BTC-Käufer hat seine Zahlung nicht begonnen!\nDie maximal zulässige Frist für den Handel ist abgelaufen.\nSie können länger warten und dem Handelspartner mehr Zeit geben oder den Vermittler um Hilfe bitten. tradeChat.chatWindowTitle=Chat-Fenster für Trade mit ID ''{0}'' tradeChat.openChat=Chat-Fenster öffnen -tradeChat.rules=Sie können mit Ihrem Trade-Partner kommunizieren, um mögliche Probleme mit diesem Trade zu lösen.\nEs ist nicht zwingend erforderlich, im Chat zu antworten.\nWenn ein Trader gegen eine der folgenden Regeln verstößt, eröffnen Sie einen Streitfall und melden Sie ihn dem Mediator oder Vermittler.\n\nChat-Regeln:\n\t● Senden Sie keine Links (Risiko von Malware). Sie können die Transaktions-ID und den Namen eines Block-Explorers senden.\n\t● Senden Sie keine Seed-Wörter, Private Keys, Passwörter oder andere sensible Informationen!\n\t● Traden Sie nicht außerhalb von Bisq (keine Sicherheit).\n\t● Beteiligen Sie sich nicht an Betrugsversuchen in Form von Social Engineering.\n\t● Wenn ein Partner nicht antwortet und es vorzieht, nicht über den Chat zu kommunizieren, respektieren Sie seine Entscheidung.\n\t● Beschränken Sie Ihre Kommunikation auf das Traden. Dieser Chat ist kein Messenger-Ersatz oder eine Trollbox.\n\t● Bleiben Sie im Gespräch freundlich und respektvoll. +tradeChat.rules=Sie können mit Ihrem Trade-Partner kommunizieren, um mögliche Probleme mit diesem Trade zu lösen.\nEs ist nicht zwingend erforderlich, im Chat zu antworten.\nWenn ein Trader gegen eine der folgenden Regeln verstößt, eröffnen Sie einen Streitfall und melden Sie ihn dem Mediator oder Vermittler.\n\nChat-Regeln:\n\t● Senden Sie keine Links (Risiko von Malware). Sie können die Transaktions-ID und den Namen eines Block-Explorers senden.\n\t● Senden Sie keine Seed-Wörter, Private Keys, Passwörter oder andere sensible Informationen!\n\t● Traden Sie nicht außerhalb von Haveno (keine Sicherheit).\n\t● Beteiligen Sie sich nicht an Betrugsversuchen in Form von Social Engineering.\n\t● Wenn ein Partner nicht antwortet und es vorzieht, nicht über den Chat zu kommunizieren, respektieren Sie seine Entscheidung.\n\t● Beschränken Sie Ihre Kommunikation auf das Traden. Dieser Chat ist kein Messenger-Ersatz oder eine Trollbox.\n\t● Bleiben Sie im Gespräch freundlich und respektvoll. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Undefiniert @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=Rückerstattete Kaution portfolio.pending.step5_buyer.withdrawBTC=Ihre Bitcoins abheben portfolio.pending.step5_buyer.amount=Abzuhebender Betrag portfolio.pending.step5_buyer.withdrawToAddress=An diese Adresse abheben -portfolio.pending.step5_buyer.moveToBisqWallet=Gelder in der Bisq Wallet aufbewahren +portfolio.pending.step5_buyer.moveToHavenoWallet=Gelder in der Haveno Wallet aufbewahren portfolio.pending.step5_buyer.withdrawExternal=An externe Wallet abheben portfolio.pending.step5_buyer.alreadyWithdrawn=Ihre Gelder wurden bereits abgehoben.\nBitte überprüfen Sie den Transaktionsverlauf. portfolio.pending.step5_buyer.confirmWithdrawal=Anfrage zum Abheben bestätigen @@ -739,9 +739,9 @@ portfolio.pending.step5_seller.sold=Sie haben verkauft portfolio.pending.step5_seller.received=Sie haben erhalten tradeFeedbackWindow.title=Glückwunsch zum Abschluss ihres Handels. -tradeFeedbackWindow.msg.part1=Wir würden gerne von Ihren Erfahrungen mit Bisq hören. Dies hilft uns die Software zu verbessern und etwaige Stolpersteine zu beseitigen. Um uns ihr Feedback mitzuteilen, füllen Sie bitte diese kurze Umfrage aus (keine Registrierung benötigt): -tradeFeedbackWindow.msg.part2=Sollten Sie Fragen oder Probleme haben, kontaktieren Sie andere Nutzer und Mitwirkende im Bisq-Forum auf: -tradeFeedbackWindow.msg.part3=Vielen Dank, dass Sie Bisq benutzen! +tradeFeedbackWindow.msg.part1=Wir würden gerne von Ihren Erfahrungen mit Haveno hören. Dies hilft uns die Software zu verbessern und etwaige Stolpersteine zu beseitigen. Um uns ihr Feedback mitzuteilen, füllen Sie bitte diese kurze Umfrage aus (keine Registrierung benötigt): +tradeFeedbackWindow.msg.part2=Sollten Sie Fragen oder Probleme haben, kontaktieren Sie andere Nutzer und Mitwirkende im Haveno-Forum auf: +tradeFeedbackWindow.msg.part3=Vielen Dank, dass Sie Haveno benutzen! portfolio.pending.role=Meine Rolle portfolio.pending.tradeInformation=Handelsinformationen @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=Die Handelsdauer beginnt mit der ersten Blockc portfolio.pending.tradePeriodWarning=Wird die Dauer überschritten, können beide Händler einen Konflikt öffnen. portfolio.pending.tradeNotCompleted=Maximale Handelsdauer wurde überschritten (bis {0}) portfolio.pending.tradeProcess=Handelsprozess -portfolio.pending.openAgainDispute.msg=Wenn Sie sich nicht sicher sind, ob die Nachricht an den Vermittler oder die Schiedsperson angekommen ist (z. B., wenn Sie nach einem Tag noch keine Antwort erhalten haben), können Sie mit Cmd/Strg+o einen weiteren Konfliktfall eröffnen. Sie können auch im Bisq Forum nach Hilfe fragen [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=Wenn Sie sich nicht sicher sind, ob die Nachricht an den Vermittler oder die Schiedsperson angekommen ist (z. B., wenn Sie nach einem Tag noch keine Antwort erhalten haben), können Sie mit Cmd/Strg+o einen weiteren Konfliktfall eröffnen. Sie können auch im Haveno Forum nach Hilfe fragen [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Konflikt erneut öffnen portfolio.pending.openSupportTicket.headline=Support-Ticket öffnen portfolio.pending.openSupportTicket.msg=Bitte verwenden Sie diese Funktion nur in Notfällen, wenn Sie keinen \"Open support\" oder \"Open dispute\" Button sehen.\n\nWenn Sie ein Support-Ticket öffnen, wird der Trade unterbrochen und von einem Mediator oder Vermittler bearbeitet. portfolio.pending.timeLockNotOver=Sie müssen ≈{0} ({1} weitere Blöcke) warten, bevor Sie einen Vermittlungskonflikt eröffnen können. -portfolio.pending.error.depositTxNull=Die Einzahlungstransaktion ist null. Sie können einen Streitfall nicht ohne eine gültige Einzahlungstransaktion eröffnen. Bitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\n\nFür weitere Hilfe wenden Sie sich bitte an den Bisq-Support-Kanal des Bisq Keybase Teams. +portfolio.pending.error.depositTxNull=Die Einzahlungstransaktion ist null. Sie können einen Streitfall nicht ohne eine gültige Einzahlungstransaktion eröffnen. Bitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\n\nFür weitere Hilfe wenden Sie sich bitte an den Haveno-Support-Kanal des Haveno Keybase Teams. portfolio.pending.mediationResult.error.depositTxNull=Die Einzahlungstransaktion ist ungültig. Sie können den Handel zu den fehlgeschlagenen Händeln verschieben. portfolio.pending.mediationResult.error.delayedPayoutTxNull=Die verzögerte Auszahlungstransaktion ist ungültig. Sie können den Handel zu den fehlgeschlagenen Händeln verschieben. -portfolio.pending.error.depositTxNotConfirmed=Die Einzahlungstransaktion ist nicht bestätigt. Sie können einen Streitfall nicht ohne eine bestätigte Einzahlungstransaktion eröffnen. Bitte warten Sie, bis diese bestätigt ist, oder gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\n\nFür weitere Hilfe wenden Sie sich bitte an den Bisq-Support-Kanal des Bisq Keybase Teams. +portfolio.pending.error.depositTxNotConfirmed=Die Einzahlungstransaktion ist nicht bestätigt. Sie können einen Streitfall nicht ohne eine bestätigte Einzahlungstransaktion eröffnen. Bitte warten Sie, bis diese bestätigt ist, oder gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\n\nFür weitere Hilfe wenden Sie sich bitte an den Haveno-Support-Kanal des Haveno Keybase Teams. portfolio.pending.support.headline.getHelp=Brauchen Sie Hilfe? -portfolio.pending.support.text.getHelp=Wenn Sie irgendwelche Probleme haben, können Sie versuchen, den Trade-Partner im Trade-Chat zu kontaktieren oder die Bisq-Community unter https://bisq.community zu fragen. Wenn Ihr Problem immer noch nicht gelöst ist, können Sie weitere Hilfe von einem Mediator anfordern. +portfolio.pending.support.text.getHelp=Wenn Sie irgendwelche Probleme haben, können Sie versuchen, den Trade-Partner im Trade-Chat zu kontaktieren oder die Haveno-Community unter https://haveno.community zu fragen. Wenn Ihr Problem immer noch nicht gelöst ist, können Sie weitere Hilfe von einem Mediator anfordern. portfolio.pending.support.button.getHelp=Trader Chat öffnen portfolio.pending.support.headline.halfPeriodOver=Zahlung überprüfen portfolio.pending.support.headline.periodOver=Die Handelsdauer ist abgelaufen @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=Die Transaktion der Abnehm portfolio.pending.failedTrade.missingDepositTx=Die Einzahlungstransaktion (die 2-of-2 Multisig-Transaktion) fehlt.\n\nOhne diese tx kann der Handel nicht abgeschlossen werden. Keine Gelder wurden gesperrt aber die Handels-Gebühr wurde bezahlt. Sie können eine Anfrage für eine Rückerstattung der Handels-Gebühr hier einreichen: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nSie können diesen Handel gerne zu den fehlgeschlagenen Händeln verschieben. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=Die verzögerte Auszahlungstransaktion fehlt, aber die Gelder wurden in der Einzahlungstransaktion gesperrt.\n\nBitte schicken Sie KEINE Geld-(Fiat-) oder Altcoin-Zahlungen an den BTC Verkäufer, weil ohne die verzögerte Auszahlungstransaktion später kein Schlichtungsverfahren eröffnet werden kann. Stattdessen öffnen Sie ein Vermittlungs-Ticket mit Cmd/Strg+o. Der Vermittler sollte vorschlagen, dass beide Handelspartner ihre vollständige Sicherheitskaution zurückerstattet bekommen (und der Verkäufer auch seinen Handels-Betrag). Durch diese Vorgehensweise entsteht kein Sicherheitsrisiko und es geht ausschließlich die Handelsgebühr verloren.\n\nSie können eine Rückerstattung der verlorenen gegangenen Handelsgebühren hier erbitten: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=Die verzögerte Auszahlungstransaktion fehlt, aber die Gelder wurden in der Einzahlungstransaktion gesperrt.\n\nWenn dem Käufer die verzögerte Auszahlungstransaktion auch fehlt, wird er dazu aufgefordert die Bezahlung NICHT zu schicken und stattdessen ein Vermittlungs-Ticket zu eröffnen. Sie sollten auch ein Vermittlungs-Ticket mit Cmd/Strg+o öffnen.\n\nWenn der Käufer die Zahlung noch nicht geschickt hat, sollte der Vermittler vorschlagen, dass beide Handelspartner ihre Sicherheitskaution vollständig zurückerhalten (und der Verkäufer auch den Handels-Betrag). Anderenfalls sollte der Handels-Betrag an den Käufer gehen.\n\nSie können eine Rückerstattung der verlorenen gegangenen Handelsgebühren hier erbitten: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=Während der Ausführung des Handel-Protokolls ist ein Fehler aufgetreten.\n\nFehler: {0}\n\nEs kann sein, dass dieser Fehler nicht gravierend ist und der Handel ganz normal abgeschlossen werden kann. Wenn Sie sich unsicher sind, öffnen Sie ein Vermittlungs-Ticket um den Rat eines Bisq Vermittlers zu erhalten.\n\nWenn der Fehler gravierend war, kann der Handel nicht abgeschlossen werden und Sie haben vielleicht die Handelsgebühr verloren. Sie können eine Rückerstattung der verlorenen gegangenen Handelsgebühren hier erbitten: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=Während der Ausführung des Handel-Protokolls ist ein Fehler aufgetreten.\n\nFehler: {0}\n\nEs kann sein, dass dieser Fehler nicht gravierend ist und der Handel ganz normal abgeschlossen werden kann. Wenn Sie sich unsicher sind, öffnen Sie ein Vermittlungs-Ticket um den Rat eines Haveno Vermittlers zu erhalten.\n\nWenn der Fehler gravierend war, kann der Handel nicht abgeschlossen werden und Sie haben vielleicht die Handelsgebühr verloren. Sie können eine Rückerstattung der verlorenen gegangenen Handelsgebühren hier erbitten: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=Der Handelsvertrag ist nicht festgelegt.\n\nDer Handel kann nicht abgeschlossen werden und Sie haben möglicherweise die Handelsgebühr verloren. Sollte das der Fall sein, können Sie eine Rückerstattung der verlorenen gegangenen Handelsgebühren hier beantragen: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=Das Handels-Protokoll hat ein paar Probleme gefunden.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=Das Handels-Protokoll hat ein schwerwiegendes Problem gefunden.\n\n{0}\n\nWollen Sie den Handel zu den fehlgeschlagenen Händeln verschieben?\n\nSie können keine Vermittlungs- oder Schlichtungsverfahren auf der Seite für fehlgeschlagene Händel eröffnen, aber Sie können einen fehlgeschlagene Handel wieder auf die Seite der offenen Händeln zurück verschieben. @@ -828,7 +828,7 @@ funds.tab.transactions=Transaktionen funds.deposit.unused=Ungenutzt funds.deposit.usedInTx=In {0} Transaktion(en) genutzt -funds.deposit.fundHavenoWallet=Bisq-Wallet finanzieren +funds.deposit.fundHavenoWallet=Haveno-Wallet finanzieren funds.deposit.noAddresses=Es wurden noch keine Kautionsadressen generiert funds.deposit.fundWallet=Ihre Wallet finanzieren funds.deposit.withdrawFromWallet=Gelder aus Wallet übertragen @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=Von Wallet abgehoben funds.tx.memo=Notiz funds.tx.noTxAvailable=Keine Transaktionen verfügbar funds.tx.revert=Umkehren -funds.tx.txSent=Transaktion erfolgreich zu einer neuen Adresse in der lokalen Bisq-Wallet gesendet. +funds.tx.txSent=Transaktion erfolgreich zu einer neuen Adresse in der lokalen Haveno-Wallet gesendet. funds.tx.direction.self=An Sie selbst senden funds.tx.dustAttackTx=Staub erhalten -funds.tx.dustAttackTx.popup=Diese Transaktion sendet einen sehr kleinen BTC Betrag an Ihre Wallet und kann von Chainanalyse Unternehmen genutzt werden um ihre Wallet zu spionieren.\n\nWenn Sie den Transaktionsausgabe in einer Ausgabe nutzen, wird es lernen, dass Sie wahrscheinlich auch Besitzer der anderen Adressen sind (coin merge),\n\nUm Ihre Privatsphäre zu schützen, wir die Bisqwallet Staubausgaben für Ausgaben und bei der Anzeige der Guthabens ignorieren. Sie können den Grenzwert, ab wann ein Wert als Staub angesehen wird in den Einstellungen ändern. +funds.tx.dustAttackTx.popup=Diese Transaktion sendet einen sehr kleinen BTC Betrag an Ihre Wallet und kann von Chainanalyse Unternehmen genutzt werden um ihre Wallet zu spionieren.\n\nWenn Sie den Transaktionsausgabe in einer Ausgabe nutzen, wird es lernen, dass Sie wahrscheinlich auch Besitzer der anderen Adressen sind (coin merge),\n\nUm Ihre Privatsphäre zu schützen, wir die Havenowallet Staubausgaben für Ausgaben und bei der Anzeige der Guthabens ignorieren. Sie können den Grenzwert, ab wann ein Wert als Staub angesehen wird in den Einstellungen ändern. #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=Nachricht wird gesendet... support.receiverNotOnline=Empfänger ist nicht online. Nachricht wird in der Mailbox gespeichert. support.sendMessageError=Senden der Nachricht fehlgeschlagen. Fehler: {0} support.receiverNotKnown=Empfänger unbekannt -support.wrongVersion=Das Angebot im Konflikt wurde mit einer älteren Bisq-Version erstellt.\nSie können den Konflikt nicht mir Ihrer Version der Anwendung schließen.\n\nNutzen Sie bitte eine ältere Version mit der Protokollversion {0} +support.wrongVersion=Das Angebot im Konflikt wurde mit einer älteren Haveno-Version erstellt.\nSie können den Konflikt nicht mir Ihrer Version der Anwendung schließen.\n\nNutzen Sie bitte eine ältere Version mit der Protokollversion {0} support.openFile=Anzufügende Datei öffnen (max. Dateigröße: {0} kb) support.attachmentTooLarge=Die Gesamtgröße Ihres Anhangs ist {0} kb und überschreitet die maximal erlaubte Nachrichtengröße von {1} kB. support.maxSize=Die maximal erlaubte Dateigröße ist {0} kB. @@ -953,15 +953,15 @@ support.sellerMaker=BTC-Verkäufer/Ersteller support.buyerTaker=BTC-Käufer/Abnehmer support.sellerTaker=BTC-Verkäufer/Abnehmer -support.backgroundInfo=Bisq ist kein Unternehmen, daher behandelt es Konflikte unterschiedlich.\n\nTrader können innerhalb der Anwendung über einen sicheren Chat auf dem Bildschirm für offene Trades kommunizieren, um zu versuchen, Konflikte selbst zu lösen. Wenn das nicht ausreicht, kann ein Mediator einschreiten und helfen. Der Mediator wird die Situation bewerten und eine Auszahlung von Trade Funds vorschlagen. Wenn beide Trader diesen Vorschlag annehmen, ist die Auszahlungstransaktion abgeschlossen und der Trade geschlossen. Wenn ein oder beide Trader mit der vom Mediator vorgeschlagenen Auszahlung nicht einverstanden sind, können sie ein Vermittlungsverfahren beantragen, bei dem der Vermittler die Situation neu bewertet und, falls gerechtfertigt, dem Trader persönlich eine Rückerstattung leistet und die Rückerstattung dieser Zahlung vom Bisq DAO verlangt. -support.initialInfo=Bitte geben Sie eine Beschreibung Ihres Problems in das untenstehende Textfeld ein. Fügen Sie so viele Informationen wie möglich hinzu, um die Zeit für die Konfliktlösung zu verkürzen.\n\nHier ist eine Checkliste für Informationen, die Sie angeben sollten:\n\t● Wenn Sie der BTC-Käufer sind: Haben Sie die Fiat- oder Altcoin-Überweisung gemacht? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung gestartet" geklickt?\n\t● Wenn Sie der BTC-Verkäufer sind: Haben Sie die Fiat- oder Altcoin-Zahlung erhalten? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung erhalten" geklickt?\n\t● Welche Version von Bisq verwenden Sie?\n\t● Welches Betriebssystem verwenden Sie?\n\t● Wenn Sie ein Problem mit fehlgeschlagenen Transaktionen hatten, überlegen Sie bitte, in ein neues Datenverzeichnis zu wechseln.\n\t Manchmal wird das Datenverzeichnis beschädigt und führt zu seltsamen Fehlern. \n\t Siehe: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nBitte machen Sie sich mit den Grundregeln für den Konfliktprozess vertraut:\n\t● Sie müssen auf die Anfragen der {0}'' innerhalb von 2 Tagen antworten.\n\t● Mediatoren antworten innerhalb von 2 Tagen. Die Vermittler antworten innerhalb von 5 Werktagen.\n\t● Die maximale Frist für einen Konflikt beträgt 14 Tage.\n\t● Sie müssen mit den {1} zusammenarbeiten und die Informationen zur Verfügung stellen, die sie anfordern, um Ihren Fall zu bearbeiten.\n\t● Mit dem ersten Start der Anwendung haben Sie die Regeln des Konfliktdokuments in der Nutzervereinbarung akzeptiert.\n\nSie können mehr über den Konfliktprozess erfahren unter: {2} +support.backgroundInfo=Haveno ist kein Unternehmen, daher behandelt es Konflikte unterschiedlich.\n\nTrader können innerhalb der Anwendung über einen sicheren Chat auf dem Bildschirm für offene Trades kommunizieren, um zu versuchen, Konflikte selbst zu lösen. Wenn das nicht ausreicht, kann ein Mediator einschreiten und helfen. Der Mediator wird die Situation bewerten und eine Auszahlung von Trade Funds vorschlagen. Wenn beide Trader diesen Vorschlag annehmen, ist die Auszahlungstransaktion abgeschlossen und der Trade geschlossen. Wenn ein oder beide Trader mit der vom Mediator vorgeschlagenen Auszahlung nicht einverstanden sind, können sie ein Vermittlungsverfahren beantragen, bei dem der Vermittler die Situation neu bewertet und, falls gerechtfertigt, dem Trader persönlich eine Rückerstattung leistet und die Rückerstattung dieser Zahlung vom Haveno DAO verlangt. +support.initialInfo=Bitte geben Sie eine Beschreibung Ihres Problems in das untenstehende Textfeld ein. Fügen Sie so viele Informationen wie möglich hinzu, um die Zeit für die Konfliktlösung zu verkürzen.\n\nHier ist eine Checkliste für Informationen, die Sie angeben sollten:\n\t● Wenn Sie der BTC-Käufer sind: Haben Sie die Fiat- oder Altcoin-Überweisung gemacht? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung gestartet" geklickt?\n\t● Wenn Sie der BTC-Verkäufer sind: Haben Sie die Fiat- oder Altcoin-Zahlung erhalten? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung erhalten" geklickt?\n\t● Welche Version von Haveno verwenden Sie?\n\t● Welches Betriebssystem verwenden Sie?\n\t● Wenn Sie ein Problem mit fehlgeschlagenen Transaktionen hatten, überlegen Sie bitte, in ein neues Datenverzeichnis zu wechseln.\n\t Manchmal wird das Datenverzeichnis beschädigt und führt zu seltsamen Fehlern. \n\t Siehe: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nBitte machen Sie sich mit den Grundregeln für den Konfliktprozess vertraut:\n\t● Sie müssen auf die Anfragen der {0}'' innerhalb von 2 Tagen antworten.\n\t● Mediatoren antworten innerhalb von 2 Tagen. Die Vermittler antworten innerhalb von 5 Werktagen.\n\t● Die maximale Frist für einen Konflikt beträgt 14 Tage.\n\t● Sie müssen mit den {1} zusammenarbeiten und die Informationen zur Verfügung stellen, die sie anfordern, um Ihren Fall zu bearbeiten.\n\t● Mit dem ersten Start der Anwendung haben Sie die Regeln des Konfliktdokuments in der Nutzervereinbarung akzeptiert.\n\nSie können mehr über den Konfliktprozess erfahren unter: {2} support.systemMsg=Systemnachricht: {0} -support.youOpenedTicket=Sie haben eine Anfrage auf Support geöffnet.\n\n{0}\n\nBisq-Version: {1} -support.youOpenedDispute=Sie haben eine Anfrage für einen Konflikt geöffnet.\n\n{0}\n\nBisq-version: {1} -support.youOpenedDisputeForMediation=Sie haben um Mediation gebeten.\n\n{0}\n\nBisq-Version: {1} -support.peerOpenedTicket=Ihr Trading-Partner hat aufgrund technischer Probleme Unterstützung angefordert.\n\n{0}\n\nBisq-Version: {1} -support.peerOpenedDispute=Ihr Trading-Partner hat einen Konflikt eröffnet.\n\n{0}\n\nBisq-Version: {1} -support.peerOpenedDisputeForMediation=Ihr Trading-Partner hat eine Mediation beantragt.\n\n{0}\n\nBisq-Version: {1} +support.youOpenedTicket=Sie haben eine Anfrage auf Support geöffnet.\n\n{0}\n\nHaveno-Version: {1} +support.youOpenedDispute=Sie haben eine Anfrage für einen Konflikt geöffnet.\n\n{0}\n\nHaveno-version: {1} +support.youOpenedDisputeForMediation=Sie haben um Mediation gebeten.\n\n{0}\n\nHaveno-Version: {1} +support.peerOpenedTicket=Ihr Trading-Partner hat aufgrund technischer Probleme Unterstützung angefordert.\n\n{0}\n\nHaveno-Version: {1} +support.peerOpenedDispute=Ihr Trading-Partner hat einen Konflikt eröffnet.\n\n{0}\n\nHaveno-Version: {1} +support.peerOpenedDisputeForMediation=Ihr Trading-Partner hat eine Mediation beantragt.\n\n{0}\n\nHaveno-Version: {1} support.mediatorsDisputeSummary=Systemnachricht: Konflikt-Zusammenfassung des Mediators:\n{0} support.mediatorsAddress=Node-Adresse des Mediators: {0} support.warning.disputesWithInvalidDonationAddress=Die verzögerte Auszahlungstransaktion hat eine ungültige Empfängeradresse verwendet. Sie stimmt mit keinem der DAO-Parameter für die gültigen Spendenadressen überein.\n\nDies könnte ein Betrugsversuch sein. Bitte informieren Sie die Entwickler über diesen Vorfall und schließen Sie den Fall nicht ab, bevor die Situation geklärt ist!\n\nIn dem Konflikt verwendete Adresse: {0}\n\nAlle DAO-Param-Spendenadressen: {1}\n\nHandels-ID: {2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaktions-URL settings.preferences.editCustomExplorer.addressUrl=Adress-URL settings.net.btcHeader=Bitcoin-Netzwerk -settings.net.p2pHeader=Bisq-Netzwerk +settings.net.p2pHeader=Haveno-Netzwerk settings.net.onionAddressLabel=Meine Onion-Adresse settings.net.btcNodesLabel=Spezifische Bitcoin-Core-Knoten verwenden settings.net.bitcoinPeersLabel=Verbundene Peers @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=Mit Bitcoin-Core-Knoten verbinden settings.net.useProvidedNodesRadio=Bereitgestellte Bitcoin-Core-Knoten verwenden settings.net.usePublicNodesRadio=Öffentliches Bitcoin-Netzwerk benutzen settings.net.useCustomNodesRadio=Spezifische Bitcoin-Core-Knoten verwenden -settings.net.warn.usePublicNodes=Wenn Sie das öffentliche Bitcoin Netzwerk verwenden, sind Sie den Privatsphäre-Probleme die durch das defekte Bloom Filter Design, das von SPV wallets wie BitcoinJ (verwendet von Bisq) verwendet wird, ausgesetzt. Jede Full Node mit der Sie sich verbinden könnte dadurch alle Adressen, die zu einer Entität gehören, herausfinden.\n\nWeitere Informationen finden Sie unter [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nSind Sie sicher, dass Sie die öffentlichen Nodes verwenden wollen? +settings.net.warn.usePublicNodes=Wenn Sie das öffentliche Bitcoin Netzwerk verwenden, sind Sie den Privatsphäre-Probleme die durch das defekte Bloom Filter Design, das von SPV wallets wie BitcoinJ (verwendet von Haveno) verwendet wird, ausgesetzt. Jede Full Node mit der Sie sich verbinden könnte dadurch alle Adressen, die zu einer Entität gehören, herausfinden.\n\nWeitere Informationen finden Sie unter [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nSind Sie sicher, dass Sie die öffentlichen Nodes verwenden wollen? settings.net.warn.usePublicNodes.useProvided=Nein, bereitgestellte Knoten verwenden settings.net.warn.usePublicNodes.usePublic=Ja, öffentliches Netzwerk verwenden settings.net.warn.useCustomNodes.B2XWarning=Bitte stellen Sie sicher, dass Sie sich mit einem vertrauenswürdigen Bitcoin-Core-Knoten verbinden!\n\nWenn Sie sich mit Knoten verbinden, die gegen die Bitcoin Core Konsensus-Regeln verstoßen, kann es zu Problemen in Ihrer Wallet und im Verlauf des Handelsprozesses kommen.\n\nBenutzer die sich zu oben genannten Knoten verbinden, sind für den verursachten Schaden verantwortlich. Dadurch entstandene Konflikte werden zugunsten des anderen Teilnehmers entschieden. Benutzer die unsere Warnungen und Sicherheitsmechanismen ignorieren wird keine technische Unterstützung geleistet! settings.net.warn.invalidBtcConfig=Die Verbindung zum Bitcoin-Netzwerk ist fehlgeschlagen, weil Ihre Konfiguration ungültig ist.\n\nIhre Konfiguration wurde zurückgesetzt, um stattdessen die bereitgestellten Bitcoin-Nodes zu verwenden. Sie müssen die Anwendung neu starten. -settings.net.localhostBtcNodeInfo=Hintergrundinformationen: Bisq sucht beim Start nach einem lokalen Bitcoin-Node. Wird dieser gefunden, kommuniziert Bisq ausschließlich über diesen mit dem Bitcoin-Netzwerk. +settings.net.localhostBtcNodeInfo=Hintergrundinformationen: Haveno sucht beim Start nach einem lokalen Bitcoin-Node. Wird dieser gefunden, kommuniziert Haveno ausschließlich über diesen mit dem Bitcoin-Netzwerk. settings.net.p2PPeersLabel=Verbundene Peers settings.net.onionAddressColumn=Onion-Adresse settings.net.creationDateColumn=Eingerichtet @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Sind Sie sicher, dass Sie den SPV Resync starten m settings.net.reSyncSPVAfterRestart=Die SPV-Kettendatei wurde gelöscht. Haben Sie bitte Geduld, es kann eine Weile dauern mit dem Netzwerk neu zu synchronisieren. settings.net.reSyncSPVAfterRestartCompleted=Die erneute Synchronisation ist jetzt abgeschlossen. Bitte starten Sie die Anwendung neu. settings.net.reSyncSPVFailed=Konnte SPV-Kettendatei nicht löschen.\nFehler: {0} -setting.about.aboutBisq=Über Bisq -setting.about.about=Bisq ist Open-Source Software, die den Tausch von Bitcoin mit nationaler Währung (und anderen Kryptowährungen), durch ein dezentralisiertes Peer-zu-Peer Netzwerk auf eine Weise ermöglicht, die Ihre Privatsphäre stark beschützt. Lernen Sie auf unserer Projektwebseite mehr über Bisq. -setting.about.web=Bisq-Website +setting.about.aboutHaveno=Über Haveno +setting.about.about=Haveno ist Open-Source Software, die den Tausch von Bitcoin mit nationaler Währung (und anderen Kryptowährungen), durch ein dezentralisiertes Peer-zu-Peer Netzwerk auf eine Weise ermöglicht, die Ihre Privatsphäre stark beschützt. Lernen Sie auf unserer Projektwebseite mehr über Haveno. +setting.about.web=Haveno-Website setting.about.code=Quellcode setting.about.agpl=AGPL-Lizenz -setting.about.support=Bisq unterstützen -setting.about.def=Bisq ist keine Firma, sondern ein Gemeinschaftsprojekt, das offen für Mitwirken ist. Wenn Sie an Bisq mitwirken oder das Projekt unterstützen wollen, folgen Sie bitte den unten stehenden Links. +setting.about.support=Haveno unterstützen +setting.about.def=Haveno ist keine Firma, sondern ein Gemeinschaftsprojekt, das offen für Mitwirken ist. Wenn Sie an Haveno mitwirken oder das Projekt unterstützen wollen, folgen Sie bitte den unten stehenden Links. setting.about.contribute=Mitwirken setting.about.providers=Datenanbieter -setting.about.apisWithFee=Bisq verwendet die Bisq Preis Indizes für Fiat und Altcoin Preise und die Bisq Mempool Nodes für die Abschätzung der Mining-Gebühr. -setting.about.apis=Bisq verwendet den Haveno Price Index für Fiat und Altcoin Preise. +setting.about.apisWithFee=Haveno verwendet die Haveno Preis Indizes für Fiat und Altcoin Preise und die Haveno Mempool Nodes für die Abschätzung der Mining-Gebühr. +setting.about.apis=Haveno verwendet den Haveno Price Index für Fiat und Altcoin Preise. setting.about.pricesProvided=Marktpreise zur Verfügung gestellt von setting.about.feeEstimation.label=Geschätzte Mining-Gebühr bereitgestellt von setting.about.versionDetails=Versionsdetails @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Strg + {0}'' oder ''Alt + {0}'' oder '' setting.about.shortcuts.menuNav=Hauptmenü navigieren setting.about.shortcuts.menuNav.value=Um durch das Hauptmenü zu navigieren, drücken Sie: 'Strg' oder 'Alt' oder 'cmd' mit einer numerischen Taste zwischen '1-9' -setting.about.shortcuts.close=Bisq beenden +setting.about.shortcuts.close=Haveno beenden setting.about.shortcuts.close.value=''Strg + {0}'' oder ''cmd + {0}'' bzw. ''Strg + {1}'' oder ''cmd + {1}'' setting.about.shortcuts.closePopup=Popup- oder Dialogfenster schließen @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Private Benachrichtigung an Peer setting.about.shortcuts.sendPrivateNotification.value=Öffnen Sie die Partner-Infos am Avatar und klicken Sie: {0} setting.info.headline=Neues automatisches Bestätigungs-Feature für XMR -setting.info.msg=Wenn Sie BTC für XMR verkaufen, können Sie die automatische Bestätigung aktivieren um nachzuprüfen ob die korrekte Menge an Ihr Wallet gesendet wurde. So kann Bisq den Trade automatisch abschließen und Trades dadurch für alle schneller machen.\n\nDie automatische Bestätigung überprüft die XMR Transaktion über mindestens 2 XMR Explorer Nodes mit dem privaten Transaktionsschlüssel den der Sender zur Verfügung gestellt hat. Bisq verwendet standardmäßig Explorer Nodes die von Bisq Contributors betrieben werden aber wir empfehlen, dass Sie für ein Maximum an Sicherheit und Privatsphäre Ihre eigene XMR Explorer Node betreiben.\n\nFür automatische Bestätigungen, können Sie die max. Höhe an BTC pro Trade und die Anzahl der benötigten Bestätigungen in den Einstellungen festlegen.\n\nFinden Sie weitere Informationen (und eine Anleitung wie Sie Ihre eigene Explorer Node aufsetzen) im Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=Wenn Sie BTC für XMR verkaufen, können Sie die automatische Bestätigung aktivieren um nachzuprüfen ob die korrekte Menge an Ihr Wallet gesendet wurde. So kann Haveno den Trade automatisch abschließen und Trades dadurch für alle schneller machen.\n\nDie automatische Bestätigung überprüft die XMR Transaktion über mindestens 2 XMR Explorer Nodes mit dem privaten Transaktionsschlüssel den der Sender zur Verfügung gestellt hat. Haveno verwendet standardmäßig Explorer Nodes die von Haveno Contributors betrieben werden aber wir empfehlen, dass Sie für ein Maximum an Sicherheit und Privatsphäre Ihre eigene XMR Explorer Node betreiben.\n\nFür automatische Bestätigungen, können Sie die max. Höhe an BTC pro Trade und die Anzahl der benötigten Bestätigungen in den Einstellungen festlegen.\n\nFinden Sie weitere Informationen (und eine Anleitung wie Sie Ihre eigene Explorer Node aufsetzen) im Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=Wenn Sie BTC für XMR verkaufen, können Sie die automatische B account.tab.mediatorRegistration=Mediator-Registrierung account.tab.refundAgentRegistration=Registrierung des Rückerstattungsbeauftragten account.tab.signing=Unterzeichnung -account.info.headline=Willkommen in Ihrem Bisq-Konto -account.info.msg=Hier können Sie Trading-Konten für nationale Währungen und Altcoins hinzufügen und Backups für Ihre Wallets & Kontodaten erstellen.\n\nEine leere Bitcoin-Wallet wurde erstellt, als Sie das erste Mal Bisq gestartet haben.\n\nWir empfehlen, dass Sie Ihre Bitcoin-Wallet-Seed-Wörter aufschreiben (siehe Tab oben) und sich überlegen ein Passwort hinzuzufügen, bevor Sie einzahlen. Bitcoin-Einzahlungen und Auszahlungen werden unter \"Gelder\" verwaltet.\n\nHinweis zu Privatsphäre & Sicherheit: da Bisq eine dezentralisierte Börse ist, bedeutet dies, dass all Ihre Daten auf ihrem Computer bleiben. Es gibt keine Server und wir haben keinen Zugriff auf Ihre persönlichen Informationen, Ihre Gelder oder selbst Ihre IP-Adresse. Daten wie Bankkontonummern, Altcoin- & Bitcoinadressen, etc werden nur mit Ihrem Trading-Partner geteilt, um Trades abzuschließen, die Sie initiiert haben (im Falle eines Konflikts wird der Vermittler die selben Daten sehen wie Ihr Trading-Partner). +account.info.headline=Willkommen in Ihrem Haveno-Konto +account.info.msg=Hier können Sie Trading-Konten für nationale Währungen und Altcoins hinzufügen und Backups für Ihre Wallets & Kontodaten erstellen.\n\nEine leere Bitcoin-Wallet wurde erstellt, als Sie das erste Mal Haveno gestartet haben.\n\nWir empfehlen, dass Sie Ihre Bitcoin-Wallet-Seed-Wörter aufschreiben (siehe Tab oben) und sich überlegen ein Passwort hinzuzufügen, bevor Sie einzahlen. Bitcoin-Einzahlungen und Auszahlungen werden unter \"Gelder\" verwaltet.\n\nHinweis zu Privatsphäre & Sicherheit: da Haveno eine dezentralisierte Börse ist, bedeutet dies, dass all Ihre Daten auf ihrem Computer bleiben. Es gibt keine Server und wir haben keinen Zugriff auf Ihre persönlichen Informationen, Ihre Gelder oder selbst Ihre IP-Adresse. Daten wie Bankkontonummern, Altcoin- & Bitcoinadressen, etc werden nur mit Ihrem Trading-Partner geteilt, um Trades abzuschließen, die Sie initiiert haben (im Falle eines Konflikts wird der Vermittler die selben Daten sehen wie Ihr Trading-Partner). account.menu.paymentAccount=Nationale Währungskonten account.menu.altCoinsAccountView=Altcoin-Konten @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=Hier wird das Wallet-Guthaben einschließli account.menu.walletInfo.xpub.headLine=Watch Keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} Wallet account.menu.walletInfo.path.headLine=HD Keychain Pfade -account.menu.walletInfo.path.info=Wenn Sie Seed Wörter in eine andere Wallet (wie Electrum) importieren, müssen Sie den Pfad angeben. Dies sollte nur in Notfällen gemacht werden, wenn Sie den Zugriff auf die Bisq-Wallet und das Data-Verzeichnis verloren haben.\nDenken Sie daran, dass die Ausgabe von Geldern aus einer Nicht-Bisq-Wallet die internen Bisq-Datenstrukturen, die mit den Wallet-Daten verbunden sind, durcheinander bringen kann, was zu fehlgeschlagenen Trades führen kann.\n\nSenden Sie NIEMALS BSQ von einer Nicht-Bisq-Wallet, da dies wahrscheinlich zu einer ungültigen BSQ-Transaktion und dem Verlust Ihrer BSQ führen wird. +account.menu.walletInfo.path.info=Wenn Sie Seed Wörter in eine andere Wallet (wie Electrum) importieren, müssen Sie den Pfad angeben. Dies sollte nur in Notfällen gemacht werden, wenn Sie den Zugriff auf die Haveno-Wallet und das Data-Verzeichnis verloren haben.\nDenken Sie daran, dass die Ausgabe von Geldern aus einer Nicht-Haveno-Wallet die internen Haveno-Datenstrukturen, die mit den Wallet-Daten verbunden sind, durcheinander bringen kann, was zu fehlgeschlagenen Trades führen kann.\n\nSenden Sie NIEMALS BSQ von einer Nicht-Haveno-Wallet, da dies wahrscheinlich zu einer ungültigen BSQ-Transaktion und dem Verlust Ihrer BSQ führen wird. account.menu.walletInfo.openDetails=Wallet-Rohdaten und Private Schlüssel anzeigen @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} Registrierung account.arbitratorRegistration.revoke=Widerrufen account.arbitratorRegistration.info.msg=Beachten Sie bitte, dass Sie nach dem Widerrufen für 15 Tage verfügbar bleiben müssen, da es Trades geben kann, die Sie als {0} nutzen. Die maximal erlaubte Trade-Dauer ist 8 Tage und der Konfliktprozess kann bis zu 7 Tage dauern. account.arbitratorRegistration.warn.min1Language=Sie müssen wenigstens 1 Sprache festlegen.\nWir haben Ihre Standardsprache für Sie hinzugefügt. -account.arbitratorRegistration.removedSuccess=Sie haben Ihre Registrierung erfolgreich aus dem Bisq-Netzwerk entfernt. +account.arbitratorRegistration.removedSuccess=Sie haben Ihre Registrierung erfolgreich aus dem Haveno-Netzwerk entfernt. account.arbitratorRegistration.removedFailed=Die Registrierung konnte nicht entfernt werden.{0} -account.arbitratorRegistration.registerSuccess=Sie haben sich erfolgreich im Bisq-Netzwerk registriert. +account.arbitratorRegistration.registerSuccess=Sie haben sich erfolgreich im Haveno-Netzwerk registriert. account.arbitratorRegistration.registerFailed=Die Registrierung konnte nicht abgeschlossen werden.{0} account.altcoin.yourAltcoinAccounts=Ihre Altcoin-Konten account.altcoin.popup.wallet.msg=Bitte stellen Sie sicher, dass Sie die Anforderungen für die Verwendung von {0} Wallets wie auf der {1} Webseite beschrieben erfüllen.\nDie Verwendung von Wallets von zentralisierten Börsen, bei denen (a) Sie Ihre Keys nicht kontrollieren oder (b) die keine kompatible Wallet-Software verwenden, ist riskant: Es kann zum Verlust der gehandelten Gelder führen!\nDer Mediator oder Vermittler ist kein {2} Spezialist und kann in solchen Fällen nicht helfen. account.altcoin.popup.wallet.confirm=Ich verstehe und bestätige, dass ich weiß, welche Wallet ich benutzen muss. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Der Handel mit UPX auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nFür das Senden von UPX müssen Sie entweder das offizielle uPlexa GUI-Wallet oder das uPlexa CLI-Wallet mit aktiviertem store-tx-info Flag verwenden (Standard in neuen Versionen). Bitte stellen Sie sicher, dass Sie auf den tx key zugreifen können, da dies bei einem Konfliktfall erforderlich wäre.\nuplexa-wallet-cli (verwenden Sie den Befehl get_tx_key)\nuplexa-wallet-gui (gehen Sie zum History Tab und klicken Sie auf (P) für den Zahlungsnachweis)\n\nBei normalen Blockexplorern ist der Transfer nicht verifizierbar.\n\nSie müssen dem Vermittler im Konfliktfall die folgenden Daten zur Verfügung stellen:\n- Der tx Private Key\n- Der Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Konfliktfall. Der UPX-Sender ist dafür verantwortlich, im Konfliktfall dem Vermittler die Verifizierung des UPX-Transfers nachzuweisen.\n\nEs ist keine Zahlungs-ID erforderlich, sondern nur die normale öffentliche Adresse.\nWenn Sie sich über diesen Prozess nicht sicher sind, besuchen Sie den uPlexa discord channel (https://discord.gg/vhdNSrV) oder den uPlexa Telegram Chat (https://t.me/uplexaOfficial), um weitere Informationen zu erhalten. +account.altcoin.popup.upx.msg=Der Handel mit UPX auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nFür das Senden von UPX müssen Sie entweder das offizielle uPlexa GUI-Wallet oder das uPlexa CLI-Wallet mit aktiviertem store-tx-info Flag verwenden (Standard in neuen Versionen). Bitte stellen Sie sicher, dass Sie auf den tx key zugreifen können, da dies bei einem Konfliktfall erforderlich wäre.\nuplexa-wallet-cli (verwenden Sie den Befehl get_tx_key)\nuplexa-wallet-gui (gehen Sie zum History Tab und klicken Sie auf (P) für den Zahlungsnachweis)\n\nBei normalen Blockexplorern ist der Transfer nicht verifizierbar.\n\nSie müssen dem Vermittler im Konfliktfall die folgenden Daten zur Verfügung stellen:\n- Der tx Private Key\n- Der Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Konfliktfall. Der UPX-Sender ist dafür verantwortlich, im Konfliktfall dem Vermittler die Verifizierung des UPX-Transfers nachzuweisen.\n\nEs ist keine Zahlungs-ID erforderlich, sondern nur die normale öffentliche Adresse.\nWenn Sie sich über diesen Prozess nicht sicher sind, besuchen Sie den uPlexa discord channel (https://discord.gg/vhdNSrV) oder den uPlexa Telegram Chat (https://t.me/uplexaOfficial), um weitere Informationen zu erhalten. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Der Handel mit ARQ auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nFür den Versand von ARQ müssen Sie entweder das offizielle ArQmA GUI-Wallet oder das ArQmA CLI-Wallet mit aktiviertem store-tx-info Flag verwenden (Standard in neuen Versionen). Bitte stellen Sie sicher, dass Sie auf den tx Key zugreifen können, da dies im Falle eines Konfliktes erforderlich wäre.\narqma-wallet-cli (verwenden Sie den Befehl get_tx_key)\narqma-wallet-gui (gehen Sie zur History Tab und klicken Sie auf (P) für den Zahlungsnachweis)\n\nBei normalen Blockexplorern ist der Transfer nicht verifizierbar.\n\nSie müssen dem Mediator oder Vermittler im Konfliktfall die folgenden Daten zur Verfügung stellen:\n- Der tx Private Key\n- Der Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Konfliktfall. Der ARQ-Sender ist im Fall eines Konflikts dafür verantwortlich, die Verifizierung des ARQ-Transfers dem Mediator oder Vermittler nachzuweisen.\n\nEs ist keine Zahlungs-ID erforderlich, sondern nur die normale öffentliche Adresse.\nWenn Sie sich über diesen Prozess nicht sicher sind, besuchen Sie den ArQmA Discord Channel (https://discord.gg/s9BQpJT) oder das ArQmA Forum (https://labs.arqma.com), um weitere Informationen zu erhalten. +account.altcoin.popup.arq.msg=Der Handel mit ARQ auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nFür den Versand von ARQ müssen Sie entweder das offizielle ArQmA GUI-Wallet oder das ArQmA CLI-Wallet mit aktiviertem store-tx-info Flag verwenden (Standard in neuen Versionen). Bitte stellen Sie sicher, dass Sie auf den tx Key zugreifen können, da dies im Falle eines Konfliktes erforderlich wäre.\narqma-wallet-cli (verwenden Sie den Befehl get_tx_key)\narqma-wallet-gui (gehen Sie zur History Tab und klicken Sie auf (P) für den Zahlungsnachweis)\n\nBei normalen Blockexplorern ist der Transfer nicht verifizierbar.\n\nSie müssen dem Mediator oder Vermittler im Konfliktfall die folgenden Daten zur Verfügung stellen:\n- Der tx Private Key\n- Der Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Konfliktfall. Der ARQ-Sender ist im Fall eines Konflikts dafür verantwortlich, die Verifizierung des ARQ-Transfers dem Mediator oder Vermittler nachzuweisen.\n\nEs ist keine Zahlungs-ID erforderlich, sondern nur die normale öffentliche Adresse.\nWenn Sie sich über diesen Prozess nicht sicher sind, besuchen Sie den ArQmA Discord Channel (https://discord.gg/s9BQpJT) oder das ArQmA Forum (https://labs.arqma.com), um weitere Informationen zu erhalten. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Der Handel mit XMR auf Bisq setzt voraus, dass Sie die folgende Anforderung verstehen.\n\nWenn Sie XMR verkaufen, müssen Sie in der Lage sein, einem Vermittler oder einer Schiedsperson im Falle eines Konflikts die folgenden Informationen zur Verfügung zu stellen:\n- den Transaktionsschlüssel (Tx Key, Tx Secret Key oder Tx Private Key)\n- die Transaktions-ID (Tx ID oder Tx Hash)\n- die Zieladresse (Empfängeradresse)\n\nIm Wiki finden Sie Einzelheiten darüber wo Sie diese Informationen in den populärsten Monero-Wallets finden [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nWerden die erforderlichen Transaktionsdaten nicht zur Verfügung gestellt, führt dies dazu, dass der Konflikt zu Ihrem Nachteil entschieden wird.\n\nBeachten Sie auch, dass Bisq jetzt eine automatische Bestätigung für XMR-Transaktionen anbietet, um Transaktionen schneller zu machen, aber Sie müssen dies in den Einstellungen aktivieren.\n\nWeitere Informationen über die automatische Bestätigungsfunktion finden Sie im Wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Der Handel mit XMR auf Haveno setzt voraus, dass Sie die folgende Anforderung verstehen.\n\nWenn Sie XMR verkaufen, müssen Sie in der Lage sein, einem Vermittler oder einer Schiedsperson im Falle eines Konflikts die folgenden Informationen zur Verfügung zu stellen:\n- den Transaktionsschlüssel (Tx Key, Tx Secret Key oder Tx Private Key)\n- die Transaktions-ID (Tx ID oder Tx Hash)\n- die Zieladresse (Empfängeradresse)\n\nIm Wiki finden Sie Einzelheiten darüber wo Sie diese Informationen in den populärsten Monero-Wallets finden [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nWerden die erforderlichen Transaktionsdaten nicht zur Verfügung gestellt, führt dies dazu, dass der Konflikt zu Ihrem Nachteil entschieden wird.\n\nBeachten Sie auch, dass Haveno jetzt eine automatische Bestätigung für XMR-Transaktionen anbietet, um Transaktionen schneller zu machen, aber Sie müssen dies in den Einstellungen aktivieren.\n\nWeitere Informationen über die automatische Bestätigungsfunktion finden Sie im Wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Der Handel mit MSR auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nFür den Versand von MSR müssen Sie entweder das offizielle Masari GUI Wallet, das Masari CLI Wallet mit dem aktivierten store-tx-info Flag (standardmäßig aktiviert) oder das Masari Web Wallet (https://wallet.getmasari.org) verwenden. Bitte stellen Sie sicher, dass Sie auf den tx Key zugreifen können, da dies im Falle eines Konfliktes erforderlich wäre.\nmasari-wallet-cli (verwenden Sie den Befehl get_tx_key)\nmasari-wallet-gui (gehen Sie zur History Tab und klicken Sie auf (P) für den Zahlungsnachweis).\n\nMasari Web Wallet (gehen Sie zum Konto -> Transaktionshistorie und lassen Sie Details zu Ihrer gesendeten Transaktion anzeigen)\n\nDie Verifizierung kann im Wallet durchgeführt werden.\nmasari-wallet-cli : mit dem Befehl (check_tx_key).\nmasari-wallet-gui : auf der Seite Advanced > Prove/Check.\nDie Verifizierung kann im Block-Explorer durchgeführt werden. \nÖffnen Sie den Block-Explorer (https://explorer.getmasari.org), verwenden Sie die Suchleiste, um Ihren Transaktionshash zu finden.\nSobald die Transaktion gefunden wurde, scrollen Sie nach unten zum Bereich 'Prove Sending' und geben Sie bei Bedarf Details ein.\nSie müssen dem Mediator oder Vermittler im Konfliktfall die folgenden Daten zur Verfügung stellen:\n- Den tx Private Key\n- Den Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Konfliktfall. Der MSR-Sender ist im Fall eines Konflikts dafür verantwortlich, die Verifizierung des MSR-Transfers dem Mediator oder Vermittler nachzuweisen.\n\nEs ist keine Zahlungs-ID erforderlich, sondern nur die normale öffentliche Adresse.\nWenn Sie sich über diesen Prozess nicht sicher sind, fragen Sie um Hilfe auf der offiziellen Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Der Handel mit MSR auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nFür den Versand von MSR müssen Sie entweder das offizielle Masari GUI Wallet, das Masari CLI Wallet mit dem aktivierten store-tx-info Flag (standardmäßig aktiviert) oder das Masari Web Wallet (https://wallet.getmasari.org) verwenden. Bitte stellen Sie sicher, dass Sie auf den tx Key zugreifen können, da dies im Falle eines Konfliktes erforderlich wäre.\nmasari-wallet-cli (verwenden Sie den Befehl get_tx_key)\nmasari-wallet-gui (gehen Sie zur History Tab und klicken Sie auf (P) für den Zahlungsnachweis).\n\nMasari Web Wallet (gehen Sie zum Konto -> Transaktionshistorie und lassen Sie Details zu Ihrer gesendeten Transaktion anzeigen)\n\nDie Verifizierung kann im Wallet durchgeführt werden.\nmasari-wallet-cli : mit dem Befehl (check_tx_key).\nmasari-wallet-gui : auf der Seite Advanced > Prove/Check.\nDie Verifizierung kann im Block-Explorer durchgeführt werden. \nÖffnen Sie den Block-Explorer (https://explorer.getmasari.org), verwenden Sie die Suchleiste, um Ihren Transaktionshash zu finden.\nSobald die Transaktion gefunden wurde, scrollen Sie nach unten zum Bereich 'Prove Sending' und geben Sie bei Bedarf Details ein.\nSie müssen dem Mediator oder Vermittler im Konfliktfall die folgenden Daten zur Verfügung stellen:\n- Den tx Private Key\n- Den Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Konfliktfall. Der MSR-Sender ist im Fall eines Konflikts dafür verantwortlich, die Verifizierung des MSR-Transfers dem Mediator oder Vermittler nachzuweisen.\n\nEs ist keine Zahlungs-ID erforderlich, sondern nur die normale öffentliche Adresse.\nWenn Sie sich über diesen Prozess nicht sicher sind, fragen Sie um Hilfe auf der offiziellen Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Der Handel mit BLUR auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm BLUR zu senden, müssen Sie die Blur Network CLI oder GUI Wallet verwenden. \n\nWenn Sie die CLI-Wallet verwenden, wird nach dem Senden eines Transfers ein Transaktionshash (tx ID) angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden des Transfers müssen Sie den Private Key der Transaktion mit dem Befehl 'get_tx_key' ermitteln. Wenn Sie diesen Schritt nicht ausführen, können Sie den Key möglicherweise später nicht mehr abrufen. \n\nWenn Sie das Blur Network GUI Wallet verwenden, können Sie problemlos den Private Key der Transaktion und die Transaktion-ID im "History" Tab finden. Suchen Sie sofort nach dem Absenden die Transaktion, die von Interesse ist. Klicken Sie auf das Symbol "?" in der unteren rechten Ecke des Feldes, das die Transaktion enthält. Sie müssen diese Informationen speichern. \n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1.) die Transaktions-ID, 2.) den Private Key der Transaktion und 3.) die Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den BLUR-Transfer mit dem Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, verlieren Sie den Konfliktfall. In allen Konfliktfällen trägt der BLUR-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler. \n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Bisq. Als Erstes suchen Sie Hilfe im Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Der Handel mit BLUR auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm BLUR zu senden, müssen Sie die Blur Network CLI oder GUI Wallet verwenden. \n\nWenn Sie die CLI-Wallet verwenden, wird nach dem Senden eines Transfers ein Transaktionshash (tx ID) angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden des Transfers müssen Sie den Private Key der Transaktion mit dem Befehl 'get_tx_key' ermitteln. Wenn Sie diesen Schritt nicht ausführen, können Sie den Key möglicherweise später nicht mehr abrufen. \n\nWenn Sie das Blur Network GUI Wallet verwenden, können Sie problemlos den Private Key der Transaktion und die Transaktion-ID im "History" Tab finden. Suchen Sie sofort nach dem Absenden die Transaktion, die von Interesse ist. Klicken Sie auf das Symbol "?" in der unteren rechten Ecke des Feldes, das die Transaktion enthält. Sie müssen diese Informationen speichern. \n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1.) die Transaktions-ID, 2.) den Private Key der Transaktion und 3.) die Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den BLUR-Transfer mit dem Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, verlieren Sie den Konfliktfall. In allen Konfliktfällen trägt der BLUR-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler. \n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Haveno. Als Erstes suchen Sie Hilfe im Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Der Handel mit Solo auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm Solo zu senden, müssen Sie das Solo Network CLI Wallet verwenden. \n\nWenn Sie das CLI-Wallet verwenden, wird nach dem Senden eines Transfers ein Transaktionshash (tx ID) angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden des Transfers müssen Sie den Private Key der Transaktion mit dem Befehl 'get_tx_key' ermitteln. Wenn Sie diesen Schritt nicht ausführen, können Sie den Key möglicherweise später nicht mehr abrufen.\n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1.) die Transaktion-ID, 2.) den Private Key der Transaktion und 3.) die Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den Solo-Transfer mit dem Solo Block Explorer, indem er nach der Transaktion sucht und dann die Funktion "Senden nachweisen" (https://explorer.minesolo.com/) verwendet.\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, verlieren Sie den Konfliktfall. In allen Konfliktfällen trägt der Solo-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler. \n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Bisq. Suchen Sie zuerst Hilfe im Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Der Handel mit Solo auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm Solo zu senden, müssen Sie das Solo Network CLI Wallet verwenden. \n\nWenn Sie das CLI-Wallet verwenden, wird nach dem Senden eines Transfers ein Transaktionshash (tx ID) angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden des Transfers müssen Sie den Private Key der Transaktion mit dem Befehl 'get_tx_key' ermitteln. Wenn Sie diesen Schritt nicht ausführen, können Sie den Key möglicherweise später nicht mehr abrufen.\n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1.) die Transaktion-ID, 2.) den Private Key der Transaktion und 3.) die Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den Solo-Transfer mit dem Solo Block Explorer, indem er nach der Transaktion sucht und dann die Funktion "Senden nachweisen" (https://explorer.minesolo.com/) verwendet.\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, verlieren Sie den Konfliktfall. In allen Konfliktfällen trägt der Solo-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler. \n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Haveno. Suchen Sie zuerst Hilfe im Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Der Handel mit CASH2 auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm CASH2 zu versenden, müssen Sie die Cash2 Wallet Version 3 oder höher verwenden. \n\nNachdem eine Transaktion gesendet wurde, wird die Transaktions-ID angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden der Transaktion müssen Sie den Befehl 'getTxKey' in simplewallet verwenden, um den Secret Key der Transaktion abzurufen. \n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1) die Transaktions-ID, 2) den Secret Key der Transaktion und 3) die Cash2-Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den CASH2-Transfer mit dem Cash2 Block Explorer (https://blocks.cash2.org).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, werden Sie den Konfliktfall verlieren. In allen Konfliktfällen trägt der CASH2-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Bisq, sondern suchen Sie zunächst Hilfe im Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Der Handel mit CASH2 auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm CASH2 zu versenden, müssen Sie die Cash2 Wallet Version 3 oder höher verwenden. \n\nNachdem eine Transaktion gesendet wurde, wird die Transaktions-ID angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden der Transaktion müssen Sie den Befehl 'getTxKey' in simplewallet verwenden, um den Secret Key der Transaktion abzurufen. \n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1) die Transaktions-ID, 2) den Secret Key der Transaktion und 3) die Cash2-Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den CASH2-Transfer mit dem Cash2 Block Explorer (https://blocks.cash2.org).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, werden Sie den Konfliktfall verlieren. In allen Konfliktfällen trägt der CASH2-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Haveno, sondern suchen Sie zunächst Hilfe im Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Der Handel mit Qwertycoin auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm QWC zu versenden, müssen Sie die offizielle QWC Wallet Version 5.1.3 oder höher verwenden. \n\nNachdem eine Transaktion gesendet wurde, wird die Transaktions-ID angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden der Transaktion müssen Sie den Befehl 'get_Tx_Key' in simplewallet verwenden, um den Secret Key der Transaktion abzurufen. \n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1) die Transaktions-ID, 2) den Secret Key der Transaktion und 3) die QWC-Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den QWC-Transfer mit dem QWC Block Explorer (https://explorer.qwertycoin.org).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, werden Sie den Konfliktfall verlieren. In allen Konfliktfällen trägt der QWC-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Bisq, sondern suchen Sie zunächst Hilfe im QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Der Handel mit Qwertycoin auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm QWC zu versenden, müssen Sie die offizielle QWC Wallet Version 5.1.3 oder höher verwenden. \n\nNachdem eine Transaktion gesendet wurde, wird die Transaktions-ID angezeigt. Sie müssen diese Informationen speichern. Unmittelbar nach dem Senden der Transaktion müssen Sie den Befehl 'get_Tx_Key' in simplewallet verwenden, um den Secret Key der Transaktion abzurufen. \n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1) die Transaktions-ID, 2) den Secret Key der Transaktion und 3) die QWC-Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den QWC-Transfer mit dem QWC Block Explorer (https://explorer.qwertycoin.org).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, werden Sie den Konfliktfall verlieren. In allen Konfliktfällen trägt der QWC-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Haveno, sondern suchen Sie zunächst Hilfe im QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Der Handel mit Dragonglass auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nAufgrund der Privatsphäre, die Dragonglass bietet, ist eine Transaktion auf der Public Blockchain nicht verifizierbar. Bei Bedarf können Sie Ihre Zahlung durch die Verwendung Ihres TXN-Private-Key nachweisen.\nDer TXN-Private Key ist ein einmaliger Schlüssel, der automatisch für jede Transaktion generiert wird, auf die Sie nur über Ihre DRGL-Wallet zugreifen können - entweder über die DRGL-Wallet GUI (im Transaktionsdetaildialog) oder über die Dragonglass CLI simplewallet (mit dem Befehl "get_tx_key").\n\nDRGL-Version "Oathkeeper" und höher sind für beide ERFORDERLICH.\n\nIm Konfliktfall müssen Sie dem Mediator oder Vermittler die folgenden Daten zur Verfügung stellen:\n- Den TXN-Private-Key\n- Den Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nDie Verifizierung der Zahlung kann mit den oben genannten Daten als Eingabe unter (http://drgl.info/#check_txn) erfolgen.\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Klärungsfall. Der Dragonglass-Sender ist für die Verifizierung des DRGL-Transfers gegenüber dem Mediator oder Vermittler im Konfliktfall verantwortlich. Die Verwendung einer PaymentID ist nicht erforderlich.\n\nWenn Sie sich über irgendeinen Teil dieses Prozesses unsicher sind, besuchen Sie Dragonglass auf Discord (http://discord.drgl.info) um Hilfe zu erhalten. +account.altcoin.popup.drgl.msg=Der Handel mit Dragonglass auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nAufgrund der Privatsphäre, die Dragonglass bietet, ist eine Transaktion auf der Public Blockchain nicht verifizierbar. Bei Bedarf können Sie Ihre Zahlung durch die Verwendung Ihres TXN-Private-Key nachweisen.\nDer TXN-Private Key ist ein einmaliger Schlüssel, der automatisch für jede Transaktion generiert wird, auf die Sie nur über Ihre DRGL-Wallet zugreifen können - entweder über die DRGL-Wallet GUI (im Transaktionsdetaildialog) oder über die Dragonglass CLI simplewallet (mit dem Befehl "get_tx_key").\n\nDRGL-Version "Oathkeeper" und höher sind für beide ERFORDERLICH.\n\nIm Konfliktfall müssen Sie dem Mediator oder Vermittler die folgenden Daten zur Verfügung stellen:\n- Den TXN-Private-Key\n- Den Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nDie Verifizierung der Zahlung kann mit den oben genannten Daten als Eingabe unter (http://drgl.info/#check_txn) erfolgen.\n\nWenn Sie die oben genannten Daten nicht angeben oder wenn Sie eine inkompatible Wallet verwendet haben, verlieren Sie den Klärungsfall. Der Dragonglass-Sender ist für die Verifizierung des DRGL-Transfers gegenüber dem Mediator oder Vermittler im Konfliktfall verantwortlich. Die Verwendung einer PaymentID ist nicht erforderlich.\n\nWenn Sie sich über irgendeinen Teil dieses Prozesses unsicher sind, besuchen Sie Dragonglass auf Discord (http://discord.drgl.info) um Hilfe zu erhalten. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Bei der Verwendung von Zcash können Sie nur die transparenten Adressen (beginnend mit t) verwenden, nicht die z-Adressen (privat), da der Mediator oder Vermittler nicht in der Lage wäre, die Transaktion mit z-Adressen zu verifizieren. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Bei der Verwendung von Zcoin können Sie nur die transparenten (rückverfolgbaren) Adressen verwenden, nicht die nicht rückverfolgbaren Adressen, da der Mediator oder Vermittler nicht in der Lage wäre, die Transaktion mit nicht rückverfolgbaren Adressen in einem Block-Explorer zu verifizieren. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN benötigt einen interaktiven Prozess zwischen Sender und Empfänger, um die Transaktion zu erstellen. Stellen Sie sicher, den Anweisungen der GRIN Projekt Webseite zu folgen, um zuverlässig GRIN zu senden und empfangen (der Empfänger muss oinline oder wenigstens während eines gewissen Zeitfensters). \n\nBisq unterstützt nur das Grinbox (Wallet713) Wallet URL Format. \n\nDer GRIN Sender muss beweisen können, die GRIN erfolgreich gesendet zu haben. Wenn die Wallet dies nicht kann, wird ein potentieller Konflikt zugunsten des GRIN Empfängers entschieden. Bitte stellen Sie sicher, dass Sie die letzte Grinbox Software nutzen, die den Transaktionsbeweis unterstützt, und Sie den Prozess verstehen, wie GRIN gesendet und empfangen wird, sowie wie man den Beweis erstellt. \n\nBeachten Sie https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only für weitere Informationen über das Grinbox proof tool. +account.altcoin.popup.grin.msg=GRIN benötigt einen interaktiven Prozess zwischen Sender und Empfänger, um die Transaktion zu erstellen. Stellen Sie sicher, den Anweisungen der GRIN Projekt Webseite zu folgen, um zuverlässig GRIN zu senden und empfangen (der Empfänger muss oinline oder wenigstens während eines gewissen Zeitfensters). \n\nHaveno unterstützt nur das Grinbox (Wallet713) Wallet URL Format. \n\nDer GRIN Sender muss beweisen können, die GRIN erfolgreich gesendet zu haben. Wenn die Wallet dies nicht kann, wird ein potentieller Konflikt zugunsten des GRIN Empfängers entschieden. Bitte stellen Sie sicher, dass Sie die letzte Grinbox Software nutzen, die den Transaktionsbeweis unterstützt, und Sie den Prozess verstehen, wie GRIN gesendet und empfangen wird, sowie wie man den Beweis erstellt. \n\nBeachten Sie https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only für weitere Informationen über das Grinbox proof tool. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM benötigt einen interaktiven Prozess zwischen Sender und Empfänger, um die Transaktion zu erstellen.\n\nStellen Sie sicher, den Anweisungen der BEAM Projekt Webseite zu folgen, um zuverlässig BEAM zu senden und empfangen (der Empfänger muss oinline oder wenigstens während eines gewissen Zeitfensters). \n\nDer BEAM Sender muss beweisen können, die BEAM erfolgreich gesendet zu haben. Bitte stellen Sie sicher, dass Sie Wallet Software verwenden, die solche Beweise erstellen kann. Falls Die Wallet den Beweis nicht erstellen kann, wird ein potentieller Konflikt zugunsten des BEAM Empfängers entschieden. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Der Handel mit ParsiCoin auf Bisq setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm PARS zu versenden, müssen Sie die offizielle ParsiCoin Wallet Version 3.0.0 oder höher verwenden. \n\nSie können Ihren Transaktionshash und Transaktionsschlüssel im Bereich Transaktionen in Ihrer GUI-Wallet (ParsiPay) überprüfen. Sie müssen mit der rechten Maustaste auf die Transaktion und dann auf Details anzeigen klicken.\n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1) den Transaktionshash, 2) den Transaktionsschlüssel und 3) die PARS-Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den PARS-Transfer mit dem ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, werden Sie den Konfliktfall verlieren. In allen Konfliktfällen trägt der ParsiCoin-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler. \n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Bisq, sondern suchen Sie zunächst Hilfe im ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Der Handel mit ParsiCoin auf Haveno setzt voraus, dass Sie die folgenden Anforderungen verstehen und erfüllen:\n\nUm PARS zu versenden, müssen Sie die offizielle ParsiCoin Wallet Version 3.0.0 oder höher verwenden. \n\nSie können Ihren Transaktionshash und Transaktionsschlüssel im Bereich Transaktionen in Ihrer GUI-Wallet (ParsiPay) überprüfen. Sie müssen mit der rechten Maustaste auf die Transaktion und dann auf Details anzeigen klicken.\n\nFalls ein Vermittlungsverfahren erforderlich ist, müssen Sie einem Mediator oder Vermittler Folgendes vorlegen: 1) den Transaktionshash, 2) den Transaktionsschlüssel und 3) die PARS-Adresse des Empfängers. Der Mediator oder Vermittler überprüft dann den PARS-Transfer mit dem ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nWenn Sie dem Mediator oder Vermittler nicht die erforderlichen Informationen zur Verfügung stellen, werden Sie den Konfliktfall verlieren. In allen Konfliktfällen trägt der ParsiCoin-Sender 100% der Verantwortung für die Verifizierung von Transaktionen gegenüber einem Mediator oder Vermittler. \n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie nicht auf Haveno, sondern suchen Sie zunächst Hilfe im ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=Um "Burnt Blackcoins" zu handeln, müssen Sie folgendes wissen:\n\nBurnt Blackcoins können nicht ausgegeben werden. Um sie auf Bisq zu handeln, müssen die Ausgabeskripte in der Form vorliegen: OP_RETURN OP_PUSHDATA, gefolgt von zugehörigen Datenbytes, die nach der Hex-Codierung Adressen darstellen. Beispielsweise haben Burnt Blackcoins mit der Adresse 666f6f ("foo" in UTF-8) das folgende Skript:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nUm Burnt Blackcoins zu erstellen, kann man den in einigen Wallets verfügbaren RPC-Befehl "burn" verwenden.\n\nFür mögliche Anwendungsfälle kann man einen Blick auf https://ibo.laboratorium.ee werfen.\n\nDa Burnt Blackcoins nicht ausgegeben werden können, können sie nicht wieder verkauft werden. "Verkaufen" von Burnt Blackcoins bedeutet, gewöhnliche Blackcoins zu verbrennen (mit zugehörigen Daten entsprechend der Zieladresse).\n\nIm Konfliktfall hat der BLK-Verkäufer den Transaktionshash zur Verfügung zu stellen. +account.altcoin.popup.blk-burnt.msg=Um "Burnt Blackcoins" zu handeln, müssen Sie folgendes wissen:\n\nBurnt Blackcoins können nicht ausgegeben werden. Um sie auf Haveno zu handeln, müssen die Ausgabeskripte in der Form vorliegen: OP_RETURN OP_PUSHDATA, gefolgt von zugehörigen Datenbytes, die nach der Hex-Codierung Adressen darstellen. Beispielsweise haben Burnt Blackcoins mit der Adresse 666f6f ("foo" in UTF-8) das folgende Skript:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nUm Burnt Blackcoins zu erstellen, kann man den in einigen Wallets verfügbaren RPC-Befehl "burn" verwenden.\n\nFür mögliche Anwendungsfälle kann man einen Blick auf https://ibo.laboratorium.ee werfen.\n\nDa Burnt Blackcoins nicht ausgegeben werden können, können sie nicht wieder verkauft werden. "Verkaufen" von Burnt Blackcoins bedeutet, gewöhnliche Blackcoins zu verbrennen (mit zugehörigen Daten entsprechend der Zieladresse).\n\nIm Konfliktfall hat der BLK-Verkäufer den Transaktionshash zur Verfügung zu stellen. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Das Trading mit L-BTC auf Bisq setzt voraus, dass Sie Folgendes verstehen:\n\nWenn Sie L-BTC für einen Trade auf Bisq erhalten, können Sie nicht die mobile Blockstream Green Wallet App oder eine Custodial/Exchange Wallet verwenden. Sie dürfen L-BTC nur in der Liquid Elements Core Wallet oder eine andere L-BTC-Wallet erhalten, die es Ihnen ermöglicht, den Blinding Key für Ihre verdeckte L-BTC-Adresse zu erhalten.\n\nFalls eine Mediation erforderlich ist oder ein Trade-Konflikt entsteht, müssen Sie den Blinding Key für Ihre L-BTC-Empfangsadresse dem Bisq-Mediator oder dem Refund Agent mitteilen, damit dieser die Details Ihrer vertraulichen Transaktion auf seinem eigenen Elements Core Full Node überprüfen kann.\n\nWenn Sie dem Mediator oder Refund Agent die erforderlichen Informationen nicht zur Verfügung stellen, führt dies dazu, dass Sie den Streitfall verlieren. In allen Streitfällen trägt der L-BTC-Empfänger 100 % der Verantwortung für die Bereitstellung kryptographischer Beweise an den Mediator oder den Refund Agent.\n\nWenn Sie diese Anforderungen nicht verstehen, sollten Sie nicht mit L-BTC auf Bisq traden. +account.altcoin.popup.liquidbitcoin.msg=Das Trading mit L-BTC auf Haveno setzt voraus, dass Sie Folgendes verstehen:\n\nWenn Sie L-BTC für einen Trade auf Haveno erhalten, können Sie nicht die mobile Blockstream Green Wallet App oder eine Custodial/Exchange Wallet verwenden. Sie dürfen L-BTC nur in der Liquid Elements Core Wallet oder eine andere L-BTC-Wallet erhalten, die es Ihnen ermöglicht, den Blinding Key für Ihre verdeckte L-BTC-Adresse zu erhalten.\n\nFalls eine Mediation erforderlich ist oder ein Trade-Konflikt entsteht, müssen Sie den Blinding Key für Ihre L-BTC-Empfangsadresse dem Haveno-Mediator oder dem Refund Agent mitteilen, damit dieser die Details Ihrer vertraulichen Transaktion auf seinem eigenen Elements Core Full Node überprüfen kann.\n\nWenn Sie dem Mediator oder Refund Agent die erforderlichen Informationen nicht zur Verfügung stellen, führt dies dazu, dass Sie den Streitfall verlieren. In allen Streitfällen trägt der L-BTC-Empfänger 100 % der Verantwortung für die Bereitstellung kryptographischer Beweise an den Mediator oder den Refund Agent.\n\nWenn Sie diese Anforderungen nicht verstehen, sollten Sie nicht mit L-BTC auf Haveno traden. account.fiat.yourFiatAccounts=Ihre Nationalen Währungskonten @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=Sie haben kein Wallet-Passwort festgelegt, was das An account.seed.warn.noPw.yes=Ja, und nicht erneut fragen account.seed.enterPw=Geben Sie Ihr Passwort ein um die Seed-Wörter zu sehen account.seed.restore.info=Bitte erstellen Sie vor dem Wiederherstellen durch Keimwörter ein Backup. Beachten Sie auch, dass Wallet-Wiederherstellung nur für Notfälle ist und Probleme mit der internen Wallet-Datenbank verursachen kann.\nEs ist kein Weg ein Backup anzuwenden! Bitte nutzen Sie ein Backup des Anwendungsdatenordner um eine vorherigen Zustand wiederherzustellen. \n\nNach der Wiederherstellung wird die Anwendung herunterfahren. Nachdem Sie die Anwendung wieder gestartet haben, wird sie wieder mit dem Bitcoin-Netzwerk synchronisieren. Dies kann lange dauern und die CPU stark beanspruchen, vor allem, wenn die Wallet alt und viele Transaktionen hatte. Bitte unterbreche Sie diesen Prozess nicht, sonst müssen Sie vielleicht die SPV Kettendatei löschen und den Wiederherstellungsprozess wiederholen. -account.seed.restore.ok=Ok, mache die Wiederherstellung und fahre Bisq herunter +account.seed.restore.ok=Ok, mache die Wiederherstellung und fahre Haveno herunter #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=Benachrichtigen, wenn BTC-Preis unter account.notifications.priceAlert.setButton=Preisalarm setzen account.notifications.priceAlert.removeButton=Preisalarm entfernen account.notifications.trade.message.title=Handelsstatus verändert -account.notifications.trade.message.msg.conf=Die Kaution-Transaktion für den Handel mit ID {0} wurde bestätigt. Bitte öffnen Sie Ihre Bisq Anwendung und starten die Zahlung. +account.notifications.trade.message.msg.conf=Die Kaution-Transaktion für den Handel mit ID {0} wurde bestätigt. Bitte öffnen Sie Ihre Haveno Anwendung und starten die Zahlung. account.notifications.trade.message.msg.started=Der BTC-Käufer hat die Zahlung für den Handel mit ID {0} begonnen. account.notifications.trade.message.msg.completed=Der Handel mit ID {0} ist abgeschlossen. account.notifications.offer.message.title=Ihr Angebot wurde angenommen @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Angebotstyp account.notifications.marketAlert.message.title=Angebotsalarm account.notifications.marketAlert.message.msg.below=unter account.notifications.marketAlert.message.msg.above=über -account.notifications.marketAlert.message.msg=Eine neue "{0} {1}" Angebote mit {2} ({3} {4} Marktpreis) und Zahlungsmethode "{5}" wurde zum Bisq Angebotsbuch.\nAngebot ID: {6}. +account.notifications.marketAlert.message.msg=Eine neue "{0} {1}" Angebote mit {2} ({3} {4} Marktpreis) und Zahlungsmethode "{5}" wurde zum Haveno Angebotsbuch.\nAngebot ID: {6}. account.notifications.priceAlert.message.title=Preisalarm für {0} account.notifications.priceAlert.message.msg=Ihr Preisalarm wurde ausgelöst. Der momentane {0} Preis ist {1} {2} -account.notifications.noWebCamFound.warning=Keine Webcam gefunden.\n\nBitte nutzen Sie die E-Mail Option um den Token und Schlüssel von Ihrem Smartphone zur Bisq-Anwendung zu senden. +account.notifications.noWebCamFound.warning=Keine Webcam gefunden.\n\nBitte nutzen Sie die E-Mail Option um den Token und Schlüssel von Ihrem Smartphone zur Haveno-Anwendung zu senden. account.notifications.priceAlert.warning.highPriceTooLow=Der hohe Preis muss größer als der tiefe Preis sein. account.notifications.priceAlert.warning.lowerPriceTooHigh=Der tiefe Preis muss kleiner als der hohe Preis sein. @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=Überprüfe Signatur... displayUpdateDownloadWindow.button.label=Installer herunterladen und Signatur überprüfen displayUpdateDownloadWindow.button.downloadLater=Später herunterladen displayUpdateDownloadWindow.button.ignoreDownload=Diese Version ignorieren -displayUpdateDownloadWindow.headline=Ein neues Bisq-Update ist verfügbar! +displayUpdateDownloadWindow.headline=Ein neues Haveno-Update ist verfügbar! displayUpdateDownloadWindow.download.failed.headline=Download fehlgeschlagen displayUpdateDownloadWindow.download.failed=Download fehlgeschlagen.\nBitte downloaden Sie und verifizieren Sie manuell unter [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unfähig den richtigen Installer zu bestimmen. Bitte downloaden und verifizieren Sie manuell unter [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Ohne Auszahlung schließen disputeSummaryWindow.close.noPayout.text=Wollen Sie schließen ohne eine Auszahlung zu tätigen? emptyWalletWindow.headline={0} Notfall-Wallets-Werkzeug -emptyWalletWindow.info=Bitte nur in Notfällen nutzen, wenn Sie vom UI aus nicht auf Ihre Gelder zugreifen können.\n\nBeachten Sie bitte, dass alle offenen Angebote geschlossen werden, wenn Sie dieses Werkzeug verwenden.\n\nErstellen Sie ein Backup Ihres Dateiverzeichnisses, bevor Sie dieses Werkzeug verwenden. Dies können Sie unter \"Konto/Backup\" tun.\n\nBitte melden Sie uns das Problem und erstellen Sie einen Fehlerbericht auf GitHub oder im Bisq-Forum, damit wir feststellen können, was das Problem verursacht hat. +emptyWalletWindow.info=Bitte nur in Notfällen nutzen, wenn Sie vom UI aus nicht auf Ihre Gelder zugreifen können.\n\nBeachten Sie bitte, dass alle offenen Angebote geschlossen werden, wenn Sie dieses Werkzeug verwenden.\n\nErstellen Sie ein Backup Ihres Dateiverzeichnisses, bevor Sie dieses Werkzeug verwenden. Dies können Sie unter \"Konto/Backup\" tun.\n\nBitte melden Sie uns das Problem und erstellen Sie einen Fehlerbericht auf GitHub oder im Haveno-Forum, damit wir feststellen können, was das Problem verursacht hat. emptyWalletWindow.balance=Ihr verfügbares Wallets-Guthaben emptyWalletWindow.address=Ihre Zieladresse emptyWalletWindow.button=Alle Gelder senden @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=Erstellungsdatum offerDetailsWindow.makersOnion=Onion-Adresse des Erstellers qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Bitte nutzen Sie diesen QR Code um Ihr Bisq Wallet von Ihrem externen Wallet aufzuladen. +qRCodeWindow.msg=Bitte nutzen Sie diesen QR Code um Ihr Haveno Wallet von Ihrem externen Wallet aufzuladen. qRCodeWindow.request=Zahlungsanfrage:\n{0} selectDepositTxWindow.headline=Kautionstransaktion für Konflikt auswählen @@ -1562,7 +1562,7 @@ popup.headline.error=Fehler popup.doNotShowAgain=Nicht erneut anzeigen popup.reportError.log=Protokolldatei öffnen popup.reportError.gitHub=Auf GitHub-Issue-Tracker melden -popup.reportError={0}\n\nUm uns bei der Verbesserung der Software zu helfen, erstellen Sie bitte einen Fehler-Bericht auf https://github.com/bisq-network/bisq/issues.\nDie Fehlermeldung wird in die Zwischenablage kopiert, wenn Sie auf einen der Knöpfe unten klicken.\nEs wird das Debuggen einfacher machen, wenn Sie die bisq.log Datei anfügen indem Sie "Logdatei öffnen" klicken, eine Kopie speichern und diese dem Fehler-Bericht anfügen. +popup.reportError={0}\n\nUm uns bei der Verbesserung der Software zu helfen, erstellen Sie bitte einen Fehler-Bericht auf https://github.com/bisq-network/bisq/issues.\nDie Fehlermeldung wird in die Zwischenablage kopiert, wenn Sie auf einen der Knöpfe unten klicken.\nEs wird das Debuggen einfacher machen, wenn Sie die haveno.log Datei anfügen indem Sie "Logdatei öffnen" klicken, eine Kopie speichern und diese dem Fehler-Bericht anfügen. popup.error.tryRestart=Versuchen Sie bitte Ihre Anwendung neu zu starten und überprüfen Sie Ihre Netzwerkverbindung um zu sehen, ob Sie das Problem beheben können. popup.error.takeOfferRequestFailed=Es ist ein Fehler aufgetreten, als jemand versuchte eins Ihrer Angebote anzunehmen:\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=Die Einzahlungstransaktion des geschlo error.closedTradeWithNoDepositTx=Die Einzahlungstransaktion des geschlossenen Trades mit der Trade-ID {0} ist null.\n\nBitte starten Sie die Anwendung neu, um die Liste der geschlossenen Trades zu bereinigen. popup.warning.walletNotInitialized=Die Wallet ist noch nicht initialisiert -popup.warning.osxKeyLoggerWarning=Aufgrund strengerer Sicherheitsmaßnahmen ab MacOS 10.14 führt der Start einer Java-Anwendung (Bisq verwendet Java) zu einer Popup-Warnung in MacOS ("Bisq möchte Tastenanschläge von einer Anwendung empfangen").\n\nUm dieses Problem zu vermeiden, öffnen Sie bitte Ihre 'macOS-Einstellungen' und gehen Sie zu 'Sicherheit & Datenschutz' -> 'Datenschutz' -> 'Eingabe-Überwachung' und entfernen Sie 'Bisq' aus der Liste auf der rechten Seite.\n\nBisq wird auf eine neuere Java-Version upgraden, um dieses Problem zu vermeiden, sobald die technischen Einschränkungen (Java-Packager für die benötigte Java-Version wird noch nicht ausgeliefert) behoben sind. -popup.warning.wrongVersion=Sie verwenden vermutlich die falsche Bisq-Version für diesen Computer.\nDie Architektur Ihres Computers ist: {0}.\nDie installierten Bisq-Binärdateien sind: {1}.\nBitte fahren Sie Bisq herunter und installieren die korrekte Version ({2}). -popup.warning.incompatibleDB=Wir haben inkompatible Datenbankdateien entdeckt!\n\nDiese Datenbankdatei(en) ist (sind) nicht kompatibel mit unserer aktuellen Code-Basis:\n{0}\n\nWir haben ein Backup der beschädigten Datei(en) erstellt und die Standardwerte auf eine neue Datenbankversion angewendet.\n\nDas Backup befindet sich unter:\n{1}/db/backup_of_corrupted_data.\n\nBitte prüfen Sie, ob Sie die neueste Version von Bisq installiert haben.\nSie können sie herunterladen unter: [HYPERLINK:https://bisq.network/downloads].\n\nBitte starten Sie die Anwendung neu. -popup.warning.startupFailed.twoInstances=Bisq läuft bereits. Sie können nicht zwei Instanzen von Bisq laufen lassen. +popup.warning.osxKeyLoggerWarning=Aufgrund strengerer Sicherheitsmaßnahmen ab MacOS 10.14 führt der Start einer Java-Anwendung (Haveno verwendet Java) zu einer Popup-Warnung in MacOS ("Haveno möchte Tastenanschläge von einer Anwendung empfangen").\n\nUm dieses Problem zu vermeiden, öffnen Sie bitte Ihre 'macOS-Einstellungen' und gehen Sie zu 'Sicherheit & Datenschutz' -> 'Datenschutz' -> 'Eingabe-Überwachung' und entfernen Sie 'Haveno' aus der Liste auf der rechten Seite.\n\nHaveno wird auf eine neuere Java-Version upgraden, um dieses Problem zu vermeiden, sobald die technischen Einschränkungen (Java-Packager für die benötigte Java-Version wird noch nicht ausgeliefert) behoben sind. +popup.warning.wrongVersion=Sie verwenden vermutlich die falsche Haveno-Version für diesen Computer.\nDie Architektur Ihres Computers ist: {0}.\nDie installierten Haveno-Binärdateien sind: {1}.\nBitte fahren Sie Haveno herunter und installieren die korrekte Version ({2}). +popup.warning.incompatibleDB=Wir haben inkompatible Datenbankdateien entdeckt!\n\nDiese Datenbankdatei(en) ist (sind) nicht kompatibel mit unserer aktuellen Code-Basis:\n{0}\n\nWir haben ein Backup der beschädigten Datei(en) erstellt und die Standardwerte auf eine neue Datenbankversion angewendet.\n\nDas Backup befindet sich unter:\n{1}/db/backup_of_corrupted_data.\n\nBitte prüfen Sie, ob Sie die neueste Version von Haveno installiert haben.\nSie können sie herunterladen unter: [HYPERLINK:https://bisq.network/downloads].\n\nBitte starten Sie die Anwendung neu. +popup.warning.startupFailed.twoInstances=Haveno läuft bereits. Sie können nicht zwei Instanzen von Haveno laufen lassen. popup.warning.tradePeriod.halfReached=Ihr Trade mit der ID {0} hat die Hälfte der maximal erlaubten Trade-Periode erreicht und ist immer noch nicht abgeschlossen.\n\nDie Trade-Periode endet am {1}\n\nBitte überprüfen Sie den Status Ihres Trades unter \"Portfolio/Offene Trades\" für weitere Informationen. popup.warning.tradePeriod.ended=Ihr Trade mit der ID {0} hat die maximal zulässige Trade-Periode erreicht und ist nicht abgeschlossen.\n\nDie Trade-Periode endete am {1}.\n\nBitte überprüfen Sie Ihren Trade unter \"Portfolio/Offene Trades\", um den Mediator zu kontaktieren. popup.warning.noTradingAccountSetup.headline=Sie haben kein Handelskonto eingerichtet @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=Es sind keine Mediatoren verfügbar. popup.warning.notFullyConnected=Sie müssen warten, bis Sie vollständig mit dem Netzwerk verbunden sind.\nDas kann bis ungefähr 2 Minuten nach dem Start dauern. popup.warning.notSufficientConnectionsToBtcNetwork=Sie müssen warten, bis Sie wenigstens {0} Verbindungen zum Bitcoinnetzwerk haben. popup.warning.downloadNotComplete=Sie müssen warten bis der Download der fehlenden Bitcoinblöcke abgeschlossen ist. -popup.warning.chainNotSynced=Die Blockchain Größe der Bisq Wallet ist nicht korrekt synchronisiert. Wenn Sie kürzlich die Applikation geöffnet haben, warten Sie bitte bis ein Bitcoin Block veröffentlicht wurde.\n\nSie können die Blockchain Größe unter Einstellungen/Netzwerkinformationen finden. Wenn mehr als ein Block veröffentlicht wird und das Problem weiterhin bestehen sollte, wird es eventuell abgewürgt werden. Dann sollten Sie einen SPV Resync durchführen. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=Die Blockchain Größe der Haveno Wallet ist nicht korrekt synchronisiert. Wenn Sie kürzlich die Applikation geöffnet haben, warten Sie bitte bis ein Bitcoin Block veröffentlicht wurde.\n\nSie können die Blockchain Größe unter Einstellungen/Netzwerkinformationen finden. Wenn mehr als ein Block veröffentlicht wird und das Problem weiterhin bestehen sollte, wird es eventuell abgewürgt werden. Dann sollten Sie einen SPV Resync durchführen. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Sind Sie sicher, dass Sie das Angebot entfernen wollen?\nDie Erstellergebühr von {0} geht verloren, wenn Sie des Angebot entfernen. popup.warning.tooLargePercentageValue=Es kann kein Prozentsatz von 100% oder mehr verwendet werden. popup.warning.examplePercentageValue=Bitte geben sei einen Prozentsatz wie folgt ein \"5.4\" für 5.4% @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=Einer der {0} Nodes wurde gebannt. # suppress inspection "UnusedProperty" popup.warning.priceRelay=Preisrelais popup.warning.seed=Seed -popup.warning.mandatoryUpdate.trading=Bitte aktualisieren Sie auf die neueste Bisq-Version. Es wurde ein obligatorisches Update veröffentlicht, das den Handel mit alten Versionen deaktiviert. Bitte besuchen Sie das Bisq-Forum für weitere Informationen. -popup.warning.noFilter=Wir haben kein Filterobjekt von den Seed Nodes erhalten. Diese Situation ist unerwartet. Bitte informieren Sie die Bisq Entwickler. +popup.warning.mandatoryUpdate.trading=Bitte aktualisieren Sie auf die neueste Haveno-Version. Es wurde ein obligatorisches Update veröffentlicht, das den Handel mit alten Versionen deaktiviert. Bitte besuchen Sie das Haveno-Forum für weitere Informationen. +popup.warning.noFilter=Wir haben kein Filterobjekt von den Seed Nodes erhalten. Diese Situation ist unerwartet. Bitte informieren Sie die Haveno Entwickler. popup.warning.burnBTC=Die Transaktion ist nicht möglich, da die Mininggebühren von {0} den übertragenen Betrag von {1} überschreiten würden. Bitte warten Sie, bis die Gebühren wieder niedrig sind, oder Sie mehr BTC zum übertragen angesammelt haben. -popup.warning.openOffer.makerFeeTxRejected=Die Verkäufergebühren-Transaktion für das Angebot mit der ID {0} wurde vom Bitcoin-Netzwerk abgelehnt.\nTransaktions-ID={1}.\nDas Angebot wurde entfernt, um weitere Probleme zu vermeiden.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\nFür weitere Hilfe wenden Sie sich bitte an den Bisq-Support-Kanal des Bisq Keybase Teams. +popup.warning.openOffer.makerFeeTxRejected=Die Verkäufergebühren-Transaktion für das Angebot mit der ID {0} wurde vom Bitcoin-Netzwerk abgelehnt.\nTransaktions-ID={1}.\nDas Angebot wurde entfernt, um weitere Probleme zu vermeiden.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\nFür weitere Hilfe wenden Sie sich bitte an den Haveno-Support-Kanal des Haveno Keybase Teams. popup.warning.trade.txRejected.tradeFee=Trade-Gebühr popup.warning.trade.txRejected.deposit=Kaution -popup.warning.trade.txRejected=Die {0} Transaktion für den Trade mit der ID {1} wurde vom Bitcoin-Netzwerk abgelehnt.\nTransaktions-ID={2}}\nDer Trade wurde in gescheiterte Trades verschoben.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie einen SPV Resync durch.\nFür weitere Hilfe wenden Sie sich bitte an den Bisq-Support-Kanal des Bisq Keybase Teams. +popup.warning.trade.txRejected=Die {0} Transaktion für den Trade mit der ID {1} wurde vom Bitcoin-Netzwerk abgelehnt.\nTransaktions-ID={2}}\nDer Trade wurde in gescheiterte Trades verschoben.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie einen SPV Resync durch.\nFür weitere Hilfe wenden Sie sich bitte an den Haveno-Support-Kanal des Haveno Keybase Teams. -popup.warning.openOfferWithInvalidMakerFeeTx=Die Verkäufergebühren-Transaktion für das Angebot mit der ID {0} ist ungültig.\nTransaktions-ID={1}.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\nFür weitere Hilfe wenden Sie sich bitte an den Bisq-Support-Kanal des Bisq Keybase Teams. +popup.warning.openOfferWithInvalidMakerFeeTx=Die Verkäufergebühren-Transaktion für das Angebot mit der ID {0} ist ungültig.\nTransaktions-ID={1}.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\nFür weitere Hilfe wenden Sie sich bitte an den Haveno-Support-Kanal des Haveno Keybase Teams. popup.info.securityDepositInfo=Um sicherzustellen, dass beide Händler dem Handelsprotokoll folgen, müssen diese eine Kaution zahlen.\n\nDie Kaution bleibt in Ihrer lokalen Wallet, bis das Angebot von einem anderen Händler angenommen wurde.\nSie wird Ihnen zurückerstattet, nachdem der Handel erfolgreich abgeschlossen wurde.\n\nBitte beachten Sie, dass Sie die Anwendung laufen lassen müssen, wenn Sie ein offenes Angebot haben.\nWenn ein anderer Händler Ihr Angebot annehmen möchte ist es notwendig, dass Ihre Anwendung online ist und reagieren kann.\nStellen Sie sicher, dass Sie den Ruhezustand deaktiviert haben, da dieser Ihren Client vom Netzwerk trennen würde (Der Ruhezustand des Monitors ist kein Problem). popup.info.cashDepositInfo=Stellen Sie sicher, dass eine Bank-Filiale in Ihrer Nähe befindet, um die Bargeld Kaution zu zahlen.\nDie Bankkennung (BIC/SWIFT) der Bank des Verkäufers ist: {0}. popup.info.cashDepositInfo.confirm=Ich bestätige, dass ich die Kaution zahlen kann -popup.info.shutDownWithOpenOffers=Bisq wird heruntergefahren, aber Sie haben offene Angebote verfügbar.\n\nDiese Angebote sind nach dem Herunterfahren nicht mehr verfügbar und werden erneut im P2P-Netzwerk veröffentlicht wenn Sie das nächste Mal Bisq starten.\n\nLassen Sie Bisq weiter laufen und stellen Sie sicher, dass Ihr Computer online bleibt, um Ihre Angebote verfügbar zu halten (z.B.: verhindern Sie den Standby-Modus... der Standby-Modus des Monitors stellt kein Problem dar). -popup.info.qubesOSSetupInfo=Es scheint so als ob Sie Bisq auf Qubes OS laufen haben.\n\nBitte stellen Sie sicher, dass Bisq qube nach unserem Setup Guide eingerichtet wurde: [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade von Version {0} auf Version {1} wird nicht unterstützt. Bitte nutzen Sie die aktuelle Bisq Version. +popup.info.shutDownWithOpenOffers=Haveno wird heruntergefahren, aber Sie haben offene Angebote verfügbar.\n\nDiese Angebote sind nach dem Herunterfahren nicht mehr verfügbar und werden erneut im P2P-Netzwerk veröffentlicht wenn Sie das nächste Mal Haveno starten.\n\nLassen Sie Haveno weiter laufen und stellen Sie sicher, dass Ihr Computer online bleibt, um Ihre Angebote verfügbar zu halten (z.B.: verhindern Sie den Standby-Modus... der Standby-Modus des Monitors stellt kein Problem dar). +popup.info.qubesOSSetupInfo=Es scheint so als ob Sie Haveno auf Qubes OS laufen haben.\n\nBitte stellen Sie sicher, dass Haveno qube nach unserem Setup Guide eingerichtet wurde: [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade von Version {0} auf Version {1} wird nicht unterstützt. Bitte nutzen Sie die aktuelle Haveno Version. popup.privateNotification.headline=Wichtige private Benachrichtigung! popup.securityRecommendation.headline=Wichtige Sicherheitsempfehlung popup.securityRecommendation.msg=Wir würden Sie gerne daran erinnern, sich zu überlegen, den Passwortschutz Ihrer Wallet zu verwenden, falls Sie diesen noch nicht aktiviert haben.\n\nEs wird außerdem dringend empfohlen, dass Sie die Wallet-Seed-Wörter aufschreiben. Diese Seed-Wörter sind wie ein Master-Passwort zum Wiederherstellen ihrer Bitcoin-Wallet.\nIm \"Wallet-Seed\"-Abschnitt finden Sie weitere Informationen.\n\nZusätzlich sollten Sie ein Backup des ganzen Anwendungsdatenordners im \"Backup\"-Abschnitt erstellen. -popup.bitcoinLocalhostNode.msg=Bisq hat einen Bitcoin Core Node entdeckt, der auf diesem Rechner (auf localhost) läuft.\n\nBitte stellen Sie sicher dass:\n- der Node vollständig synchronisiert ist, bevor Sie Bisq starten\n- Pruning deaktiviert ist ('prune=0' in bitcoin.conf)\n- Bloom-Filter aktiviert sind ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno hat einen Bitcoin Core Node entdeckt, der auf diesem Rechner (auf localhost) läuft.\n\nBitte stellen Sie sicher dass:\n- der Node vollständig synchronisiert ist, bevor Sie Haveno starten\n- Pruning deaktiviert ist ('prune=0' in bitcoin.conf)\n- Bloom-Filter aktiviert sind ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=Anwendung wird heruntergefahren popup.shutDownInProgress.msg=Das Herunterfahren der Anwendung kann einige Sekunden dauern.\nBitte unterbrechen Sie diesen Vorgang nicht. @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=Update der Handels-Wallets notification.walletUpdate.msg=Ihre Handels-Wallet ist ausreichend finanziert.\nBetrag: {0} notification.takeOffer.walletUpdate.msg=Ihre Handels-Wallet wurde bereits durch eine früher versuchte Angebotsannahme ausreichend finanziert.\nBetrag: {0} notification.tradeCompleted.headline=Handel abgeschlossen -notification.tradeCompleted.msg=Sie können Ihre Gelder jetzt auf eine externe Bitcoin-Wallet abheben oder an die Bisq-Wallet überweisen. +notification.tradeCompleted.msg=Sie können Ihre Gelder jetzt auf eine externe Bitcoin-Wallet abheben oder an die Haveno-Wallet überweisen. #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=Sie können Ihre Gelder jetzt auf eine externe B systemTray.show=Anwendungsfenster anzeigen systemTray.hide=Anwendungsfenster verstecken -systemTray.info=Informationen zu Bisq +systemTray.info=Informationen zu Haveno systemTray.exit=Beenden -systemTray.tooltip=Bisq: Ein dezentrales Bitcoin-Tauschbörsen-Netzwerk +systemTray.tooltip=Haveno: Ein dezentrales Bitcoin-Tauschbörsen-Netzwerk #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=Schlüssel aus Passwort ableiten password.walletDecrypted=Die Wallet wurde erfolgreich entschlüsselt und der Passwortschutz entfernt. password.wrongPw=Sie haben das falsche Passwort eingegeben.\n\nVersuchen Sie bitte Ihr Passwort erneut einzugeben, wobei Sie dies vorsichtig auf Tipp- und Rechtschreibfehler überprüfen sollten. password.walletEncrypted=Die Wallet wurde erfolgreich verschlüsselt und der Passwortschutz aktiviert. -password.walletEncryptionFailed=Wallet Passwort konnte nicht eingerichtet werden. Sie haben vielleicht Seed-Wörter importiert, die nicht mit der Wallet-Datenbank übereinstimmen. Bitte kontaktieren Sie die Entwickler auf Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet Passwort konnte nicht eingerichtet werden. Sie haben vielleicht Seed-Wörter importiert, die nicht mit der Wallet-Datenbank übereinstimmen. Bitte kontaktieren Sie die Entwickler auf Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=Die 2 eingegebenen Passwörter stimmen nicht überein. password.forgotPassword=Passwort vergessen? password.backupReminder=Beachten Sie, dass wenn Sie ein Passwort setzen, alle automatisch erstellten Backups der unverschlüsselten Wallet gelöscht werden.\n\nEs wird dringend empfohlen ein Backup des Anwendungsverzeichnisses zu erstellen und die Seed-Wörter aufzuschreiben, bevor Sie ein Passwort erstellen! @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=Ihre Bitcoin-Wallet ist nicht leer.\n\nSie müssen seed.warn.walletNotEmpty.restore=Ich möchte trotzdem wiederherstellen seed.warn.walletNotEmpty.emptyWallet=Ich werde meine Wallets erst leeren seed.warn.notEncryptedAnymore=Ihre Wallets sind verschlüsselt.\n\nNach einer Wiederherstellung werden die Wallets nicht mehr verschlüsselt sein und Sie werden ein neues Passwort festlegen müssen.\n\nMöchten Sie fortfahren? -seed.warn.walletDateEmpty=Da Sie kein Wallet-Datum angegeben haben, muss bisq die Blockchain ab 09. 10. 2013 (seit diesem Datum existiert BIP39) scannen.\n\nBIP39-Wallets wurden in bisq erstmals am 28.06.2017 (Release v0.5) eingeführt. Wenn Sie dieses Datum nehmen, können Sie etwas Zeit sparen.\n\nIdealerweise sollten Sie das Datum angeben, an dem Ihr Wallet Seed erstellt wurde.\n\n\nSind Sie sicher, dass Sie ohne Angabe eines Wallet-Datums fortfahren wollen? +seed.warn.walletDateEmpty=Da Sie kein Wallet-Datum angegeben haben, muss haveno die Blockchain ab 09. 10. 2013 (seit diesem Datum existiert BIP39) scannen.\n\nBIP39-Wallets wurden in haveno erstmals am 28.06.2017 (Release v0.5) eingeführt. Wenn Sie dieses Datum nehmen, können Sie etwas Zeit sparen.\n\nIdealerweise sollten Sie das Datum angeben, an dem Ihr Wallet Seed erstellt wurde.\n\n\nSind Sie sicher, dass Sie ohne Angabe eines Wallet-Datums fortfahren wollen? seed.restore.success=Wallets mit den neuen Seed-Wörtern erfolgreich wiederhergestellt.\n\nSie müssen die Anwendung herunterfahren und neu starten. seed.restore.error=Beim Wiederherstellen der Wallets mit den Seed-Wörtern ist ein Fehler aufgetreten.{0} seed.restore.openOffers.warn=Sie haben noch offene Angebote die entfernt werden wenn Sie Ihre Seed Wörter wiederherstellen.\nSind Sie sicher, dass Sie fortfahren möchten? @@ -1949,17 +1949,17 @@ payment.accountType=Kontotyp payment.checking=Überprüfe payment.savings=Ersparnisse payment.personalId=Personalausweis -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle ist ein Geldtransferdienst, der am besten *durch* eine andere Bank funktioniert.\n\n1. Sehen Sie auf dieser Seite nach, ob (und wie) Ihre Bank mit Zelle zusammenarbeitet:\nhttps://www.zellepay.com/get-started\n\n2. Achten Sie besonders auf Ihre Überweisungslimits - die Sendelimits variieren je nach Bank, und die Banken geben oft separate Tages-, Wochen- und Monatslimits an.\n\n3. Wenn Ihre Bank nicht mit Zelle zusammenarbeitet, können Sie die Zahlungsmethode trotzdem über die Zelle Mobile App benutzen, aber Ihre Überweisungslimits werden viel niedriger sein.\n\n4. Der auf Ihrem Bisq-Konto angegebene Name MUSS mit dem Namen auf Ihrem Zelle/Bankkonto übereinstimmen. \n\nWenn Sie eine Zelle Transaktion nicht wie in Ihrem Handelsvertrag angegeben durchführen können, verlieren Sie möglicherweise einen Teil (oder die gesamte) Sicherheitskaution.\n\nWegen des etwas höheren Chargeback-Risikos von Zelle wird Verkäufern empfohlen, nicht unterzeichnete Käufer per E-Mail oder SMS zu kontaktieren, um zu überprüfen, ob der Käufer wirklich das in Bisq angegebene Zelle-Konto besitzt. -payment.fasterPayments.newRequirements.info=Einige Banken haben damit begonnen, den vollständigen Namen des Empfängers für Faster Payments Überweisungen zu überprüfen. Ihr aktuelles Faster Payments-Konto gibt keinen vollständigen Namen an.\n\nBitte erwägen Sie, Ihr Faster Payments-Konto in Bisq neu einzurichten, um zukünftigen {0} Käufern einen vollständigen Namen zu geben.\n\nWenn Sie das Konto neu erstellen, stellen Sie sicher, dass Sie die genaue Bankleitzahl, Kontonummer und die "Salt"-Werte für die Altersverifikation von Ihrem alten Konto auf Ihr neues Konto kopieren. Dadurch wird sichergestellt, dass das Alter und der Unterschriftsstatus Ihres bestehenden Kontos erhalten bleiben. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle ist ein Geldtransferdienst, der am besten *durch* eine andere Bank funktioniert.\n\n1. Sehen Sie auf dieser Seite nach, ob (und wie) Ihre Bank mit Zelle zusammenarbeitet:\nhttps://www.zellepay.com/get-started\n\n2. Achten Sie besonders auf Ihre Überweisungslimits - die Sendelimits variieren je nach Bank, und die Banken geben oft separate Tages-, Wochen- und Monatslimits an.\n\n3. Wenn Ihre Bank nicht mit Zelle zusammenarbeitet, können Sie die Zahlungsmethode trotzdem über die Zelle Mobile App benutzen, aber Ihre Überweisungslimits werden viel niedriger sein.\n\n4. Der auf Ihrem Haveno-Konto angegebene Name MUSS mit dem Namen auf Ihrem Zelle/Bankkonto übereinstimmen. \n\nWenn Sie eine Zelle Transaktion nicht wie in Ihrem Handelsvertrag angegeben durchführen können, verlieren Sie möglicherweise einen Teil (oder die gesamte) Sicherheitskaution.\n\nWegen des etwas höheren Chargeback-Risikos von Zelle wird Verkäufern empfohlen, nicht unterzeichnete Käufer per E-Mail oder SMS zu kontaktieren, um zu überprüfen, ob der Käufer wirklich das in Haveno angegebene Zelle-Konto besitzt. +payment.fasterPayments.newRequirements.info=Einige Banken haben damit begonnen, den vollständigen Namen des Empfängers für Faster Payments Überweisungen zu überprüfen. Ihr aktuelles Faster Payments-Konto gibt keinen vollständigen Namen an.\n\nBitte erwägen Sie, Ihr Faster Payments-Konto in Haveno neu einzurichten, um zukünftigen {0} Käufern einen vollständigen Namen zu geben.\n\nWenn Sie das Konto neu erstellen, stellen Sie sicher, dass Sie die genaue Bankleitzahl, Kontonummer und die "Salt"-Werte für die Altersverifikation von Ihrem alten Konto auf Ihr neues Konto kopieren. Dadurch wird sichergestellt, dass das Alter und der Unterschriftsstatus Ihres bestehenden Kontos erhalten bleiben. payment.moneyGram.info=Bei der Nutzung von MoneyGram, muss der BTC Käufer die MoneyGram Zulassungsnummer und ein Foto der Quittung per E-Mail an den BTC-Verkäufer senden. Die Quittung muss den vollständigen Namen, das Land, das Bundesland des Verkäufers und den Betrag deutlich zeigen. Der Käufer bekommt die E-Mail-Adresse des Verkäufers im Handelsprozess angezeigt. payment.westernUnion.info=Bei der Nutzung von Western Union, muss der BTC Käufer die MTCN (Tracking-Nummer) Foto der Quittung per E-Mail an den BTC-Verkäufer senden. Die Quittung muss den vollständigen Namen, das Land, die Stadt des Verkäufers und den Betrag deutlich zeigen. Der Käufer bekommt die E-Mail-Adresse des Verkäufers im Handelsprozess angezeigt. payment.halCash.info=Bei Verwendung von HalCash muss der BTC-Käufer dem BTC-Verkäufer den HalCash-Code per SMS vom Mobiltelefon senden.\n\nBitte achten Sie darauf, dass Sie den maximalen Betrag, den Sie bei Ihrer Bank mit HalCash versenden dürfen, nicht überschreiten. Der Mindestbetrag pro Auszahlung beträgt 10 EUR und der Höchstbetrag 600 EUR. Bei wiederholten Abhebungen sind es 3000 EUR pro Empfänger pro Tag und 6000 EUR pro Empfänger pro Monat. Bitte überprüfen Sie diese Limits bei Ihrer Bank, um sicherzustellen, dass sie die gleichen Limits wie hier angegeben verwenden.\n\nDer Auszahlungsbetrag muss ein Vielfaches von 10 EUR betragen, da Sie keine anderen Beträge an einem Geldautomaten abheben können. Die Benutzeroberfläche beim Erstellen und Annehmen eines Angebots passt den BTC-Betrag so an, dass der EUR-Betrag korrekt ist. Sie können keinen marktbasierten Preis verwenden, da sich der EUR-Betrag bei sich ändernden Preisen ändern würde.\n\nIm Streitfall muss der BTC-Käufer den Nachweis erbringen, dass er die EUR geschickt hat. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Bitte beachten Sie, dass alle Banküberweisungen mit einem gewissen Rückbuchungsrisiko verbunden sind. Um dieses Risiko zu mindern, setzt Bisq Limits pro Trade fest, je nachdem wie hoch das Rückbuchungsrisiko der Zahlungsmethode ist. \n\nFür diese Zahlungsmethode beträgt Ihr Pro-Trade-Limit zum Kaufen oder Verkaufen {2}.\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie Sie möchten.\n\nFinden Sie mehr Informationen im Wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Bitte beachten Sie, dass alle Banküberweisungen mit einem gewissen Rückbuchungsrisiko verbunden sind. Um dieses Risiko zu mindern, setzt Haveno Limits pro Trade fest, je nachdem wie hoch das Rückbuchungsrisiko der Zahlungsmethode ist. \n\nFür diese Zahlungsmethode beträgt Ihr Pro-Trade-Limit zum Kaufen oder Verkaufen {2}.\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie Sie möchten.\n\nFinden Sie mehr Informationen im Wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=Um das Risiko einer Rückbuchung zu minimieren, setzt Bisq für diese Zahlungsmethode Limits pro Trade auf der Grundlage der folgenden 2 Faktoren fest:\n\n1. Allgemeines Rückbuchungsrisiko für die Zahlungsmethode\n2. Status der Kontounterzeichnung\n\nDieses Zahlungskonto ist noch nicht unterzeichnet. Es ist daher auf den Kauf von {0} pro Trade beschränkt ist. Nach der Unterzeichnung werden die Kauflimits wie folgt erhöht:\n\n● Vor der Unterzeichnung und für 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {0}\n● 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {1}\n● 60 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {2}\n\nVerkaufslimits sind von der Kontounterzeichnung nicht betroffen. Sie können {2} in einem einzigen Trade sofort verkaufen.\n\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie sie möchten.\n\nWeitere Informationen gibt es im Wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=Um das Risiko einer Rückbuchung zu minimieren, setzt Haveno für diese Zahlungsmethode Limits pro Trade auf der Grundlage der folgenden 2 Faktoren fest:\n\n1. Allgemeines Rückbuchungsrisiko für die Zahlungsmethode\n2. Status der Kontounterzeichnung\n\nDieses Zahlungskonto ist noch nicht unterzeichnet. Es ist daher auf den Kauf von {0} pro Trade beschränkt ist. Nach der Unterzeichnung werden die Kauflimits wie folgt erhöht:\n\n● Vor der Unterzeichnung und für 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {0}\n● 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {1}\n● 60 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {2}\n\nVerkaufslimits sind von der Kontounterzeichnung nicht betroffen. Sie können {2} in einem einzigen Trade sofort verkaufen.\n\nDieses Limit gilt nur für die Größe eines einzelnen Trades - Sie können soviele Trades platzieren wie sie möchten.\n\nWeitere Informationen gibt es im Wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Bitte bestätigen Sie, dass Ihre Bank Bareinzahlungen in Konten von anderen Personen erlaubt. Zum Beispiel werden diese Einzahlungen bei der Bank of America und Wells Fargo nicht mehr erlaubt. @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Bei der Zahlungsmethode Amazon Geschenkkarten mus payment.account.amazonGiftCard.addCountryInfo={0}\nDein bestehendes Amazon Geschenkkarten Konto ({1}) wurde keinem Land zugeteilt.\nBitte geben Sie das Amazon Geschenkkarten Land ein um Ihre Kontodaten zu aktualisieren.\nDas wird ihr Kontoalter nicht beeinflussen. payment.amazonGiftCard.upgrade.headLine=Amazon Geschenkkarte Konto updaten -payment.usPostalMoneyOrder.info=Der Handel auf Bisq unter Verwendung von US Postal Money Orders (USPMO) setzt voraus, dass Sie Folgendes verstehen:\n\n- Der BTC-Käufer muss den Namen des BTC-Verkäufers sowohl in das Feld des Zahlers als auch in das Feld des Zahlungsempfängers eintragen und vor dem Versand ein hochauflösendes Foto des USPMO und des Umschlags mit dem Tracking-Nachweis machen.\n- BTC-Käufer müssen den USPMO mit Zustellbenachrichtigung an den BTC-Verkäufer schicken.\n\nFür den Fall, dass eine Mediation erforderlich ist oder es zu einem Handelskonflikt kommt, müssen Sie die Fotos zusammen mit der USPMO-Seriennummer, der Nummer des Postamtes und dem Dollarbetrag an den Bisq-Vermittler oder Rückerstattungsbeauftragten schicken, damit dieser die Angaben auf der Website der US-Post überprüfen kann.\n\nWenn Sie dem Vermittler oder der Schiedsperson die erforderlichen Informationen nicht zur Verfügung stellen, führt dies dazu, dass der Konflikt zu Ihrem Nachteil entschieden wird.\n\nIn allen Konfliktfällen trägt der USPMO-Absender 100% der Verantwortung für die Bereitstellung von Beweisen/Nachweisen für den Vermittler oder die Schiedsperson.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie bitte nicht auf Bisq unter Verwendung von USPMO. +payment.usPostalMoneyOrder.info=Der Handel auf Haveno unter Verwendung von US Postal Money Orders (USPMO) setzt voraus, dass Sie Folgendes verstehen:\n\n- Der BTC-Käufer muss den Namen des BTC-Verkäufers sowohl in das Feld des Zahlers als auch in das Feld des Zahlungsempfängers eintragen und vor dem Versand ein hochauflösendes Foto des USPMO und des Umschlags mit dem Tracking-Nachweis machen.\n- BTC-Käufer müssen den USPMO mit Zustellbenachrichtigung an den BTC-Verkäufer schicken.\n\nFür den Fall, dass eine Mediation erforderlich ist oder es zu einem Handelskonflikt kommt, müssen Sie die Fotos zusammen mit der USPMO-Seriennummer, der Nummer des Postamtes und dem Dollarbetrag an den Haveno-Vermittler oder Rückerstattungsbeauftragten schicken, damit dieser die Angaben auf der Website der US-Post überprüfen kann.\n\nWenn Sie dem Vermittler oder der Schiedsperson die erforderlichen Informationen nicht zur Verfügung stellen, führt dies dazu, dass der Konflikt zu Ihrem Nachteil entschieden wird.\n\nIn allen Konfliktfällen trägt der USPMO-Absender 100% der Verantwortung für die Bereitstellung von Beweisen/Nachweisen für den Vermittler oder die Schiedsperson.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie bitte nicht auf Haveno unter Verwendung von USPMO. -payment.cashByMail.info=Beim Bargeld per Post Handel auf Bisq, müssen Sie folgendes verstehen: \n\n● Der BTC Käufer sollte das Bargeld in einen manipulationssicheren Geldbeutel verpacken.\n● Der BTC Käufer sollte den Verpackungsprozess des Bargeldes filmen oder mit hochauflösenden Fotos dokumentieren. Die Adresse & Tracking Nummer sollen auf der Packung bereits angebracht sein.\n● Der BTC Käufer sollte das Bargeld mit Versandbestätigung und ausreichender Versicherung an den Verkäufer senden.\n● Der BTC Verkäufer sollte die Öffnung des Bargeld-Paketes so filmen, dass die Tracking Nummer des Senders im Video sichtbar ist.\n● Der Ersteller des Angebots muss spezielle Bedingungen oder Abmachungen im 'Zusätzliche Informationen'-Feld des Zahlungskontos eintragen.\n● Der Annehmer des Angebots akzeptiert die Bedingungen und Abmachungen des Ersteller des Angebots durch die Annahme des Angebots.\n\nBargeld per Post Trades benötigen die Ehrlichkeit und das Vertrauen beider Peers.\n\n● Bargeld per Post Trades haben weniger verifizierbare Handlungen als andere FIAT Trades. Das macht die Abwicklung von Konflikten viel schwerer.\nCBM trades put the onus to act honestly squarely on both peers.\n● Versuchen Sie den Konflikt mit dem Handelspartner direkt über den Trader Chat zu lösen. Das ist der vielversprechendste Weg Konflikte bei solchen Trades zu lösen.\n● Mediatoren können den Fall untersuchen und einen Vorschlag machen aber es ist nicht garantiert, dass sie wirklich helfen können.\n● Wenn ein Mediator eingeschalten wurde und beide Peers den Vorschlag des Mediators ablehnen, werden die Gelder beider Peers zu einer Bisq Spendenadresse [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] gesendet und der Trade ist somit abgeschlossen.\n● Wenn ein Trader den Vorschlag des Mediators ablehnt und eine Arbitration eröffnet, kann es zu einem Verlust der Trading- und der Deposit-Funds kommen.\n● Arbitratoren werden ihre Entscheidungen basierend auf den zur Verfügung gestellten Beweisen treffen. Deshalb sollten Sie die Abläufe von oben befolgen und dokumentieren um im Falle eines Konflikts Beweise zu haben. Bei Bargeld per Post Trades ist die Entscheidung des Arbitrators entscheidend.\n● Rückerstattungsanfragen, von verlorenen Funds durch einen Bargeld per Post Trade, über die DAO werden nicht berücksichtigt.\n\nUm sicherzustellen, dass Sie die Anforderungen bei Bargeld per Post Trades verstanden haben lesen Sie: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\nWenn Sie diese Anforderungen nicht verstehen, nutzen Sie die Bisq-Zahlungsmethode Bargeld per Post nicht. +payment.cashByMail.info=Beim Bargeld per Post Handel auf Haveno, müssen Sie folgendes verstehen: \n\n● Der BTC Käufer sollte das Bargeld in einen manipulationssicheren Geldbeutel verpacken.\n● Der BTC Käufer sollte den Verpackungsprozess des Bargeldes filmen oder mit hochauflösenden Fotos dokumentieren. Die Adresse & Tracking Nummer sollen auf der Packung bereits angebracht sein.\n● Der BTC Käufer sollte das Bargeld mit Versandbestätigung und ausreichender Versicherung an den Verkäufer senden.\n● Der BTC Verkäufer sollte die Öffnung des Bargeld-Paketes so filmen, dass die Tracking Nummer des Senders im Video sichtbar ist.\n● Der Ersteller des Angebots muss spezielle Bedingungen oder Abmachungen im 'Zusätzliche Informationen'-Feld des Zahlungskontos eintragen.\n● Der Annehmer des Angebots akzeptiert die Bedingungen und Abmachungen des Ersteller des Angebots durch die Annahme des Angebots.\n\nBargeld per Post Trades benötigen die Ehrlichkeit und das Vertrauen beider Peers.\n\n● Bargeld per Post Trades haben weniger verifizierbare Handlungen als andere FIAT Trades. Das macht die Abwicklung von Konflikten viel schwerer.\nCBM trades put the onus to act honestly squarely on both peers.\n● Versuchen Sie den Konflikt mit dem Handelspartner direkt über den Trader Chat zu lösen. Das ist der vielversprechendste Weg Konflikte bei solchen Trades zu lösen.\n● Mediatoren können den Fall untersuchen und einen Vorschlag machen aber es ist nicht garantiert, dass sie wirklich helfen können.\n● Wenn ein Mediator eingeschalten wurde und beide Peers den Vorschlag des Mediators ablehnen, werden die Gelder beider Peers zu einer Haveno Spendenadresse [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] gesendet und der Trade ist somit abgeschlossen.\n● Wenn ein Trader den Vorschlag des Mediators ablehnt und eine Arbitration eröffnet, kann es zu einem Verlust der Trading- und der Deposit-Funds kommen.\n● Arbitratoren werden ihre Entscheidungen basierend auf den zur Verfügung gestellten Beweisen treffen. Deshalb sollten Sie die Abläufe von oben befolgen und dokumentieren um im Falle eines Konflikts Beweise zu haben. Bei Bargeld per Post Trades ist die Entscheidung des Arbitrators entscheidend.\n● Rückerstattungsanfragen, von verlorenen Funds durch einen Bargeld per Post Trade, über die DAO werden nicht berücksichtigt.\n\nUm sicherzustellen, dass Sie die Anforderungen bei Bargeld per Post Trades verstanden haben lesen Sie: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\nWenn Sie diese Anforderungen nicht verstehen, nutzen Sie die Haveno-Zahlungsmethode Bargeld per Post nicht. payment.cashByMail.contact=Kontaktinformationen payment.cashByMail.contact.prompt=Name oder Pseudonym Umschlag sollten adressiert werden an @@ -1996,7 +1996,7 @@ payment.japan.recipient=Name payment.australia.payid=PayID payment.payid=PayIDs wie E-Mail Adressen oder Telefonnummern die mit Finanzinstitutionen verbunden sind. payment.payid.info=Eine PayID wie eine Telefonnummer, E-Mail Adresse oder Australische Business Number (ABN) mit der Sie sicher Ihre Bank, Kreditgenossenschaft oder Bausparkassenkonto verlinken können. Sie müssen bereits eine PayID mit Ihrer Australischen Finanzinstitution erstellt haben. Beide Institutionen, die die sendet und die die empfängt, müssen PayID unterstützen. Weitere informationen finden Sie unter [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=Um mit einer Amazon eGift Geschenkkarte zu bezahlen, müssen Sie eine Amazon eGift Geschenkkarte über Ihr Amazon-Konto an den BTC-Verkäufer senden. \n\nBisq zeigt die E-Mail-Adresse oder Telefonnummer des BTC-Verkäufers an, an die die Geschenkkarte gesendet werden soll, und Sie müssen die Handels-ID in das Nachrichtenfeld der Geschenkkarte eintragen. Bitte lesen Sie das Wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] für weitere Details und empfohlene Vorgehensweisen. \n\nDrei wichtige Hinweise:\n- Versuchen Sie Geschenkkarten mit Beträgen von 100 USD oder weniger zu versenden, weil Amazon größere Geschenkkarten gerne als betrügerisch kennzeichnet\n- Versuchen Sie einen kreativen, glaubwürdigen Text für die Nachricht der Geschenkkarten zu verwenden (z.B. "Alles Gute zum Geburtstag Susi!"), zusammen mit der Handels-ID (und verwenden Sie den Handels-Chat, um Ihrem Handelspartner den von Ihnen gewählten Referenztext mitzuteilen, damit er Ihre Zahlung überprüfen kann)\n- Amazon Geschenkkarten können nur auf der Amazon-Website eingelöst werden, auf der sie gekauft wurden (z. B. kann eine auf amazon.it gekaufte Geschenkkarte nur auf amazon.it eingelöst werden) +payment.amazonGiftCard.info=Um mit einer Amazon eGift Geschenkkarte zu bezahlen, müssen Sie eine Amazon eGift Geschenkkarte über Ihr Amazon-Konto an den BTC-Verkäufer senden. \n\nHaveno zeigt die E-Mail-Adresse oder Telefonnummer des BTC-Verkäufers an, an die die Geschenkkarte gesendet werden soll, und Sie müssen die Handels-ID in das Nachrichtenfeld der Geschenkkarte eintragen. Bitte lesen Sie das Wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] für weitere Details und empfohlene Vorgehensweisen. \n\nDrei wichtige Hinweise:\n- Versuchen Sie Geschenkkarten mit Beträgen von 100 USD oder weniger zu versenden, weil Amazon größere Geschenkkarten gerne als betrügerisch kennzeichnet\n- Versuchen Sie einen kreativen, glaubwürdigen Text für die Nachricht der Geschenkkarten zu verwenden (z.B. "Alles Gute zum Geburtstag Susi!"), zusammen mit der Handels-ID (und verwenden Sie den Handels-Chat, um Ihrem Handelspartner den von Ihnen gewählten Referenztext mitzuteilen, damit er Ihre Zahlung überprüfen kann)\n- Amazon Geschenkkarten können nur auf der Amazon-Website eingelöst werden, auf der sie gekauft wurden (z. B. kann eine auf amazon.it gekaufte Geschenkkarte nur auf amazon.it eingelöst werden) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index 5e3fbf6f..ec115884 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -103,14 +103,14 @@ shared.faq=Visitar web preguntas frecuentes shared.yesCancel=Sí, cancelar shared.nextStep=Siguiente paso shared.selectTradingAccount=Selecionar cuenta de intercambio -shared.fundFromSavingsWalletButton=Transferir fondos desde la cartera Bisq +shared.fundFromSavingsWalletButton=Transferir fondos desde la cartera Haveno shared.fundFromExternalWalletButton=Abrir su monedero externo para agregar fondos shared.openDefaultWalletFailed=Fallo al abrir la aplicación de cartera predeterminada. ¿Tal vez no tenga una instalada? shared.belowInPercent=% por debajo del precio de mercado shared.aboveInPercent=% por encima del precio de mercado shared.enterPercentageValue=Introduzca valor % shared.OR=ó -shared.notEnoughFunds=No tiene suficientes fondos en su monedero bisq para esta transacción. Necesita {0} pero solo tiene {1} disponibles.\n\nPor favor deposite desde un monedero externo o agregue fondos a su monedero Bisq en Fondos > Recibir Fondos. +shared.notEnoughFunds=No tiene suficientes fondos en su monedero haveno para esta transacción. Necesita {0} pero solo tiene {1} disponibles.\n\nPor favor deposite desde un monedero externo o agregue fondos a su monedero Haveno en Fondos > Recibir Fondos. shared.waitingForFunds=Esperando fondos... shared.TheBTCBuyer=El comprador de BTC shared.You=Usted @@ -125,7 +125,7 @@ shared.notUsedYet=Sin usar aún shared.date=Fecha shared.sendFundsDetailsWithFee=Enviando: {0}\nDesde la dirección: {1}\nA la dirección receptora: {2}.\nLa comisión requerida de transacción es: {3} ({4} Satoshis/vbyte)\nTamaño de la transacción: {5} vKb\n\nEl receptor recibirá: {6}\n\nSeguro que quiere retirar esta cantidad? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detectó que esta transacción crearía una salida que está por debajo del umbral mínimo considerada polvo (y no está permitida por las reglas de consenso en Bitcoin). En cambio, esta transacción polvo ({0} satoshi {1}) se agregará a la tarifa de minería.\n\n\n +shared.sendFundsDetailsDust=Haveno detectó que esta transacción crearía una salida que está por debajo del umbral mínimo considerada polvo (y no está permitida por las reglas de consenso en Bitcoin). En cambio, esta transacción polvo ({0} satoshi {1}) se agregará a la tarifa de minería.\n\n\n shared.copyToClipboard=Copiar al portapapeles shared.language=Idioma shared.country=País @@ -235,8 +235,8 @@ mainView.menu.settings=Configuración mainView.menu.account=Cuenta mainView.marketPriceWithProvider.label=Precio de mercado por {0} -mainView.marketPrice.bisqInternalPrice=Precio del último intercambio en Bisq -mainView.marketPrice.tooltip.bisqInternalPrice=No existe un precio de mercado disponible proveniente de fuentes externas.\nEl precio mostrado es el último precio de intercambio en Bisq para esa moneda. +mainView.marketPrice.havenoInternalPrice=Precio del último intercambio en Haveno +mainView.marketPrice.tooltip.havenoInternalPrice=No existe un precio de mercado disponible proveniente de fuentes externas.\nEl precio mostrado es el último precio de intercambio en Haveno para esa moneda. mainView.marketPrice.tooltip=Precio de mercado ofrecido por {0}{1}\nÚltima actualización: {2}\nURL del nodo proveedor: {3} mainView.balance.available=Saldo disponible mainView.balance.reserved=Reservado en ofertas @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Sincronizando con {0} en el bloque: {1 mainView.footer.btcInfo.synchronizedWith=Sincronizado con {0} en el bloque {1} mainView.footer.btcInfo.connectingTo=Conectando a mainView.footer.btcInfo.connectionFailed=Conexión fallida a -mainView.footer.p2pInfo=Pares de Bitcoin: {0} / Pares de la red de Bisq: {1} +mainView.footer.p2pInfo=Pares de Bitcoin: {0} / Pares de la red de Haveno: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Conectando a la red Tor... mainView.bootstrapState.torNodeCreated=(2/4) Nodo Tor creado @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Datos iniciales recibidos mainView.bootstrapWarning.noSeedNodesAvailable=No hay nodos de siembra disponibles mainView.bootstrapWarning.noNodesAvailable=No hay nodos de sembrado y pares disponibles -mainView.bootstrapWarning.bootstrappingToP2PFailed=Fallo al conectarse a la red Bisq en el arranque +mainView.bootstrapWarning.bootstrappingToP2PFailed=Fallo al conectarse a la red Haveno en el arranque mainView.p2pNetworkWarnMsg.noNodesAvailable=No hay nodos de sembrado o puntos de red persistentes para los datos requeridos.\nPor favor, compruebe su conexión a Internet o intente reiniciar la aplicación. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Fallo conectándose a la red Bisq (error reportado: {0}).\nPor favor, compruebe su conexión a internet o pruebe reiniciando la aplicación. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Fallo conectándose a la red Haveno (error reportado: {0}).\nPor favor, compruebe su conexión a internet o pruebe reiniciando la aplicación. mainView.walletServiceErrorMsg.timeout=Error al conectar a la red Bitcoin en el límite de tiempo establecido. mainView.walletServiceErrorMsg.connectionError=La conexión a la red Bitcoin falló por un error: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=La conexión a la red Bitcoin fal mainView.walletServiceErrorMsg.rejectedTxException=Se rechazó una transacción desde la red.\n\n{0} mainView.networkWarning.allConnectionsLost=Perdió la conexión a todos los {0} usuarios de red.\nTal vez se ha interrumpido su conexión a Internet o su computadora estaba en modo suspendido. -mainView.networkWarning.localhostBitcoinLost=Perdió la conexión al nodo Bitcoin localhost.\nPor favor reinicie la aplicación Bisq para conectarse a otros nodos Bitcoin o reinice el nodo Bitcoin localhost. +mainView.networkWarning.localhostBitcoinLost=Perdió la conexión al nodo Bitcoin localhost.\nPor favor reinicie la aplicación Haveno para conectarse a otros nodos Bitcoin o reinice el nodo Bitcoin localhost. mainView.version.update=(Actualización disponible) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=El monto de intercambio p offerbook.warning.wrongTradeProtocol=Esta oferta requiere un protocolo de intercambio diferente al utilizado en su versión del software.\n\nPor favor, compruebe que tiene instalada la última versión del software, o de otra forma el usuario que creó la oferta ha utilizado una versión más antigua que la suya.\n\nLos usuarios no pueden realizar transacciones con una versión de protocolo de intercambio incompatible. offerbook.warning.userIgnored=Ha añadido esta dirección onion a la lista de ignorados. -offerbook.warning.offerBlocked=Esta oferta ha sido bloqueada por los desarrolladores de Bisq.\nProbablemente existe un error de software desatendido que causa problemas al tomar esta oferta. -offerbook.warning.currencyBanned=La moneda utilizada en esta oferta fue bloqueada por los desarrolladores de Bisq.\nPor favor visite el Forum de Bisq para más información. -offerbook.warning.paymentMethodBanned=El método de pago utilizado en esta oferta fue bloqueado por los desarrolladores de Bisq.\nPor favor visite el Forum Bisq para más información. -offerbook.warning.nodeBlocked=La dirección onion de este comerciante ha sido bloqueada por los desarrolladores de Bisq.\nProbablemente existe un error de software desatendido que causa problemas al tomar ofertas de este comerciante. -offerbook.warning.requireUpdateToNewVersion=Su versión de Bisq ya no es compatible para realizar intercambios.\nPor favor actualice a la última versión de Bisq en [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Esta oferta ha sido bloqueada por los desarrolladores de Haveno.\nProbablemente existe un error de software desatendido que causa problemas al tomar esta oferta. +offerbook.warning.currencyBanned=La moneda utilizada en esta oferta fue bloqueada por los desarrolladores de Haveno.\nPor favor visite el Forum de Haveno para más información. +offerbook.warning.paymentMethodBanned=El método de pago utilizado en esta oferta fue bloqueado por los desarrolladores de Haveno.\nPor favor visite el Forum Haveno para más información. +offerbook.warning.nodeBlocked=La dirección onion de este comerciante ha sido bloqueada por los desarrolladores de Haveno.\nProbablemente existe un error de software desatendido que causa problemas al tomar ofertas de este comerciante. +offerbook.warning.requireUpdateToNewVersion=Su versión de Haveno ya no es compatible para realizar intercambios.\nPor favor actualice a la última versión de Haveno en [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=No puede aceptar esta oferta porque ya lo hizo antes. Podría ser que su intento anterior de aceptar esta oferta haya terminado como un intercambio fallido. offerbook.info.sellAtMarketPrice=Venderá a precio de mercado (actualizado cada minuto). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Dote de fondos su oferta. createOffer.fundsBox.offerFee=Comisión de transacción createOffer.fundsBox.networkFee=Comisión de minado createOffer.fundsBox.placeOfferSpinnerInfo=Publicación de oferta en curso... -createOffer.fundsBox.paymentLabel=Intercambio Bisq con ID {0} +createOffer.fundsBox.paymentLabel=Intercambio Haveno con ID {0} createOffer.fundsBox.fundsStructure=({0} depósito de seguridad, {1} comisión de transacción, {2} comisión de minado) createOffer.success.headline=Su oferta ha sido publicada. createOffer.success.info=Puede gestionar sus ofertas abiertas en \"Portafolio/Mis ofertas abiertas\". @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Revisar: Poner oferta para {0} monero createOffer.createOfferFundWalletInfo.headline=Dote de fondos su trato. # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Cantidad a intercambiar: {0}\n -createOffer.createOfferFundWalletInfo.msg=Necesita depositar {0} para completar esta oferta.\n\nEsos fondos son reservados en su cartera local y se bloquearán en la dirección de depósito multifirma una vez que alguien tome su oferta.\nLa cantidad es la suma de:\n{1}- Su depósito de seguridad: {2}\n- Comisión de intercambio: {3}\n- Comisión de minado: {4}\n\nPuede elegir entre dos opciones a la hora de depositar fondos para realizar su intercambio:\n- Usar su cartera Bisq (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente con mayor privacidad)\n\nConocerá todos los detalles y opciones para depositar fondos al cerrar esta ventana. +createOffer.createOfferFundWalletInfo.msg=Necesita depositar {0} para completar esta oferta.\n\nEsos fondos son reservados en su cartera local y se bloquearán en la dirección de depósito multifirma una vez que alguien tome su oferta.\nLa cantidad es la suma de:\n{1}- Su depósito de seguridad: {2}\n- Comisión de intercambio: {3}\n- Comisión de minado: {4}\n\nPuede elegir entre dos opciones a la hora de depositar fondos para realizar su intercambio:\n- Usar su cartera Haveno (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente con mayor privacidad)\n\nConocerá todos los detalles y opciones para depositar fondos al cerrar esta ventana. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Ocurrió un error al colocar la oferta:\n\n{0}\n\nNingún importe de su cartera ha sido deducido aún.\nPor favor, reinicie su aplicación y compruebe su conexión a la red. createOffer.setAmountPrice=Establezca cantidad y precio -createOffer.warnCancelOffer=Ya ha destinado fondos para esa oferta.\nSi cancela ahora, sus fondos serán transferidos a su cartera Bisq local y estarán disponibles para retirar en la pantalla \"Fondos/Enviar fondos\".\n¿Está seguro que quiere cancelar? +createOffer.warnCancelOffer=Ya ha destinado fondos para esa oferta.\nSi cancela ahora, sus fondos serán transferidos a su cartera Haveno local y estarán disponibles para retirar en la pantalla \"Fondos/Enviar fondos\".\n¿Está seguro que quiere cancelar? createOffer.timeoutAtPublishing=Error. Fuera de tiempo en la publicación de la oferta. createOffer.errorInfo=\n\nLa tasa del creador ya se ha pagado. En el peor caso ha perdido esa tasa. Lo sentimos, pero tenga en cuenta que es una cantidad pequeña.\nPor favor pruebe a reiniciar su aplicación y compruebe la conexión a la red para ver si puede resolver el asunto. createOffer.tooLowSecDeposit.warning=Ha configurado el depósito de seguridad en un valor más bajo que el recomendado de forma predeterminada, que es {0}.\n¿Está seguro que quiere usar un valor de depósito de seguridad más bajo? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Cantidad a vender takeOffer.fundsBox.offerFee=Comisión de transacción takeOffer.fundsBox.networkFee=Comisiones de minado totales takeOffer.fundsBox.takeOfferSpinnerInfo=Aceptación de oferta en espera... -takeOffer.fundsBox.paymentLabel=Intercambio Bisq con ID {0} +takeOffer.fundsBox.paymentLabel=Intercambio Haveno con ID {0} takeOffer.fundsBox.fundsStructure=({0} depósito de seguridad {1} tasa de intercambio, {2} tarifa de minado) takeOffer.success.headline=Ha aceptado la oferta con éxito. takeOffer.success.info=Puede ver el estado de su intercambio en \"Portafolio/Intercambios abiertos\". @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=No puede tomar esta oferta porque utiliza un prec takeOffer.takeOfferFundWalletInfo.headline=Dotar de fondos su intercambio # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Cantidad a intercambiar: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=Necesita depositar {0} para tomar esta oferta.\n\nLa cantidad es la suma de:\n{1} - Su depósito de seguridad: {2}\n- Comisión de intercambio: {3}\n- Comisiones de minado totales: {4}\n\nPuede elegir entre dos opciones al depositar fondos para realizar su intercambio:\n- Usar su cartera Bisq (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente con mayor privacidad)\n\nVerá todos los detalles y opciones para depositar fondos al cerrar esta ventana. +takeOffer.takeOfferFundWalletInfo.msg=Necesita depositar {0} para tomar esta oferta.\n\nLa cantidad es la suma de:\n{1} - Su depósito de seguridad: {2}\n- Comisión de intercambio: {3}\n- Comisiones de minado totales: {4}\n\nPuede elegir entre dos opciones al depositar fondos para realizar su intercambio:\n- Usar su cartera Haveno (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente con mayor privacidad)\n\nVerá todos los detalles y opciones para depositar fondos al cerrar esta ventana. takeOffer.alreadyPaidInFunds=Si ya ha depositado puede retirarlo en la pantalla \"Fondos/Disponible para retirar\". takeOffer.paymentInfo=Información de pago takeOffer.setAmountPrice=Establecer cantidad -takeOffer.alreadyFunded.askCancel=Ya ha destinado fondos para esta oferta.\nSi cancela ahora, sus fondos serán transferidos a su cartera Bisq local y estarán disponibles para retirar en la pantalla \"Fondos/Enviar fondos\".\n¿Está seguro que quiere cancelar? +takeOffer.alreadyFunded.askCancel=Ya ha destinado fondos para esta oferta.\nSi cancela ahora, sus fondos serán transferidos a su cartera Haveno local y estarán disponibles para retirar en la pantalla \"Fondos/Enviar fondos\".\n¿Está seguro que quiere cancelar? takeOffer.failed.offerNotAvailable=Falló la solicitud de toma de oferta porque la oferta ya no está disponible. Tal vez otro comerciante la haya tomado en su lugar. takeOffer.failed.offerTaken=No puede tomar la oferta porque la oferta fue tomada por otro comerciante. takeOffer.failed.offerRemoved=No puede tomar esta oferta porque la oferta ha sido eliminada. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Confirmar: Editar oferta editOffer.publishOffer=Publicando su oferta. editOffer.failed=Fallo en la edición de oferta:\n{0} editOffer.success=Su oferta ha sido editada con éxito. -editOffer.invalidDeposit=El depósito de seguridad del comprador no está dentro de los límites definidos por la DAO Bisq y ya no puede ser ser editado. +editOffer.invalidDeposit=El depósito de seguridad del comprador no está dentro de los límites definidos por la DAO Haveno y ya no puede ser ser editado. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=La transacción de depósito aún no ha s # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Su intercambio tiene al menos una confirmación en la cadena de bloques.\n\n -portfolio.pending.step2_buyer.refTextWarn=Importante: al hacer un pago, deje el campo \"motivo de pago\" vacío. NO PONGA la ID de intercambio o algún otro texto como 'bitcoin', 'BTC', o 'Bisq'. Los comerciantes pueden convenir en el chat de intercambio un \"motivo de pago\" alternativo. +portfolio.pending.step2_buyer.refTextWarn=Importante: al hacer un pago, deje el campo \"motivo de pago\" vacío. NO PONGA la ID de intercambio o algún otro texto como 'bitcoin', 'BTC', o 'Haveno'. Los comerciantes pueden convenir en el chat de intercambio un \"motivo de pago\" alternativo. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=Si su banco carga alguna tasa por hacer la transferencia, es responsable de pagar esas tasas. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=REQUERIMIENTO IMPORTANTE:\nDesp # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Por favor envíe {0} mediante \"US Postal Money Order\" a el vendedor de BTC.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Por favor envíe {0} usando \"Efectivo por Correo\" al vendedor. Las instrucciones específicas están en el contrato de intercambio, y si no queda claro, pregunte a través del chat de intercambio.\nVea más detalles acerca de Efectivo por Correo en la wiki de Bisq [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Por favor envíe {0} usando \"Efectivo por Correo\" al vendedor. Las instrucciones específicas están en el contrato de intercambio, y si no queda claro, pregunte a través del chat de intercambio.\nVea más detalles acerca de Efectivo por Correo en la wiki de Haveno [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Por favor pague {0} a través del método de pago especificado al vendedor BTC. Encontrará los detalles de la cuenta del vendedor en la siguiente pantalla.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Enviar MTCN y recibo portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Necesita enviar el MTCN (número de seguimiento) y una foto de el recibo por email a el vendedor de BTC\nEl recibo debe mostrar claramente el nombre completo del emisor, la ciudad, el país y la cantidad. El email del vendedor es: {0}\n\n¿Envió el MTCN y el contrato al vendedor? portfolio.pending.step2_buyer.halCashInfo.headline=Enviar código HalCash portfolio.pending.step2_buyer.halCashInfo.msg=Necesita enviar un mensaje de texto con el código HalCash\nEl móvil del vendedor es {1}.\n\n¿Envió el código al vendedor? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Algunos bancos pueden verificar el nombre del receptor. Las cuentas Faster Payments creadas en antiguos clientes de Bisq no proporcionan el nombre completo del receptor, así que por favor, utilice el chat del intercambio para obtenerlo (si es necesario). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Algunos bancos pueden verificar el nombre del receptor. Las cuentas Faster Payments creadas en antiguos clientes de Haveno no proporcionan el nombre completo del receptor, así que por favor, utilice el chat del intercambio para obtenerlo (si es necesario). portfolio.pending.step2_buyer.confirmStart.headline=Confirme que ha comenzado el pago. portfolio.pending.step2_buyer.confirmStart.msg=¿Ha iniciado el pago de {0} a su par de intercambio? portfolio.pending.step2_buyer.confirmStart.yes=Sí, lo he iniciado. portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=No ha entregado una prueba de pago válida. -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=No ha introducido la transacción de ID y la clave de transacción.\n\nAl no proveer esta información el par no puede usar la autoconfirmación para liberar los BTC en cuanto los XMR se han recibido.\nAdemás de esto, Bisq requiere que el emisor de la transacción XMR sea capaz de entregar esta información al mediador o árbitro en caso de disputa.\nVea más detalles en la wiki de Bisq: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=No ha introducido la transacción de ID y la clave de transacción.\n\nAl no proveer esta información el par no puede usar la autoconfirmación para liberar los BTC en cuanto los XMR se han recibido.\nAdemás de esto, Haveno requiere que el emisor de la transacción XMR sea capaz de entregar esta información al mediador o árbitro en caso de disputa.\nVea más detalles en la wiki de Haveno: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=El valor introducido no es un valor hexadecimal de 32 bytes portfolio.pending.step2_buyer.confirmStart.warningButton=Ignorar y continuar de todos modos portfolio.pending.step2_seller.waitPayment.headline=Esperar al pago. @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=El comprador de BTC aún no ha realizado el portfolio.pending.step2_seller.openForDispute=El comprador de BTC no ha comenzado su pago!\nEl periodo máximo permitido ha finalizado.\nPuede esperar más y dar más tiempo a la otra parte o contactar con el mediador para abrir una disputa. tradeChat.chatWindowTitle=Ventana de chat para intercambio con ID "{0}" tradeChat.openChat=Abrir ventana de chat -tradeChat.rules=Puede comunicarse con su par de intercambio para resolver posibles problemas con este intercambio.\nNo es obligatorio responder en el chat.\nSi un comerciante viola alguna de las reglas de abajo, abra una disputa y repórtelo al mediador o árbitro.\n\nReglas del chat:\n\t● No enviar ningún enlace (riesgo de malware). Puedes enviar el ID de la transacción y el nombre de un explorador de bloques.\n\t● ¡No enviar las palabras semilla, llaves privadas, contraseñas u otra información sensible!\n\t● No alentar a intercambiar fuera de Bisq (sin seguridad).\n\t● No se enfrente a ningún intento de estafa de ingeniería social.\n\t● Si un par no responde y prefiere no comunicarse, respete su decisión.\n\t● Limite el tema de conversación al intercambio. Este chat no es un sustituto del messenger o troll-box.\n\t● Mantenga la conversación amigable y respetuosa. +tradeChat.rules=Puede comunicarse con su par de intercambio para resolver posibles problemas con este intercambio.\nNo es obligatorio responder en el chat.\nSi un comerciante viola alguna de las reglas de abajo, abra una disputa y repórtelo al mediador o árbitro.\n\nReglas del chat:\n\t● No enviar ningún enlace (riesgo de malware). Puedes enviar el ID de la transacción y el nombre de un explorador de bloques.\n\t● ¡No enviar las palabras semilla, llaves privadas, contraseñas u otra información sensible!\n\t● No alentar a intercambiar fuera de Haveno (sin seguridad).\n\t● No se enfrente a ningún intento de estafa de ingeniería social.\n\t● Si un par no responde y prefiere no comunicarse, respete su decisión.\n\t● Limite el tema de conversación al intercambio. Este chat no es un sustituto del messenger o troll-box.\n\t● Mantenga la conversación amigable y respetuosa. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Indefinido @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=Depósito de seguridad devuelto portfolio.pending.step5_buyer.withdrawBTC=Retirar bitcoins portfolio.pending.step5_buyer.amount=Cantidad a retirar portfolio.pending.step5_buyer.withdrawToAddress=Retirar a la dirección -portfolio.pending.step5_buyer.moveToBisqWallet=Mantener fondos en el monedero de Bisq +portfolio.pending.step5_buyer.moveToHavenoWallet=Mantener fondos en el monedero de Haveno portfolio.pending.step5_buyer.withdrawExternal=Retirar al monedero externo portfolio.pending.step5_buyer.alreadyWithdrawn=Sus fondos ya han sido retirados.\nPor favor, compruebe el historial de transacciones. portfolio.pending.step5_buyer.confirmWithdrawal=Confirme la petición de retiro @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=Ha recibido tradeFeedbackWindow.title=Felicitaciones por completar su intercambio tradeFeedbackWindow.msg.part1=Nos encantaría saber su opinión acerca de su experiencia. Nos ayudará a mejorar el software y refinar sus características. Si desea enviar sus comentarios, por favor complete esta breve encuesta (sin registro requerido) en: -tradeFeedbackWindow.msg.part2=Si tiene alguna pregunta o experimenta algún problema, por favor póngase en contacto con otros usuarios y colaboradores a través del foro Bisq en: -tradeFeedbackWindow.msg.part3=¡Gracias por usar Bisq! +tradeFeedbackWindow.msg.part2=Si tiene alguna pregunta o experimenta algún problema, por favor póngase en contacto con otros usuarios y colaboradores a través del foro Haveno en: +tradeFeedbackWindow.msg.part3=¡Gracias por usar Haveno! portfolio.pending.role=Mi rol portfolio.pending.tradeInformation=Información de intercambio @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=Después de la primera confirmación en la cad portfolio.pending.tradePeriodWarning=Si el periodo se excede ambos comerciantes pueden abrir una disputa. portfolio.pending.tradeNotCompleted=Intercambio no completado a tiempo(hasta {0}) portfolio.pending.tradeProcess=Proceso de intercambio -portfolio.pending.openAgainDispute.msg=Si no está seguro de que el mensaje al mediador o árbitro llegó (Ej. si no ha tenido respuesta después de 1 día), siéntase libre de abrir una disputa de nuevo con Cmd/Ctrl+o. También puede pedir ayuda adicional en el forum de Bisq en [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=Si no está seguro de que el mensaje al mediador o árbitro llegó (Ej. si no ha tenido respuesta después de 1 día), siéntase libre de abrir una disputa de nuevo con Cmd/Ctrl+o. También puede pedir ayuda adicional en el forum de Haveno en [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Abrir disputa de nuevo portfolio.pending.openSupportTicket.headline=Abrir ticket de soporte portfolio.pending.openSupportTicket.msg=Por favor use esta función solo en caso de emergencia si no se muestra el botón \"Abrir soporte\" o \"Abrir disputa\".\n\nCuando abra un ticket de soporte el intercambio se interrumpirá y será manejado por un mediador o un árbitro. portfolio.pending.timeLockNotOver=Tiene hasta ≈{0} ({1} bloques más) antes de que pueda abrir una disputa de arbitraje. -portfolio.pending.error.depositTxNull=La transacción de depósito es inválida. No puede abrir una disputa sin una transacción de depósito válida. Por favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\n\nPara obtener ayuda contacte con el equipo de soporte en el canal Bisq de Keybase. +portfolio.pending.error.depositTxNull=La transacción de depósito es inválida. No puede abrir una disputa sin una transacción de depósito válida. Por favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\n\nPara obtener ayuda contacte con el equipo de soporte en el canal Haveno de Keybase. portfolio.pending.mediationResult.error.depositTxNull=La transacción de depósito es nula. Puede mover la transacción a operaciones fallidas. portfolio.pending.mediationResult.error.delayedPayoutTxNull=La transacción de pago demorado es nula. Puede mover la transacción a operaciones fallidas. -portfolio.pending.error.depositTxNotConfirmed=El depósito de transacción no se ha confirmado. No puede abrir una disputa de arbitraje con una transacción de depósito no confirmada. Por favor espere a que se confirme o vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\n\nPara más ayuda por favor contacte con el equipo de soporte en el canal Bisq de Keybase. +portfolio.pending.error.depositTxNotConfirmed=El depósito de transacción no se ha confirmado. No puede abrir una disputa de arbitraje con una transacción de depósito no confirmada. Por favor espere a que se confirme o vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\n\nPara más ayuda por favor contacte con el equipo de soporte en el canal Haveno de Keybase. portfolio.pending.support.headline.getHelp=¿Necesita ayuda? -portfolio.pending.support.text.getHelp=Si tiene algún problema puede intentar contactar al par de intercambio en el chat o preguntar en la la comunidad Bisq en https://bisq.comunnity. Si su problema no se resuelve, puede abrir una disputa con un mediador. +portfolio.pending.support.text.getHelp=Si tiene algún problema puede intentar contactar al par de intercambio en el chat o preguntar en la la comunidad Haveno en https://haveno.comunnity. Si su problema no se resuelve, puede abrir una disputa con un mediador. portfolio.pending.support.button.getHelp=Abrir chat de intercambio portfolio.pending.support.headline.halfPeriodOver=Comprobar pago portfolio.pending.support.headline.periodOver=El periodo de intercambio se acabó @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=Falta la transacción de t portfolio.pending.failedTrade.missingDepositTx=Falta la transacción de depósito (la transacción multifirma 2 de 2).\n\nSin esta tx, el intercambio no se puede completar. No se han bloqueado fondos, pero se ha pagado su tarifa comercial. Puede hacer una solicitud para que se le reembolse la tarifa comercial aquí: [HYPERLINK:https://github.com/bisq-network/support/issues].\n\nSiéntase libre de mover esta operación a operaciones fallidas. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=Falta la transacción de pago demorado, pero los fondos se han bloqueado en la transacción de depósito.\n\nNO envíe el pago fiat o altcoin al vendedor de BTC, porque sin el tx de pago demorado, no se puede abrir el arbitraje. En su lugar, abra un ticket de mediación con Cmd / Ctrl + o. El mediador debe sugerir que ambos pares recuperen el monto total de sus depósitos de seguridad (y el vendedor también recibirá el monto total de la operación). De esta manera, no hay riesgo en la seguridad y solo se pierden las tarifas comerciales.\n\nPuede solicitar un reembolso por las tarifas comerciales perdidas aquí: [HYPERLINK:https://github.com/bisq-network/support/issues]. portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=Falta la transacción del pago demorado, pero los fondos se han bloqueado en la transacción de depósito.\n\nSi al comprador también le falta la transacción de pago demorado, se le indicará que NO envíe el pago y abra un ticket de mediación. También debe abrir un ticket de mediación con Cmd / Ctrl + o.\n\nSi el comprador aún no ha enviado el pago, el mediador debe sugerir que ambos pares recuperen el monto total de sus depósitos de seguridad (y el vendedor también recibirá el monto total de la operación). De lo contrario, el monto comercial debe ir al comprador.\n\nPuede solicitar un reembolso por las tarifas comerciales perdidas aquí: [HYPERLINK:https://github.com/bisq-network/support/issues]. -portfolio.pending.failedTrade.errorMsgSet=Hubo un error durante la ejecución del protocolo de intercambio.\n\nError: {0}\n\nPuede ser que este error no sea crítico y que el intercambio se pueda completar normalmente. Si no está seguro, abra un ticket de mediación para obtener consejos de los mediadores de Bisq.\n\nSi el error fue crítico y la operación no se puede completar, es posible que haya perdido su tarifa de operación. Solicite un reembolso por las tarifas comerciales perdidas aquí: [HYPERLINK:ttps://github.com/bisq-network/support/issues]. +portfolio.pending.failedTrade.errorMsgSet=Hubo un error durante la ejecución del protocolo de intercambio.\n\nError: {0}\n\nPuede ser que este error no sea crítico y que el intercambio se pueda completar normalmente. Si no está seguro, abra un ticket de mediación para obtener consejos de los mediadores de Haveno.\n\nSi el error fue crítico y la operación no se puede completar, es posible que haya perdido su tarifa de operación. Solicite un reembolso por las tarifas comerciales perdidas aquí: [HYPERLINK:ttps://github.com/bisq-network/support/issues]. portfolio.pending.failedTrade.missingContract=El contrato del intercambio no está establecido.\n\nLa operación no se puede completar y es posible que haya perdido su tarifa de operación. Si es así, puede solicitar un reembolso por las tarifas comerciales perdidas aquí: [HYPERLINK:https://github.com/bisq-network/support/issues]. portfolio.pending.failedTrade.info.popup=El protocolo de intercambio encontró algunos problemas.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=El protocolo de intercambio encontró un problema grave.\n\n{0}\n\n¿Quiere mover la operación a intercambios fallidos?\n\nNo puede abrir mediación o arbitraje desde la vista de operaciones fallidas, pero puede mover un intercambio fallido a la pantalla de intercambios abiertos en cualquier momento. @@ -828,7 +828,7 @@ funds.tab.transactions=Transacciones funds.deposit.unused=Sin usar funds.deposit.usedInTx=Usadas en {0} transacciones -funds.deposit.fundHavenoWallet=Fondear monedero Bisq +funds.deposit.fundHavenoWallet=Fondear monedero Haveno funds.deposit.noAddresses=Aún no se ha generado la dirección de depósito funds.deposit.fundWallet=Dotar de fondos su monedero funds.deposit.withdrawFromWallet=Enviar fondos desde monedero @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=Retirar desde el monedero funds.tx.memo=Nota funds.tx.noTxAvailable=Sin transacciones disponibles funds.tx.revert=Revertir -funds.tx.txSent=Transacción enviada exitosamente a una nueva dirección en la billetera Bisq local. +funds.tx.txSent=Transacción enviada exitosamente a una nueva dirección en la billetera Haveno local. funds.tx.direction.self=Enviado a usted mismo funds.tx.dustAttackTx=Dust recibido -funds.tx.dustAttackTx.popup=Esta transacción está enviando una cantidad de BTC muy pequeña a su monedero y puede ser un intento de compañías de análisis de cadenas para espiar su monedero.\n\nSi usa este output para gastar en una transacción, conocerán que probablemente usted sea el propietario de sus otras direcciones (fusión de monedas).\n\nPara proteger su privacidad el monedero Bisq ignora estos outputs para propósitos de gasto y en el balance mostrado. Puede establecer el umbral en el que un output es considerado dust en ajustes. +funds.tx.dustAttackTx.popup=Esta transacción está enviando una cantidad de BTC muy pequeña a su monedero y puede ser un intento de compañías de análisis de cadenas para espiar su monedero.\n\nSi usa este output para gastar en una transacción, conocerán que probablemente usted sea el propietario de sus otras direcciones (fusión de monedas).\n\nPara proteger su privacidad el monedero Haveno ignora estos outputs para propósitos de gasto y en el balance mostrado. Puede establecer el umbral en el que un output es considerado dust en ajustes. #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=Enviando mensaje... support.receiverNotOnline=El receptor no está conectado. El mensaje se ha guardado en su bandeja de entrada. support.sendMessageError=El envío del mensaje no tuvo éxito. Error: {0} support.receiverNotKnown=Receptor desconocido -support.wrongVersion=La oferta en esta disputa ha sido creada con una versión antigua de Bisq.\nNo puede cerrar esta disputa con su versión de la aplicación.\n\nPor favor, utilice una versión anterior con la versión de protocolo {0} +support.wrongVersion=La oferta en esta disputa ha sido creada con una versión antigua de Haveno.\nNo puede cerrar esta disputa con su versión de la aplicación.\n\nPor favor, utilice una versión anterior con la versión de protocolo {0} support.openFile=Abrir archivo a adjuntar (tamaño máximo del archivo: {0} kb) support.attachmentTooLarge=El tamaño total de sus adjuntos es {0} kb y excede el máximo permitido por mensaje de {1} kB. support.maxSize=El tamaño máximo permitido del archivo es {0} kB. @@ -953,15 +953,15 @@ support.sellerMaker=vendedor/creador BTC support.buyerTaker=comprador/Tomador BTC support.sellerTaker=vendedor/Tomador BTC -support.backgroundInfo=Bisq no es una compañía, por ello maneja las disputas de una forma diferente.\n\nLos compradores y vendedores pueden comunicarse a través de la aplicación por un chat seguro en la pantalla de intercambios abiertos para intentar resolver una disputa por su cuenta. Si eso no es suficiente, un mediador puede intervenir para ayudar. El mediador evaluará la situación y dará una recomendación para el pago de los fondos de la transacción. Si ambos aceptan esta sugerencia, la transacción del pago se completa y el intercambio se cierra. Si uno o ambos no están de acuerdo con el pago recomendado por el mediador, pueden solicitar arbitraje. El árbitro re-evaluará la situación y, si es necesario, hará el pago personalmente y solicitará un reembolso de este pago a la DAO de Bisq. -support.initialInfo=Por favor, introduzca una descripción de su problema en el campo de texto de abajo. Añada tanta información como sea posible para agilizar la resolución de la disputa.\n\nEsta es una lista de la información que usted debe proveer:\n\t● Si es el comprador de BTC: ¿Hizo la transferencia Fiat o Altcoin? Si es así, ¿Pulsó el botón 'pago iniciado' en la aplicación?\n\t● Si es el vendedor de BTC: ¿Recibió el pago Fiat o Altcoin? Si es así, ¿Pulsó el botón 'pago recibido' en la aplicación?\n\t● ¿Qué versión de Bisq está usando?\n\t● ¿Qué sistema operativo está usando?\n\t● Si tiene problemas con transacciones fallidas, por favor considere cambiar a un nuevo directorio de datos.\n\tA veces el directorio de datos se corrompe y causa errores extraños.\n\tVer: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPor favor, familiarícese con las reglas básicas del proceso de disputa:\n\t● Tiene que responder a los requerimientos de {0} en 2 días.\n\t● Los mediadores responden en 2 días. Los árbitros responden en 5 días laborables.\n\t● El periodo máximo para una disputa es de 14 días.\n\t● Tiene que cooperar con {1} y proveer la información necesaria que soliciten.\n\t● Aceptó la reglas esbozadas en el documento de disputa en el acuerdo de usuario cuando inició por primera ver la aplicación.\n\nPuede leer más sobre el proceso de disputa en: {2} +support.backgroundInfo=Haveno no es una compañía, por ello maneja las disputas de una forma diferente.\n\nLos compradores y vendedores pueden comunicarse a través de la aplicación por un chat seguro en la pantalla de intercambios abiertos para intentar resolver una disputa por su cuenta. Si eso no es suficiente, un mediador puede intervenir para ayudar. El mediador evaluará la situación y dará una recomendación para el pago de los fondos de la transacción. Si ambos aceptan esta sugerencia, la transacción del pago se completa y el intercambio se cierra. Si uno o ambos no están de acuerdo con el pago recomendado por el mediador, pueden solicitar arbitraje. El árbitro re-evaluará la situación y, si es necesario, hará el pago personalmente y solicitará un reembolso de este pago a la DAO de Haveno. +support.initialInfo=Por favor, introduzca una descripción de su problema en el campo de texto de abajo. Añada tanta información como sea posible para agilizar la resolución de la disputa.\n\nEsta es una lista de la información que usted debe proveer:\n\t● Si es el comprador de BTC: ¿Hizo la transferencia Fiat o Altcoin? Si es así, ¿Pulsó el botón 'pago iniciado' en la aplicación?\n\t● Si es el vendedor de BTC: ¿Recibió el pago Fiat o Altcoin? Si es así, ¿Pulsó el botón 'pago recibido' en la aplicación?\n\t● ¿Qué versión de Haveno está usando?\n\t● ¿Qué sistema operativo está usando?\n\t● Si tiene problemas con transacciones fallidas, por favor considere cambiar a un nuevo directorio de datos.\n\tA veces el directorio de datos se corrompe y causa errores extraños.\n\tVer: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPor favor, familiarícese con las reglas básicas del proceso de disputa:\n\t● Tiene que responder a los requerimientos de {0} en 2 días.\n\t● Los mediadores responden en 2 días. Los árbitros responden en 5 días laborables.\n\t● El periodo máximo para una disputa es de 14 días.\n\t● Tiene que cooperar con {1} y proveer la información necesaria que soliciten.\n\t● Aceptó la reglas esbozadas en el documento de disputa en el acuerdo de usuario cuando inició por primera ver la aplicación.\n\nPuede leer más sobre el proceso de disputa en: {2} support.systemMsg=Mensaje de sistema: {0} -support.youOpenedTicket=Ha abierto una solicitud de soporte.\n\n{0}\n\nVersión Bisq: {1} -support.youOpenedDispute=Ha abierto una solicitud de disputa.\n\n{0}\n\nVersión Bisq: {1} -support.youOpenedDisputeForMediation=Ha solicitado mediación\n\n{0}\n\nVersión Bisq: {1} -support.peerOpenedTicket=Su par de intercambio ha solicitado soporte debido a problemas técnicos\n\n{0}\n\nVersión Bisq: {1} -support.peerOpenedDispute=Su pareja de intercambio ha solicitado una disputa.\n\n{0}\n\nVersión Bisq: {1} -support.peerOpenedDisputeForMediation=Su par de intercambio ha solicitado mediación.\n\n{0}\n\nVersión Bisq: {1} +support.youOpenedTicket=Ha abierto una solicitud de soporte.\n\n{0}\n\nVersión Haveno: {1} +support.youOpenedDispute=Ha abierto una solicitud de disputa.\n\n{0}\n\nVersión Haveno: {1} +support.youOpenedDisputeForMediation=Ha solicitado mediación\n\n{0}\n\nVersión Haveno: {1} +support.peerOpenedTicket=Su par de intercambio ha solicitado soporte debido a problemas técnicos\n\n{0}\n\nVersión Haveno: {1} +support.peerOpenedDispute=Su pareja de intercambio ha solicitado una disputa.\n\n{0}\n\nVersión Haveno: {1} +support.peerOpenedDisputeForMediation=Su par de intercambio ha solicitado mediación.\n\n{0}\n\nVersión Haveno: {1} support.mediatorsDisputeSummary=Mensaje de sistema: Resumen de la disputa del mediador: {0} support.mediatorsAddress=Dirección del nodo del mediador: {0} support.warning.disputesWithInvalidDonationAddress=La transacción de pago demorado utilizó una dirección de receptor inválida. No coincide con ninguno de los valores de parámetro de la DAO para las direcciones de donación válidas.\n\nEsto podría ser un intento de estafa. Informe a los desarrolladores sobre ese incidente y no cierre ese caso antes de que se resuelva la situación.\n\nDirección utilizada en la disputa: {0}\n\nTodas las direcciones de donación en los parámetros de la DAO: {1}\n\nIdentificación comercial: {2} {3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=URL de transacción settings.preferences.editCustomExplorer.addressUrl=URL de la dirección settings.net.btcHeader=Red Bitcoin -settings.net.p2pHeader=Red Bisq +settings.net.p2pHeader=Red Haveno settings.net.onionAddressLabel=Mi dirección onion settings.net.btcNodesLabel=Utilizar nodos Bitcoin Core personalizados settings.net.bitcoinPeersLabel=Pares conectados @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=Nodos Bitcoin Core para conectarse settings.net.useProvidedNodesRadio=Utilizar nodos Bitcoin Core proporcionados settings.net.usePublicNodesRadio=Utilizar red pública Bitcoin settings.net.useCustomNodesRadio=Utilizar nodos Bitcoin Core personalizados -settings.net.warn.usePublicNodes=Si usa la red pública de Bitcoin está expuesto a problemas de privacidad causados por el fallo en el diseño y la implementación del filtro bloom que se utiliza para carteras SPV como BitcoinJ (usado en Bisq). Cualquier nodo completo al que esté conectado podría conocer que todas las direcciones del monedero pertenecen a una entidad.\n\nPor favor, lea más sobre los detalles en: [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\n¿Está seguro de que quiere utilizar los nodos públicos? +settings.net.warn.usePublicNodes=Si usa la red pública de Bitcoin está expuesto a problemas de privacidad causados por el fallo en el diseño y la implementación del filtro bloom que se utiliza para carteras SPV como BitcoinJ (usado en Haveno). Cualquier nodo completo al que esté conectado podría conocer que todas las direcciones del monedero pertenecen a una entidad.\n\nPor favor, lea más sobre los detalles en: [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\n¿Está seguro de que quiere utilizar los nodos públicos? settings.net.warn.usePublicNodes.useProvided=No, utilizar nodos proporcionados settings.net.warn.usePublicNodes.usePublic=Sí, utilizar la red pública settings.net.warn.useCustomNodes.B2XWarning=¡Por favor, asegúrese de que su nodo Bitcoin es un nodo de confianza Bitcoin Core!\n\nConectar a nodos que no siguen las reglas de consenso puede causar perjuicios a su cartera y causar problemas en el proceso de intercambio.\n\nLos usuarios que se conecten a los nodos que violan las reglas de consenso son responsables de cualquier daño que estos creen. Las disputas causadas por ello se decidirán en favor del otro participante. No se dará soporte técnico a usuarios que ignoren esta advertencia y los mecanismos de protección! settings.net.warn.invalidBtcConfig=La conexión a la red Bitcoin falló debido a que su configuración es inválida.\n\nSu configuración se ha reestablecido para usar los nodos Bitcoin proporcionados. Necesitará reiniciar la aplicación. -settings.net.localhostBtcNodeInfo=Información complementaria: Bisq busca un nodo local Bitcoin al inicio. Si lo encuentra, Bisq se comunicará a la red Bitcoin exclusivamente a través de él. +settings.net.localhostBtcNodeInfo=Información complementaria: Haveno busca un nodo local Bitcoin al inicio. Si lo encuentra, Haveno se comunicará a la red Bitcoin exclusivamente a través de él. settings.net.p2PPeersLabel=Pares conectados settings.net.onionAddressColumn=Dirección onion settings.net.creationDateColumn=Establecido @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Está seguro de quere hacer una resincronización settings.net.reSyncSPVAfterRestart=La cadena SPV ha sido borrada. Por favor, sea paciente. Puede llevar un tiempo resincronizar con la red. settings.net.reSyncSPVAfterRestartCompleted=La resincronización se ha completado. Por favor, reinicie la aplicación. settings.net.reSyncSPVFailed=No se pudo borrar el archivo de cadena SPV\nError: {0} -setting.about.aboutBisq=Acerca de Bisq -setting.about.about=Bisq es un software de código abierto que facilita el intercambio de bitcoin por monedas nacionales (y otras criptomonedas) a través de una red descentralizada peer-to-peer de modo que se proteja fuertemente la privacidad del usuario. Aprenda más acerca de Bisq en la página web del proyecto. -setting.about.web=Página web de Bisq +setting.about.aboutHaveno=Acerca de Haveno +setting.about.about=Haveno es un software de código abierto que facilita el intercambio de bitcoin por monedas nacionales (y otras criptomonedas) a través de una red descentralizada peer-to-peer de modo que se proteja fuertemente la privacidad del usuario. Aprenda más acerca de Haveno en la página web del proyecto. +setting.about.web=Página web de Haveno setting.about.code=código fuente setting.about.agpl=Licencia AGPL -setting.about.support=Apoye a Bisq -setting.about.def=Bisq no es una compañía - es un proyecto abierto a la comunidad. Si quiere participar o ayudar a Bisq por favor siga los enlaces de abajo. +setting.about.support=Apoye a Haveno +setting.about.def=Haveno no es una compañía - es un proyecto abierto a la comunidad. Si quiere participar o ayudar a Haveno por favor siga los enlaces de abajo. setting.about.contribute=Contribuir setting.about.providers=Proveedores de datos -setting.about.apisWithFee=Bisq usa Índices de Precios Bisq para los precios de mercado de fiat y altcoin, y los Nodos de Mempool de Bisq para la estimación de tasas de minado. -setting.about.apis=Bisq usa los Índices de Precios Bisq para los precios de mercado de fiat y altcoin. +setting.about.apisWithFee=Haveno usa Índices de Precios Haveno para los precios de mercado de fiat y altcoin, y los Nodos de Mempool de Haveno para la estimación de tasas de minado. +setting.about.apis=Haveno usa los Índices de Precios Haveno para los precios de mercado de fiat y altcoin. setting.about.pricesProvided=Precios de mercado proporcionados por: setting.about.feeEstimation.label=Estimación de comisión de minería proporcionada por: setting.about.versionDetails=Detalles de la versión @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' o ''alt + {0}'' o ''cmd + setting.about.shortcuts.menuNav=Navegar menú principal setting.about.shortcuts.menuNav.value=Para navegar por el menú principal pulse: 'Ctrl' or 'alt' or 'cmd' con una tecla numérica entre el '1-9' -setting.about.shortcuts.close=Cerrar Bisq +setting.about.shortcuts.close=Cerrar Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' o ''cmd + {0}'' o ''Ctrl + {1}'' o ''cmd + {1}'' setting.about.shortcuts.closePopup=Cerrar la ventana emergente o ventana de diálogo @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Enviar notificación privada a l setting.about.shortcuts.sendPrivateNotification.value=Abrir información de par en el avatar o disputa y pulsar: {0} setting.info.headline=Nueva función de autoconfirmación XMR -setting.info.msg=Al vender XMR por XMR puede usar la función de autoconfirmación para verificar que la cantidad correcta de XMR se envió al monedero con lo que Bisq pueda marcar el intercambio como completo, haciendo los intercambios más rápidos para todos.\n\nLa autoconfirmación comprueba que la transacción de XMR en al menos 2 nodos exploradores XMR usando la clave de transacción entregada por el emisor XMR. Por defecto, Bisq usa nodos exploradores ejecutados por contribuyentes Bisq, pero recomendamos usar sus propios nodos exploradores para un máximo de privacidad y seguridad.\n\nTambién puede configurar la cantidad máxima de BTC por intercambio para la autoconfirmación, así como el número de confirmaciones en Configuración.\n\nVea más detalles (incluído cómo configurar su propio nodo explorador) en la wiki Bisq: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=Al vender XMR por XMR puede usar la función de autoconfirmación para verificar que la cantidad correcta de XMR se envió al monedero con lo que Haveno pueda marcar el intercambio como completo, haciendo los intercambios más rápidos para todos.\n\nLa autoconfirmación comprueba que la transacción de XMR en al menos 2 nodos exploradores XMR usando la clave de transacción entregada por el emisor XMR. Por defecto, Haveno usa nodos exploradores ejecutados por contribuyentes Haveno, pero recomendamos usar sus propios nodos exploradores para un máximo de privacidad y seguridad.\n\nTambién puede configurar la cantidad máxima de BTC por intercambio para la autoconfirmación, así como el número de confirmaciones en Configuración.\n\nVea más detalles (incluído cómo configurar su propio nodo explorador) en la wiki Haveno: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=Al vender XMR por XMR puede usar la función de autoconfirmaci account.tab.mediatorRegistration=Registro de mediador account.tab.refundAgentRegistration=Registro de agente de devolución de fondos account.tab.signing=Firmado -account.info.headline=Bienvenido a su cuenta Bisq -account.info.msg=Aquí puede añadir cuentas de intercambio para monedas nacionales y altcoins y crear una copia de su cartera y datos de cuenta.\n\nUna nueva cartera Bitcoin fue creada la primera vez que inició Bisq.\n\nRecomendamos encarecidamente que escriba sus palabras de la semilla de la cartera Bitcoin (mire pestaña arriba) y considere añadir una contraseña antes de enviar fondos. Los ingresos y retiros de Bitcoin se administran en la sección \"Fondos\".\n\nNota de privacidad y seguridad: Debido a que Bisq es un exchange descentralizado, todos sus datos se guardan en su ordenador. No hay servidores, así que no tenemos acceso a su información personal, sus saldos, o incluso su dirección IP. Datos como número de cuenta bancaria, direcciones altcoin y Bitcoin, etc son solo compartidos con su par de intercambio para completar intercambios iniciados (en caso de una disputa el mediador o árbitro verá los mismos datos que el par de intercambio). +account.info.headline=Bienvenido a su cuenta Haveno +account.info.msg=Aquí puede añadir cuentas de intercambio para monedas nacionales y altcoins y crear una copia de su cartera y datos de cuenta.\n\nUna nueva cartera Bitcoin fue creada la primera vez que inició Haveno.\n\nRecomendamos encarecidamente que escriba sus palabras de la semilla de la cartera Bitcoin (mire pestaña arriba) y considere añadir una contraseña antes de enviar fondos. Los ingresos y retiros de Bitcoin se administran en la sección \"Fondos\".\n\nNota de privacidad y seguridad: Debido a que Haveno es un exchange descentralizado, todos sus datos se guardan en su ordenador. No hay servidores, así que no tenemos acceso a su información personal, sus saldos, o incluso su dirección IP. Datos como número de cuenta bancaria, direcciones altcoin y Bitcoin, etc son solo compartidos con su par de intercambio para completar intercambios iniciados (en caso de una disputa el mediador o árbitro verá los mismos datos que el par de intercambio). account.menu.paymentAccount=Cuentas de moneda nacional account.menu.altCoinsAccountView=Cuentas de altcoin @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=Esto muestrta el balance interno del monede account.menu.walletInfo.xpub.headLine=Claves centinela (xpub keys) account.menu.walletInfo.walletSelector={0} {1} monedero account.menu.walletInfo.path.headLine=ruta HD keychain -account.menu.walletInfo.path.info=Si importa las palabras semilla en otro monedero (como Electru), tendrá que definir la ruta. Esto debería hacerse solo en casos de emergencia, cuando pierda acceso a el monedero Bisq y el directorio de datos.\nTenga en cuenta que gastar fondos desde un monedero no-Bisq puede estropear la estructura de datos interna de Bisq asociado a los datos de monedero, lo que puede llevar a intercambios fallidos.\n\nNUNCA envíe BSQ desde un monedero no-Bisq, ya que probablemente llevará a una transacción inválida de BSQ y le hará perder sus BSQ. +account.menu.walletInfo.path.info=Si importa las palabras semilla en otro monedero (como Electru), tendrá que definir la ruta. Esto debería hacerse solo en casos de emergencia, cuando pierda acceso a el monedero Haveno y el directorio de datos.\nTenga en cuenta que gastar fondos desde un monedero no-Haveno puede estropear la estructura de datos interna de Haveno asociado a los datos de monedero, lo que puede llevar a intercambios fallidos.\n\nNUNCA envíe BSQ desde un monedero no-Haveno, ya que probablemente llevará a una transacción inválida de BSQ y le hará perder sus BSQ. account.menu.walletInfo.openDetails=Mostrar detalles en bruto y claves privadas @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} registro account.arbitratorRegistration.revoke=Revocar account.arbitratorRegistration.info.msg=Por favor, tenga en cuenta que necesita estar disponible 15 días después la revocación pues puede haber intercambios que le usen como {0}. El periodo máximo de intercambio permitido es de 8 días y el proceso de disputa puede llevar hasta 7 días.l account.arbitratorRegistration.warn.min1Language=Necesita especificar al menos 1 idioma.\nHemos añadido el idioma por defecto para usted. -account.arbitratorRegistration.removedSuccess=Ha eliminado su registro de la red Bisq con éxito. +account.arbitratorRegistration.removedSuccess=Ha eliminado su registro de la red Haveno con éxito. account.arbitratorRegistration.removedFailed=No se pudo eliminar el registro.{0} -account.arbitratorRegistration.registerSuccess=Se ha registrado con éxito en la red Bisq. +account.arbitratorRegistration.registerSuccess=Se ha registrado con éxito en la red Haveno. account.arbitratorRegistration.registerFailed=No se pudo completar el registro.{0} account.altcoin.yourAltcoinAccounts=Sus cuentas de altcoin account.altcoin.popup.wallet.msg=Por favor, asegúrese que sigue los requisitos para el uso de carteras {0} como se describe en la página web {1}.\nUsando carteras desde exchanges centralizados donde (a) usted no controla sus claves o (b) que no usan monederos compatibles con el software es un riesgo: ¡puede llevar a la perdida de los fondos intercambiados!\nEl mediador o árbitro no es un especialista en {2} y no puede ayudar en tales casos. account.altcoin.popup.wallet.confirm=Entiendo y confirmo que sé qué monedero tengo que utilizar. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Para intercambiar UPX en bisq es preciso que usted entienda y cumpla los siguientes requerimientos:\n\nPara enviar upx es preciso que use el monedero oficial de uPlexa GUI o el de uPlexa CLI con la opción "store-tx-info" habilitada (predeterminada en las nuevas versiones). Por favor, asegúrese de poder acceder a las llaves tx, ya que podrían requerirse en caso de disputa.\nuplexa-wallet-cli (utilice el comando get_tx_key)\nuplexa-wallet-gui (vaya a la pestaña historial y haga clic en el botón (P) para prueba de pago).\nEn los exploradores de bloques normales la transferencia no es verificable.\nUsted necesita proporcionar al árbitro los siguientes datos en caso de disputa:\n- La llave privada tx\n- El hash de la transacción\n- La dirección publica de recepción\nSi no proporciona los datos arriba señalados, o si utilizó una cartera incompatible, perderá la disputa.\nLa parte que envía UPX es responsable de proporcionar las evidencias de la transferencia de UPX al árbitro en caso de disputa.\nNo se requiere ID de pago, solo la dirección pública normal.\nSi no está seguro sobre el proceso, visite el canal de conflictos de uPlexa https://discord.gg/vhdNSrV) o el Chat de Telegram de uPlexa (https://t.me/uplexaOfficial) para encontrar más información. +account.altcoin.popup.upx.msg=Para intercambiar UPX en haveno es preciso que usted entienda y cumpla los siguientes requerimientos:\n\nPara enviar upx es preciso que use el monedero oficial de uPlexa GUI o el de uPlexa CLI con la opción "store-tx-info" habilitada (predeterminada en las nuevas versiones). Por favor, asegúrese de poder acceder a las llaves tx, ya que podrían requerirse en caso de disputa.\nuplexa-wallet-cli (utilice el comando get_tx_key)\nuplexa-wallet-gui (vaya a la pestaña historial y haga clic en el botón (P) para prueba de pago).\nEn los exploradores de bloques normales la transferencia no es verificable.\nUsted necesita proporcionar al árbitro los siguientes datos en caso de disputa:\n- La llave privada tx\n- El hash de la transacción\n- La dirección publica de recepción\nSi no proporciona los datos arriba señalados, o si utilizó una cartera incompatible, perderá la disputa.\nLa parte que envía UPX es responsable de proporcionar las evidencias de la transferencia de UPX al árbitro en caso de disputa.\nNo se requiere ID de pago, solo la dirección pública normal.\nSi no está seguro sobre el proceso, visite el canal de conflictos de uPlexa https://discord.gg/vhdNSrV) o el Chat de Telegram de uPlexa (https://t.me/uplexaOfficial) para encontrar más información. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=El ARQ de intercambio de Bisq requiere que entienda y cumpla los siguientes requerimientos:\n\nPara el ARQ de envío, necesita utilizar la cartera oficial ArQmA GUI o una cartera ArQmA CLI con la opción store-tx-info habilitada (predeterminada en nuevas versiones). Por favor asegúrese de poder acceder a la llave tx ya que podría ser requerido en caso de disputa.\narqma-wallet-cli (utilice el comando get_tx_key)\narqma-wallet-gui (vaya a la pestaña historial y pulse el botón (P) para prueba de pago)\n\nEn los exploradores de bloques normales la transferencia no es verificable.\n\nNecesita proveer al mediador o al árbitro los siguientes datos en caso de disputa:\n- El tx de la llave privada\n- El hash de transacción\n- La dirección publica de recepción\n\nNo proveer los datos arriba señalados, o si utilizó una cartera incompatible, resultará en perder la disputa. La parte ARQ que envía es responsable de proveer verificación de la transferencia ARQ al mediador o al árbitro en caso de disputa.\n\nNo se requiere ID de pago, solo la dirección pública normal.\nSi no está seguro sobre el proceso visite el canal ArQmA en discord (https://discord.gg/s9BQpJT) o el foro de ArQmA (https://labs.arqma.com) para encontrar más información. +account.altcoin.popup.arq.msg=El ARQ de intercambio de Haveno requiere que entienda y cumpla los siguientes requerimientos:\n\nPara el ARQ de envío, necesita utilizar la cartera oficial ArQmA GUI o una cartera ArQmA CLI con la opción store-tx-info habilitada (predeterminada en nuevas versiones). Por favor asegúrese de poder acceder a la llave tx ya que podría ser requerido en caso de disputa.\narqma-wallet-cli (utilice el comando get_tx_key)\narqma-wallet-gui (vaya a la pestaña historial y pulse el botón (P) para prueba de pago)\n\nEn los exploradores de bloques normales la transferencia no es verificable.\n\nNecesita proveer al mediador o al árbitro los siguientes datos en caso de disputa:\n- El tx de la llave privada\n- El hash de transacción\n- La dirección publica de recepción\n\nNo proveer los datos arriba señalados, o si utilizó una cartera incompatible, resultará en perder la disputa. La parte ARQ que envía es responsable de proveer verificación de la transferencia ARQ al mediador o al árbitro en caso de disputa.\n\nNo se requiere ID de pago, solo la dirección pública normal.\nSi no está seguro sobre el proceso visite el canal ArQmA en discord (https://discord.gg/s9BQpJT) o el foro de ArQmA (https://labs.arqma.com) para encontrar más información. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Intercambiar XMR en Bisq requiere entender y cumplir los siguientes requisitos\n\nPruebas de pago:\n\n\nSi está vendiendo XMR, debe ser capaz de entregar la siguiente información en caso de disputa:\n\n- La clave de transacción (Tx key, Tx Secret Key o Tx Private Key)\n- La ID de transacción (Tx ID o Tx Hash)\n- La dirección de destino (recipient's address)\n\nVea la wiki para detalles sobre dónde encontrar esta información en los principales monederos XMR:\nhttps://bisq.wiki/Trading_Monero#Proving_payments\n\n\nNo entregar estos datos de transacción resultará en pérdida de la disputa.\n\nTenga en cuenta que Bisq ahora ofrece confirmación automática de transacciones XMR para realizar intercambios más rápido, pero necesita habilitarlo en Configuración. \n\nVea la wiki para más información sobre la función de autoconfirmación.\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +account.altcoin.popup.xmr.msg=Intercambiar XMR en Haveno requiere entender y cumplir los siguientes requisitos\n\nPruebas de pago:\n\n\nSi está vendiendo XMR, debe ser capaz de entregar la siguiente información en caso de disputa:\n\n- La clave de transacción (Tx key, Tx Secret Key o Tx Private Key)\n- La ID de transacción (Tx ID o Tx Hash)\n- La dirección de destino (recipient's address)\n\nVea la wiki para detalles sobre dónde encontrar esta información en los principales monederos XMR:\nhttps://bisq.wiki/Trading_Monero#Proving_payments\n\n\nNo entregar estos datos de transacción resultará en pérdida de la disputa.\n\nTenga en cuenta que Haveno ahora ofrece confirmación automática de transacciones XMR para realizar intercambios más rápido, pero necesita habilitarlo en Configuración. \n\nVea la wiki para más información sobre la función de autoconfirmación.\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Para intercambiar MSR en Bisq es necesario que usted entienda y cumpla los siguientes requisitos:\n\nPara enviar MSR es necesario que use el monedero oficial de Masari monedero GUI o Masari monedero CLI con la opción "store-tx-info" habilitada (predeterminada en las nuevas versiones) o el monedero oficial Masari Web (https://wallet.getmasari.org). Por favor, asegúrese de poder acceder a las llaves tx, ya que podrían requerirse en caso de alguna disputa. \nmasari-wallet-cli (utilice el comando get_tx_key)\nmasari-wallet-gui (vaya a la pestaña historial y haga clic en el botón (P) para prueba de pago). \n\nMonedero Masari Web (vaya a Cuenta -> historial transacción y vea los detalles de su transacción enviada.)\n\nPuede lograr verificación de la transacción dentro del monedero:\nmasari-wallet-cli : usando el comando (check_tx_key).\nmasari-wallet-gui: vaya a la pestaña Avanzado > Comprobar/Revisar.\nVerificación de transacción también se puede lograr desde el explorador de bloques\nAbrir explorador de bloques (https://explorer.getmasari.org), use la barra de búsqueda para buscar el hash de transacción. \nCuando encuentre su transacción, navegue hacia el final donde dice "Comprobar Envío" y rellene los detalles necesarios. \nUsted necesita compartir esta información con el mediador o árbitro en caso de disputa:\n- La clave privada tx\n- El hash de transacción\n- La dirección pública del que recibe\n\nSi no proporciona los datos arriba señalados, o si utilizó una cartera incompatible, perderá la disputa. El que envía MSR es responsable de entregar la verificación de transferencia al mediador o árbitro en caso de disputa.\n\nNo se requiere el ID de pago, sólo la dirección pública normal.\nSi no está seguro sobre el proceso, pida ayuda visitando el canal oficial de Masari en Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Para intercambiar MSR en Haveno es necesario que usted entienda y cumpla los siguientes requisitos:\n\nPara enviar MSR es necesario que use el monedero oficial de Masari monedero GUI o Masari monedero CLI con la opción "store-tx-info" habilitada (predeterminada en las nuevas versiones) o el monedero oficial Masari Web (https://wallet.getmasari.org). Por favor, asegúrese de poder acceder a las llaves tx, ya que podrían requerirse en caso de alguna disputa. \nmasari-wallet-cli (utilice el comando get_tx_key)\nmasari-wallet-gui (vaya a la pestaña historial y haga clic en el botón (P) para prueba de pago). \n\nMonedero Masari Web (vaya a Cuenta -> historial transacción y vea los detalles de su transacción enviada.)\n\nPuede lograr verificación de la transacción dentro del monedero:\nmasari-wallet-cli : usando el comando (check_tx_key).\nmasari-wallet-gui: vaya a la pestaña Avanzado > Comprobar/Revisar.\nVerificación de transacción también se puede lograr desde el explorador de bloques\nAbrir explorador de bloques (https://explorer.getmasari.org), use la barra de búsqueda para buscar el hash de transacción. \nCuando encuentre su transacción, navegue hacia el final donde dice "Comprobar Envío" y rellene los detalles necesarios. \nUsted necesita compartir esta información con el mediador o árbitro en caso de disputa:\n- La clave privada tx\n- El hash de transacción\n- La dirección pública del que recibe\n\nSi no proporciona los datos arriba señalados, o si utilizó una cartera incompatible, perderá la disputa. El que envía MSR es responsable de entregar la verificación de transferencia al mediador o árbitro en caso de disputa.\n\nNo se requiere el ID de pago, sólo la dirección pública normal.\nSi no está seguro sobre el proceso, pida ayuda visitando el canal oficial de Masari en Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Intercambiar BLUR en Bisq requiere que entienda y cumpla los siguientes requisitos:\n\nPara enviar BLUR debe usar Blur Network CLI o la cartera GUI. \n\nSi utiliza la cartera CLI, un hash de transacción (tx ID) se mostrará después de hacer una transferencia. Deberá guardar esta información. Inmediatamente después de enviar la transferencia, deberá utilizar el comando 'get_tx_key' para obtener la clave privada de transacción. Si no realiza este paso, es posible que no pueda obtener la llave mas tarde. \n\nSi utiliza la cartera Blur Network GUI, la clave privada de transacción y el ID de transacción puede ser encontrada convenientemente en la pestaña "Historia". Inmediatamente después del envío, localice la transacción de interés. Pulse en el símbolo "?" en la esquina inferior derecha de la caja que contiene la transacción. Debe guardar esta información. \n\nEn caso de que sea necesaria una disputa, deberá presentar lo siguiente al mediador o al árbitro: 1.) el ID de transacción, 2.) la clave privada de transacción, y 3.) la dirección de destino. El mediador o árbitro entonces verificará la transferencia BLUR utilizando el Visor de Transacción Blur (https://blur.cash/#tx-viewer).\n\nSi no se proporciona la información requerida al mediador o al árbitro se perderá el caso de disputa. En todos los casos de disputa, el remitente BLUR asume el 100% de la responsabilidad en la verificación de las transacciones a un mediador o a un árbitro.. \n\nSi no comprende estos requisitos, no realice transacciones en Bisq. Primero, busque ayuda en Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Intercambiar BLUR en Haveno requiere que entienda y cumpla los siguientes requisitos:\n\nPara enviar BLUR debe usar Blur Network CLI o la cartera GUI. \n\nSi utiliza la cartera CLI, un hash de transacción (tx ID) se mostrará después de hacer una transferencia. Deberá guardar esta información. Inmediatamente después de enviar la transferencia, deberá utilizar el comando 'get_tx_key' para obtener la clave privada de transacción. Si no realiza este paso, es posible que no pueda obtener la llave mas tarde. \n\nSi utiliza la cartera Blur Network GUI, la clave privada de transacción y el ID de transacción puede ser encontrada convenientemente en la pestaña "Historia". Inmediatamente después del envío, localice la transacción de interés. Pulse en el símbolo "?" en la esquina inferior derecha de la caja que contiene la transacción. Debe guardar esta información. \n\nEn caso de que sea necesaria una disputa, deberá presentar lo siguiente al mediador o al árbitro: 1.) el ID de transacción, 2.) la clave privada de transacción, y 3.) la dirección de destino. El mediador o árbitro entonces verificará la transferencia BLUR utilizando el Visor de Transacción Blur (https://blur.cash/#tx-viewer).\n\nSi no se proporciona la información requerida al mediador o al árbitro se perderá el caso de disputa. En todos los casos de disputa, el remitente BLUR asume el 100% de la responsabilidad en la verificación de las transacciones a un mediador o a un árbitro.. \n\nSi no comprende estos requisitos, no realice transacciones en Haveno. Primero, busque ayuda en Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Para intercambiar Solo en Bisq es necesario que usted entienda y cumpla los siguientes requisitos:\n\nPara enviar Solo es necesario que use el monedero Solo Network Monedero CLI\n\nSi usted usa el monedero CLI el hash de transacción (tx ID) aparecerá después de la transferencia. Usted debe guardar esta información. Inmediatamente después de mandar de la transferencia, usted debe usar el comando 'get_tx_key' para guardar la clave privada de transacción. Si usted no guarda esta información, es posible que no podrá coleccionar esta clave después .\n\nUsted necesita compartir esta información con el mediador o árbitro en caso de disputa:\n1.) el ID de transacción, 2.) la clave privada de transacción y 3.) la dirección pública de recepción. El mediador o árbitro podrá verificar la transferencia de Solo usando el explorador de bloques Solo, buscando la transacción y usando la función "Prove sending" (https://explorer.minesolo.com/).\n\nSi no proporciona los datos arriba señalados al mediador o árbitro perderá la disputa. En todos los casos de disputa, el emisor de Solo es 100% responsable de entregar la verificación de envío al mediador o árbitro.\n\nSi no está seguro o no entiendo estos requisitos, no haga intercambio/transacción en Bisq. Primero, pida ayuda visitando el canal oficial de Solo Network en Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Para intercambiar Solo en Haveno es necesario que usted entienda y cumpla los siguientes requisitos:\n\nPara enviar Solo es necesario que use el monedero Solo Network Monedero CLI\n\nSi usted usa el monedero CLI el hash de transacción (tx ID) aparecerá después de la transferencia. Usted debe guardar esta información. Inmediatamente después de mandar de la transferencia, usted debe usar el comando 'get_tx_key' para guardar la clave privada de transacción. Si usted no guarda esta información, es posible que no podrá coleccionar esta clave después .\n\nUsted necesita compartir esta información con el mediador o árbitro en caso de disputa:\n1.) el ID de transacción, 2.) la clave privada de transacción y 3.) la dirección pública de recepción. El mediador o árbitro podrá verificar la transferencia de Solo usando el explorador de bloques Solo, buscando la transacción y usando la función "Prove sending" (https://explorer.minesolo.com/).\n\nSi no proporciona los datos arriba señalados al mediador o árbitro perderá la disputa. En todos los casos de disputa, el emisor de Solo es 100% responsable de entregar la verificación de envío al mediador o árbitro.\n\nSi no está seguro o no entiendo estos requisitos, no haga intercambio/transacción en Haveno. Primero, pida ayuda visitando el canal oficial de Solo Network en Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Intercambiar CASH2 en Bisq requiere que usted comprenda y cumpla con los siguientes requisitos:\n\nPara enviar CASH2, debe utilizar la cartera Cash2 versión 3 o superior. \n\nDespués de que se envía una transacción, se mostrará el ID de transacción. Debe guardar esta información. Inmediatamente después de enviar la transacción, debe usar el comando 'getTxKey' en simplewallet para recuperar la llave secreta de la transacción. \n\nEn el caso de que sea necesario un arbitraje, debe presentar lo siguiente a un mediador o a un árbitro: 1) ID de transacción, 2) la llave secreta de la transacción y 3) la dirección Cash2 del destinatario. El mediador o el árbitro entonces verificará la transferencia CASH2 usando el Explorador de Bloques Cash2 (https://blocks.cash2.org).\n\nSi no se proporciona la información requerida al mediador o al árbitro, se perderá el caso de disputa. En todos los casos de disputa, el remitente de CASH2 lleva el 100% de la carga de la responsabilidad de verificar las transacciones a un mediador o a un árbitro.\n\nSi no comprende estos requisitos, no realice transacciones en Bisq. Primero, busque ayuda en Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Intercambiar CASH2 en Haveno requiere que usted comprenda y cumpla con los siguientes requisitos:\n\nPara enviar CASH2, debe utilizar la cartera Cash2 versión 3 o superior. \n\nDespués de que se envía una transacción, se mostrará el ID de transacción. Debe guardar esta información. Inmediatamente después de enviar la transacción, debe usar el comando 'getTxKey' en simplewallet para recuperar la llave secreta de la transacción. \n\nEn el caso de que sea necesario un arbitraje, debe presentar lo siguiente a un mediador o a un árbitro: 1) ID de transacción, 2) la llave secreta de la transacción y 3) la dirección Cash2 del destinatario. El mediador o el árbitro entonces verificará la transferencia CASH2 usando el Explorador de Bloques Cash2 (https://blocks.cash2.org).\n\nSi no se proporciona la información requerida al mediador o al árbitro, se perderá el caso de disputa. En todos los casos de disputa, el remitente de CASH2 lleva el 100% de la carga de la responsabilidad de verificar las transacciones a un mediador o a un árbitro.\n\nSi no comprende estos requisitos, no realice transacciones en Haveno. Primero, busque ayuda en Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Intercambiar Qwertycoin en Bisq requiere que usted comprenda y cumpla los siguientes requisitos:\n\nPara enviar QWC, debe utilizar la cartera oficial QWC versión 5.1.3 o superior. \n\nDespués de que se envía una transacción, se mostrará el ID de transacción. Debe guardar esta información. Inmediatamente después de enviar la transacción, debe usar el comando 'get_Tx_Key' en simplewallet para recuperar la llave secreta de la transacción.\n\nEn el caso de que sea necesario un arbitraje, debe presentar lo siguiente a un mediador o un árbitro: 1) ID de transacción, 2) la llave secreta de la transacción y 3) la dirección QWC del destinatario. El mediador o el árbitro entonces verificará la transferencia QWC usando el Explorador de Bloques QWC (https://explorer.qwertycoin.org).\n\nSi no se proporciona la información requerida al mediador o al árbitro, se perderá el caso de disputa. En todos los casos de disputa, el remitente de QWC lleva el 100% de la carga de la responsabilidad de verificar las transacciones a un mediador o un árbitro.\n\nSi no comprende estos requisitos, no realice transacciones en Bisq. Primero, busque ayuda en QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Intercambiar Qwertycoin en Haveno requiere que usted comprenda y cumpla los siguientes requisitos:\n\nPara enviar QWC, debe utilizar la cartera oficial QWC versión 5.1.3 o superior. \n\nDespués de que se envía una transacción, se mostrará el ID de transacción. Debe guardar esta información. Inmediatamente después de enviar la transacción, debe usar el comando 'get_Tx_Key' en simplewallet para recuperar la llave secreta de la transacción.\n\nEn el caso de que sea necesario un arbitraje, debe presentar lo siguiente a un mediador o un árbitro: 1) ID de transacción, 2) la llave secreta de la transacción y 3) la dirección QWC del destinatario. El mediador o el árbitro entonces verificará la transferencia QWC usando el Explorador de Bloques QWC (https://explorer.qwertycoin.org).\n\nSi no se proporciona la información requerida al mediador o al árbitro, se perderá el caso de disputa. En todos los casos de disputa, el remitente de QWC lleva el 100% de la carga de la responsabilidad de verificar las transacciones a un mediador o un árbitro.\n\nSi no comprende estos requisitos, no realice transacciones en Haveno. Primero, busque ayuda en QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Intercambiar Dragonglass on Bisq requiere que usted comprenda y cumpla los siguientes requisitos:\n\nDebido a la privacidad que Dragonglass provee, una transacción no es verificable en la blockchain pública. Si es requerido, usted puede probar su pago a través del uso de su TXN-Private-Key.\nLa TXN-clave privada es una one-time clave generada automáticamente para cada transacción que solo puede ser accedida desde dentro de su cartera DRGL.\nO por DRGL-wallet GUI (dentro del diálogo de detalles de transacción) o por la Dragonglass CLI simplewallet (usando el comando "get_tx_key").\n\nDRGL version 'Oathkeeper' y superior son REQUERIDAS para ambos.\n\nEn caso de que sea necesario un arbitraje, debe presentar lo siguiente a un mediador o un árbitro:\n- La TXN-clave privada\n- El hash de transacción\n- La dirección pública del destinatario\n\nLa verificación de pago puede ser hecha usando los datos de arriba en (http://drgl.info/#check_txn).\n\nNo proporcionar los datos anteriores, o si usted usó una cartera incompatible, resultará en la pérdida del caso de disputa. El Dragonglass remitente es responsable de proveer verificación de la transferencia DRGL al mediador o al árbitro en caso de una disputa. El uso de PaymentID no es requerido.\n\nSi usted no está seguro sobre cualquier parte de este proceso, visite Dragonglass en Discord (http://discord.drgl.info) para ayuda. +account.altcoin.popup.drgl.msg=Intercambiar Dragonglass on Haveno requiere que usted comprenda y cumpla los siguientes requisitos:\n\nDebido a la privacidad que Dragonglass provee, una transacción no es verificable en la blockchain pública. Si es requerido, usted puede probar su pago a través del uso de su TXN-Private-Key.\nLa TXN-clave privada es una one-time clave generada automáticamente para cada transacción que solo puede ser accedida desde dentro de su cartera DRGL.\nO por DRGL-wallet GUI (dentro del diálogo de detalles de transacción) o por la Dragonglass CLI simplewallet (usando el comando "get_tx_key").\n\nDRGL version 'Oathkeeper' y superior son REQUERIDAS para ambos.\n\nEn caso de que sea necesario un arbitraje, debe presentar lo siguiente a un mediador o un árbitro:\n- La TXN-clave privada\n- El hash de transacción\n- La dirección pública del destinatario\n\nLa verificación de pago puede ser hecha usando los datos de arriba en (http://drgl.info/#check_txn).\n\nNo proporcionar los datos anteriores, o si usted usó una cartera incompatible, resultará en la pérdida del caso de disputa. El Dragonglass remitente es responsable de proveer verificación de la transferencia DRGL al mediador o al árbitro en caso de una disputa. El uso de PaymentID no es requerido.\n\nSi usted no está seguro sobre cualquier parte de este proceso, visite Dragonglass en Discord (http://discord.drgl.info) para ayuda. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Al usar Zcash solo puede usar las direcciones transparentes (que comienzan con t), no las direcciones-z (privadas), porque el mediador o el árbitro no sería capaz de verificar la transacción con direcciones-z. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Al usar Zcoin puede usar únicamente las direcciones transparentes (trazables) y no las no-trazables, porque el mediador o el árbitro no sería capaz de verificar la transacción con direcciones no trazables en el explorador de bloques. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN requiere un proceso interactivo entre el emisor y el receptor para crear la transacción. Asegúrese de seguir las instrucciones de la web del proyecto GRIN para enviar y recibir GRIN con seguridad (el receptor necesita estar en línea o al menos estar en línea durante un cierto periodo de tiempo).\nBisq solo soporta el Grinbox (Wallet713) monedero URL formato.\n\nEl emisor GRIN requiere proveer prueba que ha enviado GRIN correctamente. Si el monedero no puede proveer esa prueba, una posible controversia será resuelta a favor del GRIN receptor. Por favor asegúrese que usa el último Grinbox software que soporta la prueba de transacción y que usted entiende el proceso de transferir y recibir GRIN así como la forma de crear la prueba.\n\nVer https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only para más información sobre la herramienta de prueba Grinbox. +account.altcoin.popup.grin.msg=GRIN requiere un proceso interactivo entre el emisor y el receptor para crear la transacción. Asegúrese de seguir las instrucciones de la web del proyecto GRIN para enviar y recibir GRIN con seguridad (el receptor necesita estar en línea o al menos estar en línea durante un cierto periodo de tiempo).\nHaveno solo soporta el Grinbox (Wallet713) monedero URL formato.\n\nEl emisor GRIN requiere proveer prueba que ha enviado GRIN correctamente. Si el monedero no puede proveer esa prueba, una posible controversia será resuelta a favor del GRIN receptor. Por favor asegúrese que usa el último Grinbox software que soporta la prueba de transacción y que usted entiende el proceso de transferir y recibir GRIN así como la forma de crear la prueba.\n\nVer https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only para más información sobre la herramienta de prueba Grinbox. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM requiere un proceso interactivo entre el emisor y el receptor para crear la transacción.\n\nAsegúrese de seguir la instrucciones de la página web del proyecto BEAM para enviar y recibir BEAM con seguridad (el receptor necesita estar el línea o por lo menos estar en línea durante cierto periodo de tiempo).\n\nEl emisor BEAM requiere proveer prueba de que envió BEAM correctamente. Asegúrese de usar software de monedero que pueda producir tal prueba. Si el monedero no provee la prueba, una posible controversia será resuelta en favor del BEAM receptor. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Intercambiar ParsiCoin en Bisq requiere que usted comprenda y cumpla con los siguientes requisitos:\n\nPara enviar PARS, debe usar la cartera oficial ParsiCoin version 3.0.0 o superior.\n\nPuede comprobar su hash de transacción y la clave de la transacción en la sección de Transacciones en su cartera GUI (ParsiPay). Necesita pulsar el botón derecho en la transacción y pulsar mostrar detalles.\n\nEn el caso de que sea necesario arbitraje, debe presentar lo siguiente al mediador o al árbitro: 1) El hash de transacción, 2) La llave de la transacción, y 3) La dirección del receptor PARS. El árbitro entonces verificará la transferencia PARS usando el ParsiCoin Explorador de Bloques (http://explorer.parsicoin.net/#check_payment).\n\nSi no se proporciona la información requerida al mediador o al árbitro, se perderá el caso de disputa. En todos los casos de disputa, el remitente de ParsiCoin lleva 100% de la carga de la responsabilidad de verificar las transacciones a un mediador o un árbitro\n\nSi no comprende estos requisitos, no realice transacciones en Bisq. Primero, busque ayuda en ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Intercambiar ParsiCoin en Haveno requiere que usted comprenda y cumpla con los siguientes requisitos:\n\nPara enviar PARS, debe usar la cartera oficial ParsiCoin version 3.0.0 o superior.\n\nPuede comprobar su hash de transacción y la clave de la transacción en la sección de Transacciones en su cartera GUI (ParsiPay). Necesita pulsar el botón derecho en la transacción y pulsar mostrar detalles.\n\nEn el caso de que sea necesario arbitraje, debe presentar lo siguiente al mediador o al árbitro: 1) El hash de transacción, 2) La llave de la transacción, y 3) La dirección del receptor PARS. El árbitro entonces verificará la transferencia PARS usando el ParsiCoin Explorador de Bloques (http://explorer.parsicoin.net/#check_payment).\n\nSi no se proporciona la información requerida al mediador o al árbitro, se perderá el caso de disputa. En todos los casos de disputa, el remitente de ParsiCoin lleva 100% de la carga de la responsabilidad de verificar las transacciones a un mediador o un árbitro\n\nSi no comprende estos requisitos, no realice transacciones en Haveno. Primero, busque ayuda en ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=Para intercambiar blackcoins quemados. usted necesita saber lo siguiente:\n\nBlackcoins quemados son indestructibles. Para intercambiarlos en Bisq, los guiones de output tienen que estar en la forma: OP_RETURN OP_PUSHDATA, seguidos por bytes de datos asociados que, después de codificarlos en hexadecimal, construyen direcciones. Por ejemplo, blackcoins quemados con una dirección 666f6f ("foo" en UTF-8) tendrán el siguiente guion:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nPara crear blackcoins quemados, uno puede usar el comando RPC "quemar" disponible en algunas carteras.\n\nPara posibles casos de uso, uno puede mirar en https://ibo.laboratorium.ee .\n\nComo los blackcoins quemados son undestructibles, no pueden ser revendidos. "Vender" blackcoins quemados significa quemar blackcoins comunes (con datos asociados igual a la dirección de destino).\n\nEn caso de una disputa, el vendedor BLK necesita proveer el hash de transacción. +account.altcoin.popup.blk-burnt.msg=Para intercambiar blackcoins quemados. usted necesita saber lo siguiente:\n\nBlackcoins quemados son indestructibles. Para intercambiarlos en Haveno, los guiones de output tienen que estar en la forma: OP_RETURN OP_PUSHDATA, seguidos por bytes de datos asociados que, después de codificarlos en hexadecimal, construyen direcciones. Por ejemplo, blackcoins quemados con una dirección 666f6f ("foo" en UTF-8) tendrán el siguiente guion:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nPara crear blackcoins quemados, uno puede usar el comando RPC "quemar" disponible en algunas carteras.\n\nPara posibles casos de uso, uno puede mirar en https://ibo.laboratorium.ee .\n\nComo los blackcoins quemados son undestructibles, no pueden ser revendidos. "Vender" blackcoins quemados significa quemar blackcoins comunes (con datos asociados igual a la dirección de destino).\n\nEn caso de una disputa, el vendedor BLK necesita proveer el hash de transacción. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Comerciar L-BTC en Bisq requiere que entienda lo siguiente:\n\nAl recibir L-BTC de un intercambio en Bisq, no puede usar la app de monedero móvil Blockstream Green Wallet o un exchange/monedero que custodie sus fondos. Solo debe recibir L-BTC en el monedero Liquid Elements Core, u otro monedero L-BTC que le permita obtener la clave cegadora para su dirección L-BTC cegada.\n\nEn caso de ser necesaria mediación, o si se lleva a cabo una disputa, debe entregar la clave cegadora para su dirección receptora de L-BTC al mediador o agente de devolución de fondos Bisq para que verifique los detalles de su Transacción Confidencial en su nodo completo Elements Core.\n\nSi no entrega la información requerida al mediador o al agente de devolución de fondos se resolverá en una pérdida del caso en disputa. En todos los casos de disputa, el receptor de L-BTC es responsable del 100% de la carga de aportar la prueba criptográfica al mediador o agente de devolución de fondos.\n\nSi no entiende estos requerimientos, no intercambio L-BTC en Bisq. +account.altcoin.popup.liquidbitcoin.msg=Comerciar L-BTC en Haveno requiere que entienda lo siguiente:\n\nAl recibir L-BTC de un intercambio en Haveno, no puede usar la app de monedero móvil Blockstream Green Wallet o un exchange/monedero que custodie sus fondos. Solo debe recibir L-BTC en el monedero Liquid Elements Core, u otro monedero L-BTC que le permita obtener la clave cegadora para su dirección L-BTC cegada.\n\nEn caso de ser necesaria mediación, o si se lleva a cabo una disputa, debe entregar la clave cegadora para su dirección receptora de L-BTC al mediador o agente de devolución de fondos Haveno para que verifique los detalles de su Transacción Confidencial en su nodo completo Elements Core.\n\nSi no entrega la información requerida al mediador o al agente de devolución de fondos se resolverá en una pérdida del caso en disputa. En todos los casos de disputa, el receptor de L-BTC es responsable del 100% de la carga de aportar la prueba criptográfica al mediador o agente de devolución de fondos.\n\nSi no entiende estos requerimientos, no intercambio L-BTC en Haveno. account.fiat.yourFiatAccounts=Sus cuentas de moneda nacional: @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=No ha establecido una contraseña de cartera que prot account.seed.warn.noPw.yes=Sí, y no preguntar de nuevo account.seed.enterPw=Introducir contraseña para ver las palabras semilla account.seed.restore.info=Por favor haga una copia de seguridad antes de aplicar la restauración desde las palabras semilla. Tenga en cuenta que la restauración de cartera solo es para casos de emergencia y puede causar problemas con la base de datos interna del monedero.\nNo es el modo de aplicar una restauración de copia de seguridad! Por favor use una copia de seguridad desde el archivo de directorio de la aplicación para restaurar un estado de aplicación anterior.\n\nDespués de restaurar la aplicación se cerrará automáticamente. Después de reiniciar la aplicacion se resincronizará con la red Bitcoin. Esto puede llevar un tiempo y consumir mucha CPU, especialemente si la cartera es antigua y tiene muchas transacciones. Por favor evite interrumpir este proceso, o podría tener que borrar el archivo de la cadena SPV de nuevo o repetir el proceso de restauración. -account.seed.restore.ok=Ok, adelante con la restauración y el apagado de Bisq. +account.seed.restore.ok=Ok, adelante con la restauración y el apagado de Haveno. #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=Notificar si el precio de BTC está p account.notifications.priceAlert.setButton=Establecer alerta de precio account.notifications.priceAlert.removeButton=Eliminar alerta de precio account.notifications.trade.message.title=Estado de intercambio cambiado -account.notifications.trade.message.msg.conf=La transacción de depósito para el intercambio con ID {0} está confirmado. Por favor abra su aplicación Bisq e inicie el pago. +account.notifications.trade.message.msg.conf=La transacción de depósito para el intercambio con ID {0} está confirmado. Por favor abra su aplicación Haveno e inicie el pago. account.notifications.trade.message.msg.started=El comprador de BTC ha iniciado el pago para el intercambio con ID {0} account.notifications.trade.message.msg.completed=El intercambio con ID {0} se ha completado. account.notifications.offer.message.title=Su oferta fue tomada. @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Tipo de oferta account.notifications.marketAlert.message.title=Alerta de oferta account.notifications.marketAlert.message.msg.below=por debajo account.notifications.marketAlert.message.msg.above=por encima -account.notifications.marketAlert.message.msg=Una nueva oferta "{0} {1}" con el precio {2} ({3} {4} precio de mercado) y método de pago "{5}" se publicó en el libro de ofertas de Bisq.\nID de la oferta: {6}. +account.notifications.marketAlert.message.msg=Una nueva oferta "{0} {1}" con el precio {2} ({3} {4} precio de mercado) y método de pago "{5}" se publicó en el libro de ofertas de Haveno.\nID de la oferta: {6}. account.notifications.priceAlert.message.title=Alerta de precio para {0} account.notifications.priceAlert.message.msg=Su alerta de precio se ejecutó. El precio actual de {0} es {1} {2} -account.notifications.noWebCamFound.warning=No se ha encontrado una webcam.\n\nPor favor use la opción de email para enviar el token y clave de encriptación desde su teléfono móvil a la aplicación Bisq. +account.notifications.noWebCamFound.warning=No se ha encontrado una webcam.\n\nPor favor use la opción de email para enviar el token y clave de encriptación desde su teléfono móvil a la aplicación Haveno. account.notifications.priceAlert.warning.highPriceTooLow=El precio superior debe ser mayor que el precio inferior. account.notifications.priceAlert.warning.lowerPriceTooHigh=El precio inferior debe ser más bajo que el precio superior. @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=Verificando firma... displayUpdateDownloadWindow.button.label=Descargar instalador y verificar firma displayUpdateDownloadWindow.button.downloadLater=Descargar más tarde displayUpdateDownloadWindow.button.ignoreDownload=Ignorar esta versión -displayUpdateDownloadWindow.headline=¡Una nueva versión de Bisq está disponible! +displayUpdateDownloadWindow.headline=¡Una nueva versión de Haveno está disponible! displayUpdateDownloadWindow.download.failed.headline=Descarga fallida displayUpdateDownloadWindow.download.failed=Descarga fallida.\nPor favor descargue y verifique manualmente en [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=No se puede determinar el instalador correcto. Por favor, descargue y verifique manualmente en [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Cerrar sin realizar algún pago disputeSummaryWindow.close.noPayout.text=¿Quiere cerrar sin realizar algún pago? emptyWalletWindow.headline=Herramienta de monedero {0} de emergencia -emptyWalletWindow.info=Por favor usar sólo en caso de emergencia si no puede acceder a sus fondos desde la Interfaz de Usuario (UI).\n\nPor favor, tenga en cuenta que todas las ofertas abiertas se cerrarán automáticamente al usar esta herramienta.\n\nAntes de usar esta herramienta, por favor realice una copia de seguridad del directorio de datos. Puede hacerlo en \"Cuenta/Copia de Seguridad\".\n\nPor favor repórtenos su problema y envíe un reporte de fallos en Github en el foro de Bisq para que podamos investigar qué causa el problema. +emptyWalletWindow.info=Por favor usar sólo en caso de emergencia si no puede acceder a sus fondos desde la Interfaz de Usuario (UI).\n\nPor favor, tenga en cuenta que todas las ofertas abiertas se cerrarán automáticamente al usar esta herramienta.\n\nAntes de usar esta herramienta, por favor realice una copia de seguridad del directorio de datos. Puede hacerlo en \"Cuenta/Copia de Seguridad\".\n\nPor favor repórtenos su problema y envíe un reporte de fallos en Github en el foro de Haveno para que podamos investigar qué causa el problema. emptyWalletWindow.balance=Su balance disponible en cartera emptyWalletWindow.address=Su dirección de destino emptyWalletWindow.button=Enviar todos los fondos @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=Fecha de creación offerDetailsWindow.makersOnion=Dirección onion del creador qRCodeWindow.headline=Código QR -qRCodeWindow.msg=Por favor, utilice este código QR para fondear su billetera Bisq desde su billetera externa. +qRCodeWindow.msg=Por favor, utilice este código QR para fondear su billetera Haveno desde su billetera externa. qRCodeWindow.request=Solicitud de pago:\n{0} selectDepositTxWindow.headline=Seleccione transacción de depósito para la disputa @@ -1562,7 +1562,7 @@ popup.headline.error=Error popup.doNotShowAgain=No mostrar de nuevo popup.reportError.log=Abrir archivo de registro popup.reportError.gitHub=Reportar al rastreador de problemas de Github -popup.reportError={0}\n\nPara ayudarnos a mejorar el software por favor reporte el fallo en nuestro rastreador de fallos en https://github.com/bisq-network/bisq/issues.\nEl mensaje de error será copiado al portapapeles cuando haga clic en cualquiera de los botones inferiores.\nHará el depurado de fallos más fácil si puede adjuntar el archivo bisq.log presionando "Abrir archivo de log", guardando una copia y adjuntándola en su informe de errores. +popup.reportError={0}\n\nPara ayudarnos a mejorar el software por favor reporte el fallo en nuestro rastreador de fallos en https://github.com/bisq-network/bisq/issues.\nEl mensaje de error será copiado al portapapeles cuando haga clic en cualquiera de los botones inferiores.\nHará el depurado de fallos más fácil si puede adjuntar el archivo haveno.log presionando "Abrir archivo de log", guardando una copia y adjuntándola en su informe de errores. popup.error.tryRestart=Por favor pruebe reiniciar la aplicación y comprobar su conexión a la red para ver si puede resolver el problema. popup.error.takeOfferRequestFailed=Un error ocurrió cuando alguien intentó tomar una de sus ofertas:\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=La transacción de depósito de el int error.closedTradeWithNoDepositTx=El depósito de transacción de el intercambio cerrado con ID de intercambio {0} es inválido.\nPor favor reinicie la aplicación para limpiar la lista de intercambios cerrados. popup.warning.walletNotInitialized=La cartera aún no sea ha iniciado -popup.warning.osxKeyLoggerWarning=Debido a medidas de seguridad más estrictas en macOS 10.14 y siguientes, al iniciar una aplicación Java (Bisq usa Java) causa un popup de alarma en macOS ('Bisq would like to receive keystrokes from any application').\n\nPara evitar esto por favor abra su 'Configuración macOS' y vaya a 'Seguridad y privacidad' -> 'Privacidad¡ -> 'Monitorización de inputs' y elimine 'Bisq' de la lista a la derecha.\n\nBisq actualizara a una nueva versión de Java para evitar que este problema tan pronto como se resuelvan las limitaciones técnicas (el paquete de Java para la versión requerida de Java aún no se ha emitido). -popup.warning.wrongVersion=Probablemente tenga una versión de Bisq incorrecta para este ordenador.\nLa arquitectura de su ordenador es: {0}.\nLos binarios de Bisq instalados son: {1}.\nPor favor cierre y reinstale la versión correcta ({2}). -popup.warning.incompatibleDB=¡Hemos detectado archivos de base de datos incompatibles!\n\nEstos archivos de base de datos no son compatibles con nuestro actual código base:\n{0}\n\nHemos hecho una copia de seguridad de los archivos corruptos y aplicado los valores por defecto a la nueva versión de base de datos.\n\nLa copia de seguridad se localiza en:\n{1}/db/backup_of_corrupted_data.\n\nPor favor, compruebe si tiene la última versión de Bisq instalada.\nPuede descargarla en:\n[HYPERLINK:https://bisq.network/downloads]\n\nPor favor, reinicie la aplicación. -popup.warning.startupFailed.twoInstances=Ya está ejecutando Bisq. No puede ejecutar dos instancias de Bisq. +popup.warning.osxKeyLoggerWarning=Debido a medidas de seguridad más estrictas en macOS 10.14 y siguientes, al iniciar una aplicación Java (Haveno usa Java) causa un popup de alarma en macOS ('Haveno would like to receive keystrokes from any application').\n\nPara evitar esto por favor abra su 'Configuración macOS' y vaya a 'Seguridad y privacidad' -> 'Privacidad¡ -> 'Monitorización de inputs' y elimine 'Haveno' de la lista a la derecha.\n\nHaveno actualizara a una nueva versión de Java para evitar que este problema tan pronto como se resuelvan las limitaciones técnicas (el paquete de Java para la versión requerida de Java aún no se ha emitido). +popup.warning.wrongVersion=Probablemente tenga una versión de Haveno incorrecta para este ordenador.\nLa arquitectura de su ordenador es: {0}.\nLos binarios de Haveno instalados son: {1}.\nPor favor cierre y reinstale la versión correcta ({2}). +popup.warning.incompatibleDB=¡Hemos detectado archivos de base de datos incompatibles!\n\nEstos archivos de base de datos no son compatibles con nuestro actual código base:\n{0}\n\nHemos hecho una copia de seguridad de los archivos corruptos y aplicado los valores por defecto a la nueva versión de base de datos.\n\nLa copia de seguridad se localiza en:\n{1}/db/backup_of_corrupted_data.\n\nPor favor, compruebe si tiene la última versión de Haveno instalada.\nPuede descargarla en:\n[HYPERLINK:https://bisq.network/downloads]\n\nPor favor, reinicie la aplicación. +popup.warning.startupFailed.twoInstances=Ya está ejecutando Haveno. No puede ejecutar dos instancias de Haveno. popup.warning.tradePeriod.halfReached=Su intercambio con ID {0} ha alcanzado la mitad de el periodo máximo permitido de intercambio y aún no está completada.\n\nEl periodo de intercambio termina el {1}\n\nPor favor, compruebe el estado de su intercambio en \"Portafolio/Intercambios abiertos\" para más información. popup.warning.tradePeriod.ended=Su intercambio con ID {0} ha alcanzado el periodo máximo de intercambio y no se ha completado.\n\nEl periodo de intercambio finalizó en {1}\n\nPor favor, compruebe su intrecambio en \"Portafolio/Intercambios abiertos\" para contactar con el mediador. popup.warning.noTradingAccountSetup.headline=No ha configurado una cuenta de intercambio @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=No hay mediadores disponibles. popup.warning.notFullyConnected=Necesita esperar hasta que esté completamente conectado a la red.\nPuede llevar hasta 2 minutos al inicio. popup.warning.notSufficientConnectionsToBtcNetwork=Necesita esperar hasta que tenga al menos {0} conexiones a la red Bitcoin. popup.warning.downloadNotComplete=Tiene que esperar hasta que finalice la descarga de los bloques Bitcoin que faltan. -popup.warning.chainNotSynced=La cadena de bloques del monedero Bisq no está sincronizada correctamente. Si ha iniciado la aplicación recientemente, espere a que se haya publicado al menos un bloque Bitcoin.\n\nPuede comprobar la altura de la cadena de bloques en Configuración/Información de red. Si se encuentra más de un bloque y el problema persiste podría estar estancado, en cuyo caso deberá hacer una resincronización SPV.\n[HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=La cadena de bloques del monedero Haveno no está sincronizada correctamente. Si ha iniciado la aplicación recientemente, espere a que se haya publicado al menos un bloque Bitcoin.\n\nPuede comprobar la altura de la cadena de bloques en Configuración/Información de red. Si se encuentra más de un bloque y el problema persiste podría estar estancado, en cuyo caso deberá hacer una resincronización SPV.\n[HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=¿Está seguro que quiere eliminar la oferta?\nLa comisión de creador de {0} se perderá si elimina la oferta. popup.warning.tooLargePercentageValue=No puede establecer un porcentaje del 100% o superior. popup.warning.examplePercentageValue=Por favor, introduzca un número de porcentaje como \"5.4\" para 5.4% @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=Uno de los nodos {0} ha sido baneado. # suppress inspection "UnusedProperty" popup.warning.priceRelay=retransmisión de precio popup.warning.seed=semilla -popup.warning.mandatoryUpdate.trading=Por favor, actualice a la última versión de Bisq. Se lanzó una actualización obligatoria que inhabilita intercambios con versiones anteriores. Por favor, lea el Foro de Bisq para más información\n -popup.warning.noFilter=No hemos recibido un objeto de filtro desde los nodos semilla. Esta situación no se esperaba. Por favor, informe a los desarrolladores Bisq. +popup.warning.mandatoryUpdate.trading=Por favor, actualice a la última versión de Haveno. Se lanzó una actualización obligatoria que inhabilita intercambios con versiones anteriores. Por favor, lea el Foro de Haveno para más información\n +popup.warning.noFilter=No hemos recibido un objeto de filtro desde los nodos semilla. Esta situación no se esperaba. Por favor, informe a los desarrolladores Haveno. popup.warning.burnBTC=Esta transacción no es posible, ya que las comisiones de minado de {0} excederían la cantidad a transferir de {1}. Por favor, espere a que las comisiones de minado bajen o hasta que haya acumulado más BTC para transferir. -popup.warning.openOffer.makerFeeTxRejected=La tasa de transacción para la oferta con ID {0} se rechazó por la red Bitcoin.\nID de transacción={1}\nLa oferta se ha eliminado para evitar futuros problemas.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Bisq en el canal de Bisq en Keybase. +popup.warning.openOffer.makerFeeTxRejected=La tasa de transacción para la oferta con ID {0} se rechazó por la red Bitcoin.\nID de transacción={1}\nLa oferta se ha eliminado para evitar futuros problemas.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Haveno en el canal de Haveno en Keybase. popup.warning.trade.txRejected.tradeFee=tasa de intercambio popup.warning.trade.txRejected.deposit=depósito -popup.warning.trade.txRejected=La transacción {0} para el intercambio con ID {1} se rechazó por la red Bitcoin.\nID de transacción={2}\nEl intercambio se movió a intercambios fallidos.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Bisq en el canal de Bisq en Keybase. +popup.warning.trade.txRejected=La transacción {0} para el intercambio con ID {1} se rechazó por la red Bitcoin.\nID de transacción={2}\nEl intercambio se movió a intercambios fallidos.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Haveno en el canal de Haveno en Keybase. -popup.warning.openOfferWithInvalidMakerFeeTx=La transacción de tasa de creador para la oferta con ID {0} es inválida.\nID de transacción={1}.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Bisq en el canal de Bisq de Keybase. +popup.warning.openOfferWithInvalidMakerFeeTx=La transacción de tasa de creador para la oferta con ID {0} es inválida.\nID de transacción={1}.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Haveno en el canal de Haveno de Keybase. -popup.info.securityDepositInfo=Para asegurarse de que ambos comerciantes siguen el protocolo de intercambio, ambos necesitan pagar un depósito de seguridad.\n\nEl depósito se guarda en su monedero de intercambio hasta que el intercambio se complete, y entonces se devuelve.\n\nPor favor, tenga en cuenta que al crear una nueva oferta, Bisq necesita estar en ejecución para que otro comerciante la tome. Para mantener sus ofertas en línea, mantenga Bisq funcionando y asegúrese de que su computadora está en línea también (Ej. asegúrese de que no pasa a modo standby...el monitor en standby no es problema!) +popup.info.securityDepositInfo=Para asegurarse de que ambos comerciantes siguen el protocolo de intercambio, ambos necesitan pagar un depósito de seguridad.\n\nEl depósito se guarda en su monedero de intercambio hasta que el intercambio se complete, y entonces se devuelve.\n\nPor favor, tenga en cuenta que al crear una nueva oferta, Haveno necesita estar en ejecución para que otro comerciante la tome. Para mantener sus ofertas en línea, mantenga Haveno funcionando y asegúrese de que su computadora está en línea también (Ej. asegúrese de que no pasa a modo standby...el monitor en standby no es problema!) popup.info.cashDepositInfo=Por favor asegúrese de que tiene una oficina bancaria donde pueda hacer el depósito de efectivo.\nEl ID del banco (BIC/SWIFT) de del vendedor es: {0} popup.info.cashDepositInfo.confirm=Confirmo que puedo hacer el depósito -popup.info.shutDownWithOpenOffers=Bisq se está cerrando, pero hay ofertas abiertas.\n\nEstas ofertas no estarán disponibles en la red P2P mientras Bisq esté cerrado, pero serán re-publicadas a la red P2P la próxima vez que inicie Bisq.\n\nPara mantener sus ofertas en línea, mantenga Bisq ejecutándose y asegúrese de que la computadora permanece en línea también (Ej. asegúrese de que no se pone en modo standby... el monitor en espera no es un problema). -popup.info.qubesOSSetupInfo=Parece que está ejecutando Bisq en Qubes OS\n\nAsegúrese de que su Bisq qube esté configurado de acuerdo con nuestra Guía de configuración en [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes] -popup.warn.downGradePrevention=Degradar desde la versión {0} a la versión {1} no está soportado. Por favor use la última versión de Bisq. +popup.info.shutDownWithOpenOffers=Haveno se está cerrando, pero hay ofertas abiertas.\n\nEstas ofertas no estarán disponibles en la red P2P mientras Haveno esté cerrado, pero serán re-publicadas a la red P2P la próxima vez que inicie Haveno.\n\nPara mantener sus ofertas en línea, mantenga Haveno ejecutándose y asegúrese de que la computadora permanece en línea también (Ej. asegúrese de que no se pone en modo standby... el monitor en espera no es un problema). +popup.info.qubesOSSetupInfo=Parece que está ejecutando Haveno en Qubes OS\n\nAsegúrese de que su Haveno qube esté configurado de acuerdo con nuestra Guía de configuración en [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes] +popup.warn.downGradePrevention=Degradar desde la versión {0} a la versión {1} no está soportado. Por favor use la última versión de Haveno. popup.privateNotification.headline=Notificación privada importante! popup.securityRecommendation.headline=Recomendación de seguridad importante popup.securityRecommendation.msg=Nos gustaría recordarle que considere usar protección por contraseña para su cartera, si no la ha activado ya.\n\nTambién es muy recomendable que escriba en un papel las palabras semilla del monedero. Esas palabras semilla son como una contraseña maestra para recuperar su cartera Bitcoin.\nEn la sección \"Semilla de cartera\" encontrará más información.\n\nAdicionalmente, debería hacer una copia de seguridad completa del directorio de aplicación en la sección \"Copia de seguridad\" -popup.bitcoinLocalhostNode.msg=Bisq ha detectado un nodo de Bitcoin Core ejecutándose en esta máquina (en local).\n\nPor favor, asegúrese de:\n- que el nodo está completamente sincronizado al iniciar Bisq\n- que el podado está desabilitado ('prune=0' en bitcoin.conf)\n- que los filtros bloom están deshabilitados ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno ha detectado un nodo de Bitcoin Core ejecutándose en esta máquina (en local).\n\nPor favor, asegúrese de:\n- que el nodo está completamente sincronizado al iniciar Haveno\n- que el podado está desabilitado ('prune=0' en bitcoin.conf)\n- que los filtros bloom están deshabilitados ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=Cerrando aplicación... popup.shutDownInProgress.msg=Cerrar la aplicación puede llevar unos segundos.\nPor favor no interrumpa el proceso. @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=Actualizar monedero de intercambio. notification.walletUpdate.msg=Su monedero de intercambio tiene fondos suficientes.\nCantidad: {0} notification.takeOffer.walletUpdate.msg=Su monedero de intercambio ya tiene fondos suficientes de un intento de toma de oferta anterior.\nCantidad: {0} notification.tradeCompleted.headline=Intercambio completado -notification.tradeCompleted.msg=Ahora puede retirar sus fondos a una billetera externa de Bitcoin o transferirlos a la billetera Bisq. +notification.tradeCompleted.msg=Ahora puede retirar sus fondos a una billetera externa de Bitcoin o transferirlos a la billetera Haveno. #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=Ahora puede retirar sus fondos a una billetera e systemTray.show=Mostrar ventana de aplicación systemTray.hide=Esconder ventana de aplicación -systemTray.info=Información sobre Bisq +systemTray.info=Información sobre Haveno systemTray.exit=Salir -systemTray.tooltip=Bisq: Una red de intercambio de bitcoin descentralizada +systemTray.tooltip=Haveno: Una red de intercambio de bitcoin descentralizada #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=Derivar clave desde contraseña password.walletDecrypted=El monedero se desencriptó con éxito y se eliminó la protección por contraseña. password.wrongPw=Ha introducido la contraseña incorrecta.\n\nPor favor, introduzca nuevamente la contraseña, evitando errores. password.walletEncrypted=El monedero se encriptó con éxito y se activó la protección por contraseña. -password.walletEncryptionFailed=No se pudo establecer la contraseña de de la cartera. Puede haber importado palabras semilla que no corresponden a la base de datos del monedero. Por favor contacte con los desarrolladores en Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=No se pudo establecer la contraseña de de la cartera. Puede haber importado palabras semilla que no corresponden a la base de datos del monedero. Por favor contacte con los desarrolladores en Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=Las 2 contraseñas introducidas no coinciden. password.forgotPassword=¿Ha olvidado la contraseña? password.backupReminder=Por favor, al establecer una contraseña para la cartera, tenga en cuenta que todas las copias de seguridad creadas de la cartera no encriptada serán borradas automáticamente @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=Su cartera de Bitcoin no está vacía.\n\nDebe vaci seed.warn.walletNotEmpty.restore=Quiero restaurar de todos modos seed.warn.walletNotEmpty.emptyWallet=Vaciaré mi monedero antes seed.warn.notEncryptedAnymore=Sus carteras están cifradas.\n\nDespués de restaurarlas, las carteras no estarán cifradas y tendrá que introducir una nueva contraseña.\n\n¿Quiere continuar? -seed.warn.walletDateEmpty=Como no ha especificado una fecha específica para el monedero, bisq tendrá que escanear la cadena de bloques desde el 2013.10.09 (la fecha de BIP39).\n\nLos monederos BIP39 se introdujeron en bisq en 2017.06.28 (publicación v.0.5). Puede ahorrar tiempo utilizando esa fecha.\n\nIdealmente, debería especificar la fecha en que su semilla fue creada.\n\n\nEstá seguro de que quiere continuar sin especificar una fecha para el monedero? +seed.warn.walletDateEmpty=Como no ha especificado una fecha específica para el monedero, haveno tendrá que escanear la cadena de bloques desde el 2013.10.09 (la fecha de BIP39).\n\nLos monederos BIP39 se introdujeron en haveno en 2017.06.28 (publicación v.0.5). Puede ahorrar tiempo utilizando esa fecha.\n\nIdealmente, debería especificar la fecha en que su semilla fue creada.\n\n\nEstá seguro de que quiere continuar sin especificar una fecha para el monedero? seed.restore.success=Las carteras se restauraron con éxito con las nuevas palabras semilla.\n\nDebe cerrar y reiniciar la aplicación seed.restore.error=Un error ocurrió el restaurar los monederos con las palabras semilla. {0} seed.restore.openOffers.warn=Tiene ofertas abiertas que serán eliminadas si restaura desde las palabras semilla.\n¿Está seguro de que quiere continuar? @@ -1949,17 +1949,17 @@ payment.accountType=Tipo de cuenta payment.checking=Comprobando payment.savings=Ahorros payment.personalId=ID personal: -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle es un servicio de transmisión de dinero que funciona mejor *a través* de otro banco..\n\n1. Compruebe esta página para ver si (y cómo) trabaja su banco con Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Preste atención a los límites de transferencia -límites de envío- que varían entre bancos, y que los bancos especifican a menudo diferentes límites diarios, semanales y mensuales..\n\n3. Si su banco no trabaja con Zelle, aún puede usarlo a través de la app móvil de Zelle, pero sus límites de transferencia serán mucho menores.\n\n4. El nombre especificado en su cuenta Bisq DEBE ser igual que el nombre en su cuenta de Zelle/bancaria. \n\nSi no puede completar una transacción Zelle tal como se especifica en el contrato, puede perder algo (o todo) el depósito de seguridad!\n\nDebido a que Zelle tiene cierto riesgo de reversión de pago, se aconseja que los vendedores contacten con los compradores no firmados a través de email o SMS para verificar que el comprador realmente tiene la cuenta de Zelle especificada en Bisq. -payment.fasterPayments.newRequirements.info=Algunos bancos han comenzado a verificar el nombre completo del receptor para las transferencias Faster Payments. Su cuenta actual Faster Payments no especifica un nombre completo.\n\nConsidere recrear su cuenta Faster Payments en Bisq para proporcionarle a los futuros compradores {0} un nombre completo.\n\nCuando vuelva a crear la cuenta, asegúrese de copiar el UK Short Code de forma precisa , el número de cuenta y los valores salt de la cuenta anterior a su cuenta nueva para la verificación de edad. Esto asegurará que la edad de su cuenta existente y el estado de la firma se conserven. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle es un servicio de transmisión de dinero que funciona mejor *a través* de otro banco..\n\n1. Compruebe esta página para ver si (y cómo) trabaja su banco con Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Preste atención a los límites de transferencia -límites de envío- que varían entre bancos, y que los bancos especifican a menudo diferentes límites diarios, semanales y mensuales..\n\n3. Si su banco no trabaja con Zelle, aún puede usarlo a través de la app móvil de Zelle, pero sus límites de transferencia serán mucho menores.\n\n4. El nombre especificado en su cuenta Haveno DEBE ser igual que el nombre en su cuenta de Zelle/bancaria. \n\nSi no puede completar una transacción Zelle tal como se especifica en el contrato, puede perder algo (o todo) el depósito de seguridad!\n\nDebido a que Zelle tiene cierto riesgo de reversión de pago, se aconseja que los vendedores contacten con los compradores no firmados a través de email o SMS para verificar que el comprador realmente tiene la cuenta de Zelle especificada en Haveno. +payment.fasterPayments.newRequirements.info=Algunos bancos han comenzado a verificar el nombre completo del receptor para las transferencias Faster Payments. Su cuenta actual Faster Payments no especifica un nombre completo.\n\nConsidere recrear su cuenta Faster Payments en Haveno para proporcionarle a los futuros compradores {0} un nombre completo.\n\nCuando vuelva a crear la cuenta, asegúrese de copiar el UK Short Code de forma precisa , el número de cuenta y los valores salt de la cuenta anterior a su cuenta nueva para la verificación de edad. Esto asegurará que la edad de su cuenta existente y el estado de la firma se conserven. payment.moneyGram.info=Al utilizar MoneyGram, el comprador de BTC tiene que enviar el número de autorización y una foto del recibo al vendedor de BTC por correo electrónico. El recibo debe mostrar claramente el nobre completo del vendedor, país, estado y cantidad. El email del vendedor se mostrará al comprador durante el proceso de intercambio. payment.westernUnion.info=Al utilizar Western Union, el comprador de BTC tiene que enviar el número de seguimiento (MTCN) y una foto del recibo al vendedor de BTC por correo electrónico. El recibo debe mostrar claramente el como el nombre completo del vendedor, país, ciudad y cantidad. Al comprador se le mostrará el correo electrónico del vendedor en el proceso de intercambio. payment.halCash.info=Al usar HalCash el comprador de BTC necesita enviar al vendedor de BTC el código HalCash a través de un mensaje de texto desde el teléfono móvil.\n\nPor favor asegúrese de que no excede la cantidad máxima que su banco le permite enviar con HalCash. La cantidad mínima por retirada es de 10 EUR y el máximo son 600 EUR. Para retiros frecuentes es 3000 por receptor al día y 6000 por receptor al mes. Por favor compruebe estos límites con su banco y asegúrese que son los mismos aquí expuestos.\n\nLa cantidad de retiro debe ser un múltiplo de 10 EUR ya que no se puede retirar otras cantidades desde el cajero automático. La Interfaz de Usuario en la pantalla crear oferta y tomar oferta ajustará la cantidad de BTC para que la cantidad de EUR sea correcta. No puede usar precios basados en el mercado ya que la cantidad de EUR cambiaría con el cambio de precios.\n\nEn caso de disputa el comprador de BTC necesita proveer la prueba de que ha enviado EUR. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Por favor, tenga en cuenta que todas las transferencias bancarias tienen cierto riesgo de reversión de pago.\n\nPara disminuir este riesgo, Bisq establece límites por intercambio en función del nivel estimado de riesgo de reversión de pago para el método usado.\n\nPara este método de pago, su límite por intercambio para comprar y vender es {2}.\n\nEste límite solo aplica al tamaño de un intercambio: puede poner tantos intercambios como quira.\n\nConsulte detalles en la wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Por favor, tenga en cuenta que todas las transferencias bancarias tienen cierto riesgo de reversión de pago.\n\nPara disminuir este riesgo, Haveno establece límites por intercambio en función del nivel estimado de riesgo de reversión de pago para el método usado.\n\nPara este método de pago, su límite por intercambio para comprar y vender es {2}.\n\nEste límite solo aplica al tamaño de un intercambio: puede poner tantos intercambios como quira.\n\nConsulte detalles en la wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=Para limitar el riesgo de devolución de cargo, Bisq establece límites por compra basados en los 2 siguientes factores:\n\n1. Riesgo general de devolución de cargo para el método de pago\n2. Estado de firmado de cuenta\n\nEsta cuenta de pago aún no ha sido firmada, con lo que ha sido limitada para comprar {0} por intercambio. Después de firmarse, los límites de compra se incrementarán de esta manera:\n\n● Antes de ser firmada, y hasta 30 días después de la firma, su límite por intercambio de compra será {0}\n● 30 días después de la firma, su límite de compra por intercambio será de {1}\n● 60 días después de la firma, su límite de compra por intercambio será de {2}\n\nLos límites de venta no se ven afectados por el firmado de cuentas. Puede vender {2} en un solo \nintercambio inmediatamente.\n\nEstos límites solo aplican al tamaño de un intercambio. Puede hacer tantos intercambios como quiera.\n\n Consulte detalles en la wiki [HYPERLINK:https://bisq.wiki/Account_limits].\n\n +payment.limits.info.withSigning=Para limitar el riesgo de devolución de cargo, Haveno establece límites por compra basados en los 2 siguientes factores:\n\n1. Riesgo general de devolución de cargo para el método de pago\n2. Estado de firmado de cuenta\n\nEsta cuenta de pago aún no ha sido firmada, con lo que ha sido limitada para comprar {0} por intercambio. Después de firmarse, los límites de compra se incrementarán de esta manera:\n\n● Antes de ser firmada, y hasta 30 días después de la firma, su límite por intercambio de compra será {0}\n● 30 días después de la firma, su límite de compra por intercambio será de {1}\n● 60 días después de la firma, su límite de compra por intercambio será de {2}\n\nLos límites de venta no se ven afectados por el firmado de cuentas. Puede vender {2} en un solo \nintercambio inmediatamente.\n\nEstos límites solo aplican al tamaño de un intercambio. Puede hacer tantos intercambios como quiera.\n\n Consulte detalles en la wiki [HYPERLINK:https://bisq.wiki/Account_limits].\n\n payment.cashDeposit.info=Por favor confirme que su banco permite enviar depósitos de efectivo a cuentas de otras personas. Por ejemplo, Bank of America y Wells Fargo ya no permiten estos depósitos. @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=El método de pago Tarjetas regalo Amazon requier payment.account.amazonGiftCard.addCountryInfo={0}\nSu cuenta actual de Tarjeta regalo Amazon ({1}) no tiene un País especificado.\nPor favor introduzca el país de su Tarjeta regalo Amazon para actualizar sus datos de cuenta.\nEsto no afectará el estatus de edad de su cuenta. payment.amazonGiftCard.upgrade.headLine=Actualizar cuenta Tarjeta regalo Amazon -payment.usPostalMoneyOrder.info=Los intercambios usando US Postal Money Orders (USPMO) en Bisq requiere que entienda lo siguiente:\n\n- Los compradores de BTC deben escribir la dirección del vendedor en los campos de "Payer" y "Payee" y tomar una foto en alta resolución de la USPMO y del sobre con la prueba de seguimiento antes de enviar.\n- Los compradores de BTC deben enviar la USPMO con confirmación de entrega.\n\nEn caso de que sea necesaria la mediación, se requerirá al comprador que entregue las fotos al mediador o agente de devolución de fondos, junto con el número de serie de la USPMO, número de oficina postal, y la cantidad de USD, para que puedan verificar los detalles en la web de US Post Office.\n\nNo entregar la información requerida al Mediador o Árbitro resultará en pérdida del caso de disputa. \n\nEn todos los casos de disputa, el emisor de la USPMO tiene el 100% de responsabilidad en aportar la evidencia al Mediador o Árbitro.\n\nSi no entiende estos requerimientos, no comercie usando USPMO en Bisq. +payment.usPostalMoneyOrder.info=Los intercambios usando US Postal Money Orders (USPMO) en Haveno requiere que entienda lo siguiente:\n\n- Los compradores de BTC deben escribir la dirección del vendedor en los campos de "Payer" y "Payee" y tomar una foto en alta resolución de la USPMO y del sobre con la prueba de seguimiento antes de enviar.\n- Los compradores de BTC deben enviar la USPMO con confirmación de entrega.\n\nEn caso de que sea necesaria la mediación, se requerirá al comprador que entregue las fotos al mediador o agente de devolución de fondos, junto con el número de serie de la USPMO, número de oficina postal, y la cantidad de USD, para que puedan verificar los detalles en la web de US Post Office.\n\nNo entregar la información requerida al Mediador o Árbitro resultará en pérdida del caso de disputa. \n\nEn todos los casos de disputa, el emisor de la USPMO tiene el 100% de responsabilidad en aportar la evidencia al Mediador o Árbitro.\n\nSi no entiende estos requerimientos, no comercie usando USPMO en Haveno. -payment.cashByMail.info=Comerciar usando efectivo por correo (CBM) en Bisq requiere que entienda lo siguiente:\n\n● El comprador de BTC debe empaquetar el efectivo en una bolsa de efectivo a prueba de manipulación.\n● El comprador de BTC debe filmar o tomar fotos de alta resolución del empaquetado junto con la dirección y el número de seguimiento ya añadido al paquete.\n● El comprador de BTC debe enviar el paquete de efectivo al vendedor con la confirmación de entrega y un seguro apropiado.\n● El vendedor de BTC debe filmar la apertura del paquete, asegurándose de que el número de seguimiento entregado por el emisor es visible en todo el video.\n● El creador de la oferta debe especificar cualquier términos o condiciones especiales en el campo 'Información adicional' de la cuenta de pago.\n● Al tomar la oferta, el tomador indica estar de acuredo con los términos y condiciones del tomador.\n\nLos intercambios CBM responsabilizan a ambos pares de actuar honestamente.\n\n● Los intercambios CBM tienen menos acciones verificables que otrosintrecambios de fiat. Esto hace más complicado manejar disputas.\n● Intente a resolver las disputas directamente con su par utilizando el chat de intercambio. Esta es la ruta más prometedora.\n● Los mediadores pueden considerar su caso y hacer una sugerencia, pero no está garantizado que vayan a ayudar.\n● Si se solicita mediación, y si algún par rechaza la sugerencia de mediación, los fondos de ambos pares se enviarán a la dirección de 'donación' de Bisq[HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], y el intercambio concluirá.\n● Si un comerciante rechaza la sugerencia de mediación y abre arbitraje, podría llevar a la pérdida de todos los fondos, de intercambio y depósitos de seguridad.\n● El árbitro tomará una decisión basada en la evidencia entregada. Por tanto, por favor siga y documente el proceso indicado arriba para tener evidencia en caso de disputa.\n● Las solicitudes de reembolso de fondos perdidos resultantes de CBM en la DAO no serán considerados.\n\nAsegúrese de que entiende los requerimientos de los intercambios CBM leyendo: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nSi no entiende estos requisitos, no intercambie usando CBM. +payment.cashByMail.info=Comerciar usando efectivo por correo (CBM) en Haveno requiere que entienda lo siguiente:\n\n● El comprador de BTC debe empaquetar el efectivo en una bolsa de efectivo a prueba de manipulación.\n● El comprador de BTC debe filmar o tomar fotos de alta resolución del empaquetado junto con la dirección y el número de seguimiento ya añadido al paquete.\n● El comprador de BTC debe enviar el paquete de efectivo al vendedor con la confirmación de entrega y un seguro apropiado.\n● El vendedor de BTC debe filmar la apertura del paquete, asegurándose de que el número de seguimiento entregado por el emisor es visible en todo el video.\n● El creador de la oferta debe especificar cualquier términos o condiciones especiales en el campo 'Información adicional' de la cuenta de pago.\n● Al tomar la oferta, el tomador indica estar de acuredo con los términos y condiciones del tomador.\n\nLos intercambios CBM responsabilizan a ambos pares de actuar honestamente.\n\n● Los intercambios CBM tienen menos acciones verificables que otrosintrecambios de fiat. Esto hace más complicado manejar disputas.\n● Intente a resolver las disputas directamente con su par utilizando el chat de intercambio. Esta es la ruta más prometedora.\n● Los mediadores pueden considerar su caso y hacer una sugerencia, pero no está garantizado que vayan a ayudar.\n● Si se solicita mediación, y si algún par rechaza la sugerencia de mediación, los fondos de ambos pares se enviarán a la dirección de 'donación' de Haveno[HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], y el intercambio concluirá.\n● Si un comerciante rechaza la sugerencia de mediación y abre arbitraje, podría llevar a la pérdida de todos los fondos, de intercambio y depósitos de seguridad.\n● El árbitro tomará una decisión basada en la evidencia entregada. Por tanto, por favor siga y documente el proceso indicado arriba para tener evidencia en caso de disputa.\n● Las solicitudes de reembolso de fondos perdidos resultantes de CBM en la DAO no serán considerados.\n\nAsegúrese de que entiende los requerimientos de los intercambios CBM leyendo: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nSi no entiende estos requisitos, no intercambie usando CBM. payment.cashByMail.contact=Información de contacto payment.cashByMail.contact.prompt=El sobre con nombre o pseudónimo debería ser dirigido a @@ -1996,7 +1996,7 @@ payment.japan.recipient=Nombre payment.australia.payid=PayID payment.payid=PayID conectado a una institución financiera. Como la dirección email o el número de móvil. payment.payid.info=Un PayID como un número de teléfono, dirección email o Australian Business Number (ABN), que puede conectar con seguridad a su banco, unión de crédito o cuenta de construcción de sociedad. Necesita haber creado una PayID con su institución financiera australiana. Tanto para enviar y recibir las instituciones financieras deben soportar PayID. Para más información por favor compruebe [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=Para pagar con Tarjeta eGift Amazon. necesitará enviar una Tarjeta eGift Amazon al vendedor BTC a través de su cuenta Amazon.\n\nBisq mostrará la dirección e-mail del vendedor de BTC o el número de teléfono donde la tarjeta de regalo deberá enviarse. Por favor vea la wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] para más detalles y mejores prácticas.\n\nNotas importantes:\n- Pruebe a enviar las tarjetas regalo en cantidades de 100USD o menores, ya que Amazon está señalando tarjetas regalo mayores como fraudulentas.\n- Intente usar textos para el mensaje de la tarjeta regalo creíbles y creativos ("Feliz cumpleaños!").\n- Las tarjetas Amazon eGift pueden ser redimidas únicamente en la web de Amazon en la que se compraron (por ejemplo, una tarjeta comprada en amazon.it solo puede ser redimida en amazon.it) +payment.amazonGiftCard.info=Para pagar con Tarjeta eGift Amazon. necesitará enviar una Tarjeta eGift Amazon al vendedor BTC a través de su cuenta Amazon.\n\nHaveno mostrará la dirección e-mail del vendedor de BTC o el número de teléfono donde la tarjeta de regalo deberá enviarse. Por favor vea la wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] para más detalles y mejores prácticas.\n\nNotas importantes:\n- Pruebe a enviar las tarjetas regalo en cantidades de 100USD o menores, ya que Amazon está señalando tarjetas regalo mayores como fraudulentas.\n- Intente usar textos para el mensaje de la tarjeta regalo creíbles y creativos ("Feliz cumpleaños!").\n- Las tarjetas Amazon eGift pueden ser redimidas únicamente en la web de Amazon en la que se compraron (por ejemplo, una tarjeta comprada en amazon.it solo puede ser redimida en amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 9a04b106..099ddaee 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -103,14 +103,14 @@ shared.faq=Visit FAQ page shared.yesCancel=بله، لغو شود shared.nextStep=گام بعدی shared.selectTradingAccount=حساب معاملات را انتخاب کنید -shared.fundFromSavingsWalletButton=انتقال وجه از کیف Bisq +shared.fundFromSavingsWalletButton=انتقال وجه از کیف Haveno shared.fundFromExternalWalletButton=برای تهیه پول، کیف پول بیرونی خود را باز کنید shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed? shared.belowInPercent= ٪ زیر قیمت بازار shared.aboveInPercent= ٪ بالای قیمت بازار shared.enterPercentageValue=ارزش ٪ را وارد کنید shared.OR=یا -shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds. +shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. shared.waitingForFunds=در انتظار دریافت وجه... shared.TheBTCBuyer=خریدار بیتکوین shared.You=شما @@ -125,7 +125,7 @@ shared.notUsedYet=هنوز مورد استفاده قرار نگرفته shared.date=تاریخ shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n +shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=کپی در کلیپ‌بورد shared.language=زبان shared.country=کشور @@ -235,8 +235,8 @@ mainView.menu.settings=تنظیمات mainView.menu.account=حساب mainView.marketPriceWithProvider.label=قیمت بازار بر اساس {0} -mainView.marketPrice.bisqInternalPrice=قیمت آخرین معامله‌ی Bisq -mainView.marketPrice.tooltip.bisqInternalPrice=قیمت بازارهای خارجی موجود نیست.\nقیمت نمایش داده شده، از آخرین معامله‌ی Bisq برای ارز موردنظر اتخاذ شده است. +mainView.marketPrice.havenoInternalPrice=قیمت آخرین معامله‌ی Haveno +mainView.marketPrice.tooltip.havenoInternalPrice=قیمت بازارهای خارجی موجود نیست.\nقیمت نمایش داده شده، از آخرین معامله‌ی Haveno برای ارز موردنظر اتخاذ شده است. mainView.marketPrice.tooltip=قیمت بازار توسط {0}{1} ارائه شده است\nآخرین به روز رسانی: {2}\nURL لینک Node ارائه دهنده: {3} mainView.balance.available=موجودی در دسترس mainView.balance.reserved=رزرو شده در پیشنهادها @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=در حال ایجاد ارتباط با mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1} +mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) در حال ارتباط با شبکه Tor ... mainView.bootstrapState.torNodeCreated=(2/4) گره Tor ایجاد شد @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) داده های اولیه د mainView.bootstrapWarning.noSeedNodesAvailable=عدم وجود Node های اولیه mainView.bootstrapWarning.noNodesAvailable=Node ها و همتایان اولیه موجود نیستند -mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Bisq network failed +mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Haveno network failed mainView.p2pNetworkWarnMsg.noNodesAvailable=Nodeی برای درخواست داده موجود نیست.\nلطفاً ارتباط اینترنت خود را بررسی کنید یا برنامه را مجدداً راه اندازی کنید. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Bisq network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Haveno network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. mainView.walletServiceErrorMsg.timeout=ارتباط با شبکه‌ی بیتکوین به دلیل وقفه، ناموفق بود. mainView.walletServiceErrorMsg.connectionError=ارتباط با شبکه‌ی بیتکوین به دلیل یک خطا: {0}، ناموفق بود. @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=ارتباط با شبکه‌ی mainView.walletServiceErrorMsg.rejectedTxException=A transaction was rejected from the network.\n\n{0} mainView.networkWarning.allConnectionsLost=اتصال شما به تمام {0} همتایان شبکه قطع شد.\nشاید ارتباط کامپیوتر شما قطع شده است یا کامپیوتر در حالت Standby است. -mainView.networkWarning.localhostBitcoinLost=اتصال شما به Node لوکال هاست بیتکوین قطع شد.\nلطفاً به منظور اتصال به سایر Nodeهای بیتکوین، برنامه‌ی Bisq یا Node لوکال هاست بیتکوین را مجددا راه اندازی کنید. +mainView.networkWarning.localhostBitcoinLost=اتصال شما به Node لوکال هاست بیتکوین قطع شد.\nلطفاً به منظور اتصال به سایر Nodeهای بیتکوین، برنامه‌ی Haveno یا Node لوکال هاست بیتکوین را مجددا راه اندازی کنید. mainView.version.update=(به روز رسانی موجود است) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount offerbook.warning.wrongTradeProtocol=این پیشنهاد نیاز به نسخه پروتکل متفاوتی مانند پروتکل نسخه نرم‌افزار خودتان دارد.\n\nلطفا پس از نصب آخرین آپدیت نرم‌افزار دوباره تلاش کنید. در غیر این صورت، کاربری که این پیشنهاد را ایجاد کرده است، از نسخه‌ای قدیمی‌تر استفاده می‌کند.\n\nکاربران نمی توانند با نسخه‌های پروتکل معاملاتی ناسازگار، معامله کنند. offerbook.warning.userIgnored=شما آدرس onion کاربر را به لیست بی‌اعتنایی خودتان افزوده‌اید. -offerbook.warning.offerBlocked=پیشنهاد توسط توسعه دهندگان Bisq مسدود شد.\nاحتمالاً هنگام گرفتن پیشنهاد، یک اشکال خارج از کنترل موجب پدید آمدن مشکلاتی شده است. -offerbook.warning.currencyBanned=ارز مورد استفاده در آن پیشنهاد، توسط توسعه‌دهندگان Bisq مسدود شد.\nبرای اطلاعات بیشتر، لطفاً از انجمن Bisq بازدید نمایید. -offerbook.warning.paymentMethodBanned=روش پرداخت مورد استفاده در آن پیشنهاد، توسط توسعه دهندگان Bisq مسدود شد.\nلطفاً برای اطلاعات بیشتر، از انجمن Bisq بازدید نمایید. -offerbook.warning.nodeBlocked=آدرس onion آن معامله گر، توسط توسعه دهندگان Bisq مسدود شد.\nاحتمالاً هنگام گرفتن پیشنهاد از جانب آن معامله گر، یک اشکال ناامن موجب پدید آمدن مسائلی شده است. -offerbook.warning.requireUpdateToNewVersion=Your version of Bisq is not compatible for trading anymore.\nPlease update to the latest Bisq version at [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=پیشنهاد توسط توسعه دهندگان Haveno مسدود شد.\nاحتمالاً هنگام گرفتن پیشنهاد، یک اشکال خارج از کنترل موجب پدید آمدن مشکلاتی شده است. +offerbook.warning.currencyBanned=ارز مورد استفاده در آن پیشنهاد، توسط توسعه‌دهندگان Haveno مسدود شد.\nبرای اطلاعات بیشتر، لطفاً از انجمن Haveno بازدید نمایید. +offerbook.warning.paymentMethodBanned=روش پرداخت مورد استفاده در آن پیشنهاد، توسط توسعه دهندگان Haveno مسدود شد.\nلطفاً برای اطلاعات بیشتر، از انجمن Haveno بازدید نمایید. +offerbook.warning.nodeBlocked=آدرس onion آن معامله گر، توسط توسعه دهندگان Haveno مسدود شد.\nاحتمالاً هنگام گرفتن پیشنهاد از جانب آن معامله گر، یک اشکال ناامن موجب پدید آمدن مسائلی شده است. +offerbook.warning.requireUpdateToNewVersion=Your version of Haveno is not compatible for trading anymore.\nPlease update to the latest Haveno version at [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. It could be that your previous take-offer attempt resulted in a failed trade. offerbook.info.sellAtMarketPrice=با قیمت روز بازار خواهید فروخت (به روز رسانی در هر دقیقه). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=پیشنهاد خود را تامین وجه نمای createOffer.fundsBox.offerFee=کارمزد معامله createOffer.fundsBox.networkFee=کارمزد استخراج createOffer.fundsBox.placeOfferSpinnerInfo=انتشار پیشنهاد در حال انجام است ... -createOffer.fundsBox.paymentLabel=معامله Bisq با شناسه‌ی {0} +createOffer.fundsBox.paymentLabel=معامله Haveno با شناسه‌ی {0} createOffer.fundsBox.fundsStructure=({0} سپرده‌ی اطمینان، {1} کارمزد معامله، {2} کارمزد تراکنش) createOffer.success.headline=پیشنهاد شما، منتشر شد. createOffer.success.info=شما می توانید پیشنهادهای باز خود را در \"سبد سهام/پیشنهادهای باز من\" مدیریت نمایید. @@ -447,12 +447,12 @@ createOffer.placeOfferButton=بررسی: پیشنهاد را برای {0} بی createOffer.createOfferFundWalletInfo.headline=پیشنهاد خود را تامین وجه نمایید # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=مقدار معامله:{0}\n -createOffer.createOfferFundWalletInfo.msg=شما باید {0} برای این پیشنهاد، سپرده بگذارید.\nآن وجوه در کیف پول محلی شما ذخیره شده اند و هنگامی که کسی پیشنهاد شما را دریافت می کند، به آدرس سپرده چند امضایی قفل خواهد شد.\n\nمقدار مذکور، مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-هزینه تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Bisq خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید. +createOffer.createOfferFundWalletInfo.msg=شما باید {0} برای این پیشنهاد، سپرده بگذارید.\nآن وجوه در کیف پول محلی شما ذخیره شده اند و هنگامی که کسی پیشنهاد شما را دریافت می کند، به آدرس سپرده چند امضایی قفل خواهد شد.\n\nمقدار مذکور، مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-هزینه تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Haveno خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=یک خطا هنگام قرار دادن پیشنهاد، رخ داده است:\n\n{0}\n\nهیچ پولی تاکنون از کیف پول شما کم نشده است.\nلطفاً برنامه را مجدداً راه اندازی کرده و ارتباط اینترنت خود را بررسی نمایید. createOffer.setAmountPrice=تنظیم مقدار و قیمت -createOffer.warnCancelOffer=در حال حاضر،شما آن پیشنهاد را تامین وجه کرده‌اید.\nاگر اکنون لغو کنید، وجوه شما به کیف پول محلی Bisq منتقل شده و برای برداشت در صفحه ی \"وجوه/ارسال وجوه\" در درسترس است.\nآیا شما مطمئن هستید که می‌خواهید لغو کنید؟ +createOffer.warnCancelOffer=در حال حاضر،شما آن پیشنهاد را تامین وجه کرده‌اید.\nاگر اکنون لغو کنید، وجوه شما به کیف پول محلی Haveno منتقل شده و برای برداشت در صفحه ی \"وجوه/ارسال وجوه\" در درسترس است.\nآیا شما مطمئن هستید که می‌خواهید لغو کنید؟ createOffer.timeoutAtPublishing=یک وقفه در انتشار پیشنهاد، رخ داده است. createOffer.errorInfo=\n\nهزینه سفارش گذار، از قبل پرداخت شده است. در بدترین حالت، شما آن هزینه را از دست داده‌اید.\nلطفاً سعی کنید برنامه را مجدداً راه اندازی کرده و ارتباط اینترنت خود را بررسی کنند تا تا ببینید آیا می‌توانید این مشکل را حل کنید یا خیر. createOffer.tooLowSecDeposit.warning=شما سپرده‌های اطمینان را با مقداری کمتر از مقدار پیش‌فرض {0} تنظیم کرده‌‍اید.\nآیا شما مطمئن هستید که می‌خواهید از یک سپرده اطمینان کمتر استفاده کنید؟ @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=مبلغ فروش takeOffer.fundsBox.offerFee=کارمزد معامله takeOffer.fundsBox.networkFee=کل کارمزد استخراج takeOffer.fundsBox.takeOfferSpinnerInfo=برداشتن پیشنهاد در حال انجام است... -takeOffer.fundsBox.paymentLabel=معامله Bisq با شناسه‌ی {0} +takeOffer.fundsBox.paymentLabel=معامله Haveno با شناسه‌ی {0} takeOffer.fundsBox.fundsStructure=({0} سپرده‌ی اطمینان، {1} هزینه‌ی معامله، {2} هزینه تراکنش شبکه) takeOffer.success.headline=با موفقیت یک پیشنهاد را قبول کرده‌اید. takeOffer.success.info=شما می‌توانید وضعیت معامله‌ی خود را در \"سبد سهام /معاملات باز\" ببینید. @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=امکان پذیرفتن پیشنهاد وجود takeOffer.takeOfferFundWalletInfo.headline=معامله خود را تأمین وجه نمایید # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=مقدار معامله: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=شما باید {0} برای قبول این پیشنهاد، سپرده بگذارید.\nاین مقدار مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-تمامی هزینه های تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Bisq خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید. +takeOffer.takeOfferFundWalletInfo.msg=شما باید {0} برای قبول این پیشنهاد، سپرده بگذارید.\nاین مقدار مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-تمامی هزینه های تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Haveno خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید. takeOffer.alreadyPaidInFunds=اگر شما در حال حاضر در وجوه، پرداختی داشته اید، می توانید آن را در صفحه ی \"وجوه/ارسال وجوه\" برداشت کنید. takeOffer.paymentInfo=اطلاعات پرداخت takeOffer.setAmountPrice=تنظیم مقدار -takeOffer.alreadyFunded.askCancel=شما در حال حاضر، آن پیشنهاد را تامین وجه کرده‌اید.\nاگر اکنون لغو کنید، وجوه شما به کیف پول محلی Bisq منتقل خواهد شد و برای برداشت در صفحه ی \"وجوه/ارسال وجوه\" در درسترس است.\nآیا شما مطمئن هستید که می‌خواهید لغو کنید؟ +takeOffer.alreadyFunded.askCancel=شما در حال حاضر، آن پیشنهاد را تامین وجه کرده‌اید.\nاگر اکنون لغو کنید، وجوه شما به کیف پول محلی Haveno منتقل خواهد شد و برای برداشت در صفحه ی \"وجوه/ارسال وجوه\" در درسترس است.\nآیا شما مطمئن هستید که می‌خواهید لغو کنید؟ takeOffer.failed.offerNotAvailable=درخواست پذیرفتن پیشنهاد ناموفق بود، چون پیشنهاد دیگر در دسترس نیست. شاید معامله‌گر دیگری همزمان پیشنهاد را برداشته است. takeOffer.failed.offerTaken=شما نمی توانید آن پیشنهاد را بپذیرید، چون قبلاً توسط معامله‌گر دیگری پذیرفته شده است. takeOffer.failed.offerRemoved=شما نمی‌توانید آن پیشنهاد را بپذیرید، چون پیشنهاد در این فاصله حذف شده است. @@ -536,7 +536,7 @@ editOffer.confirmEdit=تأیید: ویرایش پیشنهاد editOffer.publishOffer=انتشار پیشنهاد شما. editOffer.failed=ویرایش پیشنهاد، ناموفق بود:\n{0} editOffer.success=پیشنهاد شما با موفقیت ویرایش شد. -editOffer.invalidDeposit=The buyer's security deposit is not within the constraints defined by the Bisq DAO and can no longer be edited. +editOffer.invalidDeposit=The buyer's security deposit is not within the constraints defined by the Haveno DAO and can no longer be edited. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=The deposit transaction is still not conf # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=مورد الزامی مهم:\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=لطفاً {0} را توسط \"US Postal Money Order\" به فروشنده‌ی بیتکوین پرداخت کنید.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=MTCN و رسید ر portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=شما باید MTCN (شماره پیگیری) و یک عکس از رسید را با ایمیل به فروشنده‌ی بیتکوین ارسال نمایید.\nرسید باید به طور واضح نام کامل، کشور، ایالت فروشنده و مقدار را نشان دهد. ایمیل فروشنده: {0}.\n\nآیا MTCN و قرارداد را برای فروشنده فرستادید؟ portfolio.pending.step2_buyer.halCashInfo.headline=ارسال کد HalCash portfolio.pending.step2_buyer.halCashInfo.msg=باید کد HalCash و شناسه‌ی معامله ({0}) را به فروشنده بیتکوین پیامک بفرستید. شماره موبایل فروشنده بیتکوین {1} است. آیا کد را برای فروشنده فرستادید؟ -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Bisq clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Haveno clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). portfolio.pending.step2_buyer.confirmStart.headline=تأیید کنید که پرداخت را آغاز کرده‌اید portfolio.pending.step2_buyer.confirmStart.msg=آیا شما پرداخت {0} را به شریک معاملاتی خود آغاز کردید؟ portfolio.pending.step2_buyer.confirmStart.yes=بلی، پرداخت را آغاز کرده‌ام portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Bisq requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway portfolio.pending.step2_seller.waitPayment.headline=برای پرداخت منتظر باشید @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=خریدار بیت‌کوین هنوز پر portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started their payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the mediator for assistance. tradeChat.chatWindowTitle=Chat window for trade with ID ''{0}'' tradeChat.openChat=Open chat window -tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Bisq (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. +tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Haveno (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. # suppress inspection "UnusedProperty" message.state.UNDEFINED=تعریف نشده @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=سپرده اطمینان مسترد شد portfolio.pending.step5_buyer.withdrawBTC=برداشت بیتکوین شما portfolio.pending.step5_buyer.amount=مبلغ قابل برداشت portfolio.pending.step5_buyer.withdrawToAddress=برداشت به آدرس -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToHavenoWallet=Keep funds in Haveno wallet portfolio.pending.step5_buyer.withdrawExternal=برداشت به کیف پول خارجی portfolio.pending.step5_buyer.alreadyWithdrawn=وجوه شما در حال حاضر برداشت شده است.\nلطفاً تاریخچه‌ی تراکنش را بررسی کنید. portfolio.pending.step5_buyer.confirmWithdrawal=تأیید درخواست برداشت @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=دریافت کرده‌اید tradeFeedbackWindow.title=تبریک، معامله شما کامل شد. tradeFeedbackWindow.msg.part1=دوست داریم تجربه شما را بشنویم. این امر به ما کمک می کند تا نرم افزار را بهبود بخشیم و مشکلات را حل کنیم. اگر می خواهید بازخوردی ارائه کنید، لطفا این نظرسنجی کوتاه (بدون نیاز به ثبت نام) را در زیر پر کنید: -tradeFeedbackWindow.msg.part2=اگر سوالی دارید یا مشکلی را تجربه کرده‌اید، لطفا با سایر کاربران و شرکت کننده ها از طریق انجمن Bisq که در ذیل ارائه شده، به اشتراک بگذارید: -tradeFeedbackWindow.msg.part3=بابت استفاده از Bisq، از شما متشکریم! +tradeFeedbackWindow.msg.part2=اگر سوالی دارید یا مشکلی را تجربه کرده‌اید، لطفا با سایر کاربران و شرکت کننده ها از طریق انجمن Haveno که در ذیل ارائه شده، به اشتراک بگذارید: +tradeFeedbackWindow.msg.part3=بابت استفاده از Haveno، از شما متشکریم! portfolio.pending.role=نقش من portfolio.pending.tradeInformation=اطلاعات معامله @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=پس از تأییدیه بلاکچین اول portfolio.pending.tradePeriodWarning=اگر مهلت به پایان برسد، هر دو معامله گر می توانند یک مناقشه را باز کنند. portfolio.pending.tradeNotCompleted=معامله به موقع (تا {0}) تکمیل نشد portfolio.pending.tradeProcess=فرآیند معامله -portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Bisq forum at [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Haveno forum at [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=باز کردن مجدد مناقشه portfolio.pending.openSupportTicket.headline=باز کردن تیکت پشتیبانی portfolio.pending.openSupportTicket.msg=Please use this function only in emergency cases if you don't see a \"Open support\" or \"Open dispute\" button.\n\nWhen you open a support ticket the trade will be interrupted and handled by a mediator or arbitrator. portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute. -portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the trade to failed trades. portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the trade to failed trades. -portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.support.headline.getHelp=Need help? -portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Bisq community at https://bisq.community. If your issue still isn't resolved, you can request more help from a mediator. +portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Haveno community at https://haveno.community. If your issue still isn't resolved, you can request more help from a mediator. portfolio.pending.support.button.getHelp=Open Trader Chat portfolio.pending.support.headline.halfPeriodOver=Check payment portfolio.pending.support.headline.periodOver=Trade period is over @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee trans portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\nWithout this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. You can make a request to be reimbursed the trade fee here: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nFeel free to move this trade to failed trades. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, but funds have been locked in the deposit transaction.\n\nPlease do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. The mediator should suggest that both peers each get back the the full amount of their security deposits (with seller receiving full trade amount back as well). This way, there is no security risk, and only trade fees are lost. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing but funds have been locked in the deposit transaction.\n\nIf the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\nIf the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of their security deposits (with seller receiving full trade amount back as well). Otherwise the trade amount should go to the buyer. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Bisq mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Haveno mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\nThe trade cannot be completed and you might have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\nDo you want to move the trade to failed trades?\n\nYou cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open trades screen any time. @@ -828,7 +828,7 @@ funds.tab.transactions=تراکنش‌ها funds.deposit.unused=استفاده نشده funds.deposit.usedInTx=مورد استفاده در تراکنش (های) {0} -funds.deposit.fundHavenoWallet=تأمین مالی کیف پول Bisq  +funds.deposit.fundHavenoWallet=تأمین مالی کیف پول Haveno  funds.deposit.noAddresses=آدرس‌هایی برای سپرده ایجاد نشده است funds.deposit.fundWallet=تأمین مالی کیف پول شما funds.deposit.withdrawFromWallet=ارسال وجه از کیف‌پول @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=برداشت شده از کیف پول funds.tx.memo=Memo funds.tx.noTxAvailable=هیچ تراکنشی موجود نیست funds.tx.revert=عودت -funds.tx.txSent=تراکنش به طور موفقیت آمیز به یک آدرس جدید در کیف پول محلی Bisq ارسال شد. +funds.tx.txSent=تراکنش به طور موفقیت آمیز به یک آدرس جدید در کیف پول محلی Haveno ارسال شد. funds.tx.direction.self=ارسال شده به خودتان funds.tx.dustAttackTx=Received dust -funds.tx.dustAttackTx.popup=This transaction is sending a very small BTC amount to your wallet and might be an attempt from chain analysis companies to spy on your wallet.\n\nIf you use that transaction output in a spending transaction they will learn that you are likely the owner of the other address as well (coin merge).\n\nTo protect your privacy the Bisq wallet ignores such dust outputs for spending purposes and in the balance display. You can set the threshold amount when an output is considered dust in the settings. +funds.tx.dustAttackTx.popup=This transaction is sending a very small BTC amount to your wallet and might be an attempt from chain analysis companies to spy on your wallet.\n\nIf you use that transaction output in a spending transaction they will learn that you are likely the owner of the other address as well (coin merge).\n\nTo protect your privacy the Haveno wallet ignores such dust outputs for spending purposes and in the balance display. You can set the threshold amount when an output is considered dust in the settings. #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=در حال ارسال پیام ... support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox. support.sendMessageError=ارسال پیام ناموفق بود. خطا: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=پیشنهاد در آن مناقشه با یک نسخه‌ی قدیمی از Bisq ایجاد شده است.\nشما نمی توانید آن مناقشه را با نسخه‌ی برنامه‌ی خودتان ببندید.\n\nلطفاً از یک نسخه‌ی قدیمی‌تر با پروتکل نسخه‌ی {0} استفاده کنید +support.wrongVersion=پیشنهاد در آن مناقشه با یک نسخه‌ی قدیمی از Haveno ایجاد شده است.\nشما نمی توانید آن مناقشه را با نسخه‌ی برنامه‌ی خودتان ببندید.\n\nلطفاً از یک نسخه‌ی قدیمی‌تر با پروتکل نسخه‌ی {0} استفاده کنید support.openFile=انتخاب فایل به منظور پیوست (حداکثر اندازه فایل: {0} کیلوبایت) support.attachmentTooLarge=مجموع اندازه ضمائم شما {0} کیلوبایت است و از حداکثر اندازه ی مجاز پیام {1} کیلوبایت، بیشتر شده است. support.maxSize=حداکثر اندازه‌ی مجاز فایل {0} کیلوبایت است. @@ -953,15 +953,15 @@ support.sellerMaker=فروشنده/سفارش گذار بیتکوین support.buyerTaker=خریدار/پذیرنده‌ی بیتکوین support.sellerTaker=فروشنده/پذیرنده‌ی بیتکوین -support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.backgroundInfo=Haveno is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Haveno DAO. +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Haveno are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=پیغام سیستم: {0} -support.youOpenedTicket=شما یک درخواست برای پشتیبانی باز کردید.\n\n{0}\n\nنسخه Bisq شما: {1} -support.youOpenedDispute=شما یک درخواست برای یک اختلاف باز کردید.\n\n{0}\n\nنسخه Bisq شما: {1} -support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nBisq version: {1} -support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nBisq version: {1} +support.youOpenedTicket=شما یک درخواست برای پشتیبانی باز کردید.\n\n{0}\n\nنسخه Haveno شما: {1} +support.youOpenedDispute=شما یک درخواست برای یک اختلاف باز کردید.\n\n{0}\n\nنسخه Haveno شما: {1} +support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nHaveno version: {1} support.mediatorsDisputeSummary=System message: Mediator''s dispute summary:\n{0} support.mediatorsAddress=Mediator''s node address: {0} support.warning.disputesWithInvalidDonationAddress=The delayed payout transaction has used an invalid receiver address. It does not match any of the DAO parameter values for the valid donation addresses.\n\nThis might be a scam attempt. Please inform the developers about that incident and do not close that case before the situation is resolved!\n\nAddress used in the dispute: {0}\n\nAll DAO param donation addresses: {1}\n\nTrade ID: {2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaction URL settings.preferences.editCustomExplorer.addressUrl=Address URL settings.net.btcHeader=شبکه بیتکوین -settings.net.p2pHeader=Bisq network +settings.net.p2pHeader=Haveno network settings.net.onionAddressLabel=آدرس onion من settings.net.btcNodesLabel=استفاده از گره‌های Bitcoin Core اختصاصی settings.net.bitcoinPeersLabel=همتایان متصل @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=گره‌های Bitcoin Core در دسترس settings.net.useProvidedNodesRadio=استفاده از نودهای بیتکوین ارائه شده settings.net.usePublicNodesRadio=استفاده از شبکه بیتکوین عمومی settings.net.useCustomNodesRadio=استفاده از نودهای بیتکوین اختصاصی -settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? +settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Haveno). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? settings.net.warn.usePublicNodes.useProvided=خیر، از نودهای فراهم شده استفاده کنید. settings.net.warn.usePublicNodes.usePublic=بلی، از شبکه عمومی استفاده کنید. settings.net.warn.useCustomNodes.B2XWarning=لطفا مطمئن شوید که گره بیت‌کوین شما یک گره مورد اعتماد Bitcoin Core است!\n\nمتصل شدن به گره‌هایی که از قوانین مورد اجماع موجود در Bitcoin Core پیروی نمی‌کنند می‌تواند باعث خراب شدن کیف پول شما شود و در فرآیند معامله مشکلاتی را به وجود بیاورد.\n\nکاربرانی که از گره‌های ناقض قوانین مورد اجماع استفاده می‌کند مسئول هر گونه آسیب ایجاد شده هستند. اگر هر گونه اختلافی به وجود بیاید به نفع دیگر گره‌هایی که از قوانین مورد اجماع پیروی می‌کنند درمورد آن تصمیم گیری خواهد شد. به کاربرانی که این هشدار و سازوکار محافظتی را نادیده می‌گیرند هیچ‌گونه پشتیبانی فنی ارائه نخواهد شد! settings.net.warn.invalidBtcConfig=Connection to the Bitcoin network failed because your configuration is invalid.\n\nYour configuration has been reset to use the provided Bitcoin nodes instead. You will need to restart the application. -settings.net.localhostBtcNodeInfo=Background information: Bisq looks for a local Bitcoin node when starting. If it is found, Bisq will communicate with the Bitcoin network exclusively through it. +settings.net.localhostBtcNodeInfo=Background information: Haveno looks for a local Bitcoin node when starting. If it is found, Haveno will communicate with the Bitcoin network exclusively through it. settings.net.p2PPeersLabel=همتایان متصل settings.net.onionAddressColumn=آدرس Onion settings.net.creationDateColumn=تثبیت شده @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=فایل زنجیره SPV حذف شده است. لطفاً صبور باشید، همگام سازی مجدد با شبکه کمی طول خواهد کشید. settings.net.reSyncSPVAfterRestartCompleted=همگام سازی مجدد هم اکنون تکمیل شده است. لطفاً برنامه را مجدداً راه اندازی نمایید. settings.net.reSyncSPVFailed=حذف فایل زنجیره SPV امکان پذیر نیست. \nخطا: {0} -setting.about.aboutBisq=درباره Bisq -setting.about.about=Bisq یک پروژه منبع باز و یک شبکه غیر متمرکز از کاربرانی است که می‌خواهند بیت‌کوین را با ارزهای ملی (یا رمزارزهای جایگزین) به روشی امن تبادل کنند. در وب سایت ما با Bisq بیشتر آشنا شوید. -setting.about.web=صفحه وب Bisq +setting.about.aboutHaveno=درباره Haveno +setting.about.about=Haveno یک پروژه منبع باز و یک شبکه غیر متمرکز از کاربرانی است که می‌خواهند بیت‌کوین را با ارزهای ملی (یا رمزارزهای جایگزین) به روشی امن تبادل کنند. در وب سایت ما با Haveno بیشتر آشنا شوید. +setting.about.web=صفحه وب Haveno setting.about.code=کد منبع setting.about.agpl=مجوز AGPL -setting.about.support=پشتیبانی از Bisq -setting.about.def=Bisq یک شرکت نیست — یک پروژه اجتماعی است و برای مشارکت آزاد است. اگر می‌خواهید در آن مشارکت کنید یا از آن حمایت نمایید، لینک‌‌های زیر را دنبال کنید. +setting.about.support=پشتیبانی از Haveno +setting.about.def=Haveno یک شرکت نیست — یک پروژه اجتماعی است و برای مشارکت آزاد است. اگر می‌خواهید در آن مشارکت کنید یا از آن حمایت نمایید، لینک‌‌های زیر را دنبال کنید. setting.about.contribute=مشارکت setting.about.providers=ارائه دهندگان داده -setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation. -setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices. +setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation. +setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices. setting.about.pricesProvided=قیمت‌های بازار ارائه شده توسط setting.about.feeEstimation.label=برآورد کارمزد استخراج ارائه شده توسط setting.about.versionDetails=جزئیات نسخه @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' or ''alt + {0}'' or ''cmd setting.about.shortcuts.menuNav=Navigate main menu setting.about.shortcuts.menuNav.value=To navigate the main menu press: 'Ctrl' or 'alt' or 'cmd' with a numeric key between '1-9' -setting.about.shortcuts.close=Close Bisq +setting.about.shortcuts.close=Close Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' or ''cmd + {0}'' or ''Ctrl + {1}'' or ''cmd + {1}'' setting.about.shortcuts.closePopup=Close popup or dialog window @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Send private notification to pee setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0} setting.info.headline=New XMR auto-confirm Feature -setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Bisq uses explorer nodes run by Bisq contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t account.tab.mediatorRegistration=Mediator registration account.tab.refundAgentRegistration=Refund agent registration account.tab.signing=Signing -account.info.headline=به حساب Bisq خود خوش آمدید -account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). +account.info.headline=به حساب Haveno خود خوش آمدید +account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Haveno.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Haveno is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). account.menu.paymentAccount=حساب های ارز ملی account.menu.altCoinsAccountView=حساب های آلت کوین @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} registration account.arbitratorRegistration.revoke=ابطال account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as {0}. The max. allowed trade period is 8 days and the dispute process might take up to 7 days. account.arbitratorRegistration.warn.min1Language=شما باید حداقل 1 زبان را انتخاب کنید.\nما زبان پیشفرض را برای شما اضافه کردیم. -account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Bisq network. +account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Haveno network. account.arbitratorRegistration.removedFailed=Could not remove registration.{0} -account.arbitratorRegistration.registerSuccess=You have successfully registered to the Bisq network. +account.arbitratorRegistration.registerSuccess=You have successfully registered to the Haveno network. account.arbitratorRegistration.registerFailed=Could not complete registration.{0} account.altcoin.yourAltcoinAccounts=حساب‌های آلت‌کوین شما account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (b) which don''t use compatible wallet software is risky: it can lead to loss of the traded funds!\nThe mediator or arbitrator is not a {2} specialist and cannot help in such cases. account.altcoin.popup.wallet.confirm=من می فهمم و تأیید می کنم که می دانم از کدام کیف پول باید استفاده کنم. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. +account.altcoin.popup.upx.msg=Trading UPX on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Trading ARQ on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. +account.altcoin.popup.arq.msg=Trading ARQ on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Trading XMR on Haveno requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Haveno now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Trading MSR on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Trading BLUR on Haveno requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Trading Solo on Bisq requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Trading Solo on Haveno requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Trading CASH2 on Bisq requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Trading CASH2 on Haveno requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. +account.altcoin.popup.drgl.msg=Trading Dragonglass on Haveno requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=When using Zcash you can only use the transparent addresses (starting with t), not the z-addresses (private), because the mediator or arbitrator would not be able to verify the transaction with z-addresses. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=When using Zcoin you can only use the transparent (traceable) addresses, not the untraceable addresses, because the mediator or arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN requires an interactive process between the sender and receiver to create the transaction. Be sure to follow the instructions from the GRIN project web page to reliably send and receive GRIN (the receiver needs to be online or at least be online during a certain time frame). \n\nBisq supports only the Grinbox (Wallet713) wallet URL format. \n\nThe GRIN sender is required to provide proof that they have sent GRIN successfully. If the wallet cannot provide that proof, a potential dispute will be resolved in favor of the GRIN receiver. Please be sure that you use the latest Grinbox software which supports the transaction proof and that you understand the process of transferring and receiving GRIN as well as how to create the proof. \n\nSee https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only for more information about the Grinbox proof tool. +account.altcoin.popup.grin.msg=GRIN requires an interactive process between the sender and receiver to create the transaction. Be sure to follow the instructions from the GRIN project web page to reliably send and receive GRIN (the receiver needs to be online or at least be online during a certain time frame). \n\nHaveno supports only the Grinbox (Wallet713) wallet URL format. \n\nThe GRIN sender is required to provide proof that they have sent GRIN successfully. If the wallet cannot provide that proof, a potential dispute will be resolved in favor of the GRIN receiver. Please be sure that you use the latest Grinbox software which supports the transaction proof and that you understand the process of transferring and receiving GRIN as well as how to create the proof. \n\nSee https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only for more information about the Grinbox proof tool. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM requires an interactive process between the sender and receiver to create the transaction. \n\nBe sure to follow the instructions from the BEAM project web page to reliably send and receive BEAM (the receiver needs to be online or at least be online during a certain time frame). \n\nThe BEAM sender is required to provide proof that they sent BEAM successfully. Be sure to use wallet software which can produce such a proof. If the wallet cannot provide the proof a potential dispute will be resolved in favor of the BEAM receiver. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Trading ParsiCoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Trading ParsiCoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Bisq, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. +account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Haveno, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Bisq requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Bisq, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Bisq mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Bisq. +account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Haveno requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Haveno, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Haveno mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Haveno. account.fiat.yourFiatAccounts=حساب‌های ارزهای ملی شما @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=شما یک رمز عبور کیف پول تنظیم account.seed.warn.noPw.yes=بلی، و دوباره از من نپرس account.seed.enterPw=وارد کردن رمز عبور به منظور مشاهده ی کلمات رمز خصوصی account.seed.restore.info=لطفا قبل از درخواست بازیابی، از کلماتSeed ، یک نسخه پشتیبان تهیه کنید. توجه داشته باشید که بازیابی کیف پول تنها در موارد اضطراری صورت می گیرد و ممکن است منجر به بروز مسائلی در رابطه با پایگاه داده کیف پول داخلی شود.\n این روش، راه مناسبی برای درخواست یک پشتیبان نیست! لطفا از یک پشتیبان دایرکتوری داده برنامه برای بازیابی وضعیت قبلی استفاده کنید.\n\nپس از بازیابی، برنامه به صورت خودکار متوقف می شود. بعد از اینکه مجددا برنامه را اجرا کنید، این برنامه دوباره با شبکه بیت کوین همگام سازی خواهد شد. این کار زمانبر خواهد بود و همچنین تا حد زیادی پردازنده را به کار خواهد گرفت، مخصوصا اگر کیف پول، قدیمی بوده و شامل تراکنش های زیادی باشد. لطفا از ایجاد وقفه برای فرآیند اجتناب کنید. در غیر اینصورت ممکن است که مجددا نیاز به حذف فایل زنجیره SPV و یا تکرار فرآیند بازیابی شوید. -account.seed.restore.ok=بسیار خب، Bisq را بازیابی و خاموش نمایید. +account.seed.restore.ok=بسیار خب، Haveno را بازیابی و خاموش نمایید. #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=با خبر کردن در صورتی account.notifications.priceAlert.setButton=تنظیم هشدار قیمت account.notifications.priceAlert.removeButton=حذف هشدار قیمت account.notifications.trade.message.title=تغییر وضعیت معامله -account.notifications.trade.message.msg.conf=تراکنش سپرده برای معامله با شناسه {0} تایید شده است. لطفا برنامه Bisq خود را بازکنید و پرداخت را شروع کنید. +account.notifications.trade.message.msg.conf=تراکنش سپرده برای معامله با شناسه {0} تایید شده است. لطفا برنامه Haveno خود را بازکنید و پرداخت را شروع کنید. account.notifications.trade.message.msg.started=خریدار BTC پرداخت با شناسه {0} را آغاز کرده است. account.notifications.trade.message.msg.completed=معامله با شناسه {0} انجام شد. account.notifications.offer.message.title=پیشنهاد شما پذیرفته شد @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=نوع پیشن account.notifications.marketAlert.message.title=هشدار پیشنهاد account.notifications.marketAlert.message.msg.below=پایین account.notifications.marketAlert.message.msg.above=بالای -account.notifications.marketAlert.message.msg=پیشنهاد جدید ''{0} {1}'' با قیمت {2} ({3} {4} قیمت بازار) و روش پرداخت ''{5}'' در دفتر پیشنهادات Bisq منتشر شده است.\nشناسه پیشنهاد: {6}. +account.notifications.marketAlert.message.msg=پیشنهاد جدید ''{0} {1}'' با قیمت {2} ({3} {4} قیمت بازار) و روش پرداخت ''{5}'' در دفتر پیشنهادات Haveno منتشر شده است.\nشناسه پیشنهاد: {6}. account.notifications.priceAlert.message.title=هشدار قیمت برای {0} account.notifications.priceAlert.message.msg=هشدار قیمت شما فعال شده است. قیمت {0} فعلی {1} {2} است -account.notifications.noWebCamFound.warning=دوبین پیدا نشد.\n\nلطفا از گزینه ایمیل برای ارسال توکن و کلید رمزنگاری از تلفن همراهتان به برنامه Bisq استفاده کنید. +account.notifications.noWebCamFound.warning=دوبین پیدا نشد.\n\nلطفا از گزینه ایمیل برای ارسال توکن و کلید رمزنگاری از تلفن همراهتان به برنامه Haveno استفاده کنید. account.notifications.priceAlert.warning.highPriceTooLow=قیمت بالاتر باید از قیمت پایین‌تر بزرگتر باشد. account.notifications.priceAlert.warning.lowerPriceTooHigh=قیمت پایین‌تر باید از قیمت بالاتر کوچکتر باشد. @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=در حال اعتبارسنجی ا displayUpdateDownloadWindow.button.label=دانلود نصب کننده و تأیید امضا displayUpdateDownloadWindow.button.downloadLater=بعداً دانلود کن displayUpdateDownloadWindow.button.ignoreDownload=نادیده گرفتن این نسخه -displayUpdateDownloadWindow.headline=یک به روز رسانی جدید برای Bisq موجود است! +displayUpdateDownloadWindow.headline=یک به روز رسانی جدید برای Haveno موجود است! displayUpdateDownloadWindow.download.failed.headline=دانلود ناموفق بود displayUpdateDownloadWindow.download.failed=Download failed.\nPlease download and verify manually at [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unable to determine the correct installer. Please download and verify manually at [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Close without any payout disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout? emptyWalletWindow.headline=ابزار اضطراری کیف پول {0} -emptyWalletWindow.info=لطفاً تنها در مورد اضطراری از آن استفاده کنید اگر نمی توانید به وجه خود از UI دسترسی داشته باشید.\n\nلطفاً توجه داشته باشید که تمام معاملات باز به طور خودکار در هنگام استفاده از این ابزار، بسته خواهد شد.\n\nقبل از به کار گیری این ابزار، از راهنمای داده ی خود پشتیبان بگیرید. می توانید این کار را در \"حساب/پشتیبان\" انجام دهید.\n\nلطفاً مشکل خود را به ما گزارش کنید و گزارش مشکل را در GitHub یا تالار گفتگوی Bisq بایگانی کنید تا ما بتوانیم منشأ مشکل را بررسی نماییم. +emptyWalletWindow.info=لطفاً تنها در مورد اضطراری از آن استفاده کنید اگر نمی توانید به وجه خود از UI دسترسی داشته باشید.\n\nلطفاً توجه داشته باشید که تمام معاملات باز به طور خودکار در هنگام استفاده از این ابزار، بسته خواهد شد.\n\nقبل از به کار گیری این ابزار، از راهنمای داده ی خود پشتیبان بگیرید. می توانید این کار را در \"حساب/پشتیبان\" انجام دهید.\n\nلطفاً مشکل خود را به ما گزارش کنید و گزارش مشکل را در GitHub یا تالار گفتگوی Haveno بایگانی کنید تا ما بتوانیم منشأ مشکل را بررسی نماییم. emptyWalletWindow.balance=موجودی در دسترس کیف‌پول شما emptyWalletWindow.address=آدرس مقصد شما emptyWalletWindow.button=ارسال تمام وجوه @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=تاریخ ایجاد offerDetailsWindow.makersOnion=آدرس Onion سفارش گذار qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Please use this QR code for funding your Bisq wallet from your external wallet. +qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet. qRCodeWindow.request=درخواست پرداخت:\n{0} selectDepositTxWindow.headline=تراکنش سپرده را برای مناقشه انتخاب کنید @@ -1562,7 +1562,7 @@ popup.headline.error=خطا popup.doNotShowAgain=دوباره نشان نده popup.reportError.log=باز کردن فایل گزارش popup.reportError.gitHub=گزارش به پیگیر مسائل GitHub  -popup.reportError={0}\n\nTo help us to improve the software please report this bug by opening a new issue at https://github.com/bisq-network/bisq/issues.\nThe above error message will be copied to the clipboard when you click either of the buttons below.\nIt will make debugging easier if you include the bisq.log file by pressing "Open log file", saving a copy, and attaching it to your bug report. +popup.reportError={0}\n\nTo help us to improve the software please report this bug by opening a new issue at https://github.com/bisq-network/bisq/issues.\nThe above error message will be copied to the clipboard when you click either of the buttons below.\nIt will make debugging easier if you include the haveno.log file by pressing "Open log file", saving a copy, and attaching it to your bug report. popup.error.tryRestart=لطفاً سعی کنید برنامه را مجدداً راه اندازی کنید و اتصال شبکه خود را بررسی کنید تا ببینید آیا می توانید مشکل را حل کنید یا خیر. popup.error.takeOfferRequestFailed=وقتی کسی تلاش کرد تا یکی از پیشنهادات شما را بپذیرد خطایی رخ داد:\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=کیف پول هنوز راه اندازی اولیه نشده است -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. -popup.warning.wrongVersion=شما احتمالاً نسخه اشتباه Bisq را برای این رایانه دارید.\nمعماری کامپیوتر شما این است: {0}.\nباینری Bisq که شما نصب کرده اید،عبارت است از: {1}.\nلطفاً نسخه فعلی را خاموش کرده و مجدداً نصب نمایید ({2}). -popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. -popup.warning.startupFailed.twoInstances=Bisq در حال اجرا است. شما نمیتوانید دو نمونه از Bisq را اجرا کنید. +popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\nHaveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. +popup.warning.wrongVersion=شما احتمالاً نسخه اشتباه Haveno را برای این رایانه دارید.\nمعماری کامپیوتر شما این است: {0}.\nباینری Haveno که شما نصب کرده اید،عبارت است از: {1}.\nلطفاً نسخه فعلی را خاموش کرده و مجدداً نصب نمایید ({2}). +popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Haveno installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. +popup.warning.startupFailed.twoInstances=Haveno در حال اجرا است. شما نمیتوانید دو نمونه از Haveno را اجرا کنید. popup.warning.tradePeriod.halfReached=معامله شما با شناسه {0} نیمی از حداکثر مجاز دوره زمانی معامله را به پایان رسانده و هنوز کامل نشده است. \n\nدوره معامله در {1} به پایان می رسد\n\n لطفا وضعیت معامله خود را در \"سبد سهام/معاملات باز\" برای اطلاعات بیشتر، بررسی کنید. popup.warning.tradePeriod.ended=Your trade with ID {0} has reached the max. allowed trading period and is not completed.\n\nThe trade period ended on {1}\n\nPlease check your trade at \"Portfolio/Open trades\" for contacting the arbitrator. popup.warning.noTradingAccountSetup.headline=شما یک حساب معاملاتی را راه اندازی نکرده اید @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=There are no mediators available. popup.warning.notFullyConnected=شما باید منتظر بمانید تا به طور کامل به شبکه متصل شوید. \nاین ممکن است در هنگام راه اندازی حدود 2 دقیقه طول بکشد. popup.warning.notSufficientConnectionsToBtcNetwork=شما باید منتظر بمانید تا حداقل {0} اتصال به شبکه بیتکوین داشته باشید. popup.warning.downloadNotComplete=شما باید منتظر بمانید تا بارگیری بلاک های بیتکوین باقیمانده کامل شود. -popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=The Haveno wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=آیا شما مطمئن هستید که می خواهید این پیشنهاد را حذف کنید؟\nاگر آن پیشنهاد را حذف کنید، هزینه سفارش گذار {0} از دست خواهد رفت . popup.warning.tooLargePercentageValue=شما نمیتوانید درصد 100٪ یا بیشتر را تنظیم کنید. popup.warning.examplePercentageValue=لطفا یک عدد درصد مانند \"5.4\" برای 5.4% وارد کنید @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. # suppress inspection "UnusedProperty" popup.warning.priceRelay=رله قیمت popup.warning.seed=دانه -popup.warning.mandatoryUpdate.trading=Please update to the latest Bisq version. A mandatory update was released which disables trading for old versions. Please check out the Bisq Forum for more information. -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=Please update to the latest Haveno version. A mandatory update was released which disables trading for old versions. Please check out the Haveno Forum for more information. +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=This transaction is not possible, as the mining fees of {0} would exceed the amount to transfer of {1}. Please wait until the mining fees are low again or until you''ve accumulated more BTC to transfer. -popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. popup.warning.trade.txRejected.tradeFee=trade fee popup.warning.trade.txRejected.deposit=deposit -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.info.securityDepositInfo=برای اطمینان از اینکه هر دو معامله گر پروتکل معامله را رعایت می‌کنند، هر دو معامله گر باید مبلغی را تحت عنوان سپرده اطمینان پرداخت کنند.\n\nاین سپرده در کیف‌پول معامله شما نگهداری می‌شود و زمانی که معامله شما با موفقیت انجام شد به خود شما بازگردانده خواهد شد.\n\nلطفا توجه کنید: اگر می‌خواهید یک پیشنهاد جدید ایجاد کنید، Bisq باید برای در سمت معامله دیگر اجرا باشد تا بتوانند آن را بپذیرد. برای اینکه پیشنهادات شما برخط بمانند، بگذارید Bisq در حال اجرابماند و همچنین مطمئن شوید که این کامپیوتر به اینترنت متصل است. (به عنوان مثال مطمئن شوید که به حالت آماده باش نمی‌رود.. البته حالت آماده باش برای نمایشگر ایرادی ندارد). +popup.info.securityDepositInfo=برای اطمینان از اینکه هر دو معامله گر پروتکل معامله را رعایت می‌کنند، هر دو معامله گر باید مبلغی را تحت عنوان سپرده اطمینان پرداخت کنند.\n\nاین سپرده در کیف‌پول معامله شما نگهداری می‌شود و زمانی که معامله شما با موفقیت انجام شد به خود شما بازگردانده خواهد شد.\n\nلطفا توجه کنید: اگر می‌خواهید یک پیشنهاد جدید ایجاد کنید، Haveno باید برای در سمت معامله دیگر اجرا باشد تا بتوانند آن را بپذیرد. برای اینکه پیشنهادات شما برخط بمانند، بگذارید Haveno در حال اجرابماند و همچنین مطمئن شوید که این کامپیوتر به اینترنت متصل است. (به عنوان مثال مطمئن شوید که به حالت آماده باش نمی‌رود.. البته حالت آماده باش برای نمایشگر ایرادی ندارد). popup.info.cashDepositInfo=لطفا مطمئن شوید که شما یک شعبه بانک در منطقه خود دارید تا بتوانید سپرده نقدی را بپردازید. شناسه بانکی (BIC/SWIFT) بانک فروشنده: {0}. popup.info.cashDepositInfo.confirm=تأیید می کنم که می توانم سپرده را ایجاد کنم -popup.info.shutDownWithOpenOffers=Bisq در حال خاموش شدن است ولی پیشنهاداتی وجود دارند که باز هستند.\n\nزمانی که Bisq بسته باشد این پیشنهادات در شبکه P2P در دسترس نخواهند بود، ولی هر وقت دوباره Bisq را باز کنید این پیشنهادات دوباره در شبکه P2P منتشر خواهند شد.\n\n برای اینکه پیشنهادات شما برخط بمانند، بگذارید Bisq در حال اجرابماند و همچنین مطمئن شوید که این کامپیوتر به اینترنت متصل است. (به عنوان مثال مطمئن شوید که به حالت آماده باش نمی‌رود.. البته حالت آماده باش برای نمایشگر ایرادی ندارد). -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\nPlease make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.info.shutDownWithOpenOffers=Haveno در حال خاموش شدن است ولی پیشنهاداتی وجود دارند که باز هستند.\n\nزمانی که Haveno بسته باشد این پیشنهادات در شبکه P2P در دسترس نخواهند بود، ولی هر وقت دوباره Haveno را باز کنید این پیشنهادات دوباره در شبکه P2P منتشر خواهند شد.\n\n برای اینکه پیشنهادات شما برخط بمانند، بگذارید Haveno در حال اجرابماند و همچنین مطمئن شوید که این کامپیوتر به اینترنت متصل است. (به عنوان مثال مطمئن شوید که به حالت آماده باش نمی‌رود.. البته حالت آماده باش برای نمایشگر ایرادی ندارد). +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\nPlease make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.privateNotification.headline=اعلان خصوصی مهم! popup.securityRecommendation.headline=توصیه امنیتی مهم popup.securityRecommendation.msg=ما می خواهیم به شما یادآوری کنیم که استفاده از رمز محافظت برای کیف پول خود را در نظر بگیرید اگر از قبل آن را فعال نکرده اید.\n\nهمچنین شدیداً توصیه می شود که کلمات رمز خصوصی کیف پول را بنویسید. این کلمات رمز خصوصی مانند یک رمزعبور اصلی برای بازیابی کیف پول بیتکوین شما هستند. \nدر قسمت \"کلمات رمز خصوصی کیف پول\" اطلاعات بیشتری کسب می کنید.\n\n علاوه بر این شما باید از پوشه داده های کامل نرم افزار در بخش \"پشتیبان گیری\" پشتیبان تهیه کنید. -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=خاموش شدن در حال انجام است popup.shutDownInProgress.msg=خاتمه دادن به برنامه می تواند چند ثانیه طول بکشد.\n لطفا این روند را قطع نکنید. @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=به روز رسانی کیف پول معام notification.walletUpdate.msg=کیف پول معاملاتی شما به میزان کافی تأمین وجه شده است.\nمبلغ: {0} notification.takeOffer.walletUpdate.msg=کیف پول معاملاتی شما قبلاً از یک تلاش اخذ پیشنهاد، تأمین وجه شده است.\nمبلغ: {0} notification.tradeCompleted.headline=معامله تکمیل شد -notification.tradeCompleted.msg=شما اکنون می توانید وجوه خود را به کیف پول بیتکوین خارجی خود برداشت کنید یا آن را به کیف پول Bisq منتقل نمایید. +notification.tradeCompleted.msg=شما اکنون می توانید وجوه خود را به کیف پول بیتکوین خارجی خود برداشت کنید یا آن را به کیف پول Haveno منتقل نمایید. #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=شما اکنون می توانید وجوه خ systemTray.show=نمایش پنجره ی برنامه systemTray.hide=مخفی کردن پنجره ی برنامه -systemTray.info=اطلاعات درباره ی Bisq  +systemTray.info=اطلاعات درباره ی Haveno  systemTray.exit=خروج -systemTray.tooltip=Bisq: A decentralized bitcoin exchange network +systemTray.tooltip=Haveno: A decentralized bitcoin exchange network #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=کلید را از رمز عبور استنتاج کنید password.walletDecrypted=کیف پول با موفقیت رمزگشایی شد و حفاظت با رمز عبور حذف شد. password.wrongPw=شما رمز عبور را اشتباه وارد کرده اید.\n\n لطفا سعی کنید رمز عبور خود را وارد کنید و با دقت خطاها و اشتباهات املایی را بررسی کنید. password.walletEncrypted=کیف پول به طور موفقیت آمیز کدگذاری و حفاظت کیف پول فعال شد. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=2 رمز عبوری که وارد نموده اید باهم مطابقت ندارند. password.forgotPassword=رمز عبور را فراموش کرده اید؟ password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\nIt is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\nYou must empty seed.warn.walletNotEmpty.restore=میخواهم به هر حال بازگردانی کنم seed.warn.walletNotEmpty.emptyWallet=من ابتدا کیف پول هایم را خالی می کنم seed.warn.notEncryptedAnymore=کیف های پول شما رمزگذاری شده اند. \n\nپس از بازگرداندن، کیف های پول دیگر رمزگذاری نخواهند شد و شما باید رمز عبور جدید را تنظیم کنید.\n\n آیا می خواهید ادامه دهید؟ -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? seed.restore.success=کیف های پول با کلمات کلمات رمز خصوصی جدید بازیابی شده است. \n\nشما باید برنامه را خاموش و مجددا راه اندازی کنید. seed.restore.error=هنگام بازگرداندن کیف پول با کلمات رمز خصوصی، خطایی روی داد. {0} seed.restore.openOffers.warn=You have open offers which will be removed if you restore from seed words.\nAre you sure that you want to continue? @@ -1949,17 +1949,17 @@ payment.accountType=نوع حساب payment.checking=بررسی payment.savings=اندوخته ها payment.personalId=شناسه شخصی -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. -payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Bisq to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Haveno account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Haveno. +payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Haveno to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=زمانی که از HalCash استفاده می‌کنید، خریدار باید کد HalCash را از طریق پیام کوتاه موبایل به فروشنده BTC ارسال کند.\n\nلطفا مطمئن شوید که از حداکثر میزانی که بانک شما برای انتقال از طریق HalCash مجاز می‌داند تجاوز نکرده‌اید. حداقل مقداردر هر برداشت معادل 10 یورو و حداکثر مقدار 600 یورو می‌باشد. این محدودیت برای برداشت‌های تکراری برای هر گیرنده در روز 3000 یورو و در ماه 6000 یورو می‌باشد. لطفا این محدودیت‌ها را با بانک خود مطابقت دهید و مطمئن شوید که آنها هم همین محدودی‌ها را دارند.\n\nمقدار برداشت باید شریبی از 10 یورو باشد چرا که مقادیر غیر از این را نمی‌توانید از طریق ATM برداشت کنید. رابط کاربری در صفحه ساخت پینشهاد و پذیرش پیشنهاد مقدار BTC را به گونه‌ای تنظیم می‌کنند که مقدار EUR درست باشد. شما نمی‌توانید از قیمت بر مبنای بازار استفاده کنید چون مقدار یورو با تغییر قیمت‌ها عوض خواهد شد.\n\nدر صورت بروز اختلاف خریدار BTC باید شواهد مربوط به ارسال یورو را ارائه دهد. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Bisq sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=لطفا مطمئن شوید که بانک شما اجازه پرداخت سپرده نفد به حساب دیگر افراد را می‌دهد. برای مثال، Bank of America و Wells Fargo دیگر اجازه چنین پرداخت‌هایی را نمی‌دهند. @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=اطلاعات تماس payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1996,7 +1996,7 @@ payment.japan.recipient=نام payment.australia.payid=PayID payment.payid=PayID linked to financial institution. Like email address or mobile phone. payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 3a263b10..53121eb2 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -103,14 +103,14 @@ shared.faq=Visitez la page FAQ shared.yesCancel=Oui, annuler shared.nextStep=Étape suivante shared.selectTradingAccount=Sélectionner le compte de trading -shared.fundFromSavingsWalletButton=Transférer des fonds depuis le portefeuille Bisq +shared.fundFromSavingsWalletButton=Transférer des fonds depuis le portefeuille Haveno shared.fundFromExternalWalletButton=Ouvrez votre portefeuille externe pour provisionner shared.openDefaultWalletFailed=L'ouverture de l'application de portefeuille Bitcoin par défaut a échoué. Êtes-vous sûr de l'avoir installée? shared.belowInPercent=% sous le prix du marché shared.aboveInPercent=% au-dessus du prix du marché shared.enterPercentageValue=Entrez la valeur en % shared.OR=OU -shared.notEnoughFunds=Il n'y a pas suffisamment de fonds dans votre portefeuille Bisq pour payer cette transaction. La transaction a besoin de {0} Votre solde disponible est de {1}. \n\nVeuillez ajouter des fonds à partir d'un portefeuille Bitcoin externe ou recharger votre portefeuille Bisq dans «Fonds / Dépôts > Recevoir des Fonds». +shared.notEnoughFunds=Il n'y a pas suffisamment de fonds dans votre portefeuille Haveno pour payer cette transaction. La transaction a besoin de {0} Votre solde disponible est de {1}. \n\nVeuillez ajouter des fonds à partir d'un portefeuille Bitcoin externe ou recharger votre portefeuille Haveno dans «Fonds / Dépôts > Recevoir des Fonds». shared.waitingForFunds=En attente des fonds... shared.TheBTCBuyer=L'acheteur de BTC shared.You=Vous @@ -125,7 +125,7 @@ shared.notUsedYet=Pas encore utilisé shared.date=Date shared.sendFundsDetailsWithFee=Envoi: {0}\nDepuis l'adresse: {1}\nVers l'adresse de réception: {2}\nLes frais de minage requis sont : {3} ({4} satoshis/byte)\nVsize de la transaction: {5} vKb\n\nLe destinataire recevra: {6}\n\nÊtes-vous certain de vouloir retirer ce montant? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq détecte que la transaction produira une sortie inférieure au seuil de fraction minimum (non autorisé par les règles de consensus Bitcoin). Au lieu de cela, ces fractions ({0} satoshi {1}) seront ajoutées aux frais de traitement minier.\n\n\n +shared.sendFundsDetailsDust=Haveno détecte que la transaction produira une sortie inférieure au seuil de fraction minimum (non autorisé par les règles de consensus Bitcoin). Au lieu de cela, ces fractions ({0} satoshi {1}) seront ajoutées aux frais de traitement minier.\n\n\n shared.copyToClipboard=Copier dans le presse-papiers shared.language=Langue shared.country=Pays @@ -235,8 +235,8 @@ mainView.menu.settings=Paramètres mainView.menu.account=Compte mainView.marketPriceWithProvider.label=Prix du marché par {0} -mainView.marketPrice.bisqInternalPrice=Cours de la dernière transaction Bisq -mainView.marketPrice.tooltip.bisqInternalPrice=Il n'y a pas de cours de marché disponible depuis une source externe.\nLe cours affiché est celui de la dernière transaction Bisq pour cette devise. +mainView.marketPrice.havenoInternalPrice=Cours de la dernière transaction Haveno +mainView.marketPrice.tooltip.havenoInternalPrice=Il n'y a pas de cours de marché disponible depuis une source externe.\nLe cours affiché est celui de la dernière transaction Haveno pour cette devise. mainView.marketPrice.tooltip=Le prix de marché est fourni par {0}{1}\nDernière mise à jour: {2}\nURL du noeud: {3} mainView.balance.available=Solde disponible mainView.balance.reserved=Réservé en ordres @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronisation avec {0} au block: {1} mainView.footer.btcInfo.synchronizedWith=Synchronisé avec {0} au block {1} mainView.footer.btcInfo.connectingTo=Se connecte à mainView.footer.btcInfo.connectionFailed=Échec de la connexion à -mainView.footer.p2pInfo=Pairs du réseau bitcoin: {0} / pairs du réseau Bisq: {1} +mainView.footer.p2pInfo=Pairs du réseau bitcoin: {0} / pairs du réseau Haveno: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Connection au réseau Tor... mainView.bootstrapState.torNodeCreated=(2/4) Noeud Tor créé @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Données initiales reçues mainView.bootstrapWarning.noSeedNodesAvailable=Pas de seed nodes disponible mainView.bootstrapWarning.noNodesAvailable=Pas de noeuds de seed ou de pairs disponibles -mainView.bootstrapWarning.bootstrappingToP2PFailed=L'initialisation du réseau Bisq a échoué +mainView.bootstrapWarning.bootstrappingToP2PFailed=L'initialisation du réseau Haveno a échoué mainView.p2pNetworkWarnMsg.noNodesAvailable=Il n'y a pas de noeud de seed ou de persisted pairs disponibles pour demander des données.\nVeuillez vérifier votre connexion Internet ou essayer de redémarrer l'application. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=La connexion au réseau Bisq a échoué (erreur signalé: {0}).\nVeuillez vérifier votre connexion internet ou essayez de redémarrer l'application. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=La connexion au réseau Haveno a échoué (erreur signalé: {0}).\nVeuillez vérifier votre connexion internet ou essayez de redémarrer l'application. mainView.walletServiceErrorMsg.timeout=La connexion au réseau Bitcoin a échoué car le délai d'attente a expiré. mainView.walletServiceErrorMsg.connectionError=La connexion au réseau Bitcoin a échoué à cause d''une erreur: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=La connexion au réseau Bitcoin a mainView.walletServiceErrorMsg.rejectedTxException=Le réseau a rejeté une transaction.\n\n{0} mainView.networkWarning.allConnectionsLost=Vous avez perdu la connexion avec tous les {0} pairs du réseau.\nVous avez peut-être perdu votre connexion Internet ou votre ordinateur était passé en mode veille. -mainView.networkWarning.localhostBitcoinLost=Vous avez perdu la connexion avec le localhost Bitcoin node.\nVeuillez redémarrer l'application Bisq pour vous connecter à d'autres Bitcoin nodes ou redémarrer le localhost Bitcoin node. +mainView.networkWarning.localhostBitcoinLost=Vous avez perdu la connexion avec le localhost Bitcoin node.\nVeuillez redémarrer l'application Haveno pour vous connecter à d'autres Bitcoin nodes ou redémarrer le localhost Bitcoin node. mainView.version.update=(Mise à jour disponible) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=Le montant de transaction offerbook.warning.wrongTradeProtocol=Cet ordre exige une version de protocole différente de celle utilisée actuellement par votre logiciel.\n\nVeuillez vérifier que vous avez bien la dernière version d'installée, il est possible que l'utilisateur qui a créé cet ordre utilise une ancienne version.\n\nIl n'est pas possible de trader avec des versions différentes de protocole. offerbook.warning.userIgnored=Vous avez ajouté l'adresse onion de cet utilisateur à votre liste noire. -offerbook.warning.offerBlocked=L'ordre a été bloqué par des développeurs de Bisq.\nIl s'agit peut être d'un bug qui cause des problèmes lors de l'acceptation de cet ordre. -offerbook.warning.currencyBanned=La devise utilisée pour cet ordre a été bloquée par les développeurs de Bisq.\nVeuillez visiter le Forum Bisq pour obtenir plus d'informations. -offerbook.warning.paymentMethodBanned=Le mode de paiement utilisé pour cet ordre a été bloqué par les développeurs de Bisq.\nVeuillez visiter le Forum Bisq pour obtenir plus d'informations. -offerbook.warning.nodeBlocked=L'adresse onion de ce trader a été bloquée par les développeurs de Bisq.\nIl s'agit peut être d'un bug qui cause des problèmes lors de l'acceptation de cet ordre. -offerbook.warning.requireUpdateToNewVersion=Votre version Bisq n'est plus compatible avec les transactions. Veuillez mettre à jour la dernière version de Bisq via https://bisq.network/downloads +offerbook.warning.offerBlocked=L'ordre a été bloqué par des développeurs de Haveno.\nIl s'agit peut être d'un bug qui cause des problèmes lors de l'acceptation de cet ordre. +offerbook.warning.currencyBanned=La devise utilisée pour cet ordre a été bloquée par les développeurs de Haveno.\nVeuillez visiter le Forum Haveno pour obtenir plus d'informations. +offerbook.warning.paymentMethodBanned=Le mode de paiement utilisé pour cet ordre a été bloqué par les développeurs de Haveno.\nVeuillez visiter le Forum Haveno pour obtenir plus d'informations. +offerbook.warning.nodeBlocked=L'adresse onion de ce trader a été bloquée par les développeurs de Haveno.\nIl s'agit peut être d'un bug qui cause des problèmes lors de l'acceptation de cet ordre. +offerbook.warning.requireUpdateToNewVersion=Votre version Haveno n'est plus compatible avec les transactions. Veuillez mettre à jour la dernière version de Haveno via https://bisq.network/downloads offerbook.warning.offerWasAlreadyUsedInTrade=Vous ne pouvez pas prendre la commande car vous avez déjà terminé l'opération. Il se peut que votre précédente tentative de prise de commandes ait entraîné l'échec de la transaction. offerbook.info.sellAtMarketPrice=Vous vendrez au prix du marché (mis à jour chaque minute). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Financer votre ordre createOffer.fundsBox.offerFee=Frais de transaction createOffer.fundsBox.networkFee=Frais de minage createOffer.fundsBox.placeOfferSpinnerInfo=Publication de l'ordre en cours ... -createOffer.fundsBox.paymentLabel=Transaction Bisq avec l''ID {0} +createOffer.fundsBox.paymentLabel=Transaction Haveno avec l''ID {0} createOffer.fundsBox.fundsStructure=({0} dépôt de garantie, {1} frais de transaction, {2} frais de minage) createOffer.success.headline=Votre ordre a été publiée createOffer.success.info=Vous pouvez gérer vos ordres en cours dans \"Portfolio/Mes ordres\". @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Review: Placer un ordre de {0} monero createOffer.createOfferFundWalletInfo.headline=Financer votre ordre # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=Montant du trade: {0}\n\n -createOffer.createOfferFundWalletInfo.msg=Vous devez déposer {0} pour cet ordre.\n\nCes fonds sont réservés dans votre portefeuille local et seront bloqués sur une adresse de dépôt multisig une fois que quelqu''un aura accepté votre ordre.\n\nLe montant correspond à la somme de:\n{1}- Votre dépôt de garantie: {2}\n- Frais de trading: {3}\n- Frais d''exploitation minière: {4}\n\nVous avez le choix entre deux options pour financer votre transaction :\n- Utilisez votre portefeuille Bisq (pratique, mais les transactions peuvent être associables) OU\n- Transfert depuis un portefeuille externe (potentiellement plus privé)\n\nVous pourrez voir toutes les options de financement et les détails après avoir fermé ce popup. +createOffer.createOfferFundWalletInfo.msg=Vous devez déposer {0} pour cet ordre.\n\nCes fonds sont réservés dans votre portefeuille local et seront bloqués sur une adresse de dépôt multisig une fois que quelqu''un aura accepté votre ordre.\n\nLe montant correspond à la somme de:\n{1}- Votre dépôt de garantie: {2}\n- Frais de trading: {3}\n- Frais d''exploitation minière: {4}\n\nVous avez le choix entre deux options pour financer votre transaction :\n- Utilisez votre portefeuille Haveno (pratique, mais les transactions peuvent être associables) OU\n- Transfert depuis un portefeuille externe (potentiellement plus privé)\n\nVous pourrez voir toutes les options de financement et les détails après avoir fermé ce popup. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Une erreur s''est produite lors du placement de cet ordre:\n\n{0}\n\nAucun fonds n''a été prélevé sur votre portefeuille pour le moment.\nVeuillez redémarrer l''application et vérifier votre connexion réseau. createOffer.setAmountPrice=Définir le montant et le prix -createOffer.warnCancelOffer=Vous avez déjà financé cet ordre.\nSi vous annulez maintenant, vos fonds seront envoyés dans votre portefeuille bisq local et seront disponible pour retrait dans l'onglet \"Fonds/Envoyer des fonds\".\nÊtes-vous certain de vouloir annuler ? +createOffer.warnCancelOffer=Vous avez déjà financé cet ordre.\nSi vous annulez maintenant, vos fonds seront envoyés dans votre portefeuille haveno local et seront disponible pour retrait dans l'onglet \"Fonds/Envoyer des fonds\".\nÊtes-vous certain de vouloir annuler ? createOffer.timeoutAtPublishing=Un timeout est survenu au moment de la publication de l'ordre. createOffer.errorInfo=\n\nLes frais de maker ont déjà été payés. Dans le pire des cas, vous avez perdu ces frais.\nVeuillez essayer de redémarrer votre application et vérifier votre connexion réseau pour voir si vous pouvez résoudre le problème. createOffer.tooLowSecDeposit.warning=Vous avez défini le dépôt de garantie à une valeur inférieure à la valeur par défaut recommandée de {0}.\nÊtes-vous sûr de vouloir utiliser un dépôt de garantie moins élevé ? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Montant à vendre takeOffer.fundsBox.offerFee=Frais de transaction du trade takeOffer.fundsBox.networkFee=Total des frais de minage takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ... -takeOffer.fundsBox.paymentLabel=Transaction Bisq avec l''ID {0} +takeOffer.fundsBox.paymentLabel=Transaction Haveno avec l''ID {0} takeOffer.fundsBox.fundsStructure=({0} dépôt de garantie, {1} frais de transaction, {2} frais de minage) takeOffer.success.headline=Vous avez accepté un ordre avec succès. takeOffer.success.info=Vous pouvez voir vos transactions dans \"Portfolio/Échanges en cours\". @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=Vous ne pouvez pas accepter cet ordre, car celui- takeOffer.takeOfferFundWalletInfo.headline=Provisionner votre trade # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Montant du trade: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=Vous devez envoyer {0} pour cet odre.\n\nLe montant est la somme de:\n{1}--Dépôt de garantie: {2}\n- Frais de transaction: {3}\n- Frais de minage: {4}\n\nVous avez deux choix pour payer votre transaction :\n- Utiliser votre portefeuille local Bisq (pratique, mais vos transactions peuvent être tracées) OU\n- Transférer d''un portefeuille externe (potentiellement plus confidentiel)\n\nVous retrouverez toutes les options de provisionnement après fermeture de ce popup. +takeOffer.takeOfferFundWalletInfo.msg=Vous devez envoyer {0} pour cet odre.\n\nLe montant est la somme de:\n{1}--Dépôt de garantie: {2}\n- Frais de transaction: {3}\n- Frais de minage: {4}\n\nVous avez deux choix pour payer votre transaction :\n- Utiliser votre portefeuille local Haveno (pratique, mais vos transactions peuvent être tracées) OU\n- Transférer d''un portefeuille externe (potentiellement plus confidentiel)\n\nVous retrouverez toutes les options de provisionnement après fermeture de ce popup. takeOffer.alreadyPaidInFunds=Si vous avez déjà provisionner des fonds vous pouvez les retirer dans l'onglet \"Fonds/Envoyer des fonds\". takeOffer.paymentInfo=Informations de paiement takeOffer.setAmountPrice=Définir le montant -takeOffer.alreadyFunded.askCancel=Vous avez déjà provisionner cet ordre.\nSi vous annulez maintenant, vos fonds seront envoyés dans votre portefeuille bisq local et seront disponible pour retrait dans l'onglet \"Fonds/Envoyer des fonds\".\nVoulez vous vraiment annuler? +takeOffer.alreadyFunded.askCancel=Vous avez déjà provisionner cet ordre.\nSi vous annulez maintenant, vos fonds seront envoyés dans votre portefeuille haveno local et seront disponible pour retrait dans l'onglet \"Fonds/Envoyer des fonds\".\nVoulez vous vraiment annuler? takeOffer.failed.offerNotAvailable=La demande de prise d'ordre a échoué car l'ordre n'est plus disponible. Peut-être qu'un autre trader a accepté l'ordre entre-temps. takeOffer.failed.offerTaken=Vous ne pouvez pas saisir cet ordre car elle a déjà été pris par un autre trader. takeOffer.failed.offerRemoved=Vous ne pouvez pas saisir cet ordre car elle a été supprimée entre-temps. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Confirmation: Modification de l'ordre editOffer.publishOffer=Publication de votre ordre. editOffer.failed=Échec de la modification de l''ordre:\n{0} editOffer.success=Votre ordre a été modifié avec succès. -editOffer.invalidDeposit=Le dépôt de garantie de l'acheteur ne respecte pas le cadre des contraintes définies par Bisq DAO et ne peut plus être modifié. +editOffer.invalidDeposit=Le dépôt de garantie de l'acheteur ne respecte pas le cadre des contraintes définies par Haveno DAO et ne peut plus être modifié. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=La transaction de dépôt n'est toujours # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Votre trade a atteint au moins une confirmation de la part de la blockchain.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: Quand vous effectuez le paiement, laissez le champ \"raison du paiement\" vide. NE METTEZ PAS l'ID du trade ou n'importe quel autre texte, par exemple 'bitcoin', 'BTC' ou 'Bisq'. Vous êtez autorisés à discuter via le chat des trader si un autre \"raison du paiement\" est préférable pour vous deux. +portfolio.pending.step2_buyer.refTextWarn=Important: Quand vous effectuez le paiement, laissez le champ \"raison du paiement\" vide. NE METTEZ PAS l'ID du trade ou n'importe quel autre texte, par exemple 'bitcoin', 'BTC' ou 'Haveno'. Vous êtez autorisés à discuter via le chat des trader si un autre \"raison du paiement\" est préférable pour vous deux. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=Si votre banque vous facture des frais pour effectuer le transfert, vous êtes responsable de payer ces frais. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=CONDITIONS REQUISES:\nAprès av # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Merci d''envoyer {0} par \"US Postal Money Order\" au vendeur de BTC.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Veuillez envoyer {0} en utlisant \"Cash by Mail\" au vendeur de BTC. Les instructions spécifiques sont dans le contrat de trade, ou si ce n'est pas clair, vous pouvez poser des questions via le chat des trader. Pour plus de détails sur Cash by Mail, allez sur le wiki Bisq \n[LIEN:https://bisq.wiki/Cash_by_Mail]\n +portfolio.pending.step2_buyer.cashByMail=Veuillez envoyer {0} en utlisant \"Cash by Mail\" au vendeur de BTC. Les instructions spécifiques sont dans le contrat de trade, ou si ce n'est pas clair, vous pouvez poser des questions via le chat des trader. Pour plus de détails sur Cash by Mail, allez sur le wiki Haveno \n[LIEN:https://bisq.wiki/Cash_by_Mail]\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Veuillez payer {0} via la méthode de paiement spécifiée par le vendeur de BTC. Vous trouverez les informations du compte du vendeur à l'écran suivant.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -636,12 +636,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Envoyer le MTCN et l portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Vous devez envoyez le MTCN (numéro de suivi) et une photo du reçu par email au vendeur de BTC.\nLe reçu doit clairement faire figurer le nom complet du vendeur, son pays, l''état et le montant. Le mail du vendeur est: {0}.\n\nAvez-vous envoyé le MTCN et le contrat au vendeur ? portfolio.pending.step2_buyer.halCashInfo.headline=Envoyer le code HalCash portfolio.pending.step2_buyer.halCashInfo.msg=Vous devez envoyez un message au format texte SMS avec le code HalCash ainsi que l''ID de la transaction ({0}) au vendeur de BTC.\nLe numéro de mobile du vendeur est {1}.\n\nAvez-vous envoyé le code au vendeur ? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Certaines banques pourraient vérifier le nom du receveur. Des comptes de paiement plus rapides créés dans des clients Bisq plus anciens ne fournissent pas le nom du receveur, veuillez donc utiliser le chat de trade pour l'obtenir (si nécessaire). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Certaines banques pourraient vérifier le nom du receveur. Des comptes de paiement plus rapides créés dans des clients Haveno plus anciens ne fournissent pas le nom du receveur, veuillez donc utiliser le chat de trade pour l'obtenir (si nécessaire). portfolio.pending.step2_buyer.confirmStart.headline=Confirmez que vous avez initié le paiement portfolio.pending.step2_buyer.confirmStart.msg=Avez-vous initié le {0} paiement auprès de votre partenaire de trading? portfolio.pending.step2_buyer.confirmStart.yes=Oui, j'ai initié le paiement portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=Vous n'avez pas fourni de preuve de paiement -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=Lorsque vous terminez une transaction BTC / XMR, vous pouvez utiliser la fonction de confirmation automatique pour vérifier si le montant correct de XMR a été envoyé à votre portefeuille, afin que Bisq puisse automatiquement marquer la transaction comme terminée et pour que tout le monde puisse aller plus vite. \n\nConfirmez automatiquement que les transactions XMR sont vérifiées sur au moins 2 nœuds d'explorateur de blocs XMR à l'aide de la clé de transaction fournie par l'expéditeur XMR. Par défaut, Bisq utilise un nœud d'explorateur de blocs exécuté par des contributeurs Bisq, mais nous vous recommandons d'exécuter votre propre nœud d'explorateur de blocs XMR pour maximiser la confidentialité et la sécurité. \n\nVous pouvez également définir le nombre maximum de BTC par transaction dans «Paramètres» pour confirmer automatiquement et le nombre de confirmations requises. \n\nPlus de détails sur Bisq Wiki (y compris comment configurer votre propre nœud d'explorateur de blocs): [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=Lorsque vous terminez une transaction BTC / XMR, vous pouvez utiliser la fonction de confirmation automatique pour vérifier si le montant correct de XMR a été envoyé à votre portefeuille, afin que Haveno puisse automatiquement marquer la transaction comme terminée et pour que tout le monde puisse aller plus vite. \n\nConfirmez automatiquement que les transactions XMR sont vérifiées sur au moins 2 nœuds d'explorateur de blocs XMR à l'aide de la clé de transaction fournie par l'expéditeur XMR. Par défaut, Haveno utilise un nœud d'explorateur de blocs exécuté par des contributeurs Haveno, mais nous vous recommandons d'exécuter votre propre nœud d'explorateur de blocs XMR pour maximiser la confidentialité et la sécurité. \n\nVous pouvez également définir le nombre maximum de BTC par transaction dans «Paramètres» pour confirmer automatiquement et le nombre de confirmations requises. \n\nPlus de détails sur Haveno Wiki (y compris comment configurer votre propre nœud d'explorateur de blocs): [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=La sasie n'est pas une valeur hexadécimale de 32 bits portfolio.pending.step2_buyer.confirmStart.warningButton=Ignorer et continuer tout de même portfolio.pending.step2_seller.waitPayment.headline=En attende du paiement @@ -651,7 +651,7 @@ portfolio.pending.step2_seller.warn=L''acheteur de BTC n''a toujours pas effectu portfolio.pending.step2_seller.openForDispute=L'acheteur de BTC n'a pas initié son paiement !\nLa période maximale autorisée pour ce trade est écoulée.\nVous pouvez attendre plus longtemps et accorder plus de temps à votre pair de trading ou contacter le médiateur pour obtenir de l'aide. tradeChat.chatWindowTitle=Fenêtre de discussion pour la transaction avec l''ID ''{0}'' tradeChat.openChat=Ouvrir une fenêtre de discussion -tradeChat.rules=Vous pouvez communiquer avec votre pair de trading pour résoudre les problèmes potentiels liés à cet échange.\nIl n'est pas obligatoire de répondre sur le chat.\nSi un trader enfreint l'une des règles ci-dessous, ouvrez un litige et signalez-le au médiateur ou à l'arbitre.\n\nRègles sur le chat:\n\t● N'envoyez pas de liens (risque de malware). Vous pouvez envoyer l'ID de transaction et le nom d'un explorateur de blocs.\n\t● N'envoyez pas les mots de votre seed, clés privées, mots de passe ou autre information sensible !\n\t● N'encouragez pas le trading en dehors de Bisq (non sécurisé).\n\t● Ne vous engagez dans aucune forme d'escroquerie d'ingénierie sociale.\n\t● Si un pair ne répond pas et préfère ne pas communiquer par chat, respectez sa décision.\n\t● Limitez la portée de la conversation à l'échange en cours. Ce chat n'est pas une alternative à messenger ou une troll-box.\n\t● Entretenez une conversation amicale et respectueuse. +tradeChat.rules=Vous pouvez communiquer avec votre pair de trading pour résoudre les problèmes potentiels liés à cet échange.\nIl n'est pas obligatoire de répondre sur le chat.\nSi un trader enfreint l'une des règles ci-dessous, ouvrez un litige et signalez-le au médiateur ou à l'arbitre.\n\nRègles sur le chat:\n\t● N'envoyez pas de liens (risque de malware). Vous pouvez envoyer l'ID de transaction et le nom d'un explorateur de blocs.\n\t● N'envoyez pas les mots de votre seed, clés privées, mots de passe ou autre information sensible !\n\t● N'encouragez pas le trading en dehors de Haveno (non sécurisé).\n\t● Ne vous engagez dans aucune forme d'escroquerie d'ingénierie sociale.\n\t● Si un pair ne répond pas et préfère ne pas communiquer par chat, respectez sa décision.\n\t● Limitez la portée de la conversation à l'échange en cours. Ce chat n'est pas une alternative à messenger ou une troll-box.\n\t● Entretenez une conversation amicale et respectueuse. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Indéfini @@ -726,7 +726,7 @@ portfolio.pending.step5_buyer.refunded=Dépôt de garantie remboursé portfolio.pending.step5_buyer.withdrawBTC=Retirer vos Bitcoins portfolio.pending.step5_buyer.amount=Montant à retirer portfolio.pending.step5_buyer.withdrawToAddress=Retirer vers l'adresse -portfolio.pending.step5_buyer.moveToBisqWallet=Garder les fonds dans le portefeuille Bisq +portfolio.pending.step5_buyer.moveToHavenoWallet=Garder les fonds dans le portefeuille Haveno portfolio.pending.step5_buyer.withdrawExternal=Retrait vers un portefeuille externe portfolio.pending.step5_buyer.alreadyWithdrawn=Vos fonds ont déjà été retirés. Merci de vérifier votre historique de transactions. portfolio.pending.step5_buyer.confirmWithdrawal=Confirmer la demande de retrait @@ -741,8 +741,8 @@ portfolio.pending.step5_seller.received=Vous avez reçu tradeFeedbackWindow.title=Félicitations pour avoir achevé votre trade tradeFeedbackWindow.msg.part1=Nous aimerions avoir de vos commentaires sur votre expérience. Cela nous aidera à améliorer le logiciel et à aplanir les aspérités. Si vous souhaitez nous faire part de vos commentaires, veuillez remplir ce court sondage (aucune inscription requise) à l'adresse suivante: -tradeFeedbackWindow.msg.part2=Si vous avez la moindre question, ou rencontrez un problème, veuillez s'il vous plaît vous mettre en relation avec les autres utilisateurs et contributeurs via le forum Bisq sur: -tradeFeedbackWindow.msg.part3=Merci d'utiliser Bisq! +tradeFeedbackWindow.msg.part2=Si vous avez la moindre question, ou rencontrez un problème, veuillez s'il vous plaît vous mettre en relation avec les autres utilisateurs et contributeurs via le forum Haveno sur: +tradeFeedbackWindow.msg.part3=Merci d'utiliser Haveno! portfolio.pending.role=Mon rôle portfolio.pending.tradeInformation=Information sur le trade @@ -752,19 +752,19 @@ portfolio.pending.tradePeriodInfo=Après la première confirmation de la blockch portfolio.pending.tradePeriodWarning=Si le délai est dépassé, l'es deux participants du trade peuvent ouvrir un litige. portfolio.pending.tradeNotCompleted=Trade inachevé dans le temps imparti (jusqu''à {0}) portfolio.pending.tradeProcess=Processus de transaction -portfolio.pending.openAgainDispute.msg=Si vous n'êtes pas certain que le message addressé au médiateur ou à l'arbitre soit arrivé (par exemple si vous n'avez pas reçu de réponse dans un délai de 1 jour), n'hésitez pas à réouvrir un litige avec Cmd/ctrl+O. Vous pouvez aussi demander de l'aide en complément sur le forum bisq à [LIEN:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=Si vous n'êtes pas certain que le message addressé au médiateur ou à l'arbitre soit arrivé (par exemple si vous n'avez pas reçu de réponse dans un délai de 1 jour), n'hésitez pas à réouvrir un litige avec Cmd/ctrl+O. Vous pouvez aussi demander de l'aide en complément sur le forum haveno à [LIEN:https://haveno.community]. portfolio.pending.openAgainDispute.button=Ouvrir à nouveau le litige portfolio.pending.openSupportTicket.headline=Ouvrir un ticket d'assistance portfolio.pending.openSupportTicket.msg=S'il vous plaît n'utilisez seulement cette fonction qu'en cas d'urgence si vous ne pouvez pas voir le bouton \"Open support\" ou \"Ouvrir un litige\.\n\nLorsque vous ouvrez un ticket de support, l'échange sera interrompu et pris en charge par le médiateur ou par l'arbitre. portfolio.pending.timeLockNotOver=Vous devez patienter jusqu''au ≈{0} ({1} blocs de plus) avant de pouvoir ouvrir ouvrir un arbitrage pour le litige. -portfolio.pending.error.depositTxNull=La transaction de dépôt est nulle. Vous ne pouvez pas ouvrir un litige sans une transaction de dépôt valide. Allez dans \"Paramètres/Info sur le réseau\" et faites une resynchronisation SPV.\n\nPour obtenir de l'aide, le canal support de l'équipe Bisq est disponible sur Keybase. +portfolio.pending.error.depositTxNull=La transaction de dépôt est nulle. Vous ne pouvez pas ouvrir un litige sans une transaction de dépôt valide. Allez dans \"Paramètres/Info sur le réseau\" et faites une resynchronisation SPV.\n\nPour obtenir de l'aide, le canal support de l'équipe Haveno est disponible sur Keybase. portfolio.pending.mediationResult.error.depositTxNull=La transaction de dépôt est nulle. Vous pouvez déplacer le trade vers les trades n'ayant pas réussi. portfolio.pending.mediationResult.error.delayedPayoutTxNull=Le paiement de la transaction différée est nul. Vous pouvez déplacer le trade vers les trades échoués. -portfolio.pending.error.depositTxNotConfirmed=La transaction de dépôt n'est pas confirmée. Vous ne pouvez pas ouvrir un arbitrage pour le litige avec une transaction de dépôt non confirmée. Veuillez patienter jusqu'à ce qu'elle soit confirmée ou allez à \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\n\nPour obtenir de l'aide, le canal support de l'équipe Bisq est disponible sur Keybase. +portfolio.pending.error.depositTxNotConfirmed=La transaction de dépôt n'est pas confirmée. Vous ne pouvez pas ouvrir un arbitrage pour le litige avec une transaction de dépôt non confirmée. Veuillez patienter jusqu'à ce qu'elle soit confirmée ou allez à \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\n\nPour obtenir de l'aide, le canal support de l'équipe Haveno est disponible sur Keybase. portfolio.pending.support.headline.getHelp=Besoin d'aide ? -portfolio.pending.support.text.getHelp=Si vous rencontrez des problèmes, vous pouvez essayer de contacter votre pair de trading dans le chat de l'échange ou demander à la communauté Bisq sur https://bisq.community. Si votre problème n'est toujours pas résolu, vous pouvez demander l'aide d'un médiateur. +portfolio.pending.support.text.getHelp=Si vous rencontrez des problèmes, vous pouvez essayer de contacter votre pair de trading dans le chat de l'échange ou demander à la communauté Haveno sur https://haveno.community. Si votre problème n'est toujours pas résolu, vous pouvez demander l'aide d'un médiateur. portfolio.pending.support.button.getHelp=Ouvrir le chat de trade portfolio.pending.support.headline.halfPeriodOver=Vérifier le paiement portfolio.pending.support.headline.periodOver=Le délai alloué pour ce trade est écoulé. @@ -796,7 +796,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=Le frais de transaction du portfolio.pending.failedTrade.missingDepositTx=Cette transaction de marge (transaction multi-signature de 2 à 2) est manquante.\n\nSans ce tx, la transaction ne peut pas être complétée. Aucun fonds n'est bloqué, mais vos frais de transaction sont toujours payés. Vous pouvez lancer une demande de compensation des frais de transaction ici: [HYPERLINK:https://github.com/bisq-network/support/issues] \nN'hésitez pas à déplacer la transaction vers la transaction échouée. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=La transaction de paiement différée est manquante, mais les fonds ont été verrouillés dans la transaction de dépôt.\n\nVeuillez NE PAS envoyer de Fiat ou d'altcoin au vendeur de BTC, car avec le tx de paiement différé, le jugemenbt ne peut être ouvert. À la place, ouvrez un ticket de médiation avec Cmd/Ctrl+O. Le médiateur devrait suggérer que les deux pair reçoivent tous les deux le montant total de leurs dépôts de sécurité (le vendeur aussi doit reçevoir le montant total du trade). De cette manière, il n'y a pas de risque de non sécurité, et seuls les frais du trade sont perdus.\n\nVous pouvez demander le remboursement des frais de trade perdus ici;\n[LIEN:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=La transaction de paiement différée est manquante, mais les fonds ont été verrouillés dans la transaction de dépôt.\n\nSi l'acheteur n'a pas non plus la transaction de paiement différée, il sera informé du fait de ne PAS envoyer le paiement et d'ouvrir un ticket de médiation à la place. Vous devriez aussi ouvrir un ticket de médiation avec Cmd/Ctrl+o.\n\nSi l'acheteur n'a pas encore envoyé le paiement, le médiateur devrait suggérer que les deux pairs reçoivent le montant total de leurs dépôts de sécurité (le vendeur doit aussi reçevoir le montant total du trade). Sinon, le montant du trade revient à l'acheteur.\n\nVous pouvez effectuer une demande de remboursement pour les frais de trade perdus ici: [LIEN:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=Il y'a eu une erreur durant l'exécution du protocole de trade.\n\nErreur: {0}\n\nIl est possible que cette erreur ne soit pas critique, et que le trade puisse être complété normalement. Si vous n'en êtes pas sûr, ouvrez un ticket de médiation pour avoir des conseils de la part des médiateurs de Bisq.\n\nSi cette erreur est critique et que le trade ne peut être complété, il est possible que vous ayez perdu le frais du trade. Effectuez une demande de remboursement ici: [LIEN:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=Il y'a eu une erreur durant l'exécution du protocole de trade.\n\nErreur: {0}\n\nIl est possible que cette erreur ne soit pas critique, et que le trade puisse être complété normalement. Si vous n'en êtes pas sûr, ouvrez un ticket de médiation pour avoir des conseils de la part des médiateurs de Haveno.\n\nSi cette erreur est critique et que le trade ne peut être complété, il est possible que vous ayez perdu le frais du trade. Effectuez une demande de remboursement ici: [LIEN:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=Le contrat de trade n'est pas complété.\n\nCe trade ne peut être complété et il est possible que vous ayiez perdu votre frais de trade. Dans ce cas, vous pouvez demander un remboursement des frais de trade perdus ici: [LIEN:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=Le protocole de trade a rencontré quelques problèmes/\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=Le protocole de trade a rencontré un problème critique.\n\n{0}\n\nVoulez-vous déplacer ce trade vers les trades échoués?\n\nVous ne pouvez pas ouvrir de médiations ou de jugements depuis la liste des trades échoués, mais vous pouvez redéplacer un trade échoué vers l'écran des trades ouverts quand vous le souhaitez. @@ -829,7 +829,7 @@ funds.tab.transactions=Transactions funds.deposit.unused=Inutilisé funds.deposit.usedInTx=Utilisé dans {0} transaction(s) -funds.deposit.fundHavenoWallet=Alimenter le portefeuille Bisq +funds.deposit.fundHavenoWallet=Alimenter le portefeuille Haveno funds.deposit.noAddresses=Aucune adresse de dépôt n'a encore été générée funds.deposit.fundWallet=Alimenter votre portefeuille funds.deposit.withdrawFromWallet=Transférer des fonds depuis le portefeuille @@ -887,10 +887,10 @@ funds.tx.withdrawnFromWallet=Retiré depuis le portefeuille funds.tx.memo=Résumé funds.tx.noTxAvailable=Pas de transactions disponibles funds.tx.revert=Revertir -funds.tx.txSent=Transaction envoyée avec succès vers une nouvelle adresse dans le portefeuille local bisq. +funds.tx.txSent=Transaction envoyée avec succès vers une nouvelle adresse dans le portefeuille local haveno. funds.tx.direction.self=Envoyé à vous même funds.tx.dustAttackTx=dust reçues -funds.tx.dustAttackTx.popup=Cette transaction va envoyer un faible montant en BTC sur votre portefeuille ce qui pourrait constituer une tentative d'espionnage de la part de sociétés qui analyse la chaine.\n\nSi vous utilisez cette transaction de sortie des données dans le cadre d'une transaction représentant une dépense il sera alors possible de comprendre que vous êtes probablement aussi le propriétaire de l'autre adresse (coin merge).\n\nAfin de protéger votre vie privée, le portefeuille Bisq ne tient pas compte de ces "dust outputs" dans le cadre des transactions de vente et dans l'affichage de la balance. Vous pouvez définir une quantité seuil lorsqu'une "output" est considérée comme poussière dans les réglages. +funds.tx.dustAttackTx.popup=Cette transaction va envoyer un faible montant en BTC sur votre portefeuille ce qui pourrait constituer une tentative d'espionnage de la part de sociétés qui analyse la chaine.\n\nSi vous utilisez cette transaction de sortie des données dans le cadre d'une transaction représentant une dépense il sera alors possible de comprendre que vous êtes probablement aussi le propriétaire de l'autre adresse (coin merge).\n\nAfin de protéger votre vie privée, le portefeuille Haveno ne tient pas compte de ces "dust outputs" dans le cadre des transactions de vente et dans l'affichage de la balance. Vous pouvez définir une quantité seuil lorsqu'une "output" est considérée comme poussière dans les réglages. #################################################################### # Support @@ -923,7 +923,7 @@ support.sendingMessage=Envoi du message... support.receiverNotOnline=Le destinataire n'est pas en ligne. Le message est enregistré dans leur boîte mail. support.sendMessageError=Échec de l''envoi du message. Erreur: {0} support.receiverNotKnown=Destinataire inconnu -support.wrongVersion=L''ordre relatif au litige en question a été créé avec une ancienne version de Bisq.\nVous ne pouvez pas clore ce litige avec votre version de l''application.\n\nVeuillez utiliser une version plus ancienne avec la version du protocole {0} +support.wrongVersion=L''ordre relatif au litige en question a été créé avec une ancienne version de Haveno.\nVous ne pouvez pas clore ce litige avec votre version de l''application.\n\nVeuillez utiliser une version plus ancienne avec la version du protocole {0} support.openFile=Ouvrir le fichier à joindre (taille max. du fichier : {0} kb) support.attachmentTooLarge=La taille totale de vos pièces jointes est de {0} ko ce qui dépasse la taille maximale autorisée de {1} ko pour les messages. support.maxSize=La taille maximale autorisée pour le fichier est {0} kB. @@ -954,15 +954,15 @@ support.sellerMaker=Vendeur BTC/Maker support.buyerTaker=Acheteur BTC/Taker support.sellerTaker=Vendeur BTC/Taker -support.backgroundInfo=Bisq n'est pas une entreprise, donc elle traite les litiges différemment.\n\nLes traders peuvent communiquer au sein de l'application via un chat sécurisé sur l'écran des transactions ouvertes pour essayer de résoudre les litiges par eux-mêmes. Si cela ne suffit pas, un médiateur peut intervenir pour les aider. Le médiateur évaluera la situation et suggérera un paiement des fonds de transaction. Si les deux traders acceptent cette suggestion, la transaction de paiement est réalisée et l'échange est clos. Si un ou les deux traders n'acceptent pas le paiement suggéré par le médiateur, ils peuvent demander un arbitrage. L'arbitre réévaluera la situation et, si cela est justifié, remboursera personnellement le négociateur et demandera le remboursement de ce paiement à la DAO Bisq. -support.initialInfo=Veuillez entrer une description de votre problème dans le champ texte ci-dessous. Ajoutez autant d''informations que possible pour accélérer le temps de résolution du litige.\n\nVoici une check list des informations que vous devez fournir :\n● Si vous êtes l''acheteur BTC : Avez-vous effectué le paiement Fiat ou Altcoin ? Si oui, avez-vous cliqué sur le bouton "paiement commencé" dans l''application ?\n● Si vous êtes le vendeur BTC : Avez-vous reçu le paiement Fiat ou Altcoin ? Si oui, avez-vous cliqué sur le bouton "paiement reçu" dans l''application ?\n● Quelle version de Bisq utilisez-vous ?\n● Quel système d''exploitation utilisez-vous ?\n● Si vous avez rencontré un problème avec des transactions qui ont échoué, veuillez envisager de passer à un nouveau répertoire de données.\nParfois, le répertoire de données est corrompu et conduit à des bogues étranges. \nVoir : https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nVeuillez vous familiariser avec les règles de base du processus de règlement des litiges :\n● Vous devez répondre aux demandes des {0} dans les 2 jours.\n● Les médiateurs répondent dans un délai de 2 jours. Les arbitres répondent dans un délai de 5 jours ouvrables.\n● Le délai maximum pour un litige est de 14 jours.\n● Vous devez coopérer avec les {1} et fournir les renseignements qu''ils demandent pour faire valoir votre cause.\n● Vous avez accepté les règles décrites dans le document de litige dans l''accord d''utilisation lorsque vous avez lancé l''application pour la première fois.\n\nVous pouvez en apprendre davantage sur le processus de litige à l''adresse suivante {2} +support.backgroundInfo=Haveno n'est pas une entreprise, donc elle traite les litiges différemment.\n\nLes traders peuvent communiquer au sein de l'application via un chat sécurisé sur l'écran des transactions ouvertes pour essayer de résoudre les litiges par eux-mêmes. Si cela ne suffit pas, un médiateur peut intervenir pour les aider. Le médiateur évaluera la situation et suggérera un paiement des fonds de transaction. Si les deux traders acceptent cette suggestion, la transaction de paiement est réalisée et l'échange est clos. Si un ou les deux traders n'acceptent pas le paiement suggéré par le médiateur, ils peuvent demander un arbitrage. L'arbitre réévaluera la situation et, si cela est justifié, remboursera personnellement le négociateur et demandera le remboursement de ce paiement à la DAO Haveno. +support.initialInfo=Veuillez entrer une description de votre problème dans le champ texte ci-dessous. Ajoutez autant d''informations que possible pour accélérer le temps de résolution du litige.\n\nVoici une check list des informations que vous devez fournir :\n● Si vous êtes l''acheteur BTC : Avez-vous effectué le paiement Fiat ou Altcoin ? Si oui, avez-vous cliqué sur le bouton "paiement commencé" dans l''application ?\n● Si vous êtes le vendeur BTC : Avez-vous reçu le paiement Fiat ou Altcoin ? Si oui, avez-vous cliqué sur le bouton "paiement reçu" dans l''application ?\n● Quelle version de Haveno utilisez-vous ?\n● Quel système d''exploitation utilisez-vous ?\n● Si vous avez rencontré un problème avec des transactions qui ont échoué, veuillez envisager de passer à un nouveau répertoire de données.\nParfois, le répertoire de données est corrompu et conduit à des bogues étranges. \nVoir : https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nVeuillez vous familiariser avec les règles de base du processus de règlement des litiges :\n● Vous devez répondre aux demandes des {0} dans les 2 jours.\n● Les médiateurs répondent dans un délai de 2 jours. Les arbitres répondent dans un délai de 5 jours ouvrables.\n● Le délai maximum pour un litige est de 14 jours.\n● Vous devez coopérer avec les {1} et fournir les renseignements qu''ils demandent pour faire valoir votre cause.\n● Vous avez accepté les règles décrites dans le document de litige dans l''accord d''utilisation lorsque vous avez lancé l''application pour la première fois.\n\nVous pouvez en apprendre davantage sur le processus de litige à l''adresse suivante {2} support.systemMsg=Message du système: {0} -support.youOpenedTicket=Vous avez ouvert une demande de support.\n\n{0}\n\nBisq version: {1} -support.youOpenedDispute=Vous avez ouvert une demande de litige.\n\n{0}\n\nBisq version: {1} -support.youOpenedDisputeForMediation=Vous avez demandé une médiation.\n\n{0}\n\nVersion de Bisq: {1} -support.peerOpenedTicket=Votre pair de trading a demandé une assistance en raison de problèmes techniques.\n\n{0}\n\nVersion de Bisq: {1} -support.peerOpenedDispute=Votre pair de trading a fait une demande de litige.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDisputeForMediation=Votre pair de trading a demandé une médiation.\n\n{0}\n\nVersion de Bisq: {1} +support.youOpenedTicket=Vous avez ouvert une demande de support.\n\n{0}\n\nHaveno version: {1} +support.youOpenedDispute=Vous avez ouvert une demande de litige.\n\n{0}\n\nHaveno version: {1} +support.youOpenedDisputeForMediation=Vous avez demandé une médiation.\n\n{0}\n\nVersion de Haveno: {1} +support.peerOpenedTicket=Votre pair de trading a demandé une assistance en raison de problèmes techniques.\n\n{0}\n\nVersion de Haveno: {1} +support.peerOpenedDispute=Votre pair de trading a fait une demande de litige.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDisputeForMediation=Votre pair de trading a demandé une médiation.\n\n{0}\n\nVersion de Haveno: {1} support.mediatorsDisputeSummary=Message système: Résumé de la dispute du médiateur:\n{0} support.mediatorsAddress=Adresse du nœud du médiateur: {0} support.warning.disputesWithInvalidDonationAddress=La transaction de paiement différé a été utilisée pour une adresse de destinataire indisponible. Il ne correspond aux paramètres dans aucun DAO de l'adresse de donation valide. \n\nCela peut être une escroquerie. Veuillez informer le développeur et ne fermez pas le dossier jusqu'à ce que le problème est résolu! \n\nAdresse pour les litiges: {0} \n\nAdresse de donation dans tous les paramètres DAO: {1} \n\nTransaction: {2} {3} @@ -1023,7 +1023,7 @@ settings.preferences.editCustomExplorer.txUrl=URL de la transaction settings.preferences.editCustomExplorer.addressUrl=Addresse URL settings.net.btcHeader=Réseau Bitcoin -settings.net.p2pHeader=Le réseau Bisq +settings.net.p2pHeader=Le réseau Haveno settings.net.onionAddressLabel=Mon adresse onion settings.net.btcNodesLabel=Utiliser des nœuds Bitcoin Core personnalisés settings.net.bitcoinPeersLabel=Pairs connectés @@ -1032,12 +1032,12 @@ settings.net.bitcoinNodesLabel=Nœuds Bitcoin Core pour se connecter à settings.net.useProvidedNodesRadio=Utiliser les nœuds Bitcoin Core fournis settings.net.usePublicNodesRadio=Utiliser le réseau Bitcoin public settings.net.useCustomNodesRadio=Utiliser des nœuds Bitcoin Core personnalisés -settings.net.warn.usePublicNodes=Si vous utilisez le réseau public Bitcoin, vous serez confronté à de sérieux problèmes de confidentialité. Ceci est dû à la conception et à la mise en œuvre du bloom filter cassé. Il convient aux portefeuilles SPV comme BitcoinJ (utilisé dans Bisq). Tout nœud complet que vous connectez peut découvrir que toutes les adresses de votre portefeuille appartiennent à une seule entité. \n\nPour plus d'informations, veuillez visiter: [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare] \n\nÊtes-vous sûr de vouloir utiliser un nœud public? +settings.net.warn.usePublicNodes=Si vous utilisez le réseau public Bitcoin, vous serez confronté à de sérieux problèmes de confidentialité. Ceci est dû à la conception et à la mise en œuvre du bloom filter cassé. Il convient aux portefeuilles SPV comme BitcoinJ (utilisé dans Haveno). Tout nœud complet que vous connectez peut découvrir que toutes les adresses de votre portefeuille appartiennent à une seule entité. \n\nPour plus d'informations, veuillez visiter: [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare] \n\nÊtes-vous sûr de vouloir utiliser un nœud public? settings.net.warn.usePublicNodes.useProvided=Non, utiliser les nœuds fournis. settings.net.warn.usePublicNodes.usePublic=Oui, utiliser un réseau public settings.net.warn.useCustomNodes.B2XWarning=Veuillez vous assurer que votre nœud Bitcoin est un nœud Bitcoin Core de confiance !\n\nLa connexion à des nœuds qui ne respectent pas les règles du consensus de Bitcoin Core peut corrompre votre portefeuille et causer des problèmes dans le processus de trading.\n\nLes utilisateurs qui se connectent à des nœuds qui ne respectent pas les règles du consensus sont responsables des dommages qui en résultent. Tout litige qui en résulte sera tranché en faveur de l'autre pair. Aucune assistance technique ne sera apportée aux utilisateurs qui ignorent ces mécanismes d'alertes et de protections ! settings.net.warn.invalidBtcConfig=La connection au réseau Bitcoin a échoué car votre configuration est invalide.\n\nVotre configuration a été réinitialisée afin d'utiliser les noeuds Bitcoin fournis à la place. Vous allez avoir besoin de relancer l'application. -settings.net.localhostBtcNodeInfo=Information additionnelle : Bisq cherche un noeud Bitcoin local au démarrage. Si il est trouvé, Bisq communiquera avec le réseau Bitcoin uniquement à travers ce noeud. +settings.net.localhostBtcNodeInfo=Information additionnelle : Haveno cherche un noeud Bitcoin local au démarrage. Si il est trouvé, Haveno communiquera avec le réseau Bitcoin uniquement à travers ce noeud. settings.net.p2PPeersLabel=Pairs connectés settings.net.onionAddressColumn=Adresse onion settings.net.creationDateColumn=Établi @@ -1073,17 +1073,17 @@ settings.net.reSyncSPVSuccess=Êtes-vous sûr de vouloir effectuer une resynchro settings.net.reSyncSPVAfterRestart=Le fichier de la chaîne SPV a été supprimé. Veuillez s'il vous plaît patienter. La resynchronisation avec le réseau peut nécessiter un certain temps. settings.net.reSyncSPVAfterRestartCompleted=La resynchronisation est maintenant terminée. Veuillez redémarrer l'application. settings.net.reSyncSPVFailed=Impossible de supprimer le fichier de la chaîne SPV.\nErreur: {0} -setting.about.aboutBisq=À propos de Bisq -setting.about.about=Bisq est un logiciel libre qui facilite l'échange de Bitcoins avec les devises nationales (et d'autres cryptomonnaies) au moyen d'un réseau pair-to-pair décentralisé, de manière à protéger au mieux la vie privée des utilisateurs. Pour en savoir plus sur Bisq, consultez la page Web du projet. -setting.about.web=Page web de Bisq +setting.about.aboutHaveno=À propos de Haveno +setting.about.about=Haveno est un logiciel libre qui facilite l'échange de Bitcoins avec les devises nationales (et d'autres cryptomonnaies) au moyen d'un réseau pair-to-pair décentralisé, de manière à protéger au mieux la vie privée des utilisateurs. Pour en savoir plus sur Haveno, consultez la page Web du projet. +setting.about.web=Page web de Haveno setting.about.code=Code source setting.about.agpl=Licence AGPL -setting.about.support=Soutenir Bisq -setting.about.def=Bisq n'est pas une entreprise, c'est un projet ouvert vers la communauté. Si vous souhaitez participer ou soutenir Bisq, veuillez suivre les liens ci-dessous. +setting.about.support=Soutenir Haveno +setting.about.def=Haveno n'est pas une entreprise, c'est un projet ouvert vers la communauté. Si vous souhaitez participer ou soutenir Haveno, veuillez suivre les liens ci-dessous. setting.about.contribute=Contribuer setting.about.providers=Fournisseurs de données -setting.about.apisWithFee=Bisq utilise les indices de prix Bisq pour les prix des marchés Fiat et Altcoin, et Bisq utilise les noeuds du Mempool pour estimer les frais de minage. -setting.about.apis=Bisq utilise les indices de prix Bisq pour les prix des marchés Fiat et Altcoin. +setting.about.apisWithFee=Haveno utilise les indices de prix Haveno pour les prix des marchés Fiat et Altcoin, et Haveno utilise les noeuds du Mempool pour estimer les frais de minage. +setting.about.apis=Haveno utilise les indices de prix Haveno pour les prix des marchés Fiat et Altcoin. setting.about.pricesProvided=Prix de marché fourni par setting.about.feeEstimation.label=Estimation des frais de minage fournie par setting.about.versionDetails=Détails sur la version @@ -1097,7 +1097,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' ou ''alt + {0}'' ou ''cmd setting.about.shortcuts.menuNav=Naviguer dans le menu principal setting.about.shortcuts.menuNav.value=Pour naviguer dans le menu principal, appuyez sur: 'Ctrl' ou 'alt' ou 'cmd' avec une touche numérique entre '1-9'. -setting.about.shortcuts.close=Fermer Bisq +setting.about.shortcuts.close=Fermer Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' ou ''cmd + {0}'' ou ''Ctrl + {1}'' ou ''cmd + {1}'' setting.about.shortcuts.closePopup=Fermer le popup ou la fenêtre de dialogue @@ -1137,7 +1137,7 @@ setting.about.shortcuts.sendPrivateNotification=Envoyer une notification privée setting.about.shortcuts.sendPrivateNotification.value=Ouvrez l'information du pair via l'avatar et appuyez sur: {0} setting.info.headline=Nouvelle fonctionnalité, l'auto-confirmation XMR -setting.info.msg=Vous n'avez pas saisi l'ID et la clé de transaction. \n\nSi vous ne fournissez pas ces données, votre partenaire commercial ne peut pas utiliser la fonction de confirmation automatique pour libérer rapidement le BTC après avoir reçu le XMR.\nEn outre, Bisq demande aux expéditeurs XMR de fournir ces informations aux médiateurs et aux arbitres en cas de litige.\nPlus de détails sont dans Bisq Wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=Vous n'avez pas saisi l'ID et la clé de transaction. \n\nSi vous ne fournissez pas ces données, votre partenaire commercial ne peut pas utiliser la fonction de confirmation automatique pour libérer rapidement le BTC après avoir reçu le XMR.\nEn outre, Haveno demande aux expéditeurs XMR de fournir ces informations aux médiateurs et aux arbitres en cas de litige.\nPlus de détails sont dans Haveno Wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1145,8 +1145,8 @@ setting.info.msg=Vous n'avez pas saisi l'ID et la clé de transaction. \n\nSi vo account.tab.mediatorRegistration=Enregistrement du médiateur account.tab.refundAgentRegistration=Enregistrement de l'agent de remboursement account.tab.signing=Signature en cours -account.info.headline=Bienvenue sur votre compte Bisq -account.info.msg=Ici, vous pouvez ajouter des comptes de trading en devises nationales et en altcoins et créer une sauvegarde de votre portefeuille ainsi que des données de votre compte.\n\nUn nouveau portefeuille Bitcoin a été créé un premier lancement de Bisq.\n\nNous vous recommandons vivement d'écrire les mots-clés de votre seed de portefeuille Bitcoin (voir l'onglet en haut) et d'envisager d'ajouter un mot de passe avant le transfert de fonds. Les dépôts et retraits de Bitcoin sont gérés dans la section \"Fonds\".\n\nNotice de confidentialité et de sécurité : Bisq étant une plateforme d'échange décentralisée, toutes vos données sont conservées sur votre ordinateur. Il n'y a pas de serveurs, nous n'avons donc pas accès à vos informations personnelles, à vos fonds ou même à votre adresse IP. Les données telles que les numéros de compte bancaire, les adresses altcoin & Bitcoin, etc ne sont partagées avec votre pair de trading que pour effectuer les transactions que vous initiez (en cas de litige, le médiateur et l’arbitre verront les mêmes données que votre pair de trading). +account.info.headline=Bienvenue sur votre compte Haveno +account.info.msg=Ici, vous pouvez ajouter des comptes de trading en devises nationales et en altcoins et créer une sauvegarde de votre portefeuille ainsi que des données de votre compte.\n\nUn nouveau portefeuille Bitcoin a été créé un premier lancement de Haveno.\n\nNous vous recommandons vivement d'écrire les mots-clés de votre seed de portefeuille Bitcoin (voir l'onglet en haut) et d'envisager d'ajouter un mot de passe avant le transfert de fonds. Les dépôts et retraits de Bitcoin sont gérés dans la section \"Fonds\".\n\nNotice de confidentialité et de sécurité : Haveno étant une plateforme d'échange décentralisée, toutes vos données sont conservées sur votre ordinateur. Il n'y a pas de serveurs, nous n'avons donc pas accès à vos informations personnelles, à vos fonds ou même à votre adresse IP. Les données telles que les numéros de compte bancaire, les adresses altcoin & Bitcoin, etc ne sont partagées avec votre pair de trading que pour effectuer les transactions que vous initiez (en cas de litige, le médiateur et l’arbitre verront les mêmes données que votre pair de trading). account.menu.paymentAccount=Comptes en devise nationale account.menu.altCoinsAccountView=Compte Altcoins @@ -1161,7 +1161,7 @@ account.menu.walletInfo.balance.info=Ceci montre le solde du portefeuille intern account.menu.walletInfo.xpub.headLine=Afficher les clés (clés xpub) account.menu.walletInfo.walletSelector={0} {1} portefeuille account.menu.walletInfo.path.headLine=Chemin du trousseau HD -account.menu.walletInfo.path.info=Si vous importez vos mots de graine dans un autre portefeuille (comme Electrum), vous aurez besoin de définir le chemin. Ceci devrait être effectué uniquement en cas d'urgence quand vous perdez accès au portefeuille Bisq et au répertoire de données.\nGardez à l'esprit que dépenser des fonds depuis un portefeuille autre que Bisq peut dérégler les structures de données internes de Bisq associées au données du portefeuille, ce qui peut mener à des trades échoués.\n\nN'envoyez JAMAIS de BSQ depuis un portefeuille autre que Bisq, cela va probablement conduire à une transaction BSQ invalide, vous faisant ainsi perdre votre BSQ. +account.menu.walletInfo.path.info=Si vous importez vos mots de graine dans un autre portefeuille (comme Electrum), vous aurez besoin de définir le chemin. Ceci devrait être effectué uniquement en cas d'urgence quand vous perdez accès au portefeuille Haveno et au répertoire de données.\nGardez à l'esprit que dépenser des fonds depuis un portefeuille autre que Haveno peut dérégler les structures de données internes de Haveno associées au données du portefeuille, ce qui peut mener à des trades échoués.\n\nN'envoyez JAMAIS de BSQ depuis un portefeuille autre que Haveno, cela va probablement conduire à une transaction BSQ invalide, vous faisant ainsi perdre votre BSQ. account.menu.walletInfo.openDetails=Afficher les détails bruts du portefeuille et les clés privées @@ -1173,48 +1173,48 @@ account.arbitratorRegistration.registration={0} Enregistrement account.arbitratorRegistration.revoke=Révoquer account.arbitratorRegistration.info.msg=Veuillez noter que vous devez rester disponible pendant 15 jours après la révocation, car il se peut que des échanges vous impliquent comme {0}. Le délai d''échange maximal autorisé est de 8 jours et la procédure de contestation peut prendre jusqu''à 7 jours. account.arbitratorRegistration.warn.min1Language=Vous devez définir au moins 1 langue.\nNous avons ajouté la langue par défaut pour vous. -account.arbitratorRegistration.removedSuccess=Vous avez supprimé votre inscription au réseau Bisq avec succès. +account.arbitratorRegistration.removedSuccess=Vous avez supprimé votre inscription au réseau Haveno avec succès. account.arbitratorRegistration.removedFailed=Impossible de supprimer l''enregistrement.{0} -account.arbitratorRegistration.registerSuccess=Vous vous êtes inscrit au réseau Bisq avec succès. +account.arbitratorRegistration.registerSuccess=Vous vous êtes inscrit au réseau Haveno avec succès. account.arbitratorRegistration.registerFailed=Impossible de terminer l''enregistrement.{0} account.altcoin.yourAltcoinAccounts=Vos comptes altcoin account.altcoin.popup.wallet.msg=Veuillez vous assurer que vous respectez les exigences relatives à l''utilisation des {0} portefeuilles, selon les conditions présentées sur la page {1} du site.\nL''utilisation des portefeuilles provenant de plateformes de trading centralisées où (a) vous ne contrôlez pas vos clés ou (b) qui ne disposent pas d''un portefeuille compatible est risquée : cela peut entraîner la perte des fonds échangés!\nLe médiateur et l''arbitre ne sont pas des spécialistes {2} et ne pourront pas intervenir dans ce cas. account.altcoin.popup.wallet.confirm=Je comprends et confirme que je sais quel portefeuille je dois utiliser. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Pour échanger UPX sur Bisq, vous devez comprendre et respecter les exigences suivantes: \n\nPour envoyer UPX, vous devez utiliser le portefeuille officiel UPXmA GUI ou le portefeuille UPXmA CLI avec le logo store-tx-info activé (valeur par défaut dans la nouvelle version) . Assurez-vous d'avoir accès à la clé tx, car elle est nécessaire dans l'état du litige. monero-wallet-cli (à l'aide de la commande get_Tx_key) monero-wallet-gui: sur la page Avancé> Preuve / Vérification. \n\nCes transactions ne sont pas vérifiables dans le navigateur blockchain ordinaire. \n\nEn cas de litige, vous devez fournir à l'arbitre les informations suivantes: \n\n- Clé privée Tx- hachage de transaction- adresse publique du destinataire \n\nSi vous ne fournissez pas les informations ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. En cas de litige, l'expéditeur UPX est responsable de fournir la vérification du transfert UPX à l'arbitre. \n\nAucun paiement d'identité n'est requis, juste une adresse publique commune. \n\nSi vous n'êtes pas sûr du processus, veuillez visiter le canal UPXmA Discord (https://discord.gg/vhdNSrV) ou le groupe d'échanges Telegram (https://t.me/uplexaOfficial) pour plus d'informations. +account.altcoin.popup.upx.msg=Pour échanger UPX sur Haveno, vous devez comprendre et respecter les exigences suivantes: \n\nPour envoyer UPX, vous devez utiliser le portefeuille officiel UPXmA GUI ou le portefeuille UPXmA CLI avec le logo store-tx-info activé (valeur par défaut dans la nouvelle version) . Assurez-vous d'avoir accès à la clé tx, car elle est nécessaire dans l'état du litige. monero-wallet-cli (à l'aide de la commande get_Tx_key) monero-wallet-gui: sur la page Avancé> Preuve / Vérification. \n\nCes transactions ne sont pas vérifiables dans le navigateur blockchain ordinaire. \n\nEn cas de litige, vous devez fournir à l'arbitre les informations suivantes: \n\n- Clé privée Tx- hachage de transaction- adresse publique du destinataire \n\nSi vous ne fournissez pas les informations ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. En cas de litige, l'expéditeur UPX est responsable de fournir la vérification du transfert UPX à l'arbitre. \n\nAucun paiement d'identité n'est requis, juste une adresse publique commune. \n\nSi vous n'êtes pas sûr du processus, veuillez visiter le canal UPXmA Discord (https://discord.gg/vhdNSrV) ou le groupe d'échanges Telegram (https://t.me/uplexaOfficial) pour plus d'informations. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Le trading d'ARQ sur Bisq exige que vous compreniez et remplissiez les exigences suivantes:\n\nPour envoyer des ARQ, vous devez utiliser soit le portefeuille officiel ArQmA GUI soit le portefeuille ArQmA CLI avec le flag store-tx-info activé (par défaut dans les nouvelles versions). Veuillez vous assurer que vous pouvez accéder à la tx key car cela pourrait être nécessaire en cas de litige.\narqma-wallet-cli (utiliser la commande get_tx_key)\narqma-wallet-gui (allez dans l'onglet historique et cliquez sur le bouton (P) pour accéder à la preuve de paiement).\n\nAvec un l'explorateur de bloc normal, le transfert n'est pas vérifiable.\n\nVous devez fournir au médiateur ou à l'arbitre les données suivantes en cas de litige:\n- Le tx de la clé privée\n- Le hash de la transaction\n- L'adresse publique du destinataire\n\nSi vous manquez de communiquer les données ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. L'expéditeur des ARQ est responsable de la transmission au médiateur ou à l'arbitre de la vérification du transfert ces informations relatives au litige.\n\nIl n'est pas nécessaire de fournir l'ID du paiement, seulement l'adresse publique normale.\nSi vous n'êtes pas sûr de ce processus, visitez le canal discord ArQmA (https://discord.gg/s9BQpJT) ou le forum ArQmA (https://labs.arqma.com) pour obtenir plus d'informations. +account.altcoin.popup.arq.msg=Le trading d'ARQ sur Haveno exige que vous compreniez et remplissiez les exigences suivantes:\n\nPour envoyer des ARQ, vous devez utiliser soit le portefeuille officiel ArQmA GUI soit le portefeuille ArQmA CLI avec le flag store-tx-info activé (par défaut dans les nouvelles versions). Veuillez vous assurer que vous pouvez accéder à la tx key car cela pourrait être nécessaire en cas de litige.\narqma-wallet-cli (utiliser la commande get_tx_key)\narqma-wallet-gui (allez dans l'onglet historique et cliquez sur le bouton (P) pour accéder à la preuve de paiement).\n\nAvec un l'explorateur de bloc normal, le transfert n'est pas vérifiable.\n\nVous devez fournir au médiateur ou à l'arbitre les données suivantes en cas de litige:\n- Le tx de la clé privée\n- Le hash de la transaction\n- L'adresse publique du destinataire\n\nSi vous manquez de communiquer les données ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. L'expéditeur des ARQ est responsable de la transmission au médiateur ou à l'arbitre de la vérification du transfert ces informations relatives au litige.\n\nIl n'est pas nécessaire de fournir l'ID du paiement, seulement l'adresse publique normale.\nSi vous n'êtes pas sûr de ce processus, visitez le canal discord ArQmA (https://discord.gg/s9BQpJT) ou le forum ArQmA (https://labs.arqma.com) pour obtenir plus d'informations. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Pour échanger XMR sur Bisq, vous devez comprendre et respecter les exigences suivantes: \n\nSi vous vendez XMR, en cas de litige, vous devez fournir au médiateur ou à l'arbitre les informations suivantes: - clé de transaction (clé publique Tx, clé Tx, clé privée Tx) - ID de transaction (ID Tx Ou hachage Tx) - Adresse de destination de la transaction (adresse du destinataire) \n\nConsultez plus d'informations sur le portefeuille Monero dans le wiki: https: //bisq.wiki/Trading_Monero#Proving_payments \n\nSi vous ne fournissez pas les données de transaction requises, vous serez directement jugé échoue dans le litige. \n\nNotez également que Bisq fournit désormais la fonction de confirmation automatique des transactions XMR pour effectuer plus rapidement des transactions, mais vous devez l'activer dans les paramètres. \n\nPour plus d'informations sur la fonction de confirmation automatique, veuillez consulter le Wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +account.altcoin.popup.xmr.msg=Pour échanger XMR sur Haveno, vous devez comprendre et respecter les exigences suivantes: \n\nSi vous vendez XMR, en cas de litige, vous devez fournir au médiateur ou à l'arbitre les informations suivantes: - clé de transaction (clé publique Tx, clé Tx, clé privée Tx) - ID de transaction (ID Tx Ou hachage Tx) - Adresse de destination de la transaction (adresse du destinataire) \n\nConsultez plus d'informations sur le portefeuille Monero dans le wiki: https: //bisq.wiki/Trading_Monero#Proving_payments \n\nSi vous ne fournissez pas les données de transaction requises, vous serez directement jugé échoue dans le litige. \n\nNotez également que Haveno fournit désormais la fonction de confirmation automatique des transactions XMR pour effectuer plus rapidement des transactions, mais vous devez l'activer dans les paramètres. \n\nPour plus d'informations sur la fonction de confirmation automatique, veuillez consulter le Wiki: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Le navigateur blockchain pour échanger MSR sur Bisq vous oblige à comprendre et à respecter les exigences suivantes: \n\nLors de l'envoi de MSR, vous devez utiliser le portefeuille officiel Masari GUI, le portefeuille Masari CLI avec le logo store-tx-info activé (activé par défaut) ou le portefeuille web Masari (https://wallet.getmasari.org). Assurez-vous d'avoir accès à la clé tx, car cela est nécessaire en cas de litige. monero-wallet-cli (à l'aide de la commande get_Tx_key) monero-wallet-gui: sur la page Avancé> Preuve / Vérification. \n\nLe portefeuille web Masari (accédez à Compte-> Historique des transactions et vérifiez les détails de la transaction que vous avez envoyés) \n\nLa vérification peut être effectuée dans le portefeuille. monero-wallet-cli: utilisez la commande (check_tx_key). monero-wallet-gui: sur la page Avancé> Preuve / Vérification La vérification peut être effectuée dans le navigateur blockchain. Ouvrez le navigateur blockchain (https://explorer.getmasari.org) et utilisez la barre de recherche pour trouver votre hachage de transaction. Une fois que vous avez trouvé la transaction, faites défiler jusqu'à la zone «certificat à envoyer» en bas et remplissez les détails requis. En cas de litige, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: - Clé privée Tx- Hachage de transaction- Adresse publique du destinataire \n\nAucun ID de transaction n'est requis, seule une adresse publique normale est requise. Si vous ne fournissez pas les informations ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. En cas de litige, l'expéditeur XMR est responsable de fournir la vérification du transfert XMR au médiateur ou un arbitre. \n\nSi vous n'êtes pas sûr du processus, veuillez visiter le Masari Discord officiel (https://discord.gg/sMCwMqs) pour obtenir de l'aide. +account.altcoin.popup.msr.msg=Le navigateur blockchain pour échanger MSR sur Haveno vous oblige à comprendre et à respecter les exigences suivantes: \n\nLors de l'envoi de MSR, vous devez utiliser le portefeuille officiel Masari GUI, le portefeuille Masari CLI avec le logo store-tx-info activé (activé par défaut) ou le portefeuille web Masari (https://wallet.getmasari.org). Assurez-vous d'avoir accès à la clé tx, car cela est nécessaire en cas de litige. monero-wallet-cli (à l'aide de la commande get_Tx_key) monero-wallet-gui: sur la page Avancé> Preuve / Vérification. \n\nLe portefeuille web Masari (accédez à Compte-> Historique des transactions et vérifiez les détails de la transaction que vous avez envoyés) \n\nLa vérification peut être effectuée dans le portefeuille. monero-wallet-cli: utilisez la commande (check_tx_key). monero-wallet-gui: sur la page Avancé> Preuve / Vérification La vérification peut être effectuée dans le navigateur blockchain. Ouvrez le navigateur blockchain (https://explorer.getmasari.org) et utilisez la barre de recherche pour trouver votre hachage de transaction. Une fois que vous avez trouvé la transaction, faites défiler jusqu'à la zone «certificat à envoyer» en bas et remplissez les détails requis. En cas de litige, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: - Clé privée Tx- Hachage de transaction- Adresse publique du destinataire \n\nAucun ID de transaction n'est requis, seule une adresse publique normale est requise. Si vous ne fournissez pas les informations ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. En cas de litige, l'expéditeur XMR est responsable de fournir la vérification du transfert XMR au médiateur ou un arbitre. \n\nSi vous n'êtes pas sûr du processus, veuillez visiter le Masari Discord officiel (https://discord.gg/sMCwMqs) pour obtenir de l'aide. # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=ntes: \n\nPour envoyer des informations anonymes, vous devez utiliser un portefeuille CLI ou GUI de réseau anonyme. Si vous utilisez un portefeuille CLI, le hachage de la transaction (tx ID) sera affiché après la transmission. Vous devez enregistrer ces informations. Après l'envoi de la transmission, vous devez immédiatement utiliser la commande «get_tx_key» pour récupérer la clé privée de la transaction. Si vous ne parvenez pas à effectuer cette étape, vous ne pourrez peut-être pas récupérer la clé ultérieurement. \n\nSi vous utilisez le portefeuille Blur Network GUI, vous pouvez facilement trouver la clé privée de transaction et l'ID de transaction dans l'onglet «Historique». Localisez la transaction d'intérêt immédiatement après l'envoi. Cliquez sur le symbole «?» dans le coin inférieur droit de la boîte contenant la transaction. Vous devez enregistrer ces informations. \n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1.) ID de transaction, 2.) clé privée de transaction, 3.) adresse du destinataire. Le processus de médiation ou d'arbitrage utilisera le visualiseur de transactions BLUR (https://blur.cash/#tx-viewer) pour vérifier les transferts BLUR. \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte du litige. Dans tous les litiges, l'expéditeur anonyme porte à 100% la responsabilité de vérifier la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Bisq. Tout d'abord, demandez de l'aide dans Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=ntes: \n\nPour envoyer des informations anonymes, vous devez utiliser un portefeuille CLI ou GUI de réseau anonyme. Si vous utilisez un portefeuille CLI, le hachage de la transaction (tx ID) sera affiché après la transmission. Vous devez enregistrer ces informations. Après l'envoi de la transmission, vous devez immédiatement utiliser la commande «get_tx_key» pour récupérer la clé privée de la transaction. Si vous ne parvenez pas à effectuer cette étape, vous ne pourrez peut-être pas récupérer la clé ultérieurement. \n\nSi vous utilisez le portefeuille Blur Network GUI, vous pouvez facilement trouver la clé privée de transaction et l'ID de transaction dans l'onglet «Historique». Localisez la transaction d'intérêt immédiatement après l'envoi. Cliquez sur le symbole «?» dans le coin inférieur droit de la boîte contenant la transaction. Vous devez enregistrer ces informations. \n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1.) ID de transaction, 2.) clé privée de transaction, 3.) adresse du destinataire. Le processus de médiation ou d'arbitrage utilisera le visualiseur de transactions BLUR (https://blur.cash/#tx-viewer) pour vérifier les transferts BLUR. \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte du litige. Dans tous les litiges, l'expéditeur anonyme porte à 100% la responsabilité de vérifier la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Haveno. Tout d'abord, demandez de l'aide dans Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Echanger Solo sur Bisq nécessite que vous compreniez et remplissiez les conditions suivantes: \n\nPour envoyer Solo, vous devez utiliser la version 5.1.3 ou supérieure du portefeuille Web Solo CLI. \n\nSi vous utilisez un portefeuille CLI, après l'envoi de la transaction, ID de transaction sera affiché. Vous devez enregistrer ces informations. Après avoir envoyé la transaction, vous devez immédiatement utiliser la commande «get_tx_key» pour récupérer la clé de transaction. Si vous ne parvenez pas à effectuer cette étape, vous ne pourrez peut-être pas récupérer la clé ultérieurement. \n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1) ID de transaction, 2) clé de transaction, 3) adresse du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs Solo (https://explorer.Solo.org) pour rechercher des transactions puis utilisera la fonction «envoyer une preuve» (https://explorer.minesolo.com/). \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte de l'affaire. Dans tous les cas de litige, l'expéditeur de QWC assume à 100% la responsabilité lors de la vérification de la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Bisq. Tout d'abord, demandez de l'aide dans Solo Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Echanger Solo sur Haveno nécessite que vous compreniez et remplissiez les conditions suivantes: \n\nPour envoyer Solo, vous devez utiliser la version 5.1.3 ou supérieure du portefeuille Web Solo CLI. \n\nSi vous utilisez un portefeuille CLI, après l'envoi de la transaction, ID de transaction sera affiché. Vous devez enregistrer ces informations. Après avoir envoyé la transaction, vous devez immédiatement utiliser la commande «get_tx_key» pour récupérer la clé de transaction. Si vous ne parvenez pas à effectuer cette étape, vous ne pourrez peut-être pas récupérer la clé ultérieurement. \n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1) ID de transaction, 2) clé de transaction, 3) adresse du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs Solo (https://explorer.Solo.org) pour rechercher des transactions puis utilisera la fonction «envoyer une preuve» (https://explorer.minesolo.com/). \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte de l'affaire. Dans tous les cas de litige, l'expéditeur de QWC assume à 100% la responsabilité lors de la vérification de la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Haveno. Tout d'abord, demandez de l'aide dans Solo Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Pour échanger CASH2 sur Bisq, vous devez comprendre et respecter les exigences suivantes: \n\nPour envoyer CASH2, vous devez utiliser la version 3 ou supérieure du portefeuille CASH2. \n\nAprès l'envoi de la transaction, ID de la transaction s'affiche. Vous devez enregistrer ces informations. Après avoir envoyé la transaction, vous devez utiliser la commande «getTxKey» dans simplewallet pour récupérer immédiatement la clé de transaction.\n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1) ID de transaction, 2) clé de transaction, 3) adresse CASH2 du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs CASH2 (https://blocks.cash2.org) pour vérifier le transfert CASH2. \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte de l'affaire. Dans tous les cas de litige, l'expéditeur de CASH2 assume à 100% la responsabilité lors de la vérification de la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Bisq. Tout d'abord, demandez de l'aide dans le Discord Cash2 (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Pour échanger CASH2 sur Haveno, vous devez comprendre et respecter les exigences suivantes: \n\nPour envoyer CASH2, vous devez utiliser la version 3 ou supérieure du portefeuille CASH2. \n\nAprès l'envoi de la transaction, ID de la transaction s'affiche. Vous devez enregistrer ces informations. Après avoir envoyé la transaction, vous devez utiliser la commande «getTxKey» dans simplewallet pour récupérer immédiatement la clé de transaction.\n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1) ID de transaction, 2) clé de transaction, 3) adresse CASH2 du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs CASH2 (https://blocks.cash2.org) pour vérifier le transfert CASH2. \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte de l'affaire. Dans tous les cas de litige, l'expéditeur de CASH2 assume à 100% la responsabilité lors de la vérification de la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Haveno. Tout d'abord, demandez de l'aide dans le Discord Cash2 (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Pour échanger Qwertycoin sur Bisq, vous devez comprendre et respecter les exigences suivantes: \n\nPour envoyer Qwertycoin, vous devez utiliser la version 5.1.3 ou supérieure du portefeuille Qwertycoin. \n\nAprès l'envoi de la transaction, ID de la transaction s'affiche. Vous devez enregistrer ces informations. Après avoir envoyé la transaction, vous devez utiliser la commande «get_Tx_Key» dans simplewallet pour récupérer immédiatement la clé de transaction. \n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1) ID de transaction, 2) clé de transaction, 3) adresse QWC du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs QWC (https://explorer.qwertycoin.org) pour vérifier les transferts QWC. \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte de l'affaire. Dans tous les cas de litige, l'expéditeur de QWC assume à 100% la responsabilité lors de la vérification de la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Bisq. Tout d'abord, demandez de l'aide dans QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Pour échanger Qwertycoin sur Haveno, vous devez comprendre et respecter les exigences suivantes: \n\nPour envoyer Qwertycoin, vous devez utiliser la version 5.1.3 ou supérieure du portefeuille Qwertycoin. \n\nAprès l'envoi de la transaction, ID de la transaction s'affiche. Vous devez enregistrer ces informations. Après avoir envoyé la transaction, vous devez utiliser la commande «get_Tx_Key» dans simplewallet pour récupérer immédiatement la clé de transaction. \n\nSi un arbitrage est nécessaire, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: 1) ID de transaction, 2) clé de transaction, 3) adresse QWC du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs QWC (https://explorer.qwertycoin.org) pour vérifier les transferts QWC. \n\nLe défaut de fournir les informations nécessaires au médiateur ou à l'arbitre entraînera la perte de l'affaire. Dans tous les cas de litige, l'expéditeur de QWC assume à 100% la responsabilité lors de la vérification de la transaction avec le médiateur ou l'arbitre. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Haveno. Tout d'abord, demandez de l'aide dans QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Echanger Dragonglass sur Bisq vous oblige à comprendre et à respecter les exigences suivantes: ~\n\nComme Dragonglass offre une protection de la confidentialité, les transactions ne peuvent pas être vérifiées sur la blockchain publique. Si nécessaire, vous pouvez prouver votre paiement en utilisant votre TXN-Private-Key. TXN-Private est une clé d'un temps générée automatiquement, utilisée pour chaque transaction qui est accessible uniquement à partir du portefeuille DESP. Soit via DRGL-wallet GUI (boîte de dialogue des détails de transaction interne), soit via Dragonglass CLI simplewallet (en utilisant la commande "get_tx_key"). \n\nLes deux nécessitent la version DRGL de «Oathkeeper» ou supérieure. \n\nEn cas de litige, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: \n\n- txn-Privite-ket- hachage de transaction- adresse publique du destinataire ~\n\nLa vérification du paiement peut utiliser les données ci-dessus comme entrée （http://drgl.info/#check_txn）.\n\nSi vous ne fournissez pas les informations ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. L'expéditeur Dragonglass est responsable de fournir la vérification de transfert DRGL au médiateur ou à l'arbitre en cas de litige. Aucun ID de paiement n'est requis. \n\nSi vous n'êtes pas sûr d'une partie de ce processus, veuillez visiter Dragonglass sur (http://discord.drgl.info) pour obtenir de l'aide. +account.altcoin.popup.drgl.msg=Echanger Dragonglass sur Haveno vous oblige à comprendre et à respecter les exigences suivantes: ~\n\nComme Dragonglass offre une protection de la confidentialité, les transactions ne peuvent pas être vérifiées sur la blockchain publique. Si nécessaire, vous pouvez prouver votre paiement en utilisant votre TXN-Private-Key. TXN-Private est une clé d'un temps générée automatiquement, utilisée pour chaque transaction qui est accessible uniquement à partir du portefeuille DESP. Soit via DRGL-wallet GUI (boîte de dialogue des détails de transaction interne), soit via Dragonglass CLI simplewallet (en utilisant la commande "get_tx_key"). \n\nLes deux nécessitent la version DRGL de «Oathkeeper» ou supérieure. \n\nEn cas de litige, vous devez fournir les informations suivantes au médiateur ou à l'arbitre: \n\n- txn-Privite-ket- hachage de transaction- adresse publique du destinataire ~\n\nLa vérification du paiement peut utiliser les données ci-dessus comme entrée （http://drgl.info/#check_txn）.\n\nSi vous ne fournissez pas les informations ci-dessus ou si vous utilisez un portefeuille incompatible, vous perdrez le litige. L'expéditeur Dragonglass est responsable de fournir la vérification de transfert DRGL au médiateur ou à l'arbitre en cas de litige. Aucun ID de paiement n'est requis. \n\nSi vous n'êtes pas sûr d'une partie de ce processus, veuillez visiter Dragonglass sur (http://discord.drgl.info) pour obtenir de l'aide. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Lors de l'utilisation de Zcash, vous ne pouvez utiliser que les adresses transparentes (commençant par t), et non les z-adresses (privées), car le médiateur ou l'arbitre ne seraient pas en mesure de vérifier la transaction avec les z-adresses. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Lors de l'utilisation de Zcoin, vous ne pouvez utiliser que les adresses transparentes (traçables), et non les adresses intraçables, car le médiateur ou l'arbitre ne seraient pas en mesure de vérifier la transaction avec des adresses intraçables dans un explorateur de blocs. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN nécessite un échange interactif entre l'émetteur et le récepteur pour créer la transaction. Assurez-vous de suivre les instructions de la page Web du projet GRIN pour envoyer et recevoir des GRIN de façon fiable (le récepteur doit être en ligne au moins pendant un certain temps).\n\nBisq ne supporte que le portefeuille Grinbox (Wallet713) format URL.\n\nL'expéditeur des GRIN doit fournir la preuve qu'il a envoyé les GRIN avec succès. Si le portefeuille ne peut pas fournir cette preuve, un litige potentiel sera résolu en faveur du destinataire des GRIN. Veuillez vous assurer que vous utilisez le dernier logiciel Grinbox qui supporte la preuve de transaction et que vous comprenez le processus de transfert et de réception des GRIN ainsi que la façon de créer la preuve.\n\nVisitez https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only pour plus d'informations sur l'outil de preuve de Grinbox. +account.altcoin.popup.grin.msg=GRIN nécessite un échange interactif entre l'émetteur et le récepteur pour créer la transaction. Assurez-vous de suivre les instructions de la page Web du projet GRIN pour envoyer et recevoir des GRIN de façon fiable (le récepteur doit être en ligne au moins pendant un certain temps).\n\nHaveno ne supporte que le portefeuille Grinbox (Wallet713) format URL.\n\nL'expéditeur des GRIN doit fournir la preuve qu'il a envoyé les GRIN avec succès. Si le portefeuille ne peut pas fournir cette preuve, un litige potentiel sera résolu en faveur du destinataire des GRIN. Veuillez vous assurer que vous utilisez le dernier logiciel Grinbox qui supporte la preuve de transaction et que vous comprenez le processus de transfert et de réception des GRIN ainsi que la façon de créer la preuve.\n\nVisitez https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only pour plus d'informations sur l'outil de preuve de Grinbox. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM nécessite un processus interactif entre l'émetteur et le récepteur pour créer la transaction.\n\nAssurez-vous de suivre les instructions de la page Web du projet BEAM pour envoyer et recevoir les BEAM de façon fiable (le récepteur doit être en ligne pendant au moins un certain temps).\n\nL'expéditeur de BEAM est tenu de fournir la preuve qu'il a envoyé BEAM avec succès. Assurez-vous d'utiliser un portefeuille qui peut produire une telle preuve. Si le portefeuille ne peut fournir la preuve, un litige potentiel sera résolu en faveur du récepteur des BEAM. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Echanger ParsiCoin sur Bisq nécessite que vous compreniez et remplissiez les conditions suivantes: \n\nPour envoyer PARS, vous devez utiliser la version 3.0.0 ou supérieure du portefeuille ParsiCoin officiel. \n\nVous pouvez vérifier votre hachage de transaction et votre clé de transaction dans la section transaction du portefeuille GUI (ParsiPay). Vous devez cliquer avec le bouton droit de la souris sur «Transaction» puis cliquer sur «Afficher les détails». \n\nSi l'arbitrage est à 100% nécessaire, vous devez fournir au médiateur ou à l'arbitre les éléments suivants: 1) hachage de transaction, 2) clé de transaction et 3) adresse PARS du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs ParsiCoin (http://explorer.parsicoin.net/#check_payment) pour vérifier les transmissions PARS. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Bisq. Tout d'abord, demandez de l'aide sur le ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Echanger ParsiCoin sur Haveno nécessite que vous compreniez et remplissiez les conditions suivantes: \n\nPour envoyer PARS, vous devez utiliser la version 3.0.0 ou supérieure du portefeuille ParsiCoin officiel. \n\nVous pouvez vérifier votre hachage de transaction et votre clé de transaction dans la section transaction du portefeuille GUI (ParsiPay). Vous devez cliquer avec le bouton droit de la souris sur «Transaction» puis cliquer sur «Afficher les détails». \n\nSi l'arbitrage est à 100% nécessaire, vous devez fournir au médiateur ou à l'arbitre les éléments suivants: 1) hachage de transaction, 2) clé de transaction et 3) adresse PARS du destinataire. Le médiateur ou l'arbitre utilisera l’explorateur de blocs ParsiCoin (http://explorer.parsicoin.net/#check_payment) pour vérifier les transmissions PARS. \n\nSi vous ne comprenez pas ces exigences, n'échangez pas sur Haveno. Tout d'abord, demandez de l'aide sur le ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=Pour échanger les monnaies brûlées, vous devez savoir ce qui suit: \n\nLes monnaies brûlées ne peuvent pas être dépensée. Pour les échanger sur Bisq, le script de sortie doit prendre la forme suivante: OP_RETURN OP_PUSHDATA, suivi des octets de données pertinents, ces octets forment l'adresse après le codage hexadécimal. Par exemple, une devise brûlée avec l'adresse 666f6f ("foo" en UTF-8) aura le script suivant: \n\nOP_RETURN OP_PUSHDATA 666f6f \n\nPour créer de la monnaie brûlée, vous pouvez utiliser la commande RPC «brûler», disponible dans certains portefeuilles. \n\nPour d'éventuelles situations, vous pouvez vérifier https://ibo.laboratorium.ee \n\nPuisque la monnaie brûlée ne peut pas être utilisée, elle ne peut pas être revendue. «Vendre» une devise brûlée signifie brûler la devise d'origine (données associées à l'adresse de destination). \n\nEn cas de litige, le vendeur BLK doit fournir le hachage de la transaction. +account.altcoin.popup.blk-burnt.msg=Pour échanger les monnaies brûlées, vous devez savoir ce qui suit: \n\nLes monnaies brûlées ne peuvent pas être dépensée. Pour les échanger sur Haveno, le script de sortie doit prendre la forme suivante: OP_RETURN OP_PUSHDATA, suivi des octets de données pertinents, ces octets forment l'adresse après le codage hexadécimal. Par exemple, une devise brûlée avec l'adresse 666f6f ("foo" en UTF-8) aura le script suivant: \n\nOP_RETURN OP_PUSHDATA 666f6f \n\nPour créer de la monnaie brûlée, vous pouvez utiliser la commande RPC «brûler», disponible dans certains portefeuilles. \n\nPour d'éventuelles situations, vous pouvez vérifier https://ibo.laboratorium.ee \n\nPuisque la monnaie brûlée ne peut pas être utilisée, elle ne peut pas être revendue. «Vendre» une devise brûlée signifie brûler la devise d'origine (données associées à l'adresse de destination). \n\nEn cas de litige, le vendeur BLK doit fournir le hachage de la transaction. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Pour échanger L-BTC sur Bisq, vous devez comprendre les termes suivants: \n\nLorsque vous acceptez des transactions L-BTC sur Bisq, vous ne pouvez pas utiliser Blockstream Green Wallet sur le téléphone mobile ou un portefeuille de dépôt / commercial. Vous ne devez recevoir du L-BTC que dans le portefeuille Liquid Elements Core ou un autre portefeuille L-BTC avec une adresse L-BTC et une clé de sécurité qui vous permettre d'être anonyme. \n\nEn cas de médiation ou en cas de litige de transaction, vous devez divulguer la clé de sécurité de l'adresse L-BTC au médiateur Bisq ou à l'agent de remboursement afin qu'ils puissent vérifier les détails de votre transaction anonyme sur leur propre nœud complet Elements Core. \n\nSi vous ne comprenez pas ou ne comprenez pas ces exigences, n'échangez pas de L-BTC sur Bisq. +account.altcoin.popup.liquidbitcoin.msg=Pour échanger L-BTC sur Haveno, vous devez comprendre les termes suivants: \n\nLorsque vous acceptez des transactions L-BTC sur Haveno, vous ne pouvez pas utiliser Blockstream Green Wallet sur le téléphone mobile ou un portefeuille de dépôt / commercial. Vous ne devez recevoir du L-BTC que dans le portefeuille Liquid Elements Core ou un autre portefeuille L-BTC avec une adresse L-BTC et une clé de sécurité qui vous permettre d'être anonyme. \n\nEn cas de médiation ou en cas de litige de transaction, vous devez divulguer la clé de sécurité de l'adresse L-BTC au médiateur Haveno ou à l'agent de remboursement afin qu'ils puissent vérifier les détails de votre transaction anonyme sur leur propre nœud complet Elements Core. \n\nSi vous ne comprenez pas ou ne comprenez pas ces exigences, n'échangez pas de L-BTC sur Haveno. account.fiat.yourFiatAccounts=Vos comptes en devise nationale @@ -1236,12 +1236,12 @@ account.password.info=Avec la protection par mot de passe, vous devrez entrer vo account.seed.backup.title=Sauvegarder les mots composant la seed de votre portefeuille account.seed.info=Veuillez noter les mots de la seed du portefeuille ainsi que la date! Vous pouvez récupérer votre portefeuille à tout moment avec les mots de la seed et la date.\nLes mêmes mots-clés de la seed sont utilisés pour les portefeuilles BTC et BSQ.\n\nVous devriez écrire les mots de la seed sur une feuille de papier. Ne les enregistrez pas sur votre ordinateur.\n\nVeuillez noter que les mots de la seed ne remplacent PAS une sauvegarde.\nVous devez créer une sauvegarde de l'intégralité du répertoire de l'application à partir de l'écran \"Compte/Sauvergarde\" pour restaurer correctement les données de l'application.\nL'importation de mots de la seed n'est recommandée qu'en cas d'urgence. L'application ne sera pas fonctionnelle sans une sauvegarde adéquate des fichiers et des clés de la base de données ! -account.seed.backup.warning=Veuillez noter que les mots de départ ne peuvent pas remplacer les sauvegardes. Vous devez sauvegarder tout le répertoire de l'application (dans l'onglet «Compte / Sauvegarde») pour restaurer l'état et les données de l'application. L'importation de mots de départ n'est recommandée qu'en cas d'urgence. Si le fichier de base de données et la clé ne sont pas correctement sauvegardés, l'application ne fonctionnera pas! \n\nVoir plus d'informations sur le wiki Bisq: [HYPERLINK:https://bisq.wiki/Backing_up_application_data] +account.seed.backup.warning=Veuillez noter que les mots de départ ne peuvent pas remplacer les sauvegardes. Vous devez sauvegarder tout le répertoire de l'application (dans l'onglet «Compte / Sauvegarde») pour restaurer l'état et les données de l'application. L'importation de mots de départ n'est recommandée qu'en cas d'urgence. Si le fichier de base de données et la clé ne sont pas correctement sauvegardés, l'application ne fonctionnera pas! \n\nVoir plus d'informations sur le wiki Haveno: [HYPERLINK:https://bisq.wiki/Backing_up_application_data] account.seed.warn.noPw.msg=Vous n'avez pas configuré un mot de passe de portefeuille qui protégerait l'affichage des mots composant la seed.\n\nVoulez-vous afficher les mots composant la seed? account.seed.warn.noPw.yes=Oui, et ne me le demander plus à l'avenir account.seed.enterPw=Entrer le mot de passe afficher les mots composant la seed account.seed.restore.info=Veuillez effectuer une sauvegarde avant de procéder à une restauration à partir du mot de passe. Sachez que la restauration d'un portefeuille n'est a faire qu'en cas d'urgence et qu'elle peut causer des problèmes avec la base de données interne du portefeuille.\nCe n'est pas une façon de faire une sauvegarde ! Veuillez utiliser une sauvegarde à partir du répertoire de données de l'application pour restaurer l'état antérieur de l'application.\n\nAprès la restauration, l'application s'arrêtera automatiquement. Après le redémarrage de l'application, elle sera resynchronisée avec le réseau Bitcoin. Cela peut prendre un certain temps et peut consommer beaucoup de puissance sur le CPU, surtout si le portefeuille était plus vieux et contient beaucoup de transactions. Veuillez éviter d'interrompre ce processus, sinon vous devrez peut-être supprimer à nouveau le fichier de chaîne SPV ou répéter le processus de restauration. -account.seed.restore.ok=Ok, effectuer la restauration et arrêter Bisq +account.seed.restore.ok=Ok, effectuer la restauration et arrêter Haveno #################################################################### @@ -1270,7 +1270,7 @@ account.notifications.priceAlert.low.label=Me prévenir si le prix du BTC est in account.notifications.priceAlert.setButton=Définir l'alerte de prix account.notifications.priceAlert.removeButton=Retirer l'alerte de prix account.notifications.trade.message.title=L'état du trade a été modifié. -account.notifications.trade.message.msg.conf=La transaction de dépôt pour l''échange avec ID {0} est confirmée. Veuillez ouvrir votre application Bisq et initier le paiement. +account.notifications.trade.message.msg.conf=La transaction de dépôt pour l''échange avec ID {0} est confirmée. Veuillez ouvrir votre application Haveno et initier le paiement. account.notifications.trade.message.msg.started=L''acheteur de BTC a initié le paiement pour la transaction avec ID {0}. account.notifications.trade.message.msg.completed=La transaction avec l''ID {0} est terminée. account.notifications.offer.message.title=Votre ordre a été accepté @@ -1295,10 +1295,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Type d'ordre account.notifications.marketAlert.message.title=Alerte d'ordre account.notifications.marketAlert.message.msg.below=en dessous de account.notifications.marketAlert.message.msg.above=au dessus de -account.notifications.marketAlert.message.msg=Un nouvel ordre ''{0} {1}''' avec le prix {2} ({3} {4} prix de marché) avec le moyen de paiement ''{5}'' a été publiée dans le livre des ordres de Bisq.\nID de l''ordre: {6}. +account.notifications.marketAlert.message.msg=Un nouvel ordre ''{0} {1}''' avec le prix {2} ({3} {4} prix de marché) avec le moyen de paiement ''{5}'' a été publiée dans le livre des ordres de Haveno.\nID de l''ordre: {6}. account.notifications.priceAlert.message.title=Alerte de prix pour {0} account.notifications.priceAlert.message.msg=Votre alerte de prix a été déclenchée. l''actuel {0} le prix est {1}. {2} -account.notifications.noWebCamFound.warning=Aucune webcam n'a été trouvée.\n\nUtilisez l'option mail pour envoyer le jeton et la clé de cryptage depuis votre téléphone portable vers l'application Bisq. +account.notifications.noWebCamFound.warning=Aucune webcam n'a été trouvée.\n\nUtilisez l'option mail pour envoyer le jeton et la clé de cryptage depuis votre téléphone portable vers l'application Haveno. account.notifications.priceAlert.warning.highPriceTooLow=Le prix le plus élevé doit être supérieur au prix le plus bas. account.notifications.priceAlert.warning.lowerPriceTooHigh=Le prix le plus bas doit être inférieur au prix le plus élevé. @@ -1328,7 +1328,7 @@ displayUpdateDownloadWindow.status.verifying=Vérification de la signature.... displayUpdateDownloadWindow.button.label=Télécharger le programme d'installation et vérifier la signature displayUpdateDownloadWindow.button.downloadLater=Télécharger plus tard displayUpdateDownloadWindow.button.ignoreDownload=Ignorer cette version -displayUpdateDownloadWindow.headline=Une nouvelle mise à jour Bisq est disponible ! +displayUpdateDownloadWindow.headline=Une nouvelle mise à jour Haveno est disponible ! displayUpdateDownloadWindow.download.failed.headline=Echec du téléchargement displayUpdateDownloadWindow.download.failed=Téléchargement échoué. Veuillez télécharger et vérifier via [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Impossible de déterminer le bon programme d'installation. Veuillez télécharger et vérifier manuellement via [HYPERLINK:https://bisq.network/downloads] . @@ -1402,7 +1402,7 @@ disputeSummaryWindow.close.noPayout.headline=Fermé sans paiement disputeSummaryWindow.close.noPayout.text=Voulez-vous fermer sans paiement ? emptyWalletWindow.headline={0} Outil de secours du portefeuille -emptyWalletWindow.info=Veuillez utiliser ceci qu'en cas d'urgence si vous ne pouvez pas accéder à vos fonds à partir de l'interface utilisateur.\n\nVeuillez remarquer que touts les ordres en attente seront automatiquement fermés lors de l'utilisation de cet outil.\n\nAvant d'utiliser cet outil, veuillez sauvegarder votre répertoire de données. Vous pouvez le faire sur \"Compte/sauvegarde\".\n\nVeuillez nous signaler votre problème et déposer un rapport de bug sur GitHub ou sur le forum Bisq afin que nous puissions enquêter sur la source du problème. +emptyWalletWindow.info=Veuillez utiliser ceci qu'en cas d'urgence si vous ne pouvez pas accéder à vos fonds à partir de l'interface utilisateur.\n\nVeuillez remarquer que touts les ordres en attente seront automatiquement fermés lors de l'utilisation de cet outil.\n\nAvant d'utiliser cet outil, veuillez sauvegarder votre répertoire de données. Vous pouvez le faire sur \"Compte/sauvegarde\".\n\nVeuillez nous signaler votre problème et déposer un rapport de bug sur GitHub ou sur le forum Haveno afin que nous puissions enquêter sur la source du problème. emptyWalletWindow.balance=Votre solde disponible sur le portefeuille emptyWalletWindow.address=Votre adresse de destination emptyWalletWindow.button=Envoyer tous les fonds @@ -1454,7 +1454,7 @@ offerDetailsWindow.creationDate=Date de création offerDetailsWindow.makersOnion=Adresse onion du maker qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Veuillez utiliser le code QR pour recharger du portefeuille externe au portefeuille Bisq. +qRCodeWindow.msg=Veuillez utiliser le code QR pour recharger du portefeuille externe au portefeuille Haveno. qRCodeWindow.request=Demande de paiement:\n{0} selectDepositTxWindow.headline=Sélectionner la transaction de dépôt en cas de litige @@ -1563,7 +1563,7 @@ popup.headline.error=Erreur popup.doNotShowAgain=Ne plus montrer popup.reportError.log=Ouvrir le dossier de log popup.reportError.gitHub=Signaler au Tracker de problème GitHub -popup.reportError={0}\n\nAfin de nous aider à améliorer le logiciel, veuillez signaler ce bug en ouvrant un nouveau ticket de support sur https://github.com/bisq-network/bisq/issues.\nLe message d''erreur ci-dessus sera copié dans le presse-papier lorsque vous cliquerez sur l''un des boutons ci-dessous.\nCela facilitera le dépannage si vous incluez le fichier bisq.log en appuyant sur "ouvrir le fichier de log", en sauvegardant une copie, et en l''attachant à votre rapport de bug. +popup.reportError={0}\n\nAfin de nous aider à améliorer le logiciel, veuillez signaler ce bug en ouvrant un nouveau ticket de support sur https://github.com/bisq-network/bisq/issues.\nLe message d''erreur ci-dessus sera copié dans le presse-papier lorsque vous cliquerez sur l''un des boutons ci-dessous.\nCela facilitera le dépannage si vous incluez le fichier haveno.log en appuyant sur "ouvrir le fichier de log", en sauvegardant une copie, et en l''attachant à votre rapport de bug. popup.error.tryRestart=Veuillez essayer de redémarrer votre application et vérifier votre connexion réseau pour voir si vous pouvez résoudre ce problème. popup.error.takeOfferRequestFailed=Une erreur est survenue pendant que quelqu''un essayait d''accepter l''un de vos ordres:\n{0} @@ -1574,10 +1574,10 @@ error.closedTradeWithUnconfirmedDepositTx=La transaction de dépôt de l''échan error.closedTradeWithNoDepositTx=La transaction de dépôt de l'échange fermé avec l''ID d'échange {0} est nulle.\n\nVeuillez redémarrer l''application pour nettoyer la liste des transactions fermées. popup.warning.walletNotInitialized=Le portefeuille n'est pas encore initialisé -popup.warning.osxKeyLoggerWarning=En raison de mesures de sécurité plus strictes dans MacOS 10.14 et dans la version supérieure, le lancement d'une application Java (Bisq utilise Java) provoquera un avertissement pop-up dans MacOS (« Bisq souhaite recevoir les frappes de toute application »). \n\nPour éviter ce problème, veuillez ouvrir «Paramètres MacOS», puis allez dans «Sécurité et confidentialité» -> «Confidentialité» -> «Surveillance des entrées», puis supprimez «Bisq» de la liste de droite. \n\nUne fois les limitations techniques résolues (le packager Java de la version Java requise n'a pas été livré), Bisq effectuera une mise à niveau vers la nouvelle version Java pour éviter ce problème. -popup.warning.wrongVersion=Vous avez probablement une mauvaise version de Bisq sur cet ordinateur.\nL''architecture de votre ordinateur est: {0}.\nLa binary Bisq que vous avez installé est: {1}.\nVeuillez éteindre et réinstaller une bonne version ({2}). -popup.warning.incompatibleDB=Nous avons détecté un fichier de base de données incompatible!\n\nCes fichiers de base de données ne sont pas compatibles avec notre base de code actuelle: {0}\n\nNous avons sauvegardé les fichiers endommagés et appliqué les valeurs par défaut à la nouvelle version de la base de données.\n\nLa sauvegarde se trouve dans: \n\n{1} / db / backup_of_corrupted_data. \n\nVeuillez vérifier si vous avez installé la dernière version de Bisq. \n\nVous pouvez télécharger: \n\n[HYPERLINK:https://bisq.network/downloads] \n\nVeuillez redémarrer l'application. -popup.warning.startupFailed.twoInstances=Bisq est déjà lancé. Vous ne pouvez pas lancer deux instances de bisq. +popup.warning.osxKeyLoggerWarning=En raison de mesures de sécurité plus strictes dans MacOS 10.14 et dans la version supérieure, le lancement d'une application Java (Haveno utilise Java) provoquera un avertissement pop-up dans MacOS (« Haveno souhaite recevoir les frappes de toute application »). \n\nPour éviter ce problème, veuillez ouvrir «Paramètres MacOS», puis allez dans «Sécurité et confidentialité» -> «Confidentialité» -> «Surveillance des entrées», puis supprimez «Haveno» de la liste de droite. \n\nUne fois les limitations techniques résolues (le packager Java de la version Java requise n'a pas été livré), Haveno effectuera une mise à niveau vers la nouvelle version Java pour éviter ce problème. +popup.warning.wrongVersion=Vous avez probablement une mauvaise version de Haveno sur cet ordinateur.\nL''architecture de votre ordinateur est: {0}.\nLa binary Haveno que vous avez installé est: {1}.\nVeuillez éteindre et réinstaller une bonne version ({2}). +popup.warning.incompatibleDB=Nous avons détecté un fichier de base de données incompatible!\n\nCes fichiers de base de données ne sont pas compatibles avec notre base de code actuelle: {0}\n\nNous avons sauvegardé les fichiers endommagés et appliqué les valeurs par défaut à la nouvelle version de la base de données.\n\nLa sauvegarde se trouve dans: \n\n{1} / db / backup_of_corrupted_data. \n\nVeuillez vérifier si vous avez installé la dernière version de Haveno. \n\nVous pouvez télécharger: \n\n[HYPERLINK:https://bisq.network/downloads] \n\nVeuillez redémarrer l'application. +popup.warning.startupFailed.twoInstances=Haveno est déjà lancé. Vous ne pouvez pas lancer deux instances de haveno. popup.warning.tradePeriod.halfReached=Votre transaction avec ID {0} a atteint la moitié de la période de trading maximale autorisée et n''est toujours pas terminée.\n\nLa période de trade se termine le {1}.\n\nVeuillez vérifier l''état de votre transaction dans \"Portfolio/échanges en cours\" pour obtenir de plus amples informations. popup.warning.tradePeriod.ended=Votre échange avec l''ID {0} a atteint la période de trading maximale autorisée et n''est pas terminé.\n\nLa période d''échange s''est terminée le {1}.\n\nVeuillez vérifier votre transaction sur \"Portfolio/Echanges en cours\" pour contacter le médiateur. popup.warning.noTradingAccountSetup.headline=Vous n'avez pas configuré de compte de trading @@ -1587,7 +1587,7 @@ popup.warning.noMediatorsAvailable=Il n'y a pas de médiateurs disponibles. popup.warning.notFullyConnected=Vous devez attendre d'être complètement connecté au réseau.\nCela peut prendre jusqu'à 2 minutes au démarrage. popup.warning.notSufficientConnectionsToBtcNetwork=Vous devez attendre d''avoir au minimum {0} connexions au réseau Bitcoin. popup.warning.downloadNotComplete=Vous devez attendre que le téléchargement des blocs Bitcoin manquants soit terminé. -popup.warning.chainNotSynced=La hauteur de la blockchain du portefeuille Bisq n'est pas synchronisée correctement. Si vous avez récemment démarré l'application, veuillez attendre qu'un block de Bitcoin a soit publié.\n\nVous pouvez vérifier la hauteur de la blockchain dans Paramètres/Informations Réseau. Si plus d'un block passe et que ce problème persiste, il est possible que ça soit bloqué, dans ce cas effectuez une resynchronisation SPV [LIEN:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=La hauteur de la blockchain du portefeuille Haveno n'est pas synchronisée correctement. Si vous avez récemment démarré l'application, veuillez attendre qu'un block de Bitcoin a soit publié.\n\nVous pouvez vérifier la hauteur de la blockchain dans Paramètres/Informations Réseau. Si plus d'un block passe et que ce problème persiste, il est possible que ça soit bloqué, dans ce cas effectuez une resynchronisation SPV [LIEN:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Vous êtes certain de vouloir retirer cet ordre?\nLes frais du maker de {0} seront perdus si vous retirez cet ordre. popup.warning.tooLargePercentageValue=Vous ne pouvez pas définir un pourcentage de 100% ou plus grand. popup.warning.examplePercentageValue=Merci de saisir un nombre sous la forme d'un pourcentage tel que \"5.4\" pour 5.4% @@ -1605,32 +1605,32 @@ popup.warning.nodeBanned=Un des noeuds {0} a été banni. # suppress inspection "UnusedProperty" popup.warning.priceRelay=Relais de prix popup.warning.seed=seed -popup.warning.mandatoryUpdate.trading=Veuillez faire une mise à jour vers la dernière version de Bisq. Une mise à jour obligatoire a été publiée, laquelle désactive le trading sur les anciennes versions. Veuillez consulter le Forum Bisq pour obtenir plus d'informations. -popup.warning.noFilter=Nous n'avons pas reçu d'object de filtre de la part des noeuds source. Ceci n'est pas une situation attendue. Veuillez informer les développeurs de Bisq +popup.warning.mandatoryUpdate.trading=Veuillez faire une mise à jour vers la dernière version de Haveno. Une mise à jour obligatoire a été publiée, laquelle désactive le trading sur les anciennes versions. Veuillez consulter le Forum Haveno pour obtenir plus d'informations. +popup.warning.noFilter=Nous n'avons pas reçu d'object de filtre de la part des noeuds source. Ceci n'est pas une situation attendue. Veuillez informer les développeurs de Haveno popup.warning.burnBTC=Cette transaction n''est pas possible, car les frais de minage de {0} dépasseraient le montant à transférer de {1}. Veuillez patienter jusqu''à ce que les frais de minage soient de nouveau bas ou jusqu''à ce que vous ayez accumulé plus de BTC à transférer. -popup.warning.openOffer.makerFeeTxRejected=La transaction de frais de maker pour l''offre avec ID {0} a été rejetée par le réseau Bitcoin.\nID de transaction={1}.\nL''offre a été retirée pour éviter d''autres problèmes.\nAllez dans \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l''équipe Bisq disposible sur Keybase. +popup.warning.openOffer.makerFeeTxRejected=La transaction de frais de maker pour l''offre avec ID {0} a été rejetée par le réseau Bitcoin.\nID de transaction={1}.\nL''offre a été retirée pour éviter d''autres problèmes.\nAllez dans \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l''équipe Haveno disposible sur Keybase. popup.warning.trade.txRejected.tradeFee=frais de transaction popup.warning.trade.txRejected.deposit=dépôt -popup.warning.trade.txRejected=La transaction {0} pour le trade qui a pour ID {1} a été rejetée par le réseau Bitcoin.\nID de transaction={2}.\nLe trade a été déplacé vers les échanges échoués.\nAllez dans \"Paramètres/Info sur le réseau\" et effectuez une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l'équipe Bisq est disponible sur Keybase. +popup.warning.trade.txRejected=La transaction {0} pour le trade qui a pour ID {1} a été rejetée par le réseau Bitcoin.\nID de transaction={2}.\nLe trade a été déplacé vers les échanges échoués.\nAllez dans \"Paramètres/Info sur le réseau\" et effectuez une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l'équipe Haveno est disponible sur Keybase. -popup.warning.openOfferWithInvalidMakerFeeTx=La transaction de frais de maker pour l''offre avec ID {0} n''est pas valide.\nID de transaction={1}.\nAllez dans \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l''équipe Bisq est disponible sur Keybase. +popup.warning.openOfferWithInvalidMakerFeeTx=La transaction de frais de maker pour l''offre avec ID {0} n''est pas valide.\nID de transaction={1}.\nAllez dans \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l''équipe Haveno est disponible sur Keybase. -popup.info.securityDepositInfo=Afin de s'assurer que les deux traders suivent le protocole de trading, les deux traders doivent payer un dépôt de garantie.\n\nCe dépôt est conservé dans votre portefeuille d'échange jusqu'à ce que votre transaction soit terminée avec succès, et ensuite il vous sera restitué.\n\nRemarque : si vous créez un nouvel ordre, Bisq doit être en cours d'exécution pour qu'un autre trader puisse l'accepter. Pour garder vos ordres en ligne, laissez Bisq en marche et assurez-vous que cet ordinateur reste en ligne aussi (pour cela, assurez-vous qu'il ne passe pas en mode veille....le mode veille du moniteur ne pose aucun problème). +popup.info.securityDepositInfo=Afin de s'assurer que les deux traders suivent le protocole de trading, les deux traders doivent payer un dépôt de garantie.\n\nCe dépôt est conservé dans votre portefeuille d'échange jusqu'à ce que votre transaction soit terminée avec succès, et ensuite il vous sera restitué.\n\nRemarque : si vous créez un nouvel ordre, Haveno doit être en cours d'exécution pour qu'un autre trader puisse l'accepter. Pour garder vos ordres en ligne, laissez Haveno en marche et assurez-vous que cet ordinateur reste en ligne aussi (pour cela, assurez-vous qu'il ne passe pas en mode veille....le mode veille du moniteur ne pose aucun problème). popup.info.cashDepositInfo=Veuillez vous assurer d''avoir une succursale de l''établissement bancaire dans votre région afin de pouvoir effectuer le dépôt en espèces.\nL''identifiant bancaire (BIC/SWIFT) de la banque du vendeur est: {0}. popup.info.cashDepositInfo.confirm=Je confirme que je peux effectuer le dépôt. -popup.info.shutDownWithOpenOffers=Bisq est en cours de fermeture, mais des ordres sont en attente.\n\nCes ordres ne seront pas disponibles sur le réseau P2P si Bisq est éteint, mais ils seront republiés sur le réseau P2P la prochaine fois que vous lancerez Bisq.\n\nPour garder vos ordres en ligne, laissez Bisq en marche et assurez-vous que cet ordinateur reste aussi en ligne (pour cela, assurez-vous qu'il ne passe pas en mode veille...la veille du moniteur ne pose aucun problème). -popup.info.qubesOSSetupInfo=Il semble que vous exécutez Bisq sous Qubes OS.\n\nVeuillez vous assurer que votre Bisq qube est mis en place de la manière expliquée dans notre guide [LIEN:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=La rétrogradation depuis la version {0} vers la version {1} n'est pas supportée. Veuillez utiliser la dernière version de Bisq. +popup.info.shutDownWithOpenOffers=Haveno est en cours de fermeture, mais des ordres sont en attente.\n\nCes ordres ne seront pas disponibles sur le réseau P2P si Haveno est éteint, mais ils seront republiés sur le réseau P2P la prochaine fois que vous lancerez Haveno.\n\nPour garder vos ordres en ligne, laissez Haveno en marche et assurez-vous que cet ordinateur reste aussi en ligne (pour cela, assurez-vous qu'il ne passe pas en mode veille...la veille du moniteur ne pose aucun problème). +popup.info.qubesOSSetupInfo=Il semble que vous exécutez Haveno sous Qubes OS.\n\nVeuillez vous assurer que votre Haveno qube est mis en place de la manière expliquée dans notre guide [LIEN:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=La rétrogradation depuis la version {0} vers la version {1} n'est pas supportée. Veuillez utiliser la dernière version de Haveno. popup.privateNotification.headline=Notification privée importante! popup.securityRecommendation.headline=Recommendation de sécurité importante popup.securityRecommendation.msg=Nous vous rappelons d'envisager d'utiliser la protection par mot de passe pour votre portefeuille si vous ne l'avez pas déjà activé.\n\nIl est également fortement recommandé d'écrire les mots de la seed de portefeuille. Ces mots de la seed sont comme un mot de passe principal pour récupérer votre portefeuille Bitcoin.\nVous trouverez plus d'informations à ce sujet dans l'onglet \"seed du portefeuille\".\n\nDe plus, il est recommandé de sauvegarder le dossier complet des données de l'application dans l'onglet \"Sauvegarde". -popup.bitcoinLocalhostNode.msg=Bisq a détecté un noeud Bitcoin Core en cours d'exécution sur cette machine (sur l'ĥote local)\n\nVeuillez vous assurer que:\n- le noeud est complètement synchronisé avant de lancer Bisq\n- l'élagage est désactivé ('prune=0' dans bitcoin.conf)\n- les filtres de Bloom sont activés ('peerbloomfilters=1' dans bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno a détecté un noeud Bitcoin Core en cours d'exécution sur cette machine (sur l'ĥote local)\n\nVeuillez vous assurer que:\n- le noeud est complètement synchronisé avant de lancer Haveno\n- l'élagage est désactivé ('prune=0' dans bitcoin.conf)\n- les filtres de Bloom sont activés ('peerbloomfilters=1' dans bitcoin.conf) popup.shutDownInProgress.headline=Fermeture en cours popup.shutDownInProgress.msg=La fermeture de l'application nécessite quelques secondes.\nVeuillez ne pas interrompre ce processus. @@ -1693,7 +1693,7 @@ notification.walletUpdate.headline=Mise à jour du portefeuille de trading notification.walletUpdate.msg=Votre portefeuille de trading est suffisamment approvisionné.\nMontant: {0} notification.takeOffer.walletUpdate.msg=Votre portefeuille de trading était déjà suffisamment approvisionné à la suite d''une précédente tentative d''achat de l'ordre.\nMontant: {0} notification.tradeCompleted.headline=Le trade est terminé -notification.tradeCompleted.msg=Vous pouvez maintenant retirer vos fonds vers votre portefeuille Bitcoin externe ou les transférer vers le portefeuille Bisq. +notification.tradeCompleted.msg=Vous pouvez maintenant retirer vos fonds vers votre portefeuille Bitcoin externe ou les transférer vers le portefeuille Haveno. #################################################################### @@ -1702,9 +1702,9 @@ notification.tradeCompleted.msg=Vous pouvez maintenant retirer vos fonds vers vo systemTray.show=Montrer la fenêtre de l'application systemTray.hide=Cacher la fenêtre de l'application -systemTray.info=Informations au sujet de Bisq +systemTray.info=Informations au sujet de Haveno systemTray.exit=Sortir -systemTray.tooltip=Bisq: Une plateforme d''échange décentralisée sur le réseau bitcoin +systemTray.tooltip=Haveno: Une plateforme d''échange décentralisée sur le réseau bitcoin #################################################################### @@ -1846,7 +1846,7 @@ password.deriveKey=Récupérer la clé à partir du mot de passe password.walletDecrypted=Portefeuille décrypté avec succès et protection par mot de passe désactivée. password.wrongPw=Vous avez entré un mot de passe incorrect.\n\nVeuillez réessayer d'entrer votre mot de passe, en vérifiant soigneusement qu'il ne contient pas de fautes de frappe ou d'orthographe. password.walletEncrypted=Portefeuille crypté avec succès et protection par mot de passe activée. -password.walletEncryptionFailed=Le mot de passe du portefeuille n'a pas pu être défini. Il est possible que vous ayiez importé des mots sources qui ne correspondent pas à la base de données du portefeuille. Veuillez contacter les développeurs sur Keybase ([LIEN:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Le mot de passe du portefeuille n'a pas pu être défini. Il est possible que vous ayiez importé des mots sources qui ne correspondent pas à la base de données du portefeuille. Veuillez contacter les développeurs sur Keybase ([LIEN:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=Les 2 mots de passe entrés ne correspondent pas. password.forgotPassword=Mot de passe oublié? password.backupReminder=Veuillez noter que lors de la définition d'un mot de passe de portefeuille, toutes les sauvegardes créées automatiquement à partir du portefeuille non crypté seront supprimées.\n\nIl est fortement recommandé de faire une sauvegarde du répertoire de l'application et d'écrire les mots source avant de définir un mot de passe! @@ -1864,7 +1864,7 @@ seed.warn.walletNotEmpty.msg=Votre portefeuille Bitcoin n'est pas vide.\n\nVous seed.warn.walletNotEmpty.restore=Je veux quand même restaurer. seed.warn.walletNotEmpty.emptyWallet=Je viderai mes portefeuilles en premier. seed.warn.notEncryptedAnymore=Vos portefeuilles sont cryptés.\n\nAprès la restauration, les portefeuilles ne seront plus cryptés et vous devrez définir un nouveau mot de passe.\n\nSouhaitez-vous continuer ? -seed.warn.walletDateEmpty=Puisque vous n'avez pas spécifié la date du portefeuille, Bisq devra scanner la blockchain après le 09/10/2013 (date de création du BIP39). \n\nLe portefeuille BIP39 a été lancé pour la première fois sur Bisq le 28/06/2017 (version v0.5). Par conséquent, vous pouvez utiliser cette date pour gagner du temps. \n\nIdéalement, vous devez indiquer la date à laquelle la graine de départ du portefeuille est créée. \n\n\nÊtes-vous sûr de vouloir continuer sans spécifier la date du portefeuille? +seed.warn.walletDateEmpty=Puisque vous n'avez pas spécifié la date du portefeuille, Haveno devra scanner la blockchain après le 09/10/2013 (date de création du BIP39). \n\nLe portefeuille BIP39 a été lancé pour la première fois sur Haveno le 28/06/2017 (version v0.5). Par conséquent, vous pouvez utiliser cette date pour gagner du temps. \n\nIdéalement, vous devez indiquer la date à laquelle la graine de départ du portefeuille est créée. \n\n\nÊtes-vous sûr de vouloir continuer sans spécifier la date du portefeuille? seed.restore.success=Portefeuilles restaurés avec succès grâce aux nouveaux mots de la seed.\n\nVous devez arrêter et redémarrer l'application. seed.restore.error=Une erreur est survenue lors de la restauration des portefeuilles avec les mots composant la seed.{0} seed.restore.openOffers.warn=Vous avez des offres ouvertes qui seront retirées si vous restaurer à partir des mots sources.\nÊtes-vous sûr de vouloir continuer. @@ -1950,17 +1950,17 @@ payment.accountType=Type de compte payment.checking=Vérification payment.savings=Épargne payment.personalId=Pièce d'identité -payment.makeOfferToUnsignedAccount.warning=Avec la récente montée en prix du XMR, soyez informés que vendre {0} ou moins cause un risque plus élevé qu'avant.\n\nIl est hautement recommandé de:\n- faire des offres au dessus de {0}, ainsi vous traiterez uniquement avec des acheteurs signés/de confiance\n- garder les offres pour vendre en desous de {0} à une valeur d'environ 100 USD, cette valeur a (historiquement) découragé les arnaqueurs\n\nLes développeurs de Bisq travaillent sur des meilleurs moyens de sécuriser le modèle de compte de paiement pour des trades plus petits. Rejoignez la discussion ici : [LIEN:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=Avec la récente montée en prix du BTC, soyez informés que vendre {0} ou moins cause un risque plus élevé qu'avant.\n\nIl est hautement recommandé de:\n- prendre les offres d'acheteurs signés uniquement\n- garder les offres pour vendre en desous de {0} à une valeur d'environ 100 USD, cette valeur a (historiquement) découragé les arnaqueurs\n\nLes développeurs de Bisq travaillent sur des meilleurs moyens de sécuriser le modèle de compte de paiement pour des trades plus petits. Rejoignez la discussion ici : [LIEN:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle est un service de transfert d'argent, qui fonctionne bien pour transférer de l'argent vers d'autres banques. \n\n1. Consultez cette page pour voir si (et comment) votre banque coopère avec Zelle: \n[HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Faites particulièrement attention à votre limite de transfert - les limites de versement varient d'une banque à l'autre, et les banques spécifient généralement des limites quotidiennes, hebdomadaires et mensuelles. \n\n3. Si votre banque ne peut pas utiliser Zelle, vous pouvez toujours l'utiliser via l'application mobile Zelle, mais votre limite de transfert sera bien inférieure. \n\n4. Le nom indiqué sur votre compte Bisq doit correspondre à celui du compte Zelle / bancaire. \n\nSi vous ne parvenez pas à réaliser la transaction Zelle comme stipulé dans le contrat commercial, vous risquez de perdre une partie (ou la totalité) de votre marge.\n\nComme Zelle présente un risque élevé de rétrofacturation, il est recommandé aux vendeurs de contacter les acheteurs non signés par e-mail ou SMS pour confirmer que les acheteurs ont le compte Zelle spécifié dans Bisq. -payment.fasterPayments.newRequirements.info=Certaines banques ont déjà commencé à vérifier le nom complet du destinataire du paiement rapide. Votre compte de paiement rapide actuel ne remplit pas le nom complet. \n\nPensez à recréer votre compte de paiement rapide dans Bisq pour fournir un nom complet aux futurs {0} acheteurs. \n\nLors de la recréation d'un compte, assurez-vous de copier l'indicatif bancaire, le numéro de compte et le sel de vérification de l'âge de l'ancien compte vers le nouveau compte. Cela garantira que votre âge du compte et état de signature existant sont conservés. +payment.makeOfferToUnsignedAccount.warning=Avec la récente montée en prix du XMR, soyez informés que vendre {0} ou moins cause un risque plus élevé qu'avant.\n\nIl est hautement recommandé de:\n- faire des offres au dessus de {0}, ainsi vous traiterez uniquement avec des acheteurs signés/de confiance\n- garder les offres pour vendre en desous de {0} à une valeur d'environ 100 USD, cette valeur a (historiquement) découragé les arnaqueurs\n\nLes développeurs de Haveno travaillent sur des meilleurs moyens de sécuriser le modèle de compte de paiement pour des trades plus petits. Rejoignez la discussion ici : [LIEN:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=Avec la récente montée en prix du BTC, soyez informés que vendre {0} ou moins cause un risque plus élevé qu'avant.\n\nIl est hautement recommandé de:\n- prendre les offres d'acheteurs signés uniquement\n- garder les offres pour vendre en desous de {0} à une valeur d'environ 100 USD, cette valeur a (historiquement) découragé les arnaqueurs\n\nLes développeurs de Haveno travaillent sur des meilleurs moyens de sécuriser le modèle de compte de paiement pour des trades plus petits. Rejoignez la discussion ici : [LIEN:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle est un service de transfert d'argent, qui fonctionne bien pour transférer de l'argent vers d'autres banques. \n\n1. Consultez cette page pour voir si (et comment) votre banque coopère avec Zelle: \n[HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Faites particulièrement attention à votre limite de transfert - les limites de versement varient d'une banque à l'autre, et les banques spécifient généralement des limites quotidiennes, hebdomadaires et mensuelles. \n\n3. Si votre banque ne peut pas utiliser Zelle, vous pouvez toujours l'utiliser via l'application mobile Zelle, mais votre limite de transfert sera bien inférieure. \n\n4. Le nom indiqué sur votre compte Haveno doit correspondre à celui du compte Zelle / bancaire. \n\nSi vous ne parvenez pas à réaliser la transaction Zelle comme stipulé dans le contrat commercial, vous risquez de perdre une partie (ou la totalité) de votre marge.\n\nComme Zelle présente un risque élevé de rétrofacturation, il est recommandé aux vendeurs de contacter les acheteurs non signés par e-mail ou SMS pour confirmer que les acheteurs ont le compte Zelle spécifié dans Haveno. +payment.fasterPayments.newRequirements.info=Certaines banques ont déjà commencé à vérifier le nom complet du destinataire du paiement rapide. Votre compte de paiement rapide actuel ne remplit pas le nom complet. \n\nPensez à recréer votre compte de paiement rapide dans Haveno pour fournir un nom complet aux futurs {0} acheteurs. \n\nLors de la recréation d'un compte, assurez-vous de copier l'indicatif bancaire, le numéro de compte et le sel de vérification de l'âge de l'ancien compte vers le nouveau compte. Cela garantira que votre âge du compte et état de signature existant sont conservés. payment.moneyGram.info=Lors de l'utilisation de MoneyGram, l'acheteur de BTC doit envoyer le numéro d'autorisation et une photo du reçu par email au vendeur de BTC. Le reçu doit clairement mentionner le nom complet du vendeur, le pays, la région et le montant. L'email du vendeur sera donné à l'acheteur durant le processus de transaction. payment.westernUnion.info=Lors de l'utilisation de Western Union, l'acheteur BTC doit envoyer le MTCN (numéro de suivi) et une photo du reçu par e-mail au vendeur de BTC. Le reçu doit indiquer clairement le nom complet du vendeur, la ville, le pays et le montant. L'acheteur verra ensuite s'afficher l'email du vendeur pendant le processus de transaction. payment.halCash.info=Lors de l'utilisation de HalCash, l'acheteur de BTC doit envoyer au vendeur de BTC le code HalCash par SMS depuis son téléphone portable.\n\nVeuillez vous assurer de ne pas dépasser le montant maximum que votre banque vous permet d'envoyer avec HalCash. Le montant minimum par retrait est de 10 EUR et le montant maximum est de 600 EUR. Pour les retraits récurrents, il est de 3000 EUR par destinataire par jour et 6000 EUR par destinataire par mois. Veuillez vérifier ces limites auprès de votre banque pour vous assurer qu'elles utilisent les mêmes limites que celles indiquées ici.\n\nLe montant du retrait doit être un multiple de 10 EUR car vous ne pouvez pas retirer d'autres montants à un distributeur automatique. Pendant les phases de create-offer et take-offer l'affichage de l'interface utilisateur ajustera le montant en BTC afin que le montant en euros soit correct. Vous ne pouvez pas utiliser le prix basé sur le marché, car le montant en euros varierait en fonction de l'évolution des prix.\n\nEn cas de litige, l'acheteur de BTC doit fournir la preuve qu'il a envoyé la somme en EUR. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Sachez que tous les virements bancaires comportent un certain risque de rétrofacturation. Pour mitiger ce risque, Bisq fixe des limites par trade en fonction du niveau estimé de risque de rétrofacturation pour la méthode de paiement utilisée.\n\nPour cette méthode de paiement, votre limite de trading pour l'achat et la vente est de {2}.\n\nCette limite ne s'applique qu'à la taille d'une seule transaction. Vous pouvez effectuer autant de transactions que vous le souhaitez.\n\nVous trouverez plus de détails sur le wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Sachez que tous les virements bancaires comportent un certain risque de rétrofacturation. Pour mitiger ce risque, Haveno fixe des limites par trade en fonction du niveau estimé de risque de rétrofacturation pour la méthode de paiement utilisée.\n\nPour cette méthode de paiement, votre limite de trading pour l'achat et la vente est de {2}.\n\nCette limite ne s'applique qu'à la taille d'une seule transaction. Vous pouvez effectuer autant de transactions que vous le souhaitez.\n\nVous trouverez plus de détails sur le wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=Afin de limiter le risque de rétrofacturation des achats, Bisq fixe des limites d'achat par transaction pour ce compte de paiement basé sur les 2 facteurs suivants :\n\n1. Risque de rétrofacturation pour le mode de paiement\n2. Statut de signature du compte\n\nCe compte de paiement n'est pas encore signé, il est donc limité à l'achat de {0} par trade. Après sa signature, les limites d'achat augmenteront comme suit :\n\n● Avant la signature, et jusqu'à 30 jours après la signature, votre limite d'achat par trade sera de {0}\n● 30 jours après la signature, votre limite d'achat par trade sera de {1}\n● 60 jours après la signature, votre limite d'achat par trade sera de {2}\n\nLes limites de vente ne sont pas affectées par la signature du compte. Vous pouvez vendre {2} en un seul trade immédiatement.\n\nCes limites s'appliquent uniquement à la taille d'un seul trade-vous pouvez placer autant de trades que vous voulez.\n\n Pour plus d''nformations, rendez vous à [LIEN:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=Afin de limiter le risque de rétrofacturation des achats, Haveno fixe des limites d'achat par transaction pour ce compte de paiement basé sur les 2 facteurs suivants :\n\n1. Risque de rétrofacturation pour le mode de paiement\n2. Statut de signature du compte\n\nCe compte de paiement n'est pas encore signé, il est donc limité à l'achat de {0} par trade. Après sa signature, les limites d'achat augmenteront comme suit :\n\n● Avant la signature, et jusqu'à 30 jours après la signature, votre limite d'achat par trade sera de {0}\n● 30 jours après la signature, votre limite d'achat par trade sera de {1}\n● 60 jours après la signature, votre limite d'achat par trade sera de {2}\n\nLes limites de vente ne sont pas affectées par la signature du compte. Vous pouvez vendre {2} en un seul trade immédiatement.\n\nCes limites s'appliquent uniquement à la taille d'un seul trade-vous pouvez placer autant de trades que vous voulez.\n\n Pour plus d''nformations, rendez vous à [LIEN:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Veuillez confirmer que votre banque vous permet d'envoyer des dépôts en espèces sur le compte d'autres personnes. Par exemple, Bank of America et Wells Fargo n'autorisent plus de tels dépôts. @@ -1972,9 +1972,9 @@ payment.amazonGiftCard.upgrade=La méthode de paiement via carte cadeaux Amazon payment.account.amazonGiftCard.addCountryInfo={0}\nVotre compte carte cadeau Amazon existant ({1}) n'a pas de pays spécifé.\nVeuillez entrer le pays de votre compte carte cadeau Amazon pour mettre à jour les données de votre compte.\nCeci n'affectera pas le statut de l'âge du compte. payment.amazonGiftCard.upgrade.headLine=Mettre à jour le compte des cartes cadeaux Amazon -payment.usPostalMoneyOrder.info=Pour échanger US Postal Money Orders (USPMO) sur Bisq, vous devez comprendre les termes suivants: \n\n- L'acheteur BTC doit écrire le nom du vendeur BTC dans les champs expéditeur et bénéficiaire, et prendre une photo à haute résolution de USPMO et de l'enveloppe avec une preuve de suivi avant l'envoi. \n\n- L'acheteur BTC doit envoyer USPMO avec la confirmation de livraison au vendeur BTC. \n\nSi une médiation est nécessaire, ou s'il y a un différend de transaction, vous devrez envoyer la photo avec le numéro USPMO, le numéro du bureau de poste et le montant de la transaction au médiateur Bisq ou à l'agent de remboursement afin qu'ils puissent vérifier les détails sur le site web de la poste américaine. \n\nSi vous ne fournissez pas les données de transaction requises, vous perdrez directement dans le différend. \n\nDans tous les cas de litige, l'expéditeur de l'USPMO assume à 100% la responsabilité lors de la fourniture de preuves / certification au médiateur ou à l'arbitre. \n\nSi vous ne comprenez pas ces exigences, veuillez ne pas échanger USPMO sur Bisq. +payment.usPostalMoneyOrder.info=Pour échanger US Postal Money Orders (USPMO) sur Haveno, vous devez comprendre les termes suivants: \n\n- L'acheteur BTC doit écrire le nom du vendeur BTC dans les champs expéditeur et bénéficiaire, et prendre une photo à haute résolution de USPMO et de l'enveloppe avec une preuve de suivi avant l'envoi. \n\n- L'acheteur BTC doit envoyer USPMO avec la confirmation de livraison au vendeur BTC. \n\nSi une médiation est nécessaire, ou s'il y a un différend de transaction, vous devrez envoyer la photo avec le numéro USPMO, le numéro du bureau de poste et le montant de la transaction au médiateur Haveno ou à l'agent de remboursement afin qu'ils puissent vérifier les détails sur le site web de la poste américaine. \n\nSi vous ne fournissez pas les données de transaction requises, vous perdrez directement dans le différend. \n\nDans tous les cas de litige, l'expéditeur de l'USPMO assume à 100% la responsabilité lors de la fourniture de preuves / certification au médiateur ou à l'arbitre. \n\nSi vous ne comprenez pas ces exigences, veuillez ne pas échanger USPMO sur Haveno. -payment.cashByMail.info=Le trading en cash-by-mail (CBM) sur Bisq nécessite que vous compreniez ce qui suit:\n\n● L'acheteur de BTC doit emballer l'argent liquide dans un sac d'argent inviolable.\n● L'acheteur de BTC doit filmer ou prendre des photos haute résolution du processus d'emballage en espèces avec l'adresse et le numéro de suivi déjà apposés sur l'emballage.\n● L'acheteur de BTC doit envoyer le colis en espèces au vendeur BTC avec une confirmation de livraison et une assurance appropriée.\n● Le vendeur de BTC doit filmer l'ouverture du colis, en s'assurant que le numéro de suivi fourni par l'expéditeur est visible dans la vidéo.\n● Le maker de l'offre doit indiquer toutes les conditions particulières dans le champ «Informations supplémentaires» du compte de paiement.\n● Le preneur de l'offre accepte les conditions générales du maker en acceptant l'offre.\n\nLes transactions CBM imposent la responsabilité d'agir honnêtement pour les deux pairs.\n\n● Les transactions CBM ont des actions moins vérifiables que les autres transactions Fiat. Cela rend la gestion des litiges beaucoup plus difficile.\n● Essayez de résoudre les litiges directement avec votre pair en utilisant le chat de trade. C'est la voie la plus prometteuse pour résoudre tout litige CBM.\n● Les médiateurs peuvent examiner votre cas et faire une suggestion, mais il n'est PAS garanti qu'ils puissent vous aider.\n● Si un médiateur est engagé et si un des pair rejette la suggestion du médiateur, les fonds des deux pairs seront envoyés à une adresse de «don» Bisq [LIEN:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], et le trade sera effectivement terminé.\n● Si un commerçant rejette une suggestion de médiation et ouvre un arbitrage, cela pourrait entraîner une perte à la fois des fonds de négociation et du dépôt.\n● Les arbitres prendront une décision sur la base des preuves qui leur auront été fournies. Par conséquent, veuillez suivre et rédiger un document sur les processus ci-dessus pour avoir des preuves en cas de litige. Pour les transactions Cash by Mail, la décision des arbitres est définitive.\n● Les demandes de remboursement de fonds perdus résultant de transactions Cash By Mail avec le Bisq DAO ne seront PAS prises en compte.\n\nPour être sûr de bien comprendre les exigences des transactions en espèces par courrier, veuillez consulter:[LIEN:https://bisq.wiki/Cash_by_Mail]\n\nSi vous ne comprenez pas ces exigences, n'échangez pas en utilisant CBM sur Bisq. +payment.cashByMail.info=Le trading en cash-by-mail (CBM) sur Haveno nécessite que vous compreniez ce qui suit:\n\n● L'acheteur de BTC doit emballer l'argent liquide dans un sac d'argent inviolable.\n● L'acheteur de BTC doit filmer ou prendre des photos haute résolution du processus d'emballage en espèces avec l'adresse et le numéro de suivi déjà apposés sur l'emballage.\n● L'acheteur de BTC doit envoyer le colis en espèces au vendeur BTC avec une confirmation de livraison et une assurance appropriée.\n● Le vendeur de BTC doit filmer l'ouverture du colis, en s'assurant que le numéro de suivi fourni par l'expéditeur est visible dans la vidéo.\n● Le maker de l'offre doit indiquer toutes les conditions particulières dans le champ «Informations supplémentaires» du compte de paiement.\n● Le preneur de l'offre accepte les conditions générales du maker en acceptant l'offre.\n\nLes transactions CBM imposent la responsabilité d'agir honnêtement pour les deux pairs.\n\n● Les transactions CBM ont des actions moins vérifiables que les autres transactions Fiat. Cela rend la gestion des litiges beaucoup plus difficile.\n● Essayez de résoudre les litiges directement avec votre pair en utilisant le chat de trade. C'est la voie la plus prometteuse pour résoudre tout litige CBM.\n● Les médiateurs peuvent examiner votre cas et faire une suggestion, mais il n'est PAS garanti qu'ils puissent vous aider.\n● Si un médiateur est engagé et si un des pair rejette la suggestion du médiateur, les fonds des deux pairs seront envoyés à une adresse de «don» Haveno [LIEN:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], et le trade sera effectivement terminé.\n● Si un commerçant rejette une suggestion de médiation et ouvre un arbitrage, cela pourrait entraîner une perte à la fois des fonds de négociation et du dépôt.\n● Les arbitres prendront une décision sur la base des preuves qui leur auront été fournies. Par conséquent, veuillez suivre et rédiger un document sur les processus ci-dessus pour avoir des preuves en cas de litige. Pour les transactions Cash by Mail, la décision des arbitres est définitive.\n● Les demandes de remboursement de fonds perdus résultant de transactions Cash By Mail avec le Haveno DAO ne seront PAS prises en compte.\n\nPour être sûr de bien comprendre les exigences des transactions en espèces par courrier, veuillez consulter:[LIEN:https://bisq.wiki/Cash_by_Mail]\n\nSi vous ne comprenez pas ces exigences, n'échangez pas en utilisant CBM sur Haveno. payment.cashByMail.contact=information de contact payment.cashByMail.contact.prompt=Nom ou nym à qui l'enveloppe devrait être addressée @@ -1997,7 +1997,7 @@ payment.japan.recipient=Nom payment.australia.payid=ID de paiement payment.payid=ID de paiement lié à une institution financière. Comme l'addresse email ou le téléphone portable. payment.payid.info=Un PayID, tel qu'un numéro de téléphone, une adresse électronique ou un numéro d'entreprise australien (ABN), que vous pouvez lier en toute sécurité à votre compte bancaire, votre crédit mutuel ou votre société de crédit immobilier. Vous devez avoir déjà créé un PayID auprès de votre institution financière australienne. Les institutions financières émettrices et réceptrices doivent toutes deux prendre en charge PayID. Pour plus d'informations, veuillez consulter [LIEN:https://payid.com.au/faqs/]. -payment.amazonGiftCard.info=Pour payer avec une carte cadeau Amazon eGift Card, vous devrez envoyer une carte cadeau Amazon eGift Card au vendeur de BTC via votre compte Amazon. \n\nBisq indiquera l'adresse e-mail ou le numéro de téléphone du vendeur BTC où la carte cadeau doit être envoyée, et vous devrez inclure l'ID du trade dans le champ de messagerie de la carte cadeau. Veuillez consulter le wiki [LIEN:https://bisq.wiki/Amazon_eGift_card] pour plus de détails et pour les meilleures pratiques à adopter. \n\nTrois remarques importantes :\n- essayez d'envoyer des cartes-cadeaux d'un montant inférieur ou égal à 100 USD, car Amazon est connu pour signaler les cartes-cadeaux plus importantes comme frauduleuses\n- essayez d'utiliser un texte créatif et crédible pour le message de la carte cadeau (par exemple, "Joyeux anniversaire Susan !") ainsi que l'ID du trade (et utilisez le chat du trader pour indiquer à votre pair de trading le texte de référence que vous avez choisi afin qu'il puisse vérifier votre paiement).\n- Les cartes cadeaux électroniques Amazon ne peuvent être échangées que sur le site Amazon où elles ont été achetées (par exemple, une carte cadeau achetée sur amazon.it ne peut être échangée que sur amazon.it). +payment.amazonGiftCard.info=Pour payer avec une carte cadeau Amazon eGift Card, vous devrez envoyer une carte cadeau Amazon eGift Card au vendeur de BTC via votre compte Amazon. \n\nHaveno indiquera l'adresse e-mail ou le numéro de téléphone du vendeur BTC où la carte cadeau doit être envoyée, et vous devrez inclure l'ID du trade dans le champ de messagerie de la carte cadeau. Veuillez consulter le wiki [LIEN:https://bisq.wiki/Amazon_eGift_card] pour plus de détails et pour les meilleures pratiques à adopter. \n\nTrois remarques importantes :\n- essayez d'envoyer des cartes-cadeaux d'un montant inférieur ou égal à 100 USD, car Amazon est connu pour signaler les cartes-cadeaux plus importantes comme frauduleuses\n- essayez d'utiliser un texte créatif et crédible pour le message de la carte cadeau (par exemple, "Joyeux anniversaire Susan !") ainsi que l'ID du trade (et utilisez le chat du trader pour indiquer à votre pair de trading le texte de référence que vous avez choisi afin qu'il puisse vérifier votre paiement).\n- Les cartes cadeaux électroniques Amazon ne peuvent être échangées que sur le site Amazon où elles ont été achetées (par exemple, une carte cadeau achetée sur amazon.it ne peut être échangée que sur amazon.it). # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 6064d9ff..2bfd568b 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -103,14 +103,14 @@ shared.faq=Visit FAQ page shared.yesCancel=Si, annulla shared.nextStep=Passo successivo shared.selectTradingAccount=Seleziona conto di trading -shared.fundFromSavingsWalletButton=Trasferisci fondi dal portafoglio Bisq +shared.fundFromSavingsWalletButton=Trasferisci fondi dal portafoglio Haveno shared.fundFromExternalWalletButton=Apri il tuo portafoglio esterno per aggiungere fondi shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed? shared.belowInPercent=Sotto % del prezzo di mercato shared.aboveInPercent=Sopra % del prezzo di mercato shared.enterPercentageValue=Immetti il valore % shared.OR=OPPURE -shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds. +shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. shared.waitingForFunds=In attesa dei fondi... shared.TheBTCBuyer=L'acquirente di BTC shared.You=Tu @@ -125,7 +125,7 @@ shared.notUsedYet=Non ancora usato shared.date=Data shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n +shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Copia negli appunti shared.language=Lingua shared.country=Paese @@ -235,8 +235,8 @@ mainView.menu.settings=Impostazioni mainView.menu.account=Account mainView.marketPriceWithProvider.label=Prezzo di mercato per {0} -mainView.marketPrice.bisqInternalPrice=Prezzo dell'ultimo scambio su Bisq -mainView.marketPrice.tooltip.bisqInternalPrice=Non è disponibile alcun prezzo di mercato da fornitori terzi di feed dei prezzi.\nIl prezzo visualizzato è l'ultimo prezzo di scambio su Bisq per quella valuta. +mainView.marketPrice.havenoInternalPrice=Prezzo dell'ultimo scambio su Haveno +mainView.marketPrice.tooltip.havenoInternalPrice=Non è disponibile alcun prezzo di mercato da fornitori terzi di feed dei prezzi.\nIl prezzo visualizzato è l'ultimo prezzo di scambio su Haveno per quella valuta. mainView.marketPrice.tooltip=Il prezzo di mercato é fornito da {0}{1}\nUltimo aggiornamento: {2}\nURL del nodo del provider: {3} mainView.balance.available=Saldo disponibile mainView.balance.reserved=Riservati nelle offerte @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Connessione a mainView.footer.btcInfo.connectionFailed=Connessione fallita -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1} +mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Connessione alla rete Tor... mainView.bootstrapState.torNodeCreated=(2/4) Nodo Tor creato @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Dati iniziali ricevuti mainView.bootstrapWarning.noSeedNodesAvailable=Nessun nodo seme disponibile mainView.bootstrapWarning.noNodesAvailable=Nessun nodo seme e peer disponibili -mainView.bootstrapWarning.bootstrappingToP2PFailed=Il bootstrap sulla rete Bisq non è riuscito +mainView.bootstrapWarning.bootstrappingToP2PFailed=Il bootstrap sulla rete Haveno non è riuscito mainView.p2pNetworkWarnMsg.noNodesAvailable=Non ci sono nodi seed o peer persistenti disponibili per la richiesta di dati.\nControlla la tua connessione Internet o prova a riavviare l'applicazione. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connessione alla rete Bisq non riuscita (errore segnalato: {0}).\nControlla la tua connessione Internet o prova a riavviare l'applicazione. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connessione alla rete Haveno non riuscita (errore segnalato: {0}).\nControlla la tua connessione Internet o prova a riavviare l'applicazione. mainView.walletServiceErrorMsg.timeout=Connessione alla rete Bitcoin fallita a causa di un timeout. mainView.walletServiceErrorMsg.connectionError=Connessione alla rete Bitcoin fallita a causa di un errore: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=Connessione alla rete Bitcoin fal mainView.walletServiceErrorMsg.rejectedTxException=Una transazione è stata rifiutata dalla rete.\n\n{0} mainView.networkWarning.allConnectionsLost=Hai perso la connessione a tutti i {0} peer di rete.\nForse hai perso la connessione a Internet o il computer era in modalità standby. -mainView.networkWarning.localhostBitcoinLost=Hai perso la connessione al nodo Bitcoin in localhost.\nRiavvia l'applicazione Bisq per connetterti ad altri nodi Bitcoin o riavvia il nodo Bitcoin in localhost. +mainView.networkWarning.localhostBitcoinLost=Hai perso la connessione al nodo Bitcoin in localhost.\nRiavvia l'applicazione Haveno per connetterti ad altri nodi Bitcoin o riavvia il nodo Bitcoin in localhost. mainView.version.update=(Aggiornamento disponibile) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=L'importo di scambio cons offerbook.warning.wrongTradeProtocol=Questa offerta richiede una versione di protocollo diversa da quella utilizzata nella versione del tuo software.\n\nVerifica di aver installato l'ultima versione, altrimenti l'utente che ha creato l'offerta ha utilizzato una versione precedente.\n\nGli utenti non possono effettuare scambi con una versione di protocollo di scambio incompatibile. offerbook.warning.userIgnored=Hai aggiunto l'indirizzo onion dell'utente al tuo elenco di persone da ignorare. -offerbook.warning.offerBlocked=Tale offerta è stata bloccata dagli sviluppatori Bisq.\nProbabilmente c'è un bug non gestito che causa problemi quando si accetta tale offerta. -offerbook.warning.currencyBanned=La valuta utilizzata in quell'offerta è stata bloccata dagli sviluppatori Bisq.\nPer ulteriori informazioni, visitare il forum di Bisq. -offerbook.warning.paymentMethodBanned=Il metodo di pagamento utilizzato in quell'offerta è stato bloccato dagli sviluppatori Bisq.\nPer ulteriori informazioni, visitare il forum di Bisq. -offerbook.warning.nodeBlocked=L'indirizzo onion di quel trader è stato bloccato dagli sviluppatori Bisq.\nProbabilmente c'è un bug non gestito che causa problemi quando si accettano offerte da quel trader. -offerbook.warning.requireUpdateToNewVersion=Your version of Bisq is not compatible for trading anymore.\nPlease update to the latest Bisq version at [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Tale offerta è stata bloccata dagli sviluppatori Haveno.\nProbabilmente c'è un bug non gestito che causa problemi quando si accetta tale offerta. +offerbook.warning.currencyBanned=La valuta utilizzata in quell'offerta è stata bloccata dagli sviluppatori Haveno.\nPer ulteriori informazioni, visitare il forum di Haveno. +offerbook.warning.paymentMethodBanned=Il metodo di pagamento utilizzato in quell'offerta è stato bloccato dagli sviluppatori Haveno.\nPer ulteriori informazioni, visitare il forum di Haveno. +offerbook.warning.nodeBlocked=L'indirizzo onion di quel trader è stato bloccato dagli sviluppatori Haveno.\nProbabilmente c'è un bug non gestito che causa problemi quando si accettano offerte da quel trader. +offerbook.warning.requireUpdateToNewVersion=Your version of Haveno is not compatible for trading anymore.\nPlease update to the latest Haveno version at [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. It could be that your previous take-offer attempt resulted in a failed trade. offerbook.info.sellAtMarketPrice=Venderai al prezzo di mercato (aggiornato ogni minuto). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Finanzia la tua offerta createOffer.fundsBox.offerFee=Commissione di scambio createOffer.fundsBox.networkFee=Commissione di mining createOffer.fundsBox.placeOfferSpinnerInfo=Pubblicazione dell'offerta in corso ... -createOffer.fundsBox.paymentLabel=Scambio Bisq con ID {0} +createOffer.fundsBox.paymentLabel=Scambio Haveno con ID {0} createOffer.fundsBox.fundsStructure=({0} deposito cauzionale, {1} commissione di scambio, {2} commissione di mining) createOffer.success.headline=La tua offerta è stata pubblicata createOffer.success.info=Puoi gestire le tue offerte aperte su \"Portafoglio/Le mie offerte aperte\". @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Revisione: piazza l'offerta a {0} monero createOffer.createOfferFundWalletInfo.headline=Finanzia la tua offerta # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Importo di scambio: {0} \n -createOffer.createOfferFundWalletInfo.msg=Devi depositare {0} a questa offerta.\n\nTali fondi sono riservati nel tuo portafoglio locale e verranno bloccati nell'indirizzo di deposito multisig una volta che qualcuno accetta la tua offerta.\n\nL'importo è la somma di:\n{1} - Il tuo deposito cauzionale: {2}\n- Commissione di scambio: {3}\n- Commissione di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usa il tuo portafoglio Bisq (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Effettua il trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup. +createOffer.createOfferFundWalletInfo.msg=Devi depositare {0} a questa offerta.\n\nTali fondi sono riservati nel tuo portafoglio locale e verranno bloccati nell'indirizzo di deposito multisig una volta che qualcuno accetta la tua offerta.\n\nL'importo è la somma di:\n{1} - Il tuo deposito cauzionale: {2}\n- Commissione di scambio: {3}\n- Commissione di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usa il tuo portafoglio Haveno (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Effettua il trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Si è verificato un errore durante l'immissione dell'offerta:\n\n{0}\n\nNon sono ancora usciti fondi dal tuo portafoglio.\nRiavvia l'applicazione e controlla la connessione di rete. createOffer.setAmountPrice=Imposta importo e prezzo -createOffer.warnCancelOffer=Hai già finanziato questa offerta.\nSe annulli ora, i tuoi fondi verranno spostati sul tuo portafoglio Bisq locale e saranno disponibili per il prelievo nella schermata "Fondi/Invia fondi".\nSei sicuro di voler annullare? +createOffer.warnCancelOffer=Hai già finanziato questa offerta.\nSe annulli ora, i tuoi fondi verranno spostati sul tuo portafoglio Haveno locale e saranno disponibili per il prelievo nella schermata "Fondi/Invia fondi".\nSei sicuro di voler annullare? createOffer.timeoutAtPublishing=Si è verificato un timeout durante la pubblicazione dell'offerta. createOffer.errorInfo=\n\nLa maker fee è già pagata. Nel peggiore dei casi hai perso quella commissione.\nProva a riavviare l'applicazione e controlla la connessione di rete per vedere se riesci a risolvere il problema. createOffer.tooLowSecDeposit.warning=Il deposito cauzionale è stato impostato su un valore inferiore rispetto al valore predefinito consigliato di {0}.\nSei sicuro di voler utilizzare un deposito di sicurezza inferiore? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Importo da vendere takeOffer.fundsBox.offerFee=Commissione di scambio takeOffer.fundsBox.networkFee=Totale commissioni di mining takeOffer.fundsBox.takeOfferSpinnerInfo=Accettazione dell'offerta in corso ... -takeOffer.fundsBox.paymentLabel=Scambia Bisq con ID {0} +takeOffer.fundsBox.paymentLabel=Scambia Haveno con ID {0} takeOffer.fundsBox.fundsStructure=({0} deposito cauzionale, {1} commissione commerciale, {2} commissione mineraria) takeOffer.success.headline=Hai accettato con successo un'offerta. takeOffer.success.info=Puoi vedere lo stato del tuo scambio su \"Portafoglio/Scambi aperti\". @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=Non puoi accettare questa offerta poiché utilizz takeOffer.takeOfferFundWalletInfo.headline=Finanzia il tuo scambio # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Importo di scambio: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Devi depositare {0} per accettare questa offerta.\n\nL'importo è la somma de:\n{1} - Il tuo deposito cauzionale: {2}\n- La commissione di trading: {3}\n- I costi di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usare il tuo portafoglio Bisq (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup. +takeOffer.takeOfferFundWalletInfo.msg=Devi depositare {0} per accettare questa offerta.\n\nL'importo è la somma de:\n{1} - Il tuo deposito cauzionale: {2}\n- La commissione di trading: {3}\n- I costi di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usare il tuo portafoglio Haveno (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup. takeOffer.alreadyPaidInFunds=Se hai già pagato in fondi puoi effettuare il ritiro nella schermata \"Fondi/Invia fondi\". takeOffer.paymentInfo=Informazioni sul pagamento takeOffer.setAmountPrice=Importo stabilito -takeOffer.alreadyFunded.askCancel=Hai già finanziato questa offerta.\nSe annulli ora, i tuoi fondi verranno spostati sul tuo portafoglio Bisq locale e saranno disponibili per il prelievo nella schermata "Fondi/Invia fondi".\nSei sicuro di voler annullare? +takeOffer.alreadyFunded.askCancel=Hai già finanziato questa offerta.\nSe annulli ora, i tuoi fondi verranno spostati sul tuo portafoglio Haveno locale e saranno disponibili per il prelievo nella schermata "Fondi/Invia fondi".\nSei sicuro di voler annullare? takeOffer.failed.offerNotAvailable=Accettazione dell'offerta non riuscita perché l'offerta non è più disponibile. Nel frattempo, un altro trader potrebbe aver già accettato l'offerta. takeOffer.failed.offerTaken=Non puoi accettare questa offerta perché l'offerta è già stata presa da un altro trader. takeOffer.failed.offerRemoved=Non puoi accettare quell'offerta perché nel frattempo l'offerta è stata rimossa. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Conferma: modifica offerta editOffer.publishOffer=Pubblica la tua offerta. editOffer.failed=Modifica dell'offerta fallita:\n{0} editOffer.success=La tua offerta è stata modificata con successo. -editOffer.invalidDeposit=Il deposito di sicurezza dell'acquirente non rientra nei vincoli definiti dalla DAO di Bisq e non può più essere modificato. +editOffer.invalidDeposit=Il deposito di sicurezza dell'acquirente non rientra nei vincoli definiti dalla DAO di Haveno e non può più essere modificato. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=La transazione di deposito non è ancora # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=REQUISITO IMPORTANTE:\nDopo ave # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Invia {0} tramite \"Vaglia Postale Statunitense\" al venditore BTC.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Invia MTCN e ricevut portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Devi inviare l'MTCN (numero di tracciamento) e una foto della ricevuta via e-mail al venditore BTC.\nLa ricevuta deve indicare chiaramente il nome completo, la città, il paese e l'importo del venditore. L'email del venditore è: {0}.\n\nHai inviato l'MTCN e la ricevuta al venditore? portfolio.pending.step2_buyer.halCashInfo.headline=Invia il codice HalCash portfolio.pending.step2_buyer.halCashInfo.msg=È necessario inviare un messaggio di testo con il codice HalCash e l'ID dello scambio ({0}) al venditore BTC.\nIl numero di cellulare del venditore è {1}.\n\nHai inviato il codice al venditore? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Alcune banche potrebbero richiedere il nome del destinatario. Gli account di Pagamento Veloci creati dai vecchi client Bisq non forniscono il nome del destinatario, quindi (se necessario) utilizza la chat dell scambio per fartelo comunicare. +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Alcune banche potrebbero richiedere il nome del destinatario. Gli account di Pagamento Veloci creati dai vecchi client Haveno non forniscono il nome del destinatario, quindi (se necessario) utilizza la chat dell scambio per fartelo comunicare. portfolio.pending.step2_buyer.confirmStart.headline=Conferma di aver avviato il pagamento portfolio.pending.step2_buyer.confirmStart.msg=Hai avviato il pagamento {0} al tuo partner commerciale? portfolio.pending.step2_buyer.confirmStart.yes=Sì, ho avviato il pagamento portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Bisq requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway portfolio.pending.step2_seller.waitPayment.headline=In attesa del pagamento @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=L'acquirente BTC non ha ancora effettuato il portfolio.pending.step2_seller.openForDispute=L'acquirente BTC non ha ancora inviato il pagamento!\nIl periodo massimo consentito per lo scambio è trascorso.\nPuoi aspettare più a lungo e dare più tempo al partner di scambio oppure puoi contattare il mediatore per ricevere assistenza. tradeChat.chatWindowTitle=Finestra di chat per scambi con ID '' {0} '' tradeChat.openChat=Apri la finestra di chat -tradeChat.rules=Puoi comunicare con il tuo peer di trading per risolvere potenziali problemi con questo scambio.\nNon è obbligatorio rispondere nella chat.\nSe un trader viola una delle seguenti regole, apri una controversia ed effettua una segnalazione al mediatore o all'arbitro.\n\nRegole della chat:\n● Non inviare nessun link (rischio di malware). È possibile inviare l'ID transazione e il nome di un block explorer.\n● Non inviare parole del seed, chiavi private, password o altre informazioni sensibili!\n● Non incoraggiare il trading al di fuori di Bisq (non garantisce nessuna sicurezza).\n● Non intraprendere alcuna forma di tentativo di frode di ingegneria sociale.\n● Se un peer non risponde e preferisce non comunicare tramite chat, rispettane la decisione.\n● Limita l'ambito della conversazione allo scambio. Questa chat non è una sostituzione di messenger o un troll-box.\n● Mantieni la conversazione amichevole e rispettosa.\n  +tradeChat.rules=Puoi comunicare con il tuo peer di trading per risolvere potenziali problemi con questo scambio.\nNon è obbligatorio rispondere nella chat.\nSe un trader viola una delle seguenti regole, apri una controversia ed effettua una segnalazione al mediatore o all'arbitro.\n\nRegole della chat:\n● Non inviare nessun link (rischio di malware). È possibile inviare l'ID transazione e il nome di un block explorer.\n● Non inviare parole del seed, chiavi private, password o altre informazioni sensibili!\n● Non incoraggiare il trading al di fuori di Haveno (non garantisce nessuna sicurezza).\n● Non intraprendere alcuna forma di tentativo di frode di ingegneria sociale.\n● Se un peer non risponde e preferisce non comunicare tramite chat, rispettane la decisione.\n● Limita l'ambito della conversazione allo scambio. Questa chat non è una sostituzione di messenger o un troll-box.\n● Mantieni la conversazione amichevole e rispettosa.\n  # suppress inspection "UnusedProperty" message.state.UNDEFINED=Non definito @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=Deposito di sicurezza rimborsato portfolio.pending.step5_buyer.withdrawBTC=Preleva i tuoi bitcoin portfolio.pending.step5_buyer.amount=Importo da prelevare portfolio.pending.step5_buyer.withdrawToAddress=Ritirare all'indirizzo -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToHavenoWallet=Keep funds in Haveno wallet portfolio.pending.step5_buyer.withdrawExternal=Ritira verso un portafoglio esterno portfolio.pending.step5_buyer.alreadyWithdrawn=I tuoi fondi sono già stati ritirati.\nSi prega di controllare la cronologia delle transazioni. portfolio.pending.step5_buyer.confirmWithdrawal=Conferma richiesta di prelievo @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=Hai ricevuto tradeFeedbackWindow.title=Congratulazioni per aver concluso il tuo scambio tradeFeedbackWindow.msg.part1=Ci piacerebbe avere notizie sulla tua esperienza. Ci aiuterà a migliorare il software e a correggere eventuali errori. Se desideri fornire un feedback, compila questo breve sondaggio (non è richiesta la registrazione) all'indirizzo: -tradeFeedbackWindow.msg.part2=In caso di domande o problemi, si prega di mettersi in contatto con altri utenti e collaboratori tramite il forum Bisq all'indirizzo: -tradeFeedbackWindow.msg.part3=Grazie per aver usato Bisq! +tradeFeedbackWindow.msg.part2=In caso di domande o problemi, si prega di mettersi in contatto con altri utenti e collaboratori tramite il forum Haveno all'indirizzo: +tradeFeedbackWindow.msg.part3=Grazie per aver usato Haveno! portfolio.pending.role=Il mio ruolo portfolio.pending.tradeInformation=Informazioni sullo scambio @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=Dopo la prima conferma della blockchain, inizi portfolio.pending.tradePeriodWarning=Se il periodo viene superato, entrambi i trader possono aprire una disputa. portfolio.pending.tradeNotCompleted=Scambio non completato in tempo (fino a {0}) portfolio.pending.tradeProcess=Processo dello scambio -portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Bisq forum at [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Haveno forum at [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Apri nuovamente la disputa portfolio.pending.openSupportTicket.headline=Apri ticket di supporto portfolio.pending.openSupportTicket.msg=Utilizza questa funzione solo in caso di emergenza se non viene visualizzato il pulsante \"Apri supporto\" o \"Apri disputa\".\n\nQuando apri un ticket di supporto, lo scambio verrà interrotto e gestito da un mediatore o da un arbitro. portfolio.pending.timeLockNotOver=Devi aspettare fino a ≈ {0} ({1} più blocchi) prima di poter aprire una controversia arbitrale. -portfolio.pending.error.depositTxNull=La transazione di deposito è nulla. Non è possibile aprire una disputa senza una transazione di deposito valida. Vai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\n\nPer ulteriore assistenza, contatta il canale di supporto Bisq nel team di Bisq Keybase. +portfolio.pending.error.depositTxNull=La transazione di deposito è nulla. Non è possibile aprire una disputa senza una transazione di deposito valida. Vai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\n\nPer ulteriore assistenza, contatta il canale di supporto Haveno nel team di Haveno Keybase. portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the trade to failed trades. portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the trade to failed trades. -portfolio.pending.error.depositTxNotConfirmed=La transazione di deposito non è confermata. Non è possibile aprire una disputa arbitrale con una transazione di deposito non confermata. Attendi fino alla conferma o vai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\n\nPer ulteriore assistenza, contatta il canale di supporto Bisq nel team di Bisq Keybase. +portfolio.pending.error.depositTxNotConfirmed=La transazione di deposito non è confermata. Non è possibile aprire una disputa arbitrale con una transazione di deposito non confermata. Attendi fino alla conferma o vai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\n\nPer ulteriore assistenza, contatta il canale di supporto Haveno nel team di Haveno Keybase. portfolio.pending.support.headline.getHelp=Ho bisogno di aiuto? -portfolio.pending.support.text.getHelp=In caso di problemi, puoi provare a contattare il peer di scambio tramite la chat oppure puoi chiedere aiuto alla comunità Bisq all'indirizzo https://bisq.community. Se il problema persiste, puoi richiedere ulteriore aiuto ad un mediatore. +portfolio.pending.support.text.getHelp=In caso di problemi, puoi provare a contattare il peer di scambio tramite la chat oppure puoi chiedere aiuto alla comunità Haveno all'indirizzo https://haveno.community. Se il problema persiste, puoi richiedere ulteriore aiuto ad un mediatore. portfolio.pending.support.button.getHelp=Apri la chat dello scambio portfolio.pending.support.headline.halfPeriodOver=Controlla il pagamento portfolio.pending.support.headline.periodOver=Il periodo di scambio è finito @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee trans portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\nWithout this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. You can make a request to be reimbursed the trade fee here: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nFeel free to move this trade to failed trades. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, but funds have been locked in the deposit transaction.\n\nPlease do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. The mediator should suggest that both peers each get back the the full amount of their security deposits (with seller receiving full trade amount back as well). This way, there is no security risk, and only trade fees are lost. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing but funds have been locked in the deposit transaction.\n\nIf the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\nIf the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of their security deposits (with seller receiving full trade amount back as well). Otherwise the trade amount should go to the buyer. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Bisq mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Haveno mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\nThe trade cannot be completed and you might have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\nDo you want to move the trade to failed trades?\n\nYou cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open trades screen any time. @@ -828,7 +828,7 @@ funds.tab.transactions=Transazioni funds.deposit.unused=Non usato funds.deposit.usedInTx=Utilizzato in {0} transazioni -funds.deposit.fundHavenoWallet=Finanzia portafoglio Bisq +funds.deposit.fundHavenoWallet=Finanzia portafoglio Haveno funds.deposit.noAddresses=Non sono stati ancora generati indirizzi di deposito funds.deposit.fundWallet=Finanzia il tuo portafoglio funds.deposit.withdrawFromWallet=Invia fondi dal portafoglio @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=Prelevato dal portafoglio funds.tx.memo=Memo funds.tx.noTxAvailable=Nessuna transazione disponibile funds.tx.revert=Storna -funds.tx.txSent=Transazione inviata con successo ad un nuovo indirizzo nel portafoglio Bisq locale. +funds.tx.txSent=Transazione inviata con successo ad un nuovo indirizzo nel portafoglio Haveno locale. funds.tx.direction.self=Invia a te stesso funds.tx.dustAttackTx=Polvere ricevuta -funds.tx.dustAttackTx.popup=Questa transazione sta inviando un importo BTC molto piccolo al tuo portafoglio e potrebbe essere un tentativo da parte delle società di chain analysis per spiare il tuo portafoglio.\n\nSe usi quell'output della transazione in una transazione di spesa, scopriranno che probabilmente sei anche il proprietario dell'altro indirizzo (combinazione di monete).\n\nPer proteggere la tua privacy, il portafoglio Bisq ignora tali output di polvere a fini di spesa e nella visualizzazione del saldo. È possibile impostare la soglia al di sotto della quale un output è considerato polvere.\n  +funds.tx.dustAttackTx.popup=Questa transazione sta inviando un importo BTC molto piccolo al tuo portafoglio e potrebbe essere un tentativo da parte delle società di chain analysis per spiare il tuo portafoglio.\n\nSe usi quell'output della transazione in una transazione di spesa, scopriranno che probabilmente sei anche il proprietario dell'altro indirizzo (combinazione di monete).\n\nPer proteggere la tua privacy, il portafoglio Haveno ignora tali output di polvere a fini di spesa e nella visualizzazione del saldo. È possibile impostare la soglia al di sotto della quale un output è considerato polvere.\n  #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=Inviando il messaggio ... support.receiverNotOnline=Il destinatario non è online. Il messaggio viene salvato nella loro casella di posta. support.sendMessageError=Invio messaggio non riuscito. Errore: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=L'offerta in quella controversia è stata creata con una versione precedente di Bisq.\nNon puoi chiudere quella controversia con la versione della tua applicazione.\n\nUtilizza una versione precedente con la versione del protocollo {0} +support.wrongVersion=L'offerta in quella controversia è stata creata con una versione precedente di Haveno.\nNon puoi chiudere quella controversia con la versione della tua applicazione.\n\nUtilizza una versione precedente con la versione del protocollo {0} support.openFile=Apri il file da allegare (dimensione massima del file: {0}) support.attachmentTooLarge=La dimensione dei tuoi allegati è di {0} e supera il massimo consentito di {1} kB. support.maxSize=La dimensione massima del file permessa è di {0} kB. @@ -953,15 +953,15 @@ support.sellerMaker=Venditore/Maker BTC support.buyerTaker=Acquirente/Taker BTC support.sellerTaker=Venditore/Taker BTC -support.backgroundInfo=Bisq non è una società, quindi gestisce le controversie in modo diverso.\n\nI trader possono comunicare all'interno dell'applicazione tramite chat sicura nella schermata degli scambi aperti per provare a risolvere le controversie da soli. Se ciò non è sufficiente, un mediatore può intervenire per aiutare. Il mediatore valuterà la situazione e suggerirà un pagamento di fondi commerciali. Se entrambi i trader accettano questo suggerimento, la transazione di pagamento è completata e lo scambio è chiuso. Se uno o entrambi i trader non accettano il pagamento suggerito dal mediatore, possono richiedere l'arbitrato. L'arbitro rivaluterà la situazione e, se garantito, ripagherà personalmente il trader e chiederà il rimborso per questo pagamento dal DAO Bisq. -support.initialInfo=Inserisci una descrizione del tuo problema nel campo di testo qui sotto. Aggiungi quante più informazioni possibili per accelerare i tempi di risoluzione della disputa.\n\nEcco una lista delle informazioni che dovresti fornire:\n● Se sei l'acquirente BTC: hai effettuato il trasferimento Fiat o Altcoin? In tal caso, hai fatto clic sul pulsante "pagamento avviato" nell'applicazione?\n● Se sei il venditore BTC: hai ricevuto il pagamento Fiat o Altcoin? In tal caso, hai fatto clic sul pulsante "pagamento ricevuto" nell'applicazione?\n● Quale versione di Bisq stai usando?\n● Quale sistema operativo stai usando?\n● Se si è verificato un problema con transazioni non riuscite, prendere in considerazione la possibilità di passare a una nuova directory di dati.\n  A volte la directory dei dati viene danneggiata e porta a strani bug.\n  Vedi: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nAcquisire familiarità con le regole di base per la procedura di disputa:\n● È necessario rispondere alle richieste di {0} entro 2 giorni.\n● I mediatori rispondono entro 2 giorni. Gli arbitri rispondono entro 5 giorni lavorativi.\n● Il periodo massimo per una disputa è di 14 giorni.\n● È necessario collaborare con {1} e fornire le informazioni richieste per presentare il proprio caso.\n● Hai accettato le regole delineate nel documento di contestazione nel contratto con l'utente al primo avvio dell'applicazione.\n\nPuoi leggere ulteriori informazioni sulla procedura di contestazione all'indirizzo: {2}\n  +support.backgroundInfo=Haveno non è una società, quindi gestisce le controversie in modo diverso.\n\nI trader possono comunicare all'interno dell'applicazione tramite chat sicura nella schermata degli scambi aperti per provare a risolvere le controversie da soli. Se ciò non è sufficiente, un mediatore può intervenire per aiutare. Il mediatore valuterà la situazione e suggerirà un pagamento di fondi commerciali. Se entrambi i trader accettano questo suggerimento, la transazione di pagamento è completata e lo scambio è chiuso. Se uno o entrambi i trader non accettano il pagamento suggerito dal mediatore, possono richiedere l'arbitrato. L'arbitro rivaluterà la situazione e, se garantito, ripagherà personalmente il trader e chiederà il rimborso per questo pagamento dal DAO Haveno. +support.initialInfo=Inserisci una descrizione del tuo problema nel campo di testo qui sotto. Aggiungi quante più informazioni possibili per accelerare i tempi di risoluzione della disputa.\n\nEcco una lista delle informazioni che dovresti fornire:\n● Se sei l'acquirente BTC: hai effettuato il trasferimento Fiat o Altcoin? In tal caso, hai fatto clic sul pulsante "pagamento avviato" nell'applicazione?\n● Se sei il venditore BTC: hai ricevuto il pagamento Fiat o Altcoin? In tal caso, hai fatto clic sul pulsante "pagamento ricevuto" nell'applicazione?\n● Quale versione di Haveno stai usando?\n● Quale sistema operativo stai usando?\n● Se si è verificato un problema con transazioni non riuscite, prendere in considerazione la possibilità di passare a una nuova directory di dati.\n  A volte la directory dei dati viene danneggiata e porta a strani bug.\n  Vedi: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nAcquisire familiarità con le regole di base per la procedura di disputa:\n● È necessario rispondere alle richieste di {0} entro 2 giorni.\n● I mediatori rispondono entro 2 giorni. Gli arbitri rispondono entro 5 giorni lavorativi.\n● Il periodo massimo per una disputa è di 14 giorni.\n● È necessario collaborare con {1} e fornire le informazioni richieste per presentare il proprio caso.\n● Hai accettato le regole delineate nel documento di contestazione nel contratto con l'utente al primo avvio dell'applicazione.\n\nPuoi leggere ulteriori informazioni sulla procedura di contestazione all'indirizzo: {2}\n  support.systemMsg=Messaggio di sistema: {0} -support.youOpenedTicket=Hai aperto una richiesta di supporto.\n\n{0}\n\nVersione Bisq: {1} -support.youOpenedDispute=Hai aperto una richiesta per una controversia.\n\n{0}\n\nVersione Bisq: {1} -support.youOpenedDisputeForMediation=Hai richiesto la mediazione.\n\n{0}\n\nVersione Bisq: {1} -support.peerOpenedTicket=Il tuo peer di trading ha richiesto supporto a causa di problemi tecnici.\n\n{0}\n\nVersione Bisq: {1} -support.peerOpenedDispute=Il tuo peer di trading ha richiesto una controversia.\n\n{0}\n\nVersione Bisq: {1} -support.peerOpenedDisputeForMediation=Il tuo peer di trading ha richiesto la mediazione.\n\n{0}\n\nVersione Bisq: {1} +support.youOpenedTicket=Hai aperto una richiesta di supporto.\n\n{0}\n\nVersione Haveno: {1} +support.youOpenedDispute=Hai aperto una richiesta per una controversia.\n\n{0}\n\nVersione Haveno: {1} +support.youOpenedDisputeForMediation=Hai richiesto la mediazione.\n\n{0}\n\nVersione Haveno: {1} +support.peerOpenedTicket=Il tuo peer di trading ha richiesto supporto a causa di problemi tecnici.\n\n{0}\n\nVersione Haveno: {1} +support.peerOpenedDispute=Il tuo peer di trading ha richiesto una controversia.\n\n{0}\n\nVersione Haveno: {1} +support.peerOpenedDisputeForMediation=Il tuo peer di trading ha richiesto la mediazione.\n\n{0}\n\nVersione Haveno: {1} support.mediatorsDisputeSummary=System message: Mediator''s dispute summary:\n{0} support.mediatorsAddress=Indirizzo nodo del mediatore: {0} support.warning.disputesWithInvalidDonationAddress=The delayed payout transaction has used an invalid receiver address. It does not match any of the DAO parameter values for the valid donation addresses.\n\nThis might be a scam attempt. Please inform the developers about that incident and do not close that case before the situation is resolved!\n\nAddress used in the dispute: {0}\n\nAll DAO param donation addresses: {1}\n\nTrade ID: {2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaction URL settings.preferences.editCustomExplorer.addressUrl=Address URL settings.net.btcHeader=Network Bitcoin -settings.net.p2pHeader=Rete Bisq +settings.net.p2pHeader=Rete Haveno settings.net.onionAddressLabel=Il mio indirizzo onion settings.net.btcNodesLabel=Usa nodi Bitcoin Core personalizzati settings.net.bitcoinPeersLabel=Peer connessi @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=Nodi Bitcoin Core a cui connettersi settings.net.useProvidedNodesRadio=Usa i nodi Bitcoin Core forniti settings.net.usePublicNodesRadio=Usa la rete pubblica di Bitcoin settings.net.useCustomNodesRadio=Usa nodi Bitcoin Core personalizzati -settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? +settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Haveno). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? settings.net.warn.usePublicNodes.useProvided=No, utilizza i nodi forniti settings.net.warn.usePublicNodes.usePublic=Sì, usa la rete pubblica settings.net.warn.useCustomNodes.B2XWarning=Assicurati che il tuo nodo Bitcoin sia un nodo Bitcoin Core di fiducia!\n\nLa connessione a nodi che non seguono le regole di consenso di Bitcoin Core potrebbe corrompere il tuo portafoglio e causare problemi nel processo di scambio.\n\nGli utenti che si connettono a nodi che violano le regole di consenso sono responsabili per qualsiasi danno risultante. Eventuali controversie risultanti saranno decise a favore dell'altro pari. Nessun supporto tecnico verrà fornito agli utenti che ignorano questo meccanismo di avvertimento e protezione! settings.net.warn.invalidBtcConfig=Connessione alla rete Bitcoin non riuscita perché la configurazione non è valida.\n\nLa tua configurazione è stata ripristinata per utilizzare invece i nodi Bitcoin forniti. Dovrai riavviare l'applicazione. -settings.net.localhostBtcNodeInfo=Informazioni di base: Bisq cerca un nodo Bitcoin locale all'avvio. Se viene trovato, Bisq comunicherà con la rete Bitcoin esclusivamente attraverso di esso. +settings.net.localhostBtcNodeInfo=Informazioni di base: Haveno cerca un nodo Bitcoin locale all'avvio. Se viene trovato, Haveno comunicherà con la rete Bitcoin esclusivamente attraverso di esso. settings.net.p2PPeersLabel=Peer connessi settings.net.onionAddressColumn=Indirizzo onion settings.net.creationDateColumn=Stabilito @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=Il file della catena SPV è stato eliminato. Per favore sii paziente. La risincronizzazione con la rete può richiedere del tempo. settings.net.reSyncSPVAfterRestartCompleted=La risincronizzazione è ora completata. Si prega di riavviare l'applicazione. settings.net.reSyncSPVFailed=Impossibile eliminare il file della catena SPV.\nErrore: {0} -setting.about.aboutBisq=Riguardo Bisq -setting.about.about=Bisq è un software open source che facilita lo scambio di bitcoin con valute nazionali (e altre criptovalute) attraverso una rete peer-to-peer decentralizzata in modo da proteggere fortemente la privacy degli utenti. Leggi di più riguardo Bisq sulla pagina web del progetto. -setting.about.web=Pagina web Bisq +setting.about.aboutHaveno=Riguardo Haveno +setting.about.about=Haveno è un software open source che facilita lo scambio di bitcoin con valute nazionali (e altre criptovalute) attraverso una rete peer-to-peer decentralizzata in modo da proteggere fortemente la privacy degli utenti. Leggi di più riguardo Haveno sulla pagina web del progetto. +setting.about.web=Pagina web Haveno setting.about.code=Codice sorgente setting.about.agpl=Licenza AGPL -setting.about.support=Supporta Bisq -setting.about.def=Bisq non è un'azienda, è un progetto aperto alla comunità. Se vuoi partecipare o supportare Bisq, segui i link qui sotto. +setting.about.support=Supporta Haveno +setting.about.def=Haveno non è un'azienda, è un progetto aperto alla comunità. Se vuoi partecipare o supportare Haveno, segui i link qui sotto. setting.about.contribute=Contribuisci setting.about.providers=Fornitori di dati -setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation. -setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices. +setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation. +setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices. setting.about.pricesProvided=Prezzi di mercato forniti da setting.about.feeEstimation.label=Previsione della commissione di mining fornita da setting.about.versionDetails=Dettagli versione @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' o ''alt + {0}'' o ''cmd + setting.about.shortcuts.menuNav=Naviga il menu principale setting.about.shortcuts.menuNav.value=Per navigare nel menu principale premere: 'Ctrl' o 'alt' o 'cmd' con un tasto numerico tra '1-9' -setting.about.shortcuts.close=Chiudi Bisq +setting.about.shortcuts.close=Chiudi Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' o ''cmd + {0}'' o ''Ctrl + {1}'' o ''cmd + {1}'' setting.about.shortcuts.closePopup=Chiudi popup o finestra di dialogo @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Invia notifica privata al peer ( setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0} setting.info.headline=New XMR auto-confirm Feature -setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Bisq uses explorer nodes run by Bisq contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t account.tab.mediatorRegistration=Registrazione del mediatore account.tab.refundAgentRegistration=Registrazione agente di rimborso account.tab.signing=Signing -account.info.headline=Benvenuto nel tuo Account Bisq -account.info.msg=Qui puoi aggiungere conti di trading per valute nazionali e altcoin e creare un backup dei tuoi dati di portafoglio e conto.\n\nUn nuovo portafoglio Bitcoin è stato creato la prima volta che hai avviato Bisq.\n\nTi consigliamo vivamente di annotare le parole del seme del portafoglio Bitcoin (vedi la scheda in alto) e prendere in considerazione l'aggiunta di una password prima del finanziamento. I depositi e prelievi di bitcoin sono gestiti nella sezione \"Fondi\".\n\nInformativa sulla privacy e sulla sicurezza: poiché Bisq è un exchange decentralizzato, tutti i tuoi dati vengono conservati sul tuo computer. Non ci sono server, quindi non abbiamo accesso alle tue informazioni personali, ai tuoi fondi o persino al tuo indirizzo IP. Dati come numeri di conto bancario, altcoin e indirizzi Bitcoin, ecc. vengono condivisi con il proprio partner commerciale per adempiere alle negoziazioni avviate (in caso di controversia il mediatore o l'arbitro vedrà gli stessi dati del proprio peer di negoziazione). +account.info.headline=Benvenuto nel tuo Account Haveno +account.info.msg=Qui puoi aggiungere conti di trading per valute nazionali e altcoin e creare un backup dei tuoi dati di portafoglio e conto.\n\nUn nuovo portafoglio Bitcoin è stato creato la prima volta che hai avviato Haveno.\n\nTi consigliamo vivamente di annotare le parole del seme del portafoglio Bitcoin (vedi la scheda in alto) e prendere in considerazione l'aggiunta di una password prima del finanziamento. I depositi e prelievi di bitcoin sono gestiti nella sezione \"Fondi\".\n\nInformativa sulla privacy e sulla sicurezza: poiché Haveno è un exchange decentralizzato, tutti i tuoi dati vengono conservati sul tuo computer. Non ci sono server, quindi non abbiamo accesso alle tue informazioni personali, ai tuoi fondi o persino al tuo indirizzo IP. Dati come numeri di conto bancario, altcoin e indirizzi Bitcoin, ecc. vengono condivisi con il proprio partner commerciale per adempiere alle negoziazioni avviate (in caso di controversia il mediatore o l'arbitro vedrà gli stessi dati del proprio peer di negoziazione). account.menu.paymentAccount=Conti in valuta nazionale account.menu.altCoinsAccountView=Conti altcoin @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} registrazione account.arbitratorRegistration.revoke=Revoca account.arbitratorRegistration.info.msg=Nota che è necessario rimanere disponibili per 15 giorni dopo la revoca poiché potrebbero esserci operazioni che ti utilizzano come {0}. Il periodo massimo di scambio consentito è di 8 giorni e il processo di contestazione potrebbe richiedere fino a 7 giorni. account.arbitratorRegistration.warn.min1Language=Devi impostare almeno 1 lingua.\nAbbiamo aggiunto la lingua predefinita per te. -account.arbitratorRegistration.removedSuccess=Hai rimosso con successo la tua registrazione dalla rete Bisq. +account.arbitratorRegistration.removedSuccess=Hai rimosso con successo la tua registrazione dalla rete Haveno. account.arbitratorRegistration.removedFailed=Impossibile rimuovere la registrazione. {0} -account.arbitratorRegistration.registerSuccess=Ti sei registrato correttamente alla rete Bisq. +account.arbitratorRegistration.registerSuccess=Ti sei registrato correttamente alla rete Haveno. account.arbitratorRegistration.registerFailed=Impossibile completare la registrazione. {0} account.altcoin.yourAltcoinAccounts=I tuoi conti altcoin account.altcoin.popup.wallet.msg=Assicurati di seguire i requisiti per l'uso di {0} portafogli come descritto nella pagina web {1}.\nL'uso di portafogli da exchange centralizzati in cui (a) non controlli le tue chiavi o (b) che non usano software di portafoglio compatibile è rischioso: può portare alla perdita dei fondi scambiati!\nIl mediatore o l'arbitro non è uno specialista {2} e non può essere d'aiuto in questi casi. account.altcoin.popup.wallet.confirm=Capisco e confermo di sapere quale portafoglio devo usare. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. +account.altcoin.popup.upx.msg=Trading UPX on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Il trading di ARQ su Bisq richiede di comprendere e soddisfare i seguenti requisiti:\n\nPer inviare ARQ, è necessario utilizzare il portafoglio GUI ArQmA ufficiale o il portafoglio CLI ArQmA con il flag store-tx-info abilitato (impostazione predefinita nelle nuove versioni). Assicurati di poter accedere alla chiave tx come sarebbe richiesto in caso di controversia.\narqma-wallet-cli (utilizzare il comando get_tx_key)\narqma-wallet-gui (vai allo storico trnsazioni e fai clic sul pulsante (P) per la prova del pagamento)\n\nNegli explorer di blocchi normali il trasferimento non è verificabile.\n\nÈ necessario fornire al mediatore o all'arbitro i seguenti dati in caso di controversia:\n- La chiave privata tx\n- L'hash della transazione\n- L'indirizzo pubblico del destinatario\n\nIl mancato conferimento dei dati di cui sopra o l'utilizzo di un portafoglio incompatibile comporterà la perdita del caso di contestazione. Il mittente ARQ è responsabile di fornire la verifica del trasferimento ARQ al mediatore o all'arbitro in caso di controversia.\n\nNon è richiesto un ID di pagamento, ma solo il normale indirizzo pubblico.\nSe non si è sicuri di tale processo, visitare il canale discord ArQmA (https://discord.gg/s9BQpJT) o il forum ArQmA (https://labs.arqma.com) per trovare ulteriori informazioni.\n  +account.altcoin.popup.arq.msg=Il trading di ARQ su Haveno richiede di comprendere e soddisfare i seguenti requisiti:\n\nPer inviare ARQ, è necessario utilizzare il portafoglio GUI ArQmA ufficiale o il portafoglio CLI ArQmA con il flag store-tx-info abilitato (impostazione predefinita nelle nuove versioni). Assicurati di poter accedere alla chiave tx come sarebbe richiesto in caso di controversia.\narqma-wallet-cli (utilizzare il comando get_tx_key)\narqma-wallet-gui (vai allo storico trnsazioni e fai clic sul pulsante (P) per la prova del pagamento)\n\nNegli explorer di blocchi normali il trasferimento non è verificabile.\n\nÈ necessario fornire al mediatore o all'arbitro i seguenti dati in caso di controversia:\n- La chiave privata tx\n- L'hash della transazione\n- L'indirizzo pubblico del destinatario\n\nIl mancato conferimento dei dati di cui sopra o l'utilizzo di un portafoglio incompatibile comporterà la perdita del caso di contestazione. Il mittente ARQ è responsabile di fornire la verifica del trasferimento ARQ al mediatore o all'arbitro in caso di controversia.\n\nNon è richiesto un ID di pagamento, ma solo il normale indirizzo pubblico.\nSe non si è sicuri di tale processo, visitare il canale discord ArQmA (https://discord.gg/s9BQpJT) o il forum ArQmA (https://labs.arqma.com) per trovare ulteriori informazioni.\n  # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Trading XMR on Haveno requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Haveno now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Trading MSR on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Trading BLUR on Haveno requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Trading Solo on Bisq requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Trading Solo on Haveno requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Trading CASH2 on Bisq requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Trading CASH2 on Haveno requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Il trading di Dragonglass su Bisq richiede di comprendere e soddisfare i seguenti requisiti:\n\nA causa della privacy fornita da Dragonglass, una transazione non è verificabile sulla blockchain pubblica. Se necessario, puoi provare il tuo pagamento utilizzando la tua chiave privata TXN.\nLa chiave privata TXN è una chiave una tantum generata automaticamente per ogni transazione a cui è possibile accedere solo dal proprio portafoglio DRGL.\nOppore dalla GUI del wallet DRGL (nella finestra di dialogo dei dettagli della transazione) o dalla semplice interfaccia CLI di Dragonglass (usando il comando "get_tx_key").\n\nPer entrambi è richiesta la versione DRGL 'Oathkeeper' e successive.\n\nIn caso di controversia, è necessario fornire al mediatore o all'arbitro i seguenti dati:\n- La chiave privata TXN\n- L'hash della transazione\n- L'indirizzo pubblico del destinatario\n\nLa verifica del pagamento può essere effettuata utilizzando i dati sopra riportati come input su (http://drgl.info/#check_txn).\n\nIl mancato conferimento dei dati di cui sopra o l'utilizzo di un portafoglio incompatibile comporterà la perdita del caso di disputa. Il mittente Dragonglass è responsabile di fornire la verifica del trasferimento DRGL al mediatore o all'arbitro in caso di controversia. L'uso di PaymentID non è richiesto.\n\nIn caso di dubbi su qualsiasi parte di questo processo, visitare Dragonglass su Discord (http://discord.drgl.info) per assistenza.\n  +account.altcoin.popup.drgl.msg=Il trading di Dragonglass su Haveno richiede di comprendere e soddisfare i seguenti requisiti:\n\nA causa della privacy fornita da Dragonglass, una transazione non è verificabile sulla blockchain pubblica. Se necessario, puoi provare il tuo pagamento utilizzando la tua chiave privata TXN.\nLa chiave privata TXN è una chiave una tantum generata automaticamente per ogni transazione a cui è possibile accedere solo dal proprio portafoglio DRGL.\nOppore dalla GUI del wallet DRGL (nella finestra di dialogo dei dettagli della transazione) o dalla semplice interfaccia CLI di Dragonglass (usando il comando "get_tx_key").\n\nPer entrambi è richiesta la versione DRGL 'Oathkeeper' e successive.\n\nIn caso di controversia, è necessario fornire al mediatore o all'arbitro i seguenti dati:\n- La chiave privata TXN\n- L'hash della transazione\n- L'indirizzo pubblico del destinatario\n\nLa verifica del pagamento può essere effettuata utilizzando i dati sopra riportati come input su (http://drgl.info/#check_txn).\n\nIl mancato conferimento dei dati di cui sopra o l'utilizzo di un portafoglio incompatibile comporterà la perdita del caso di disputa. Il mittente Dragonglass è responsabile di fornire la verifica del trasferimento DRGL al mediatore o all'arbitro in caso di controversia. L'uso di PaymentID non è richiesto.\n\nIn caso di dubbi su qualsiasi parte di questo processo, visitare Dragonglass su Discord (http://discord.drgl.info) per assistenza.\n  # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Quando si utilizza Zcash è possibile utilizzare solo gli indirizzi trasparenti (a partire da t), non gli indirizzi z (privati), poiché il mediatore o l'arbitro non sarebbero in grado di verificare la transazione con gli indirizzi z. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Quando si utilizza Zcoin è possibile utilizzare solo gli indirizzi trasparenti (tracciabili), non quelli non rintracciabili, poiché il mediatore o l'arbitro non sarebbero in grado di verificare la transazione con indirizzi non rintracciabili in un explorer di blocchi. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN richiede un processo interattivo tra il mittente e il destinatario per creare la transazione. Assicurati di seguire le istruzioni dalla pagina web del progetto GRIN per inviare e ricevere in modo affidabile GRIN (il ricevitore deve essere online o almeno essere online durante un certo periodo di tempo).\n\nBisq supporta solo il formato URL del portafoglio Grinbox (Wallet713).\n\nIl mittente GRIN è tenuto a dimostrare di aver inviato GRIN correttamente. Se il portafoglio non è in grado di fornire tale prova, una potenziale disputa verrà risolta a favore del destinatario GRIN. Assicurati di utilizzare il software Grinbox più recente che supporti la prova delle transazioni e di comprendere il processo di trasferimento e ricezione di GRIN e come creare la prova.\n\nVedi https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only per ulteriori informazioni sullo strumento Grinbox proof. +account.altcoin.popup.grin.msg=GRIN richiede un processo interattivo tra il mittente e il destinatario per creare la transazione. Assicurati di seguire le istruzioni dalla pagina web del progetto GRIN per inviare e ricevere in modo affidabile GRIN (il ricevitore deve essere online o almeno essere online durante un certo periodo di tempo).\n\nHaveno supporta solo il formato URL del portafoglio Grinbox (Wallet713).\n\nIl mittente GRIN è tenuto a dimostrare di aver inviato GRIN correttamente. Se il portafoglio non è in grado di fornire tale prova, una potenziale disputa verrà risolta a favore del destinatario GRIN. Assicurati di utilizzare il software Grinbox più recente che supporti la prova delle transazioni e di comprendere il processo di trasferimento e ricezione di GRIN e come creare la prova.\n\nVedi https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only per ulteriori informazioni sullo strumento Grinbox proof. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM richiede un processo interattivo tra il mittente e il destinatario per creare la transazione.\n\nAssicurati di seguire le istruzioni dalla pagina web del progetto BEAM per inviare e ricevere in modo affidabile BEAM (il ricevitore deve essere online o almeno essere online durante un certo periodo di tempo).\n\nIl mittente BEAM è tenuto a fornire la prova di aver inviato BEAM correttamente. Assicurati di utilizzare il software del portafoglio che può produrre tale prova. Se il portafoglio non è in grado di fornire la prova, una potenziale disputa verrà risolta a favore del destinatario BEAM. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Trading ParsiCoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Trading ParsiCoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Bisq, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. +account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Haveno, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Il trading di L-BTC su Bisq richiede la comprensione di quanto segue:\n\nQuando ricevi L-BTC per uno scambio su Bisq, non puoi utilizzare l'applicazione mobile Blockstream Green Wallet o un portafoglio di custodia/scambio. Devi ricevere L-BTC solo nel portafoglio Liquid Elements Core o in un altro portafoglio L-BTC che ti consenta di ottenere la chiave per il tuo indirizzo L-BTC.\n\nNel caso in cui sia necessaria la mediazione o in caso di disputa nello scambio, è necessario divulgare la chiave di ricezione per il proprio indirizzo L-BTC al mediatore Bisq o all'agente di rimborso in modo che possano verificare i dettagli della propria Transazione riservata sul proprio full node Elements Core.\n\nLa mancata fornitura delle informazioni richieste dal mediatore o dall'agente di rimborso comporterà la perdita della disputa. In tutti i casi di disputa, il ricevente L-BTC si assume al 100% l'onere della responsabilità nel fornire prove crittografiche al mediatore o all'agente di rimborso.\n\nSe non comprendi i sopracitati requisiti, non scambiare L-BTC su Bisq. +account.altcoin.popup.liquidbitcoin.msg=Il trading di L-BTC su Haveno richiede la comprensione di quanto segue:\n\nQuando ricevi L-BTC per uno scambio su Haveno, non puoi utilizzare l'applicazione mobile Blockstream Green Wallet o un portafoglio di custodia/scambio. Devi ricevere L-BTC solo nel portafoglio Liquid Elements Core o in un altro portafoglio L-BTC che ti consenta di ottenere la chiave per il tuo indirizzo L-BTC.\n\nNel caso in cui sia necessaria la mediazione o in caso di disputa nello scambio, è necessario divulgare la chiave di ricezione per il proprio indirizzo L-BTC al mediatore Haveno o all'agente di rimborso in modo che possano verificare i dettagli della propria Transazione riservata sul proprio full node Elements Core.\n\nLa mancata fornitura delle informazioni richieste dal mediatore o dall'agente di rimborso comporterà la perdita della disputa. In tutti i casi di disputa, il ricevente L-BTC si assume al 100% l'onere della responsabilità nel fornire prove crittografiche al mediatore o all'agente di rimborso.\n\nSe non comprendi i sopracitati requisiti, non scambiare L-BTC su Haveno. account.fiat.yourFiatAccounts=I tuoi conti in valuta nazionale @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=Non hai impostato una password per il portafoglio che account.seed.warn.noPw.yes=Sì, e non chiedermelo più account.seed.enterPw=Immettere la password per visualizzare le parole chiave account.seed.restore.info=Effettuare un backup prima di cominciare il ripristino dalle parole del seed. Tenere presente che il ripristino del portafoglio è solo per casi di emergenza e potrebbe causare problemi con il database del portafoglio interno.\nNon è un modo per effettuare un backup! Utilizzare un backup della directory dei dati dell'applicazione per ripristinare uno stato dell'applicazione precedente.\n\nDopo aver ripristinato, l'applicazione si spegnerà automaticamente. Dopo aver riavviato l'applicazione, si risincronizzerà con la rete Bitcoin. Questo può richiedere del tempo e può consumare molta CPU, soprattutto se il portafoglio era vecchio e aveva molte transazioni. Evita di interrompere tale processo, altrimenti potrebbe essere necessario eliminare nuovamente il file della catena SPV o ripetere il processo di ripristino. -account.seed.restore.ok=Ok, fai il ripristino e spegni Bisq +account.seed.restore.ok=Ok, fai il ripristino e spegni Haveno #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=Notifica se il prezzo BTC è inferior account.notifications.priceAlert.setButton=Imposta un avviso di prezzo account.notifications.priceAlert.removeButton=Rimuovi avviso di prezzo account.notifications.trade.message.title=Lo stato dello scambio è cambiato -account.notifications.trade.message.msg.conf=La transazione di deposito per lo scambio con ID {0} è confermata. Si prega di aprire l'applicazione Bisq e avviare il pagamento. +account.notifications.trade.message.msg.conf=La transazione di deposito per lo scambio con ID {0} è confermata. Si prega di aprire l'applicazione Haveno e avviare il pagamento. account.notifications.trade.message.msg.started=L'acquirente BTC ha avviato il pagamento per lo scambio con ID {0}. account.notifications.trade.message.msg.completed=Lo scambio con ID {0} è completato. account.notifications.offer.message.title=La tua offerta è stata presa @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Tipo di offerta account.notifications.marketAlert.message.title=Avviso di offerta account.notifications.marketAlert.message.msg.below=sotto account.notifications.marketAlert.message.msg.above=sopra -account.notifications.marketAlert.message.msg=Una nuova ''{0} {1}'' offerta con prezzo {2} ({3} {4} prezzo di mercato) e metodo di pagamento ''{5}'' è stata pubblicata sulla pagina delle offerte Bisq.\nID offerta: {6}. +account.notifications.marketAlert.message.msg=Una nuova ''{0} {1}'' offerta con prezzo {2} ({3} {4} prezzo di mercato) e metodo di pagamento ''{5}'' è stata pubblicata sulla pagina delle offerte Haveno.\nID offerta: {6}. account.notifications.priceAlert.message.title=Avviso di prezzo per {0} account.notifications.priceAlert.message.msg=Il tuo avviso di prezzo è stato attivato. L'attuale prezzo {0} è {1} {2} -account.notifications.noWebCamFound.warning=Nessuna webcam trovata.\n\nUtilizzare l'opzione e-mail per inviare il token e la chiave di crittografia dal telefono cellulare all'applicazione Bisq. +account.notifications.noWebCamFound.warning=Nessuna webcam trovata.\n\nUtilizzare l'opzione e-mail per inviare il token e la chiave di crittografia dal telefono cellulare all'applicazione Haveno. account.notifications.priceAlert.warning.highPriceTooLow=Il prezzo più alto deve essere maggiore del prezzo più basso. account.notifications.priceAlert.warning.lowerPriceTooHigh=Il prezzo più basso deve essere inferiore al prezzo più alto. @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=Verifica firma... displayUpdateDownloadWindow.button.label=Scarica il programma di installazione e verifica la firma displayUpdateDownloadWindow.button.downloadLater=Scarica più tardi displayUpdateDownloadWindow.button.ignoreDownload=Ignora questa versione -displayUpdateDownloadWindow.headline=È disponibile un nuovo aggiornamento di Bisq! +displayUpdateDownloadWindow.headline=È disponibile un nuovo aggiornamento di Haveno! displayUpdateDownloadWindow.download.failed.headline=Download fallito displayUpdateDownloadWindow.download.failed=Download failed.\nPlease download and verify manually at [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unable to determine the correct installer. Please download and verify manually at [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Close without any payout disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout? emptyWalletWindow.headline={0} strumento portafoglio di emergenza -emptyWalletWindow.info=Utilizzalo solo in caso di emergenza se non puoi accedere al tuo fondo dall'interfaccia utente.\n\nSi noti che tutte le offerte aperte verranno chiuse automaticamente quando si utilizza questo strumento.\n\nPrima di utilizzare questo strumento, eseguire il backup della directory dei dati. Puoi farlo in \"Account/Backup\".\n\nTi preghiamo di segnalarci il tuo problema e di presentare una segnalazione di bug su GitHub o sul forum Bisq in modo da poter esaminare la causa del problema. +emptyWalletWindow.info=Utilizzalo solo in caso di emergenza se non puoi accedere al tuo fondo dall'interfaccia utente.\n\nSi noti che tutte le offerte aperte verranno chiuse automaticamente quando si utilizza questo strumento.\n\nPrima di utilizzare questo strumento, eseguire il backup della directory dei dati. Puoi farlo in \"Account/Backup\".\n\nTi preghiamo di segnalarci il tuo problema e di presentare una segnalazione di bug su GitHub o sul forum Haveno in modo da poter esaminare la causa del problema. emptyWalletWindow.balance=Il saldo disponibile del tuo portafoglio emptyWalletWindow.address=Il tuo indirizzo di destinazione emptyWalletWindow.button=Invia tutti i fondi @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=Data di creazione offerDetailsWindow.makersOnion=Indirizzo .onion del maker qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Please use this QR code for funding your Bisq wallet from your external wallet. +qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet. qRCodeWindow.request=Richiesta di pagamento:\n{0} selectDepositTxWindow.headline=Seleziona la transazione di deposito per la disputa @@ -1562,7 +1562,7 @@ popup.headline.error=Errore popup.doNotShowAgain=Non mostrare di nuovo popup.reportError.log=Apri file di registro popup.reportError.gitHub=Segnala sugli errori di GitHub -popup.reportError={0}\n\nPer aiutarci a migliorare il software, segnala questo errore aprendo un nuova segnalazione su https://github.com/bisq-network/bisq/issues.\nIl messaggio di errore sopra verrà copiato negli appunti quando si fa clic su uno dei pulsanti di seguito.\nFaciliterà il debug se includi il file bisq.log premendo "Apri file di registro", salvando una copia e allegandolo alla tua segnalazione di bug.\n  +popup.reportError={0}\n\nPer aiutarci a migliorare il software, segnala questo errore aprendo un nuova segnalazione su https://github.com/bisq-network/bisq/issues.\nIl messaggio di errore sopra verrà copiato negli appunti quando si fa clic su uno dei pulsanti di seguito.\nFaciliterà il debug se includi il file haveno.log premendo "Apri file di registro", salvando una copia e allegandolo alla tua segnalazione di bug.\n  popup.error.tryRestart=Prova a riavviare l'applicazione e controlla la connessione di rete per vedere se riesci a risolvere il problema. popup.error.takeOfferRequestFailed=Si è verificato un errore quando qualcuno ha tentato di accettare una delle tue offerte:\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=La transazione di deposito dello scamb error.closedTradeWithNoDepositTx=La transazione di deposito dello scambio chiuso con ID {0} è nulla.\n\nRiavvia l'applicazione per ripulire l'elenco delle transazioni chiuse. popup.warning.walletNotInitialized=Il portafoglio non è ancora inizializzato -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. -popup.warning.wrongVersion=Probabilmente hai la versione Bisq sbagliata per questo computer.\nL'architettura del tuo computer è: {0}.\nIl binario Bisq che hai installato è: {1}.\nChiudere e reinstallare la versione corretta ({2}). -popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. -popup.warning.startupFailed.twoInstances=Bisq è già in esecuzione. Non è possibile eseguire due istanze di Bisq. +popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\nHaveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. +popup.warning.wrongVersion=Probabilmente hai la versione Haveno sbagliata per questo computer.\nL'architettura del tuo computer è: {0}.\nIl binario Haveno che hai installato è: {1}.\nChiudere e reinstallare la versione corretta ({2}). +popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Haveno installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. +popup.warning.startupFailed.twoInstances=Haveno è già in esecuzione. Non è possibile eseguire due istanze di Haveno. popup.warning.tradePeriod.halfReached=Il tuo scambio con ID {0} ha raggiunto la metà del massimo periodo di negoziazione consentito e non è ancora completato.\n\nIl periodo di scambio termina il {1}\n\nPer ulteriori informazioni, controllare lo stato dello scambio in \"Portafoglio/Scambi aperti\". popup.warning.tradePeriod.ended= \nIl tuo scambio con ID {0} ha raggiunto il limite massimo del periodo di scambio consentito e non è stato completato.\n\nIl periodo di scambio è terminato il {1}\n\nPer favore verifica il tuo trade su \"Portafoglio/Scambi aperti\" per contattare il mediatore. popup.warning.noTradingAccountSetup.headline=Non hai impostato un account di trading @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=Non ci sono mediatori disponibili. popup.warning.notFullyConnected=È necessario attendere fino a quando non si è completamente connessi alla rete.\nQuesto potrebbe richiedere fino a circa 2 minuti all'avvio. popup.warning.notSufficientConnectionsToBtcNetwork=Devi aspettare fino a quando non hai almeno {0} connessioni alla rete Bitcoin. popup.warning.downloadNotComplete=Devi aspettare fino al completamento del download dei blocchi Bitcoin mancanti. -popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=The Haveno wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Sei sicuro di voler rimuovere quell'offerta?\nLa commissione del maker di {0} andrà persa se rimuovi quell'offerta. popup.warning.tooLargePercentageValue=Non è possibile impostare una percentuale del 100% o superiore. popup.warning.examplePercentageValue=Inserisci un numero percentuale come \"5.4\" per il 5,4% @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. # suppress inspection "UnusedProperty" popup.warning.priceRelay=ripetitore di prezzo popup.warning.seed=seme -popup.warning.mandatoryUpdate.trading=Si prega di aggiornare Bisq all'ultima versione. È stato rilasciato un aggiornamento obbligatorio che disabilita il trading per le vecchie versioni. Per ulteriori informazioni, consultare il forum Bisq. -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=Si prega di aggiornare Haveno all'ultima versione. È stato rilasciato un aggiornamento obbligatorio che disabilita il trading per le vecchie versioni. Per ulteriori informazioni, consultare il forum Haveno. +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=Questa transazione non è possibile, poiché le commissioni di mining di {0} supererebbero l'importo da trasferire di {1}. Attendi fino a quando le commissioni di mining non saranno nuovamente basse o fino a quando non avrai accumulato più BTC da trasferire. -popup.warning.openOffer.makerFeeTxRejected=La commissione della transazione del creatore dell'offerta con ID {0} è stata rifiutata dalla rete Bitcoin.\nTransazione ID={1}.\nL'offerta è stata rimossa per evitare ulteriori problemi.\nVai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\nPer ulteriore assistenza, contattare il canale di supporto Bisq nel team di Bisq Keybase. +popup.warning.openOffer.makerFeeTxRejected=La commissione della transazione del creatore dell'offerta con ID {0} è stata rifiutata dalla rete Bitcoin.\nTransazione ID={1}.\nL'offerta è stata rimossa per evitare ulteriori problemi.\nVai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\nPer ulteriore assistenza, contattare il canale di supporto Haveno nel team di Haveno Keybase. popup.warning.trade.txRejected.tradeFee=commissione di scambio popup.warning.trade.txRejected.deposit=deposita -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=La commissione della transazione del creatore dell'offerta con ID {0} non è valida.\nTransazione ID={1}.\nVai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\nPer ulteriore assistenza, contattare il canale di supporto Bisq nel team di Bisq Keybase. +popup.warning.openOfferWithInvalidMakerFeeTx=La commissione della transazione del creatore dell'offerta con ID {0} non è valida.\nTransazione ID={1}.\nVai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\nPer ulteriore assistenza, contattare il canale di supporto Haveno nel team di Haveno Keybase. -popup.info.securityDepositInfo=Per garantire che i trader seguano il protocollo di scambio, entrambi devono pagare un deposito cauzionale.\n\nQuesto deposito viene conservato nel tuo portafoglio di scambio fino a quando la tua transazione non è stata completata con successo, quindi ti viene rimborsato.\n\nNota: se stai creando una nuova offerta, Bisq deve essere in esecuzione per essere accettato da un altro trader. Per mantenere le tue offerte online, mantieni Bisq in funzione e assicurati che anche questo computer rimanga online (ad esempio, assicurati che non passi alla modalità standby ... monitor standby va bene). +popup.info.securityDepositInfo=Per garantire che i trader seguano il protocollo di scambio, entrambi devono pagare un deposito cauzionale.\n\nQuesto deposito viene conservato nel tuo portafoglio di scambio fino a quando la tua transazione non è stata completata con successo, quindi ti viene rimborsato.\n\nNota: se stai creando una nuova offerta, Haveno deve essere in esecuzione per essere accettato da un altro trader. Per mantenere le tue offerte online, mantieni Haveno in funzione e assicurati che anche questo computer rimanga online (ad esempio, assicurati che non passi alla modalità standby ... monitor standby va bene). popup.info.cashDepositInfo=Assicurati di avere una filiale bancaria nella tua zona per poter effettuare il deposito in contanti.\nL'ID bancario (BIC/SWIFT) della banca del venditore è: {0}. popup.info.cashDepositInfo.confirm=Confermo di poter effettuare il deposito -popup.info.shutDownWithOpenOffers=Bisq viene chiuso, ma ci sono offerte aperte.\n\nQueste offerte non saranno disponibili sulla rete P2P mentre Bisq rimane chiuso, ma verranno ripubblicate sulla rete P2P al prossimo avvio di Bisq.\n\nPer mantenere le tue offerte attive è necessario che Bisq rimanga in funzione ed il computer online (assicurati che non vada in modalità standby. Il solo monitor in standby non è un problema). -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\nPlease make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.info.shutDownWithOpenOffers=Haveno viene chiuso, ma ci sono offerte aperte.\n\nQueste offerte non saranno disponibili sulla rete P2P mentre Haveno rimane chiuso, ma verranno ripubblicate sulla rete P2P al prossimo avvio di Haveno.\n\nPer mantenere le tue offerte attive è necessario che Haveno rimanga in funzione ed il computer online (assicurati che non vada in modalità standby. Il solo monitor in standby non è un problema). +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\nPlease make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.privateNotification.headline=Notifica privata importante! popup.securityRecommendation.headline=Raccomandazione di sicurezza importante popup.securityRecommendation.msg=Vorremmo ricordarti di prendere in considerazione l'utilizzo della protezione con password per il tuo portafoglio se non l'avessi già abilitato.\n\nSi consiglia inoltre di annotare le parole seme del portafoglio. Le parole seme sono come una password principale per recuperare il tuo portafoglio Bitcoin.\nNella sezione \"Wallet Seed\" trovi ulteriori informazioni.\n\nInoltre, è necessario eseguire il backup della cartella completa dei dati dell'applicazione nella sezione \"Backup\". -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=Arresto in corso popup.shutDownInProgress.msg=La chiusura dell'applicazione può richiedere un paio di secondi.\nNon interrompere il processo. @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=Aggiornamento del portafoglio di trading notification.walletUpdate.msg=Il tuo portafoglio di trading è sufficientemente finanziato.\nImporto: {0} notification.takeOffer.walletUpdate.msg=Il tuo portafoglio di trading era già sufficientemente finanziato da un precedente tentativo di offerta.\nImporto: {0} notification.tradeCompleted.headline=Scambio completato -notification.tradeCompleted.msg=Puoi ritirare i tuoi fondi sul tuo portafoglio Bitcoin esterno o trasferirlo sul portafoglio Bisq. +notification.tradeCompleted.msg=Puoi ritirare i tuoi fondi sul tuo portafoglio Bitcoin esterno o trasferirlo sul portafoglio Haveno. #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=Puoi ritirare i tuoi fondi sul tuo portafoglio B systemTray.show=Mostra la finestra dell'applicazione systemTray.hide=Nascondi la finestra dell'applicazione -systemTray.info=Informazioni su Bisq +systemTray.info=Informazioni su Haveno systemTray.exit=Esci -systemTray.tooltip=Bisq: una rete di scambio decentralizzata di bitcoin +systemTray.tooltip=Haveno: una rete di scambio decentralizzata di bitcoin #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=Deriva la chiave dalla password password.walletDecrypted=Portafoglio decodificato correttamente e protezione con password rimossa. password.wrongPw=Hai inserito la password errata.\n\nProva a inserire nuovamente la password, verificando attentamente errori di battitura o errori di ortografia. password.walletEncrypted=Portafoglio crittografato correttamente e protezione con password abilitata. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=Le 2 password inserite non corrispondono. password.forgotPassword=Password dimenticata? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\nIt is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\nYou must empty seed.warn.walletNotEmpty.restore=Voglio comunque effettuare il ripristino seed.warn.walletNotEmpty.emptyWallet=Prima svuoterò i miei portafogli seed.warn.notEncryptedAnymore=I tuoi portafogli sono crittografati.\n\nDopo il ripristino, i portafogli non saranno più crittografati ed è necessario impostare una nuova password.\n\nVuoi procedere? -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? seed.restore.success=Portafogli ripristinati con successo con le nuove parole mnemoniche.\n\nÈ necessario arrestare e riavviare l'applicazione. seed.restore.error=Si è verificato un errore durante il ripristino dei portafogli con le parole del seme. {0} seed.restore.openOffers.warn=You have open offers which will be removed if you restore from seed words.\nAre you sure that you want to continue? @@ -1949,17 +1949,17 @@ payment.accountType=Tipologia conto payment.checking=Verifica payment.savings=Risparmi payment.personalId=ID personale -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. -payment.fasterPayments.newRequirements.info=Alcune banche hanno iniziato a verificare il nome completo del destinatario per i trasferimenti di Faster Payments (UK). Il tuo attuale account Faster Payments non specifica un nome completo.\n\nTi consigliamo di ricreare il tuo account Faster Payments in Bisq per fornire ai futuri acquirenti {0} un nome completo.\n\nQuando si ricrea l'account, assicurarsi di copiare il codice di ordinamento preciso, il numero di account e i valori salt della verifica dell'età dal vecchio account al nuovo account. Ciò garantirà il mantenimento dell'età del tuo account esistente e lo stato della firma.\n  +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Haveno account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Haveno. +payment.fasterPayments.newRequirements.info=Alcune banche hanno iniziato a verificare il nome completo del destinatario per i trasferimenti di Faster Payments (UK). Il tuo attuale account Faster Payments non specifica un nome completo.\n\nTi consigliamo di ricreare il tuo account Faster Payments in Haveno per fornire ai futuri acquirenti {0} un nome completo.\n\nQuando si ricrea l'account, assicurarsi di copiare il codice di ordinamento preciso, il numero di account e i valori salt della verifica dell'età dal vecchio account al nuovo account. Ciò garantirà il mantenimento dell'età del tuo account esistente e lo stato della firma.\n  payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=Quando utilizza HalCash, l'acquirente BTC deve inviare al venditore BTC il codice HalCash tramite un messaggio di testo dal proprio telefono cellulare.\n\nAssicurati di non superare l'importo massimo che la tua banca ti consente di inviare con HalCash. L'importo minimo per prelievo è di 10 EURO, l'importo massimo è di 600 EURO. Per prelievi ripetuti è di 3000 EURO per destinatario al giorno e 6000 EURO per destintario al mese. Verifica i limiti con la tua banca per accertarti che utilizzino gli stessi limiti indicati qui.\n\nL'importo del prelievo deve essere un multiplo di 10 EURO in quanto non è possibile prelevare altri importi da un bancomat. L'interfaccia utente nella schermata di creazione offerta e accettazione offerta modificherà l'importo BTC in modo che l'importo in EURO sia corretto. Non è possibile utilizzare il prezzo di mercato poiché l'importo in EURO cambierebbe al variare dei prezzi.\n\nIn caso di controversia, l'acquirente BTC deve fornire la prova di aver inviato gli EURO. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Bisq sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Conferma che la tua banca ti consente di inviare depositi in contanti su conti di altre persone. Ad esempio, Bank of America e Wells Fargo non consentono più tali depositi. @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=Informazioni di contatto payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1996,7 +1996,7 @@ payment.japan.recipient=Nome payment.australia.payid=PayID payment.payid=PayID linked to financial institution. Like email address or mobile phone. payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index e2e99805..4052bc01 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -103,14 +103,14 @@ shared.faq=FAQを参照する shared.yesCancel=はい、取り消します shared.nextStep=次へ shared.selectTradingAccount=取引アカウントを選択 -shared.fundFromSavingsWalletButton=Bisqウォレットから資金を移動する +shared.fundFromSavingsWalletButton=Havenoウォレットから資金を移動する shared.fundFromExternalWalletButton=外部のwalletを開く shared.openDefaultWalletFailed=ビットコインウォレットのアプリを開けませんでした。インストールされているか確認して下さい。 shared.belowInPercent=市場価格から％以下 shared.aboveInPercent=市場価格から％以上 shared.enterPercentageValue=%を入力 shared.OR=または -shared.notEnoughFunds=このトランザクションには、Bisqウォレットに資金が足りません。\n{0}が必要ですが、Bisqウォレットには{1}しかありません。\n\n外部のビットコインウォレットから入金するか、または「資金 > 資金の受取」でBisqウォレットに入金してください。 +shared.notEnoughFunds=このトランザクションには、Havenoウォレットに資金が足りません。\n{0}が必要ですが、Havenoウォレットには{1}しかありません。\n\n外部のビットコインウォレットから入金するか、または「資金 > 資金の受取」でHavenoウォレットに入金してください。 shared.waitingForFunds=資金を待っています shared.TheBTCBuyer=BTC買い手 shared.You=あなた @@ -125,7 +125,7 @@ shared.notUsedYet=未使用 shared.date=日付 shared.sendFundsDetailsWithFee=送金中: {0}\n送金元アドレス: {1}\n入金先アドレス: {2}\n必要なマイニング手数料: {3} ({4} Satoshis/byte)\nトランザクションvサイズ: {5} vKb\n\n入金先の受け取る金額: {6}\n\n本当にこの金額を出金しますか？ # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisqがこのトランザクションはダストの最小閾値以下のおつりアウトプットを生じることを検出しました(それにしたがって、ビットコインのコンセンサス・ルールによって許されない)。代わりに、その ({0} satoshi{1}) のダストはマイニング手数料に追加されます。\n\n\n +shared.sendFundsDetailsDust=Havenoがこのトランザクションはダストの最小閾値以下のおつりアウトプットを生じることを検出しました(それにしたがって、ビットコインのコンセンサス・ルールによって許されない)。代わりに、その ({0} satoshi{1}) のダストはマイニング手数料に追加されます。\n\n\n shared.copyToClipboard=クリップボードにコピー shared.language=言語 shared.country=国 @@ -235,8 +235,8 @@ mainView.menu.settings=設定 mainView.menu.account=アカウント mainView.marketPriceWithProvider.label={0} による市場価格 -mainView.marketPrice.bisqInternalPrice=Bisqにおける最新の取引価格 -mainView.marketPrice.tooltip.bisqInternalPrice=利用可能な外部価格フィードプロバイダーからの市場価格がありません。\n表示されている価格は、その通貨の最新のBisq取引価格です。 +mainView.marketPrice.havenoInternalPrice=Havenoにおける最新の取引価格 +mainView.marketPrice.tooltip.havenoInternalPrice=利用可能な外部価格フィードプロバイダーからの市場価格がありません。\n表示されている価格は、その通貨の最新のHaveno取引価格です。 mainView.marketPrice.tooltip=市場価格は{0}{1}に提供されています\n最終更新: {2}\n提供者のノードのURL: {3} mainView.balance.available=利用可能残高 mainView.balance.reserved=オファーのために予約済み @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith={0}と同期中、ブロック: {1} / mainView.footer.btcInfo.synchronizedWith={0}と同期されています、ブロック{1}に mainView.footer.btcInfo.connectingTo=接続中: mainView.footer.btcInfo.connectionFailed=接続失敗 -mainView.footer.p2pInfo=ビットコインネットワークピア: {0} / Bisqネットワークピア: {1} +mainView.footer.p2pInfo=ビットコインネットワークピア: {0} / Havenoネットワークピア: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Torネットワークに接続中... mainView.bootstrapState.torNodeCreated=(2/4) Torノードが作成されました @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) 初期データを受信しま mainView.bootstrapWarning.noSeedNodesAvailable=シードノードが見つかりません mainView.bootstrapWarning.noNodesAvailable=シードノードとピアが見つかりません -mainView.bootstrapWarning.bootstrappingToP2PFailed=Bisqネットワークとの同期に失敗しました +mainView.bootstrapWarning.bootstrappingToP2PFailed=Havenoネットワークとの同期に失敗しました mainView.p2pNetworkWarnMsg.noNodesAvailable=データを要求するためのシードノードと永続ピアが見つかりません。\nインターネット接続を確認するか、アプリケーションを再起動してみてください。 -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Bisqネットワークへの接続に失敗しました(報告されたエラー: {0})。\nインターネット接続を確認するか、アプリケーションを再起動してみてください。 +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Havenoネットワークへの接続に失敗しました(報告されたエラー: {0})。\nインターネット接続を確認するか、アプリケーションを再起動してみてください。 mainView.walletServiceErrorMsg.timeout=タイムアウトのためビットコインネットワークへの接続に失敗しました mainView.walletServiceErrorMsg.connectionError=次のエラーのためビットコインネットワークへの接続に失敗しました: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=次のエラーのためビット mainView.walletServiceErrorMsg.rejectedTxException=トランザクションはネットワークに拒否されました。\n\n{0} mainView.networkWarning.allConnectionsLost=全ての{0}のネットワークピアへの接続が切断されました。\nインターネット接続が切断されたか、コンピュータがスタンバイモードになった可能性があります。 -mainView.networkWarning.localhostBitcoinLost=ローカルホストビットコインノードへの接続が切断されました。\nBisqアプリケーションを再起動して他のビットコインノードに接続するか、ローカルホストのビットコインノードを再起動してください。 +mainView.networkWarning.localhostBitcoinLost=ローカルホストビットコインノードへの接続が切断されました。\nHavenoアプリケーションを再起動して他のビットコインノードに接続するか、ローカルホストのビットコインノードを再起動してください。 mainView.version.update=(更新が利用可能) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=許可されたトレー offerbook.warning.wrongTradeProtocol=そのオファーには、ご使用のソフトウェアのバージョンで使用されているものとは異なるプロトコルバージョンが必要です。\n\n最新バージョンがインストールされているかどうかを確認してください。そうでなければ、オファーを作成したユーザーが古いバージョンを使用しています。\n\nユーザーは、互換性のないトレードプロトコルバージョンと取引することはできません。 offerbook.warning.userIgnored=そのユーザのonionアドレスを無視リストに追加しました。 -offerbook.warning.offerBlocked=そのオファーはBisq開発者によってブロックされました。\nおそらくそのオファーを受けるときに問題が引きおこさる未処理のバグがあります。 -offerbook.warning.currencyBanned=そのオファーで使用されている通貨はBisq開発者によってブロックされています。\n詳しくはBisqフォーラムをご覧ください。 -offerbook.warning.paymentMethodBanned=そのオファーで使用されている支払い方法はBisq開発者によってブロックされています。\n詳しくはBisqフォーラムをご覧ください。 -offerbook.warning.nodeBlocked=そのonionアドレスはBisq開発者によってブロックされました。\nおそらくその取引者からのオファーを受けるときに問題が引きおこさる未処理のバグがあります。 -offerbook.warning.requireUpdateToNewVersion=このBisqのバージョンはもはやトレードする互換性がありません。\n[HYPERLINK:https://bisq.network/downloads] で最新のBisqバージョンに更新してください。 +offerbook.warning.offerBlocked=そのオファーはHaveno開発者によってブロックされました。\nおそらくそのオファーを受けるときに問題が引きおこさる未処理のバグがあります。 +offerbook.warning.currencyBanned=そのオファーで使用されている通貨はHaveno開発者によってブロックされています。\n詳しくはHavenoフォーラムをご覧ください。 +offerbook.warning.paymentMethodBanned=そのオファーで使用されている支払い方法はHaveno開発者によってブロックされています。\n詳しくはHavenoフォーラムをご覧ください。 +offerbook.warning.nodeBlocked=そのonionアドレスはHaveno開発者によってブロックされました。\nおそらくその取引者からのオファーを受けるときに問題が引きおこさる未処理のバグがあります。 +offerbook.warning.requireUpdateToNewVersion=このHavenoのバージョンはもはやトレードする互換性がありません。\n[HYPERLINK:https://bisq.network/downloads] で最新のHavenoバージョンに更新してください。 offerbook.warning.offerWasAlreadyUsedInTrade=このオファーを以前に受けましたせいで、現在受けることができません。以前のオファー受け入り試みは失敗トレードに終わりましたかもしれません。 offerbook.info.sellAtMarketPrice=市場価格で売却されるでしょう（毎分更新されます）。 @@ -423,7 +423,7 @@ createOffer.fundsBox.title=あなたのオファーへ入金 createOffer.fundsBox.offerFee=取引手数料 createOffer.fundsBox.networkFee=マイニング手数料 createOffer.fundsBox.placeOfferSpinnerInfo=オファー公開の処理中 ... -createOffer.fundsBox.paymentLabel=次のIDとのBisqトレード: {0} +createOffer.fundsBox.paymentLabel=次のIDとのHavenoトレード: {0} createOffer.fundsBox.fundsStructure=（{0} セキュリティデポジット, {1} 取引手数料, {2}マイニング手数料） createOffer.success.headline=オファーが公開されました createOffer.success.info=自分のオファーは「ポートフォリオ/私のオープンオファー」で管理できます @@ -447,12 +447,12 @@ createOffer.placeOfferButton=再確認: ビットコインを{0}オファーを createOffer.createOfferFundWalletInfo.headline=あなたのオファーへ入金 # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- 取引額: {0}\n -createOffer.createOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\nこの資金はあなたのローカルウォレットに予約済として保管され、オファーが受け入れられた時にマルチシグデポジットアドレスに移動しロックされます。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Bisqウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。 +createOffer.createOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\nこの資金はあなたのローカルウォレットに予約済として保管され、オファーが受け入れられた時にマルチシグデポジットアドレスに移動しロックされます。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Havenoウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=オファーを出す時にエラーが発生しました:\n\n{0}\n\nウォレットにまだ資金がありません。\nアプリケーションを再起動してネットワーク接続を確認してください。 createOffer.setAmountPrice=取引額と価格を入力して下さい -createOffer.warnCancelOffer=そのオファーは既に入金済みです。\n今すぐキャンセルした場合、あなたの資金はあなたのローカルBisqウォレットに移動され、「資金/送金する」画面で出金することができます。\n本当にキャンセルしてもよろしいですか？ +createOffer.warnCancelOffer=そのオファーは既に入金済みです。\n今すぐキャンセルした場合、あなたの資金はあなたのローカルHavenoウォレットに移動され、「資金/送金する」画面で出金することができます。\n本当にキャンセルしてもよろしいですか？ createOffer.timeoutAtPublishing=オファーの公開中にタイムアウトが発生しました。 createOffer.errorInfo=\n\nメイカー手数料は既に支払い済みです。 最悪の場合、あなたはその手数料を失っています。\nアプリケーションを再起動し、ネットワーク接続を確認して問題を解決できるかどうかを確認してください。 createOffer.tooLowSecDeposit.warning=セキュリティデポジットが推奨されるデフォルト値{0}よりも低い値に設定されました。\nより低いセキュリティデポジットを使用してよろしいですか？ @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=売却額 takeOffer.fundsBox.offerFee=取引手数料 takeOffer.fundsBox.networkFee=合計マイニング手数料 takeOffer.fundsBox.takeOfferSpinnerInfo=オファー受け入れ処理中 ... -takeOffer.fundsBox.paymentLabel=次のIDとのBisqトレード: {0} +takeOffer.fundsBox.paymentLabel=次のIDとのHavenoトレード: {0} takeOffer.fundsBox.fundsStructure=（{0} セキュリティデポジット, {1} 取引手数料, {2}マイニング手数料） takeOffer.success.headline=オファー受け入れに成功しました takeOffer.success.info=あなたのトレード状態は「ポートフォリオ/オープントレード」で見られます @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=そのオファーは市場価格に基づくパ takeOffer.takeOfferFundWalletInfo.headline=あなたのオファーへ入金 # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount= - 取引額: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Bisqウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\nまたは\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。 +takeOffer.takeOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Havenoウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\nまたは\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。 takeOffer.alreadyPaidInFunds=あなたがすでに資金を支払っている場合は「資金/送金する」画面でそれを出金することができます。 takeOffer.paymentInfo=支払い情報 takeOffer.setAmountPrice=金額を設定 -takeOffer.alreadyFunded.askCancel=そのオファーは既に入金済みです。\n今すぐキャンセルした場合、あなたの資金はあなたのローカルBisqウォレットに移動され、「資金/送金する」画面で出金ができます。\n本当にキャンセルしてもよろしいですか？ +takeOffer.alreadyFunded.askCancel=そのオファーは既に入金済みです。\n今すぐキャンセルした場合、あなたの資金はあなたのローカルHavenoウォレットに移動され、「資金/送金する」画面で出金ができます。\n本当にキャンセルしてもよろしいですか？ takeOffer.failed.offerNotAvailable=オファーが利用できなくなったため、オファー受け入れに失敗しました。 この間に別のトレーダーがオファーを受けた可能性があります。 takeOffer.failed.offerTaken=そのオファーは既に別の取引者によって受け取られため、そのオファーは受け取れません。 takeOffer.failed.offerRemoved=そのオファーはこの間に削除されたため、そのオファーは受け取れません @@ -536,7 +536,7 @@ editOffer.confirmEdit=承認: オファーを編集 editOffer.publishOffer=あなたのオファーの公開。 editOffer.failed=オファー編集に失敗:\n{0} editOffer.success=オファー編集に成功しました -editOffer.invalidDeposit=買い手のセキュリティデポジットはBisq DAOによって定義された制約の範囲内ではなく、もう編集することはできません。 +editOffer.invalidDeposit=買い手のセキュリティデポジットはHaveno DAOによって定義された制約の範囲内ではなく、もう編集することはできません。 #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=デポジットトランザクション # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=トレードは少なくとも1つのブロックチェーン承認に達しました。\n\n -portfolio.pending.step2_buyer.refTextWarn=注意点：支払う時に、\"支払理由\"のフィールドを空白にしておいて下さい。いかなる場合でも、トレードIDそれとも「ビットコイン」、「BTC」、「Bisq」などを入力しないで下さい。両者にとって許容できる別の\"支払理由\"があれば、自由に取引者チャットで話し合いをして下さい。 +portfolio.pending.step2_buyer.refTextWarn=注意点：支払う時に、\"支払理由\"のフィールドを空白にしておいて下さい。いかなる場合でも、トレードIDそれとも「ビットコイン」、「BTC」、「Haveno」などを入力しないで下さい。両者にとって許容できる別の\"支払理由\"があれば、自由に取引者チャットで話し合いをして下さい。 # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=銀行口座振替を行うには手数料がある場合、その手数料を払う責任があります。 # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=重要な要件: \n支払いが # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal={0}を「米国の郵便為替」でBTCの売り手に送付してください。\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=\"郵送で現金\"で、{0}をBTC売り手に送って下さい。詳細な指示はトレード契約書に書いてあります、そして分からない点があれば取引者チャットで質問できます。「郵送で現金」について詳しくはBisqのWikiを参照：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n +portfolio.pending.step2_buyer.cashByMail=\"郵送で現金\"で、{0}をBTC売り手に送って下さい。詳細な指示はトレード契約書に書いてあります、そして分からない点があれば取引者チャットで質問できます。「郵送で現金」について詳しくはHavenoのWikiを参照：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=特定された支払い方法で{0}をBTCの売り手に支払ってお願いします。売り手のアカウント詳細は次の画面に表示されます。\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=MTCNと領収書を portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=あなたはMTCN（追跡番号）とレシートの写真をBTCの売り手にEメールで送る必要があります。\n領収書には、売り手の氏名、市区町村、国、金額が明確に示されている必要があります。 販売者のメールアドレス: {0}\n\nMTCNと契約書を売り手へ送付しましたか？ portfolio.pending.step2_buyer.halCashInfo.headline=HalCashコードを送信 portfolio.pending.step2_buyer.halCashInfo.msg=HalCashコードと取引ID（{0}）を含むテキストメッセージをBTCの売り手に送信する必要があります。\n売り手の携帯電話番号は {1} です。\n\n売り手にコードを送信しましたか？ -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=銀行によっては、受信者の名前を検証する場合があります。 旧バージョンのBisqクライアントで作成した「Faster Payments」アカウントでは、受信者の名前は提供されませんので、(必要ならば)トレードチャットで尋ねて下さい。 +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=銀行によっては、受信者の名前を検証する場合があります。 旧バージョンのHavenoクライアントで作成した「Faster Payments」アカウントでは、受信者の名前は提供されませんので、(必要ならば)トレードチャットで尋ねて下さい。 portfolio.pending.step2_buyer.confirmStart.headline=支払いが開始したことを確認 portfolio.pending.step2_buyer.confirmStart.msg=トレーディングパートナーへの{0}支払いを開始しましたか？ portfolio.pending.step2_buyer.confirmStart.yes=はい、支払いを開始しました portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=支払証明を提出していません -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=トランザクションIDとトランザクション・キーを入力していません。\n\nこのデータを提供しなければ、ピアはXMRを受取る直後にBTCを解放するため自動確認機能を利用できません。\nその上、係争の場合にBisqはXMRトランザクションの送信者がこの情報を調停者や調停人に送れることを必要とします。\n詳しくはBisqのWikiを参照 [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] 。 +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=トランザクションIDとトランザクション・キーを入力していません。\n\nこのデータを提供しなければ、ピアはXMRを受取る直後にBTCを解放するため自動確認機能を利用できません。\nその上、係争の場合にHavenoはXMRトランザクションの送信者がこの情報を調停者や調停人に送れることを必要とします。\n詳しくはHavenoのWikiを参照 [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] 。 portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=入力が32バイトの16進値ではありません。 portfolio.pending.step2_buyer.confirmStart.warningButton=無視して続ける portfolio.pending.step2_seller.waitPayment.headline=支払いをお待ちください @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=BTCの買い手はまだ{0}の支払いを portfolio.pending.step2_seller.openForDispute=BTCの買い手は支払いを開始していません！\nトレードの許可された最大期間が経過しました。\nもっと長く待ってトレードピアにもっと時間を与えるか、助けを求めるために調停者に連絡することができます。 tradeChat.chatWindowTitle=トレードID '{0}'' のチャットウィンドウ tradeChat.openChat=チャットウィンドウを開く -tradeChat.rules=このトレードに対する潜在的な問題を解決するため、トレードピアと連絡できます。\nチャットに返事する義務はありません。\n取引者が以下のルールを破ると、係争を開始して調停者や調停人に報告して下さい。\n\nチャット・ルール：\n\t●リンクを送らないこと（マルウェアの危険性）。トランザクションIDとブロックチェーンエクスプローラの名前を送ることができます。\n\t●シードワード、プライベートキー、パスワードなどの機密な情報を送らないこと。\n\t●Bisq外のトレードを助長しないこと（セキュリティーがありません）。\n\t●ソーシャル・エンジニアリングや詐欺の行為に参加しないこと。\n\t●チャットで返事されない場合、それともチャットでの連絡が断られる場合、ピアの決断を尊重すること。\n\t●チャットの範囲をトレードに集中しておくこと。チャットはメッセンジャーの代わりや釣りをする場所ではありません。\n\t●礼儀正しく丁寧に話すこと。 +tradeChat.rules=このトレードに対する潜在的な問題を解決するため、トレードピアと連絡できます。\nチャットに返事する義務はありません。\n取引者が以下のルールを破ると、係争を開始して調停者や調停人に報告して下さい。\n\nチャット・ルール：\n\t●リンクを送らないこと（マルウェアの危険性）。トランザクションIDとブロックチェーンエクスプローラの名前を送ることができます。\n\t●シードワード、プライベートキー、パスワードなどの機密な情報を送らないこと。\n\t●Haveno外のトレードを助長しないこと（セキュリティーがありません）。\n\t●ソーシャル・エンジニアリングや詐欺の行為に参加しないこと。\n\t●チャットで返事されない場合、それともチャットでの連絡が断られる場合、ピアの決断を尊重すること。\n\t●チャットの範囲をトレードに集中しておくこと。チャットはメッセンジャーの代わりや釣りをする場所ではありません。\n\t●礼儀正しく丁寧に話すこと。 # suppress inspection "UnusedProperty" message.state.UNDEFINED=未定義 @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=返金されたセキュリティデポ portfolio.pending.step5_buyer.withdrawBTC=ビットコインを出金する portfolio.pending.step5_buyer.amount=出金額 portfolio.pending.step5_buyer.withdrawToAddress=出金先アドレス -portfolio.pending.step5_buyer.moveToBisqWallet=資金をBisqウォレットに保管する +portfolio.pending.step5_buyer.moveToHavenoWallet=資金をHavenoウォレットに保管する portfolio.pending.step5_buyer.withdrawExternal=外部ウォレットに出金する portfolio.pending.step5_buyer.alreadyWithdrawn=資金はすでに出金されています。\nトランザクション履歴を確認してください。 portfolio.pending.step5_buyer.confirmWithdrawal=出金リクエストを承認 @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=受け取りました tradeFeedbackWindow.title=おめでとうございます、トレードが完了しました tradeFeedbackWindow.msg.part1=私達はあなたの体験についての連絡をお待ちしております。 それは私達のソフトウェアを改良して、荒削りな部分を洗練させる手助けになります。 ご意見をお寄せになりたい場合は、こちらの簡単なアンケートにご記入ください（登録不要）: -tradeFeedbackWindow.msg.part2=ご質問がある場合、または問題が発生した場合は、次のBisqフォーラムで他のユーザーや貢献者に連絡してください： -tradeFeedbackWindow.msg.part3=Bisqを使ってくれてありがとう！ +tradeFeedbackWindow.msg.part2=ご質問がある場合、または問題が発生した場合は、次のHavenoフォーラムで他のユーザーや貢献者に連絡してください： +tradeFeedbackWindow.msg.part3=Havenoを使ってくれてありがとう！ portfolio.pending.role=私の役割 portfolio.pending.tradeInformation=トレード情報 @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=最初のブロックチェーンの確認後 portfolio.pending.tradePeriodWarning=この期間を超えた場合、両方の取引者が係争を開始できます。 portfolio.pending.tradeNotCompleted=時間内に完了してないトレード（{0}まで） portfolio.pending.tradeProcess=トレードプロセス -portfolio.pending.openAgainDispute.msg=調停人や調停者へのメッセージが到着したことに確信が持てない場合（例えば、1日経っても返事がない場合）、「command/ctrl+o」で再度係争を申し立てる、あるいは [HYPERLINK:https://bisq.community] でBisq掲示板からさらにサポートを受けることができます。 +portfolio.pending.openAgainDispute.msg=調停人や調停者へのメッセージが到着したことに確信が持てない場合（例えば、1日経っても返事がない場合）、「command/ctrl+o」で再度係争を申し立てる、あるいは [HYPERLINK:https://haveno.community] でHaveno掲示板からさらにサポートを受けることができます。 portfolio.pending.openAgainDispute.button=もう一度係争を開始 portfolio.pending.openSupportTicket.headline=サポートチケットをオープン portfolio.pending.openSupportTicket.msg=この機能を \"サポートをオープン\" や \"係争を開始\" ボタンが表示されていない緊急の場合のみに利用して下さい。\n\nサポートチケットをオープンすると、トレードは割り込まれ調停人や調停者によって扱われます。 portfolio.pending.timeLockNotOver=係争仲裁を開始するには、≈{0} ({1} ブロック) 確認まで待たなければなりません。 -portfolio.pending.error.depositTxNull=入金トランザクションは無効とされました。有効な入金トランザクションがなければ、係争を開始できません。\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\n\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。 +portfolio.pending.error.depositTxNull=入金トランザクションは無効とされました。有効な入金トランザクションがなければ、係争を開始できません。\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\n\nさらにサポートを受けるため、Haveno Keybaseチームのサポートチャンネルに連絡して下さい。 portfolio.pending.mediationResult.error.depositTxNull=デポジットトランザクションは無効とされました。「失敗トレード」へ送れます。 portfolio.pending.mediationResult.error.delayedPayoutTxNull=遅延支払いトランザクションは無効とされました。「失敗トレード」へ送れます。 -portfolio.pending.error.depositTxNotConfirmed=入金トランザクションは承認されていません。非確認された入金トランザクションで係争を開始できません。承認まで待つか、\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\n\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。 +portfolio.pending.error.depositTxNotConfirmed=入金トランザクションは承認されていません。非確認された入金トランザクションで係争を開始できません。承認まで待つか、\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\n\nさらにサポートを受けるため、Haveno Keybaseチームのサポートチャンネルに連絡して下さい。 portfolio.pending.support.headline.getHelp=助けが必要ですか？ -portfolio.pending.support.text.getHelp=問題があれば、トレードチャットにトレードピアと連絡してみるか、 https://bisq.community でBisqコミュニティーから助けを求めることができます。それでも問題は解決されない場合、調停者からさらに助けを求めることもできます。 +portfolio.pending.support.text.getHelp=問題があれば、トレードチャットにトレードピアと連絡してみるか、 https://haveno.community でHavenoコミュニティーから助けを求めることができます。それでも問題は解決されない場合、調停者からさらに助けを求めることもできます。 portfolio.pending.support.button.getHelp=取引者チャットを開く portfolio.pending.support.headline.halfPeriodOver=支払いを確認 portfolio.pending.support.headline.periodOver=トレード期間は終了しました @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=ピアのテイカー手 portfolio.pending.failedTrade.missingDepositTx=入金トランザクション（2-of-2マルチシグトランザクション）は欠測します。\n\nこのtxがなければ、トレードを完了できません。資金はロックされませんでしたが、トレード手数料は支払いました。トレード手数料の返済要求はここから提出できます： [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nこのトレードを「失敗トレード」へ送れます。 portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=遅延支払いトランザクションは欠測しますが、資金は入金トランザクションにロックされました。\n\nこの法定通貨・アルトコイン支払いをBTC売り手に送信しないで下さい。遅延支払いtxがなければ、係争仲裁は開始されることができません。代りに、「Cmd/Ctrl+o」で調停チケットをオープンして下さい。調停者はおそらく両方のピアへセキュリティデポジットの全額を払い戻しを提案します（売り手はトレード金額も払い戻しを受ける）。このような方法でセキュリティーのリスクがなし、トレード手数料のみが失われます。\n\n失われたトレード手数料の払い戻し要求はここから提出できます： [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=遅延支払いトランザクションは欠測しますが、資金は入金トランザクションにロックされました。\n\n買い手の遅延支払いトランザクションが同じく欠測される場合、相手は支払いを送信せず調停チケットをオープンするように指示されます。同様に「Cmd/Ctrl+o」で調停チケットをオープンするのは賢明でしょう。\n\n買い手はまだ支払いを送信しなかった場合、調停者はおそらく両方のピアへセキュリティデポジットの全額を払い戻しを提案します（売り手はトレード金額も払い戻しを受ける）。さもなければ、トレード金額は買い手に支払われるでしょう。\n\n失われたトレード手数料の払い戻し要求はここから提出できます： [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=トレードプロトコルの実行にはエラーが生じました。\n\nエラー： {0}\n\nクリティカル・エラーではない可能性はあり、トレードは普通に完了できるかもしれない。迷う場合は調停チケットをオープンして、Bisq調停者からアドバイスを受けることができます。\n\nクリティカル・エラーでトレードが完了できなかった場合はトレード手数料は失われた可能性があります。失われたトレード手数料の払い戻し要求はここから提出できます： [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=トレードプロトコルの実行にはエラーが生じました。\n\nエラー： {0}\n\nクリティカル・エラーではない可能性はあり、トレードは普通に完了できるかもしれない。迷う場合は調停チケットをオープンして、Haveno調停者からアドバイスを受けることができます。\n\nクリティカル・エラーでトレードが完了できなかった場合はトレード手数料は失われた可能性があります。失われたトレード手数料の払い戻し要求はここから提出できます： [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=トレード契約書は設定されません。\n\nトレードは完了できません。トレード手数料は失われた可能性もあります。その場合は失われたトレード手数料の払い戻し要求はここから提出できます： [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=トレードプロトコルは問題に遭遇しました。\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=トレードプロトコルは深刻な問題に遭遇しました。\n\n{0}\n\nトレードを「失敗トレード」へ送りますか？\n\n「失敗トレード」画面から調停・仲裁を開始できませんけど、失敗トレードがいつでも「オープントレード」へ戻されることができます。 @@ -828,7 +828,7 @@ funds.tab.transactions=トランザクション funds.deposit.unused=未使用 funds.deposit.usedInTx={0}トランザクションで使われています -funds.deposit.fundHavenoWallet=Bisqウォレットに入金 +funds.deposit.fundHavenoWallet=Havenoウォレットに入金 funds.deposit.noAddresses=デポジットアドレスはまだ生成されていません funds.deposit.fundWallet=あなたのウォレットに入金 funds.deposit.withdrawFromWallet=ウォレットから資金を送金 @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=ウォレットからの出金 funds.tx.memo=メモ funds.tx.noTxAvailable=利用できるトランザクションがありません funds.tx.revert=元に戻す -funds.tx.txSent=トランザクションはローカルBisqウォレットの新しいアドレスに正常に送信されました。 +funds.tx.txSent=トランザクションはローカルHavenoウォレットの新しいアドレスに正常に送信されました。 funds.tx.direction.self=自分自身に送信済み funds.tx.dustAttackTx=ダストを受取りました -funds.tx.dustAttackTx.popup=このトランザクションはごくわずかなBTC金額をあなたのウォレットに送っているので、あなたのウォレットを盗もうとするチェーン解析会社による試みかもしれません。\n\nあなたが支払い取引でそのトランザクションアウトプットを使うならば、彼らはあなたが他のアドレスの所有者である可能性が高いことを学びます（コインマージ）。\n\nあなたのプライバシーを保護するために、Bisqウォレットは、支払い目的および残高表示において、そのようなダストアウトプットを無視します。 設定でアウトプットがダストと見なされるときのしきい値を設定できます。 +funds.tx.dustAttackTx.popup=このトランザクションはごくわずかなBTC金額をあなたのウォレットに送っているので、あなたのウォレットを盗もうとするチェーン解析会社による試みかもしれません。\n\nあなたが支払い取引でそのトランザクションアウトプットを使うならば、彼らはあなたが他のアドレスの所有者である可能性が高いことを学びます（コインマージ）。\n\nあなたのプライバシーを保護するために、Havenoウォレットは、支払い目的および残高表示において、そのようなダストアウトプットを無視します。 設定でアウトプットがダストと見なされるときのしきい値を設定できます。 #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=メッセージを送信中 support.receiverNotOnline=受信者はオンラインではありません。 メッセージは彼のメールボックスに保存されます。 support.sendMessageError=メッセージ送信失敗。エラー: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=その係争の申し出はBisqの古いバージョンで作成されました。\nあなたのアプリケーションのバージョンではその係争を閉じることはできません。\n\n次のより古いバージョンを使用してください:プロトコルバージョン{0} +support.wrongVersion=その係争の申し出はHavenoの古いバージョンで作成されました。\nあなたのアプリケーションのバージョンではその係争を閉じることはできません。\n\n次のより古いバージョンを使用してください:プロトコルバージョン{0} support.openFile=添付ファイルを開く（最大ファイルサイズ: {0} kb） support.attachmentTooLarge=添付ファイルの合計サイズは{0} kbで、最大サイズを超えています。 許容されるメッセージサイズは{1} KBです。 support.maxSize=許容された最大ファイルサイズは{0} KBです。 @@ -953,15 +953,15 @@ support.sellerMaker=BTC 売り手/メイカー support.buyerTaker=BTC 買い手/テイカー support.sellerTaker=BTC 売り手/テイカー -support.backgroundInfo=Bisqは会社ではないので、係争の扱いが異なります。\n\n取引者はアプリ内の「オープントレード」画面からセキュアチャットでお互いに紛争を解決しようと努めれる。その方法は十分でない場合、調停者は間に入って助けることもできます。調停者は状況を判断して、トレード資金の支払い配分を提案します。両当事者は提案に同意する場合、支払いトランザクションは完了され、トレードは閉じられます。片当事者もしくは両当事者は調停者の支払い提案に同意しない場合、仲裁を求めることができます。調停人は再びに問題を検討し、正当な場合は個人的に取引者に払い戻す、そしてBisqのDAOからその分の払い戻し要求を提出します。 -support.initialInfo=下のテキストフィールドに問題の説明を入力してください。係争解決の時間を短縮するために、可能な限り多くの情報を追加してください。\n\n提供する必要がある情報のチェックリストを次に示します:\n\t●BTC買い手の場合：法定通貨またはアルトコインの送金を行いましたか？その場合、アプリケーションの「支払い開始」ボタンをクリックしましたか？\n\t●BTC売り手の場合：法定通貨またはアルトコインの支払いを受け取りましたか？その場合、アプリケーションの「支払いを受け取った」ボタンをクリックしましたか？\n\t●どのバージョンのBisqを使用していますか？\n\t●どのオペレーティングシステムを使用していますか？\n\t●失敗したトランザクションで問題が発生した場合は、新しいデータディレクトリへの切り替えを検討してください。\n\t データディレクトリが破損し、不可解なバグが発生している場合があります。\n\t 参照：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n係争プロセスの基本的なルールをよく理解してください:\n\t●2日以内に{0}の要求に応答する必要があります。\n\t●調停者は2日以内に返事をするでしょう。調停人は5営業日以内に返事をするでしょう。\n\t●係争の最大期間は14日間です。\n\t●{1}と協力し、彼らがあなたの主張をするために、要求された情報を提供する必要があります\n\t●あなたは申請を最初に開始したときに、ユーザー契約の係争文書に記載されている規則を受け入れています。\n\n係争プロセスの詳細については、{2} をご覧ください。 +support.backgroundInfo=Havenoは会社ではないので、係争の扱いが異なります。\n\n取引者はアプリ内の「オープントレード」画面からセキュアチャットでお互いに紛争を解決しようと努めれる。その方法は十分でない場合、調停者は間に入って助けることもできます。調停者は状況を判断して、トレード資金の支払い配分を提案します。両当事者は提案に同意する場合、支払いトランザクションは完了され、トレードは閉じられます。片当事者もしくは両当事者は調停者の支払い提案に同意しない場合、仲裁を求めることができます。調停人は再びに問題を検討し、正当な場合は個人的に取引者に払い戻す、そしてHavenoのDAOからその分の払い戻し要求を提出します。 +support.initialInfo=下のテキストフィールドに問題の説明を入力してください。係争解決の時間を短縮するために、可能な限り多くの情報を追加してください。\n\n提供する必要がある情報のチェックリストを次に示します:\n\t●BTC買い手の場合：法定通貨またはアルトコインの送金を行いましたか？その場合、アプリケーションの「支払い開始」ボタンをクリックしましたか？\n\t●BTC売り手の場合：法定通貨またはアルトコインの支払いを受け取りましたか？その場合、アプリケーションの「支払いを受け取った」ボタンをクリックしましたか？\n\t●どのバージョンのHavenoを使用していますか？\n\t●どのオペレーティングシステムを使用していますか？\n\t●失敗したトランザクションで問題が発生した場合は、新しいデータディレクトリへの切り替えを検討してください。\n\t データディレクトリが破損し、不可解なバグが発生している場合があります。\n\t 参照：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n係争プロセスの基本的なルールをよく理解してください:\n\t●2日以内に{0}の要求に応答する必要があります。\n\t●調停者は2日以内に返事をするでしょう。調停人は5営業日以内に返事をするでしょう。\n\t●係争の最大期間は14日間です。\n\t●{1}と協力し、彼らがあなたの主張をするために、要求された情報を提供する必要があります\n\t●あなたは申請を最初に開始したときに、ユーザー契約の係争文書に記載されている規則を受け入れています。\n\n係争プロセスの詳細については、{2} をご覧ください。 support.systemMsg=システムメッセージ: {0} -support.youOpenedTicket=サポートのリクエスト開始しました。\n\n{0}\n\nBisqバージョン: {1} -support.youOpenedDispute=係争のリクエスト開始しました。\n\n{0}\n\nBisqバージョン: {1} -support.youOpenedDisputeForMediation=調停を求めました。\n\n{0}\n\nBisqバージョン： {1} -support.peerOpenedTicket=トレードピアは技術的な問題によるサポートを要求しました。\n\n{0}\n\nBisqバージョン： {1} -support.peerOpenedDispute=トレードピアは係争を求めました。\n\n{0}\n\nBisqバージョン: {1} -support.peerOpenedDisputeForMediation=トレードピアは調停を求めました。\n\n{0}\n\nBisqバージョン： {1} +support.youOpenedTicket=サポートのリクエスト開始しました。\n\n{0}\n\nHavenoバージョン: {1} +support.youOpenedDispute=係争のリクエスト開始しました。\n\n{0}\n\nHavenoバージョン: {1} +support.youOpenedDisputeForMediation=調停を求めました。\n\n{0}\n\nHavenoバージョン： {1} +support.peerOpenedTicket=トレードピアは技術的な問題によるサポートを要求しました。\n\n{0}\n\nHavenoバージョン： {1} +support.peerOpenedDispute=トレードピアは係争を求めました。\n\n{0}\n\nHavenoバージョン: {1} +support.peerOpenedDisputeForMediation=トレードピアは調停を求めました。\n\n{0}\n\nHavenoバージョン： {1} support.mediatorsDisputeSummary=システム・メッセージ：調停者の係争概要：\n{0} support.mediatorsAddress=調停人のノードアドレス: {0} support.warning.disputesWithInvalidDonationAddress=遅延支払いトランザクションは無効な受信アドレスを利用しました。有効な寄付アドレスに対するDAOパラメーターと合っていません。\n\n詐欺の未遂かもしれません。開発者に報告して、問題が解決される前に事件を閉じないで下さい！\n\nこの係争に利用されたアドレス： {0}\n\nDAOパラメーターに合う寄付アドレス： {1}\n\nトレードID： {2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=トランザクションURL settings.preferences.editCustomExplorer.addressUrl=アドレスURL settings.net.btcHeader=ビットコインのネットワーク -settings.net.p2pHeader=Bisqネットワーク +settings.net.p2pHeader=Havenoネットワーク settings.net.onionAddressLabel=私のonionアドレス settings.net.btcNodesLabel=任意のビットコインノードを使う settings.net.bitcoinPeersLabel=接続されたピア @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=接続するBitcoin Coreノード: settings.net.useProvidedNodesRadio=提供されたBitcoin Core ノードを使う settings.net.usePublicNodesRadio=ビットコインの公共ネットワークを使用 settings.net.useCustomNodesRadio=任意のビットコインノードを使う -settings.net.warn.usePublicNodes=パブリックなビットコインネットワークを使用する場合、BitcoinJ（Bisqで使用）のようなSPVウォレットに使用される破損したブルームフィルターの設計と実装によって、重大なプライバシー問題にさらされます。接続しているすべてのノードは、すべてのウォレットアドレスが1つのエンティティに属していることがわかります。\n\n詳細については、[HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare] をご覧ください。\n\nパブリックノードを使用しても本当によろしいですか？ +settings.net.warn.usePublicNodes=パブリックなビットコインネットワークを使用する場合、BitcoinJ（Havenoで使用）のようなSPVウォレットに使用される破損したブルームフィルターの設計と実装によって、重大なプライバシー問題にさらされます。接続しているすべてのノードは、すべてのウォレットアドレスが1つのエンティティに属していることがわかります。\n\n詳細については、[HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare] をご覧ください。\n\nパブリックノードを使用しても本当によろしいですか？ settings.net.warn.usePublicNodes.useProvided=いいえ、提供されたノードを使用します settings.net.warn.usePublicNodes.usePublic=はい、公共ネットワークを使います settings.net.warn.useCustomNodes.B2XWarning=あなたのBitcoinノードが信頼できるBitcoin Coreノードであることを確認してください！\n\nBitcoin Coreのコンセンサスルールに従わないノードに接続すると、ウォレットが破損し、トレードプロセスに問題が生じる可能性があります。\n\nコンセンサスルールに違反するノードへ接続したユーザーは、引き起こされるいかなる損害に対しても責任を負います。 結果として生じる係争は、他のピアによって決定されます。この警告と保護のメカニズムを無視しているユーザーには、テクニカルサポートは提供されません！ settings.net.warn.invalidBtcConfig=無効な設定によりビットコインネットワークとの接続は失敗しました。\n\n代りに提供されたビットコインノードを利用するのに設定はリセットされました。アプリを再起動する必要があります。 -settings.net.localhostBtcNodeInfo=バックグラウンド情報：Bisqが起動時に、ローカルビットコインノードを探します。見つかれば、Bisqはそのノードを排他的に介してビットコインネットワークと接続します。 +settings.net.localhostBtcNodeInfo=バックグラウンド情報：Havenoが起動時に、ローカルビットコインノードを探します。見つかれば、Havenoはそのノードを排他的に介してビットコインネットワークと接続します。 settings.net.p2PPeersLabel=接続されたピア settings.net.onionAddressColumn=Onionアドレス settings.net.creationDateColumn=既定 @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=SPVの再同期を実行してもよろしいで settings.net.reSyncSPVAfterRestart=SPVチェーンファイルが削除されました。しばらくお待ちください。ネットワークとの再同期には時間がかかる場合があります。 settings.net.reSyncSPVAfterRestartCompleted=再同期が完了しました。アプリケーションを再起動してください。 settings.net.reSyncSPVFailed=SPVチェーンファイルを削除できませんでした。\nエラー: {0} -setting.about.aboutBisq=Bisqについて -setting.about.about=Bisqは、ユーザーのプライバシーを強力に保護する方法で、非中央集権型のピアツーピアネットワークを介して各国通貨（およびその他の暗号通貨）とのビットコインの交換を容易にするオープンソースソフトウェアです。 Bisqの詳細については、プロジェクトのWebページをご覧ください。 -setting.about.web=Bisqホームページ +setting.about.aboutHaveno=Havenoについて +setting.about.about=Havenoは、ユーザーのプライバシーを強力に保護する方法で、非中央集権型のピアツーピアネットワークを介して各国通貨（およびその他の暗号通貨）とのビットコインの交換を容易にするオープンソースソフトウェアです。 Havenoの詳細については、プロジェクトのWebページをご覧ください。 +setting.about.web=Havenoホームページ setting.about.code=ソースコード setting.about.agpl=AGPLライセンス -setting.about.support=Bisqをサポートする -setting.about.def=Bisqは会社ではなく、開かれたコミュニティのプロジェクトです。Bisqにサポートしたい時は下のURLをチェックしてください。 +setting.about.support=Havenoをサポートする +setting.about.def=Havenoは会社ではなく、開かれたコミュニティのプロジェクトです。Havenoにサポートしたい時は下のURLをチェックしてください。 setting.about.contribute=貢献 setting.about.providers=データプロバイダー -setting.about.apisWithFee=Bisqは、法定通貨とアルトコインの市場価格の推定にBisq物価指数を利用し、マイニング手数料の推定にMempoolノードを使用します。 -setting.about.apis=Bisqは、法定通貨とアルトコインの市場価格の推定にBisq物価指数を利用します。 +setting.about.apisWithFee=Havenoは、法定通貨とアルトコインの市場価格の推定にHaveno物価指数を利用し、マイニング手数料の推定にMempoolノードを使用します。 +setting.about.apis=Havenoは、法定通貨とアルトコインの市場価格の推定にHaveno物価指数を利用します。 setting.about.pricesProvided=市場価格を提供している： setting.about.feeEstimation.label=推定マイニング手数料の提供: setting.about.versionDetails=バージョン詳細 @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=「Ctrl + {0}」または「Alt + {0}」 setting.about.shortcuts.menuNav=メインメニューをナビゲートする setting.about.shortcuts.menuNav.value=メインメニューをナビゲートするのに：「Ctrl」または「Alt」それとも「Cmd」キーと1-9の数字キーを押して下さい。 -setting.about.shortcuts.close=Bisqを閉じる +setting.about.shortcuts.close=Havenoを閉じる setting.about.shortcuts.close.value=「Ctrl + {0}」か「cmd + {0}」、それとも「Ctrl + {1}」か「cmd + {1}」 setting.about.shortcuts.closePopup=ポップアップやダイアログ・ウィンドウを閉じる @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=ピアにプライベート通 setting.about.shortcuts.sendPrivateNotification.value=アバターからピア情報を開いて押す：{0} setting.info.headline=新しいXMR自動確認の機能 -setting.info.msg=BTC売ってXMR買う場合、Bisqが自動的にトレードを完了としてマークできるように自動確認機能で適正量のXMRはウォレットに送られたかを検証できます。その際、皆にトレードをより早く完了できるようにします。\n\n自動確認はXMR送信者が提供するプライベート・トランザクション・キーを利用して少なくとも2つのXMRエクスプローラノードでXMRトランザクションを確認します。デフォルト設定でBisqは貢献者に管理されるエクスプローラノードを利用しますが、最大のプライバシーやセキュリティーのため自分のXMRエクスプローラノードを管理するのをおすすめします。\n\n1つのトレードにつき自動確認する最大額のBTC、そして必要承認の数をこの画面で設定できます。\n\nBisqのWikiから詳細（自分のエクスプローラノードを管理する方法も含めて）を参照できます： [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=BTC売ってXMR買う場合、Havenoが自動的にトレードを完了としてマークできるように自動確認機能で適正量のXMRはウォレットに送られたかを検証できます。その際、皆にトレードをより早く完了できるようにします。\n\n自動確認はXMR送信者が提供するプライベート・トランザクション・キーを利用して少なくとも2つのXMRエクスプローラノードでXMRトランザクションを確認します。デフォルト設定でHavenoは貢献者に管理されるエクスプローラノードを利用しますが、最大のプライバシーやセキュリティーのため自分のXMRエクスプローラノードを管理するのをおすすめします。\n\n1つのトレードにつき自動確認する最大額のBTC、そして必要承認の数をこの画面で設定できます。\n\nHavenoのWikiから詳細（自分のエクスプローラノードを管理する方法も含めて）を参照できます： [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=BTC売ってXMR買う場合、Bisqが自動的にトレード account.tab.mediatorRegistration=調停者登録 account.tab.refundAgentRegistration=仲裁人登録 account.tab.signing=署名中 -account.info.headline=あなたのBisqアカウントへようこそ！ -account.info.msg=ここでは、各国通貨とアルトコインのトレードアカウントを追加したり、ウォレットやアカウントデータのバックアップを作成することができます。\n\nBisqは最初に起動した時、新しいビットコインウォレットが自動的に作られました。\n\nビットコインウォレットのシードワードを書き留めて（上部のタブを参照）、入金の前にパスワードを追加することを検討することを強くお勧めします。 ビットコインの入出金は「資金」セクションで管理されます。\n\nプライバシーとセキュリティに関するメモ: Bisqは非中央集権型の交換であるため、すべてのデータはコンピュータに保存されています。 サーバーがないので、私たちはあなたの個人情報、あなたの資金、あるいはあなたのIPアドレスにさえもアクセスできません。 銀行口座番号、アルトコイン&ビットコインのアドレスなどのデータは、あなたが開始したトレードを遂行するためにあなたのトレード相手とだけ共有されます（係争の場合には調停人があなたのトレードピアと同じデータを見るでしょう）。 +account.info.headline=あなたのHavenoアカウントへようこそ！ +account.info.msg=ここでは、各国通貨とアルトコインのトレードアカウントを追加したり、ウォレットやアカウントデータのバックアップを作成することができます。\n\nHavenoは最初に起動した時、新しいビットコインウォレットが自動的に作られました。\n\nビットコインウォレットのシードワードを書き留めて（上部のタブを参照）、入金の前にパスワードを追加することを検討することを強くお勧めします。 ビットコインの入出金は「資金」セクションで管理されます。\n\nプライバシーとセキュリティに関するメモ: Havenoは非中央集権型の交換であるため、すべてのデータはコンピュータに保存されています。 サーバーがないので、私たちはあなたの個人情報、あなたの資金、あるいはあなたのIPアドレスにさえもアクセスできません。 銀行口座番号、アルトコイン&ビットコインのアドレスなどのデータは、あなたが開始したトレードを遂行するためにあなたのトレード相手とだけ共有されます（係争の場合には調停人があなたのトレードピアと同じデータを見るでしょう）。 account.menu.paymentAccount=各国通貨口座 account.menu.altCoinsAccountView=アルトコインアカウント @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=非確認されたトランザクション account.menu.walletInfo.xpub.headLine=ウォッチキー（xpubキー） account.menu.walletInfo.walletSelector={0} {1} ウォレット account.menu.walletInfo.path.headLine=HDキーチェーンのパス -account.menu.walletInfo.path.info=他のウォレット（例えばElectrum）にシードワードをインポートすると、パスを設定しなければなりません。 Bisqウォレットとデータディレクトリーをアクセスできないような緊急事態の場合のみにして下さい。\nBisqでないウォレットからその資金を遣うと、ウォレットデータと繋がっているBisq内部データ構造は破損される可能性があり、失敗トレードにつながる可能性があります。\n\n絶対にBisqでないウォレットからBSQを遣わないで下さい。無効なトランザクションになる可能性が高い、そしてBSQを失うことになるでしょう。 +account.menu.walletInfo.path.info=他のウォレット（例えばElectrum）にシードワードをインポートすると、パスを設定しなければなりません。 Havenoウォレットとデータディレクトリーをアクセスできないような緊急事態の場合のみにして下さい。\nHavenoでないウォレットからその資金を遣うと、ウォレットデータと繋がっているHaveno内部データ構造は破損される可能性があり、失敗トレードにつながる可能性があります。\n\n絶対にHavenoでないウォレットからBSQを遣わないで下さい。無効なトランザクションになる可能性が高い、そしてBSQを失うことになるでしょう。 account.menu.walletInfo.openDetails=生ウォレット詳細、秘密鍵を表示する @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} 登録 account.arbitratorRegistration.revoke=取り消し account.arbitratorRegistration.info.msg={0} としてあなたを使用しているトレードが存在する可能性があるので、取り消し後の15日間にかけて必ず待機しておいて下さい。許可されるトレード期間は8日間で、係争処理には最長で7日間かかる場合があります。 account.arbitratorRegistration.warn.min1Language=少なくとも1つの言語を設定する必要があります。\nデフォルトの言語を追加しました。 -account.arbitratorRegistration.removedSuccess=Bisqネットワークから登録を正常に削除しました。 +account.arbitratorRegistration.removedSuccess=Havenoネットワークから登録を正常に削除しました。 account.arbitratorRegistration.removedFailed=登録を削除できませんでした。{0} -account.arbitratorRegistration.registerSuccess=Bisqネットワークに正常に登録しました。 +account.arbitratorRegistration.registerSuccess=Havenoネットワークに正常に登録しました。 account.arbitratorRegistration.registerFailed=登録を完了できませんでした。{0} account.altcoin.yourAltcoinAccounts=あなたのアルトコインアカウント account.altcoin.popup.wallet.msg={1} のWebページに記載されているように、{0}ウォレットの使用に関する要件に必ず従ってください。\n（a）あなたが自分で鍵を管理していない、または（b）互換性のあるウォレットソフトウェアを使用していないような、中央集権化された取引所でウォレットを使用することは危険です。トレード資金の損失につながる可能性があります！\n調停者や調停人は{2}スペシャリストではなく、そのような場合には手助けできません。 account.altcoin.popup.wallet.confirm=どのウォレットを使うべきか理解しており、承認する # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. +account.altcoin.popup.upx.msg=Trading UPX on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=BisqでARQをトレードするには、次の要件を理解し、満たす必要があります。\n\nARQを送信するには、store-tx-infoフラグを有効（新しいバージョンではデフォルト）にした公式のArQmA GUIウォレットまたはArQmA CLIウォレットのいずれかを使用する必要があります。係争が発生した場合に必要になるため、txキーにアクセスできることを確認してください。\narqma-wallet-cli（コマンドget_tx_keyを使用）\narqma-wallet-gui（履歴タブに移動し、支払い証明のために（P）ボタンをクリックします）\n\n通常のブロックエクスプローラーでは、転送は検証できません。\n\n係争の場合、調停人に次のデータを提供する必要があります。\n-txプライベートキー\n-トランザクションハッシュ\n-受信者のパブリックアドレス\n\n上記のデータを提供しない場合、または互換性のないウォレットを使用した場合は、係争のケースが失われます。 ARQ送信者は、係争の場合にARQ転送の検証を調停人に提供する責任があります。\n\n支払いIDは不要で、通常のパブリックアドレスのみです。\nこのプロセスがわからない場合は、ArQmA Discordチャンネル（ https://discord.gg/s9BQpJT ）またはArQmAフォーラム（ https://labs.arqma.com ）にアクセスして、詳細を確認してください。 +account.altcoin.popup.arq.msg=HavenoでARQをトレードするには、次の要件を理解し、満たす必要があります。\n\nARQを送信するには、store-tx-infoフラグを有効（新しいバージョンではデフォルト）にした公式のArQmA GUIウォレットまたはArQmA CLIウォレットのいずれかを使用する必要があります。係争が発生した場合に必要になるため、txキーにアクセスできることを確認してください。\narqma-wallet-cli（コマンドget_tx_keyを使用）\narqma-wallet-gui（履歴タブに移動し、支払い証明のために（P）ボタンをクリックします）\n\n通常のブロックエクスプローラーでは、転送は検証できません。\n\n係争の場合、調停人に次のデータを提供する必要があります。\n-txプライベートキー\n-トランザクションハッシュ\n-受信者のパブリックアドレス\n\n上記のデータを提供しない場合、または互換性のないウォレットを使用した場合は、係争のケースが失われます。 ARQ送信者は、係争の場合にARQ転送の検証を調停人に提供する責任があります。\n\n支払いIDは不要で、通常のパブリックアドレスのみです。\nこのプロセスがわからない場合は、ArQmA Discordチャンネル（ https://discord.gg/s9BQpJT ）またはArQmAフォーラム（ https://labs.arqma.com ）にアクセスして、詳細を確認してください。 # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=BisqでXMRをトレードするには、以下の要件を理解し、満たす必要があります。\n\nXMRを売る場合、係争を解決するため調停者や調停人に以下の情報を提供できる必要があります：\n- トランザクションキー（Txキー、Tx秘密キー、Txプライベートキー）\n- トランザクションID（TxID、Txハッシュ）\n- 宛先アドレス（受領者のアドレス）\n\n人気のモネロウォレットからこういう情報を見つける方法について、BisqのWikiを参照して下さい [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments]\n必要のトランザクションデータを提供しなければ、係争で不利な裁定を下されます。\n\nBisqではXMRトランザクションに自動確認機能を提供しますが、設で有効にする必要があります。\n\n自動確認機能について詳しくはWikiで参照して下さい：\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +account.altcoin.popup.xmr.msg=HavenoでXMRをトレードするには、以下の要件を理解し、満たす必要があります。\n\nXMRを売る場合、係争を解決するため調停者や調停人に以下の情報を提供できる必要があります：\n- トランザクションキー（Txキー、Tx秘密キー、Txプライベートキー）\n- トランザクションID（TxID、Txハッシュ）\n- 宛先アドレス（受領者のアドレス）\n\n人気のモネロウォレットからこういう情報を見つける方法について、HavenoのWikiを参照して下さい [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments]\n必要のトランザクションデータを提供しなければ、係争で不利な裁定を下されます。\n\nHavenoではXMRトランザクションに自動確認機能を提供しますが、設で有効にする必要があります。\n\n自動確認機能について詳しくはWikiで参照して下さい：\n[HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Trading MSR on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=BisqでBLURをトレードするには、次の要件を理解し、満たす必要があります。\n\nBLURを送信するには、Blur Network CLIまたはGUI ウォレットを使用する必要があります。\n\nCLIウォレットを使用している場合、転送の送信後にトランザクションハッシュ（tx ID）が表示されます。この情報を保存する必要があります。転送を送信した直後に、コマンド「get_tx_key」を使用してトランザクションプライベートキーを取得する必要があります。この手順を実行しないと、後でキーを取得できない場合があります。\n\nBlur Network GUIウォレットを使用している場合、トランザクションのプライベートキーとトランザクションIDは「履歴」タブで簡単に見つけることができます。送信後すぐに、目的のトランザクションを見つけてください。このトランザクションを含むボックスの右下隅にある「？」記号をクリックしてください。この情報を保存する必要があります。\n\n調停が必要な場合は、1) トランザクションID、2) トランザクションプライベートキー、3) 受信者のアドレス　を調停人に提示する必要があります。調停人は、Blur Transaction Viewer（ https://blur.cash/#tx-viewer ）を使用してBLUR転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、BLUR送信者は、調停人に対する取引を確認する責任の100％を負担します。\n\nこれらの要件を理解していない場合は、Bisqで取引しないでください。まず、Blur Network Discord（ https://discord.gg/dMWaqVW ）で助けを求めてください。 +account.altcoin.popup.blur.msg=HavenoでBLURをトレードするには、次の要件を理解し、満たす必要があります。\n\nBLURを送信するには、Blur Network CLIまたはGUI ウォレットを使用する必要があります。\n\nCLIウォレットを使用している場合、転送の送信後にトランザクションハッシュ（tx ID）が表示されます。この情報を保存する必要があります。転送を送信した直後に、コマンド「get_tx_key」を使用してトランザクションプライベートキーを取得する必要があります。この手順を実行しないと、後でキーを取得できない場合があります。\n\nBlur Network GUIウォレットを使用している場合、トランザクションのプライベートキーとトランザクションIDは「履歴」タブで簡単に見つけることができます。送信後すぐに、目的のトランザクションを見つけてください。このトランザクションを含むボックスの右下隅にある「？」記号をクリックしてください。この情報を保存する必要があります。\n\n調停が必要な場合は、1) トランザクションID、2) トランザクションプライベートキー、3) 受信者のアドレス　を調停人に提示する必要があります。調停人は、Blur Transaction Viewer（ https://blur.cash/#tx-viewer ）を使用してBLUR転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、BLUR送信者は、調停人に対する取引を確認する責任の100％を負担します。\n\nこれらの要件を理解していない場合は、Havenoで取引しないでください。まず、Blur Network Discord（ https://discord.gg/dMWaqVW ）で助けを求めてください。 # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Trading Solo on Bisq requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Trading Solo on Haveno requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=BisqでCASH2をトレードするには、次の要件を理解し、満たす必要があります。\n\nCASH2を送信するには、Cash2 Walletバージョン3以降を使用する必要があります。\n\nトランザクションが送信された後、トランザクションIDが表示されます。この情報を保存する必要があります。トランザクションを送信した直後に、simplewalletのコマンド「getTxKey」を使用して、トランザクションのプライベートキーを取得する必要があります。\n\n調停が必要な場合は、1) トランザクションID、2) トランザクションプライベートキー、および 3) 受信者のCash2アドレス を調停人に提示する必要があります。その後、調停人は、Cash2 Block Explorer（ https://blocks.cash2.org ）を使用してCASH2転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、CASH2の送信者が、仲裁人への取引を確認する責任を100％負います。\n\nこれらの要件を理解していない場合は、Bisqで取引しないでください。まず、Cash2 Discord（ https://discord.gg/FGfXAYN ）で助けを求めてください。 +account.altcoin.popup.cash2.msg=HavenoでCASH2をトレードするには、次の要件を理解し、満たす必要があります。\n\nCASH2を送信するには、Cash2 Walletバージョン3以降を使用する必要があります。\n\nトランザクションが送信された後、トランザクションIDが表示されます。この情報を保存する必要があります。トランザクションを送信した直後に、simplewalletのコマンド「getTxKey」を使用して、トランザクションのプライベートキーを取得する必要があります。\n\n調停が必要な場合は、1) トランザクションID、2) トランザクションプライベートキー、および 3) 受信者のCash2アドレス を調停人に提示する必要があります。その後、調停人は、Cash2 Block Explorer（ https://blocks.cash2.org ）を使用してCASH2転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、CASH2の送信者が、仲裁人への取引を確認する責任を100％負います。\n\nこれらの要件を理解していない場合は、Havenoで取引しないでください。まず、Cash2 Discord（ https://discord.gg/FGfXAYN ）で助けを求めてください。 # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=BisqでQwertycoinをトレードするには、次の要件を理解し、満たす必要があります。\n\nQWCを送信するには、公式のQWCウォレットバージョン5.1.3以降を使用する必要があります。\n\nトランザクションが送信された後、トランザクションIDが表示されます。この情報を保存する必要があります。トランザクションを送信した直後に、simplewalletのコマンド「get_Tx_Key」を使用してトランザクションのプライベートキーを取得する必要があります。\n\n調停が必要な場合は、1) トランザクションID、2) トランザクションプライベートキー、3)受信者のQWCアドレス を調停人に提示する必要があります。その後、調停人はQWC Block Explorer（ https://explorer.qwertycoin.org ）を使用してQWC転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、QWCの送信者が、調停人のトレードの検証における100％の責任を負います。\n\nこれらの要件を理解していない場合は、Bisqで取引しないでください。まず、QWC Discord（ https://discord.gg/rUkfnpC ）で助けを求めてください。 +account.altcoin.popup.qwertycoin.msg=HavenoでQwertycoinをトレードするには、次の要件を理解し、満たす必要があります。\n\nQWCを送信するには、公式のQWCウォレットバージョン5.1.3以降を使用する必要があります。\n\nトランザクションが送信された後、トランザクションIDが表示されます。この情報を保存する必要があります。トランザクションを送信した直後に、simplewalletのコマンド「get_Tx_Key」を使用してトランザクションのプライベートキーを取得する必要があります。\n\n調停が必要な場合は、1) トランザクションID、2) トランザクションプライベートキー、3)受信者のQWCアドレス を調停人に提示する必要があります。その後、調停人はQWC Block Explorer（ https://explorer.qwertycoin.org ）を使用してQWC転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、QWCの送信者が、調停人のトレードの検証における100％の責任を負います。\n\nこれらの要件を理解していない場合は、Havenoで取引しないでください。まず、QWC Discord（ https://discord.gg/rUkfnpC ）で助けを求めてください。 # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=BisqでDragonglassをトレードするには、次の要件を理解し、満たす必要があります。\n\nDragonglassが提供するプライバシーのため、トランザクションはパブリックブロックチェーンでは検証できません。必要に応じて、TXN-Private-Keyを使用して支払いを証明できます。\nTXN-Private-Keyは、DRGLウォレット内からのみアクセスできるトランザクションごとに自動的に生成されるワンタイムキーです。\nDRGLウォレットGUI（トランザクション詳細ダイアログ内）またはDragonglass CLIシンプルウォレット（コマンド「get_tx_key」を使用）のいずれか。\n\nDRGLバージョン「Oathkeeper」以降には両方が「必要」です。\n\n係争が発生した場合、調停人に次のデータを提供する必要があります。\n-TXN-Private-Key\n-トランザクションハッシュ\n-受信者のパブリックアドレス\n\n上記のデータを（ http://drgl.info/#check_txn ）の入力として使用して、支払いの検証を行うことができます。\n\n上記のデータを提供しない場合、または互換性のないウォレットを使用した場合は、係争のケースが失われます。 Dragonglassの送信者は、係争の場合にDRGL転送の調停人に検証を提供する責任があります。 PaymentIDの使用は必要ありません。\n\nこのプロセスについて不明な点がある場合は、Dragonglass on Discord（ http://discord.drgl.info ）にアクセスしてください。 +account.altcoin.popup.drgl.msg=HavenoでDragonglassをトレードするには、次の要件を理解し、満たす必要があります。\n\nDragonglassが提供するプライバシーのため、トランザクションはパブリックブロックチェーンでは検証できません。必要に応じて、TXN-Private-Keyを使用して支払いを証明できます。\nTXN-Private-Keyは、DRGLウォレット内からのみアクセスできるトランザクションごとに自動的に生成されるワンタイムキーです。\nDRGLウォレットGUI（トランザクション詳細ダイアログ内）またはDragonglass CLIシンプルウォレット（コマンド「get_tx_key」を使用）のいずれか。\n\nDRGLバージョン「Oathkeeper」以降には両方が「必要」です。\n\n係争が発生した場合、調停人に次のデータを提供する必要があります。\n-TXN-Private-Key\n-トランザクションハッシュ\n-受信者のパブリックアドレス\n\n上記のデータを（ http://drgl.info/#check_txn ）の入力として使用して、支払いの検証を行うことができます。\n\n上記のデータを提供しない場合、または互換性のないウォレットを使用した場合は、係争のケースが失われます。 Dragonglassの送信者は、係争の場合にDRGL転送の調停人に検証を提供する責任があります。 PaymentIDの使用は必要ありません。\n\nこのプロセスについて不明な点がある場合は、Dragonglass on Discord（ http://discord.drgl.info ）にアクセスしてください。 # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Zcashを使用する場合、調停者や調停人はzアドレスを持つトランザクションを検証できないため、zアドレス（プライベート）ではなく、透過アドレス（tで始まる）のみを使用できます。 # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Zcoinを使用する場合、調停者や調停人はブロックエクスプローラーで追跡不可能なアドレスを持つトランザクションを検証できないため、追跡不可能なアドレスではなく、透過（追跡可能な）アドレスのみを使用できます。 # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRINでは、トランザクションを作成するために送信者と受信者の間の対話型プロセスが必要です。 GRINプロジェクトのWebページの指示に従って、GRINを確実に送受信してください（受信者はオンラインであるか、特定の時間枠内で少なくともオンラインである必要があります）。\n\nBisqは、Grinbox（Wallet713）ウォレットURL形式のみをサポートします。\n\nGRIN送信者は、GRINが正常に送信されたことを証明する必要があります。ウォレットがその証拠を提供できない場合、起こり得る係争はGRIN受信者に有利に解決されるでしょう。トランザクションプルーフをサポートする最新のGrinboxソフトウェアを使用し、GRINの送受信プロセスとプルーフの作成方法を理解してください。\n\nGrinboxプルーフツールの詳細については、https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only を参照してください。 +account.altcoin.popup.grin.msg=GRINでは、トランザクションを作成するために送信者と受信者の間の対話型プロセスが必要です。 GRINプロジェクトのWebページの指示に従って、GRINを確実に送受信してください（受信者はオンラインであるか、特定の時間枠内で少なくともオンラインである必要があります）。\n\nHavenoは、Grinbox（Wallet713）ウォレットURL形式のみをサポートします。\n\nGRIN送信者は、GRINが正常に送信されたことを証明する必要があります。ウォレットがその証拠を提供できない場合、起こり得る係争はGRIN受信者に有利に解決されるでしょう。トランザクションプルーフをサポートする最新のGrinboxソフトウェアを使用し、GRINの送受信プロセスとプルーフの作成方法を理解してください。\n\nGrinboxプルーフツールの詳細については、https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only を参照してください。 # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAMではトランザクションを作成するために、送信者と受信者の間で対話型プロセスが必要です。\n\n必ずBEAMプロジェクトのWebページの指示に従って、BEAMを確実に送受信してください（受信者はオンラインであるか、特定の時間枠で少なくともオンラインである必要があります）。\n\nBEAM送信者は、BEAMが正常に送信されたことを証明する必要があります。そのような証拠を作成できるウォレットソフトウェアを使用してください。ウォレットが証拠を提供できない場合、起こり得る論争はBEAM受信者に有利に解決されるでしょう。 # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=ParsiCoinをBisqでトレードするには、次の要件を理解し、満たす必要があります。\n\nPARSを送信するには、公式のParsiCoin Walletバージョン3.0.0以降を使用する必要があります。\n\nGUIウォレット（ParsiPay）のTransactionsセクションでトランザクションハッシュとトランザクションキーを確認できます。Transactionを右クリックして、show detailsをクリックします。\n\n調停が必要な場合は、1) トランザクションハッシュ、2) トランザクションキー、および3） 受信者のPARSア​​ドレス を調停人に提示する必要があります。その後、調停人は、ParsiCoin Block Explorer（ http://explorer.parsicoin.net/#check_payment ）を使用してPARS転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、ParsiCoinの送信者が、係争人のトランザクションの検証における100％の責任を負います。\n\nこれらの要件を理解していない場合は、Bisqで取引しないでください。まず、ParsiCoin Discord（ https://discord.gg/c7qmFNh ）で助けを求めてください。 +account.altcoin.popup.pars.msg=ParsiCoinをHavenoでトレードするには、次の要件を理解し、満たす必要があります。\n\nPARSを送信するには、公式のParsiCoin Walletバージョン3.0.0以降を使用する必要があります。\n\nGUIウォレット（ParsiPay）のTransactionsセクションでトランザクションハッシュとトランザクションキーを確認できます。Transactionを右クリックして、show detailsをクリックします。\n\n調停が必要な場合は、1) トランザクションハッシュ、2) トランザクションキー、および3） 受信者のPARSア​​ドレス を調停人に提示する必要があります。その後、調停人は、ParsiCoin Block Explorer（ http://explorer.parsicoin.net/#check_payment ）を使用してPARS転送を検証します。\n\n必要な情報を調停人に提供しないと、係争のケースが失われます。係争のすべての場合において、ParsiCoinの送信者が、係争人のトランザクションの検証における100％の責任を負います。\n\nこれらの要件を理解していない場合は、Havenoで取引しないでください。まず、ParsiCoin Discord（ https://discord.gg/c7qmFNh ）で助けを求めてください。 # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Bisq, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. +account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Haveno, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=BisqでL-BTCをトレードするには、以下を理解する必要があります：\n\nBisqでのトレードにL-BTCを受け取る場合、モバイル用「Blockstream Green」ウォレットアプリそれとも取引場などの第三者によって保管されるウォレットの利用は不可能です。「Liquid Elements Core」ウォレット、あるいは機密L-BTCアドレスの「blindingキー」が入手可能のウォレットのみにL-BTCを受け取って下さい。\n\n調停が必要になる場合、あるいはトレード係争が開始される場合、調停者や調停人が「Elements Core」フルノードで機密トランザクションを検証できるように、受取アドレスのblindingキーを明かす必要があります。\n\n調停者や調停人に必要な情報を提供しなければ、係争で不利な裁定を下されます。全ての係争には、調停者や調停人に暗号証明を提供するのは100%受信者の責任です。\n\n以上の条件を理解しない場合、BisqでL-BTCのトレードをしないで下さい。 +account.altcoin.popup.liquidbitcoin.msg=HavenoでL-BTCをトレードするには、以下を理解する必要があります：\n\nHavenoでのトレードにL-BTCを受け取る場合、モバイル用「Blockstream Green」ウォレットアプリそれとも取引場などの第三者によって保管されるウォレットの利用は不可能です。「Liquid Elements Core」ウォレット、あるいは機密L-BTCアドレスの「blindingキー」が入手可能のウォレットのみにL-BTCを受け取って下さい。\n\n調停が必要になる場合、あるいはトレード係争が開始される場合、調停者や調停人が「Elements Core」フルノードで機密トランザクションを検証できるように、受取アドレスのblindingキーを明かす必要があります。\n\n調停者や調停人に必要な情報を提供しなければ、係争で不利な裁定を下されます。全ての係争には、調停者や調停人に暗号証明を提供するのは100%受信者の責任です。\n\n以上の条件を理解しない場合、HavenoでL-BTCのトレードをしないで下さい。 account.fiat.yourFiatAccounts=あなたの各国通貨口座 @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=シードワードの表示を保護するための account.seed.warn.noPw.yes=はい、そして次回から確認しないで下さい account.seed.enterPw=シードワードを見るためにパスワードを入力 account.seed.restore.info=シードワードから復元を適用する前に、バックアップを作成してください。ウォレットの復元は緊急時のみであり、内部ウォレットデータベースに問題を引き起こす可能性があることに注意してください。 \nこれはバックアップを適用する方法ではありません！以前のアプリケーションの状態を復元するには、アプリケーションデータディレクトリのバックアップを使用してください。\n\nアプリケーションを復元すると、自動的にシャットダウンします。アプリケーションを再起動すると、ビットコインネットワークと再同期します。特にウォレットが古く、多くのトランザクションがあった場合、これには時間がかかり、CPUを多く消費する可能性があります。このプロセスは中断しないでください。さもなければ、SPVチェーンファイルを再度削除するか、復元プロセスを繰り返す必要があります。 -account.seed.restore.ok=わかりました、復元してBisqをシャットダウンしてください +account.seed.restore.ok=わかりました、復元してHavenoをシャットダウンしてください #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=BTC価格が次を下回ったら通 account.notifications.priceAlert.setButton=価格アラートをセット account.notifications.priceAlert.removeButton=価格アラートを削除 account.notifications.trade.message.title=トレード状態が変わった -account.notifications.trade.message.msg.conf=ID {0}とのトレードのデポジットトランザクションが承認されました。 Bisqアプリケーションを開いて支払いを開始してください。 +account.notifications.trade.message.msg.conf=ID {0}とのトレードのデポジットトランザクションが承認されました。 Havenoアプリケーションを開いて支払いを開始してください。 account.notifications.trade.message.msg.started=BTCの買い手がID {0}とのトレードの支払いを開始しました。 account.notifications.trade.message.msg.completed=ID {0}とのトレードが完了しました。 account.notifications.offer.message.title=オファーが受け入れられました @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=オファーの account.notifications.marketAlert.message.title=オファーのアラート account.notifications.marketAlert.message.msg.below=以下 account.notifications.marketAlert.message.msg.above=以上 -account.notifications.marketAlert.message.msg=新しい「{0} {1}」オファーが{2} ({3} {4}市場価格)の価格、支払い方法[{5}」でBisqオファーブックに発行されました。\nオファーID: {6}。 +account.notifications.marketAlert.message.msg=新しい「{0} {1}」オファーが{2} ({3} {4}市場価格)の価格、支払い方法[{5}」でHavenoオファーブックに発行されました。\nオファーID: {6}。 account.notifications.priceAlert.message.title={0}で価格アラート account.notifications.priceAlert.message.msg=価格アラートがトリガーされました。現在の{0}価格は{1} {2}です -account.notifications.noWebCamFound.warning=ウェブカメラが見つかりません。\n\n電子メールオプションを使用して、トークンと暗号化キーを携帯電話からBisqアプリケーションに送信してください。 +account.notifications.noWebCamFound.warning=ウェブカメラが見つかりません。\n\n電子メールオプションを使用して、トークンと暗号化キーを携帯電話からHavenoアプリケーションに送信してください。 account.notifications.priceAlert.warning.highPriceTooLow=最高価格は最低価格よりも高い必要があります account.notifications.priceAlert.warning.lowerPriceTooHigh=最低価格は最高価格よりも低い必要があります @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=署名を検証中... displayUpdateDownloadWindow.button.label=インストーラーをダウンロードして署名を検証 displayUpdateDownloadWindow.button.downloadLater=後でダウンロード displayUpdateDownloadWindow.button.ignoreDownload=このバージョンを無視 -displayUpdateDownloadWindow.headline=新しいBisqの更新が利用可能です！ +displayUpdateDownloadWindow.headline=新しいHavenoの更新が利用可能です！ displayUpdateDownloadWindow.download.failed.headline=ダウンロードに失敗 displayUpdateDownloadWindow.download.failed=ダウンロード失敗。\n[HYPERLINK:https://bisq.network/downloads] から手動でダウンロード、確認してください。 displayUpdateDownloadWindow.installer.failed=正しいインストーラーを判別できません。 [HYPERLINK:https://bisq.network/downloads] から手動でダウンロードして検証してください。 @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=支払いなしで閉じる disputeSummaryWindow.close.noPayout.text=支払いなしで閉じてもよろしいですか？ emptyWalletWindow.headline={0} 緊急ウォレットツール -emptyWalletWindow.info=UIから資金にアクセスできない緊急時にのみ使用してください。\n\nこのツールを使用すると、開いているオファーはすべて自動的に閉じられることに注意してください。\n\nこのツールを使用する前に、データディレクトリをバックアップしてください。これは「アカウント/バックアップ」で行えます。\n\n問題の原因を調査できるように、問題を報告し、GitHubまたはBisqフォーラムにバグレポートを提出してください。 +emptyWalletWindow.info=UIから資金にアクセスできない緊急時にのみ使用してください。\n\nこのツールを使用すると、開いているオファーはすべて自動的に閉じられることに注意してください。\n\nこのツールを使用する前に、データディレクトリをバックアップしてください。これは「アカウント/バックアップ」で行えます。\n\n問題の原因を調査できるように、問題を報告し、GitHubまたはHavenoフォーラムにバグレポートを提出してください。 emptyWalletWindow.balance=あなたの利用可能なウォレット残高 emptyWalletWindow.address=あなたの宛先アドレス emptyWalletWindow.button=全ての資金を送る @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=作成日 offerDetailsWindow.makersOnion=メイカーのonionアドレス qRCodeWindow.headline=QRコード -qRCodeWindow.msg=外部ウォレットからBisqウォレットへ送金するのに、このQRコードを利用して下さい。 +qRCodeWindow.msg=外部ウォレットからHavenoウォレットへ送金するのに、このQRコードを利用して下さい。 qRCodeWindow.request=支払いリクエスト:\n{0} selectDepositTxWindow.headline=係争の為のデポジットトランザクションを選択 @@ -1562,7 +1562,7 @@ popup.headline.error=エラー popup.doNotShowAgain=次回から表示しない popup.reportError.log=ログファイルを開く popup.reportError.gitHub=GitHub issue trackerに報告 -popup.reportError={0}\n\nソフトウェアの改善に役立てるため、https://github.com/bisq-network/bisq/issues で新しい issue を開いてこのバグを報告してください。\n下のボタンのいずれかをクリックすると、上記のエラーメッセージがクリップボードにコピーされます。\n「ログファイルを開く」を押して、コピーを保存し、バグレポートに添付されるbisq.logファイル含めると、デバッグが容易になります。 +popup.reportError={0}\n\nソフトウェアの改善に役立てるため、https://github.com/bisq-network/bisq/issues で新しい issue を開いてこのバグを報告してください。\n下のボタンのいずれかをクリックすると、上記のエラーメッセージがクリップボードにコピーされます。\n「ログファイルを開く」を押して、コピーを保存し、バグレポートに添付されるhaveno.logファイル含めると、デバッグが容易になります。 popup.error.tryRestart=アプリケーションを再起動し、ネットワーク接続を確認して問題を解決できるかどうかを確認してください。 popup.error.takeOfferRequestFailed=誰かがあなたのいずれかのオファーを受けようと時にエラーが発生しました:\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=トレードID{0}で識別されるト error.closedTradeWithNoDepositTx=トレードID{0}で識別されるトレードのデポジットトランザクションは無効とされました。\n\n閉じられたトレードリストを更新するため、アプリケーションを再起動して下さい。 popup.warning.walletNotInitialized=ウォレットはまだ初期化されていません -popup.warning.osxKeyLoggerWarning=macOS 10.14以上の厳しいセキュリティー対策のため、Javaアプリケーション（BisqはJavaを利用します）はmacOSで警告用のポップアップ・ウィンドウを生じます（「Bisqは他のアプリからキー操作をアクセスしたい」）。\n\nこの問題を解決するのに、macOS設定を開いて、「セキュリティとプライバシー -> プライバシー -> 入力監視」において右側のリストからBisqを外して下さい。\n\n技術的な限界は克服されたら（必要のJavaバージョンパッケージャーがまだリリースされていません）、問題を避けるためにBisqは新しいJavaバージョンにアップグレードします。 -popup.warning.wrongVersion=このコンピューターのBisqバージョンが間違っている可能性があります。\nコンピューターのアーキテクチャ: {0}\nインストールしたBisqバイナリ: {1}\nシャットダウンして、次の正しいバージョンを再インストールしてください（{2}）。 -popup.warning.incompatibleDB=互換性のないデータベースファイルが検出されました！\n\nこういうデータベースファイルは、現在のコードベースと互換性がありません:\n{0}\n\n破損したファイルのバックアップを作成し、デフォルト値を新しいデータベースバージョンに適用しました。\n\nバックアップは次の場所にあります。\n{1}/db/backup_of_corrupted_data.\n\nBisqの最新バージョンがインストールされているかどうかを確認してください。\n以下からダウンロードできます。\n[HYPERLINK:https://bisq.network/downloads]\n\nアプリケーションを再起動してください。 -popup.warning.startupFailed.twoInstances=Bisqは既に起動中です。Bisqを2つ起動することはできません。 +popup.warning.osxKeyLoggerWarning=macOS 10.14以上の厳しいセキュリティー対策のため、Javaアプリケーション（HavenoはJavaを利用します）はmacOSで警告用のポップアップ・ウィンドウを生じます（「Havenoは他のアプリからキー操作をアクセスしたい」）。\n\nこの問題を解決するのに、macOS設定を開いて、「セキュリティとプライバシー -> プライバシー -> 入力監視」において右側のリストからHavenoを外して下さい。\n\n技術的な限界は克服されたら（必要のJavaバージョンパッケージャーがまだリリースされていません）、問題を避けるためにHavenoは新しいJavaバージョンにアップグレードします。 +popup.warning.wrongVersion=このコンピューターのHavenoバージョンが間違っている可能性があります。\nコンピューターのアーキテクチャ: {0}\nインストールしたHavenoバイナリ: {1}\nシャットダウンして、次の正しいバージョンを再インストールしてください（{2}）。 +popup.warning.incompatibleDB=互換性のないデータベースファイルが検出されました！\n\nこういうデータベースファイルは、現在のコードベースと互換性がありません:\n{0}\n\n破損したファイルのバックアップを作成し、デフォルト値を新しいデータベースバージョンに適用しました。\n\nバックアップは次の場所にあります。\n{1}/db/backup_of_corrupted_data.\n\nHavenoの最新バージョンがインストールされているかどうかを確認してください。\n以下からダウンロードできます。\n[HYPERLINK:https://bisq.network/downloads]\n\nアプリケーションを再起動してください。 +popup.warning.startupFailed.twoInstances=Havenoは既に起動中です。Havenoを2つ起動することはできません。 popup.warning.tradePeriod.halfReached=ID {0}とのトレードは許可された最大トレード期間の半分に達しましたが、まだ完了していません\n\n取引期間は{1}で終了します\n\n詳細については、「ポートフォリオ/オープントレード」でトレード状態を確認してください。 popup.warning.tradePeriod.ended=ID {0}とのトレードは許可された最大トレード期間に達しましたが、まだ完了していません。\n\nトレード期間は{1}で終了しました\n\n調停者に連絡するには、「ポートフォリオ/オープントレード」であなたのトレードを確認してください。 popup.warning.noTradingAccountSetup.headline=トレードアカウントが設定されていません @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=利用可能な調停人がいません。 popup.warning.notFullyConnected=ネットワークへ完全に接続するまで待つ必要があります。\n起動までに約2分かかります。 popup.warning.notSufficientConnectionsToBtcNetwork=少なくとも{0}のビットコインネットワークへの接続が確立されるまでお待ちください。 popup.warning.downloadNotComplete=欠落しているビットコインブロックのダウンロードが完了するまで待つ必要があります。 -popup.warning.chainNotSynced=Bisqウォレットのブロックチェーン高さは正しく同期されていません。アプリを最近起動した場合、1つのビットコインブロックが発行されるまで待って下さい。\n\nブロックチェーン高さは\"設定/ネットワーク情報\"に表示されます。 2つ以上のブロックが発行されても問題が解決されない場合、フリーズしている可能性があります。その場合には、SPV再同期を行って下さい [HYPERLINK: https://bisq.wiki/Resyncing_SPV_file ]。 +popup.warning.chainNotSynced=Havenoウォレットのブロックチェーン高さは正しく同期されていません。アプリを最近起動した場合、1つのビットコインブロックが発行されるまで待って下さい。\n\nブロックチェーン高さは\"設定/ネットワーク情報\"に表示されます。 2つ以上のブロックが発行されても問題が解決されない場合、フリーズしている可能性があります。その場合には、SPV再同期を行って下さい [HYPERLINK: https://bisq.wiki/Resyncing_SPV_file ]。 popup.warning.removeOffer=本当にオファーを削除しますか？\nオファーを削除する場合、{0}のメイカー手数料が失われます。 popup.warning.tooLargePercentageValue=100%以上のパーセントを設定できません popup.warning.examplePercentageValue=パーセントの数字を入力してください。5.4%は「5.4」のように入力します。 @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned={0}ノードの1つが禁止されました。 # suppress inspection "UnusedProperty" popup.warning.priceRelay=価格中継 popup.warning.seed=シード -popup.warning.mandatoryUpdate.trading=最新のBisqバージョンに更新してください。古いバージョンのトレードを無効にする必須の更新プログラムがリリースされました。詳細については、Bisqフォーラムをご覧ください。 -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=最新のHavenoバージョンに更新してください。古いバージョンのトレードを無効にする必須の更新プログラムがリリースされました。詳細については、Havenoフォーラムをご覧ください。 +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC={0}のマイニング手数料が{1}の送金額を超えるため、このトランザクションは利用不可です。マイニング手数料が再び低くなるか、送金するBTCがさらに蓄積されるまでお待ちください。 -popup.warning.openOffer.makerFeeTxRejected=ID{0}で識別されるオファーのためのメイカー手数料トランザクションがビットコインネットワークに拒否されました。\nトランザクションID= {1} 。\n更なる問題を避けるため、そのオファーは削除されました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。 +popup.warning.openOffer.makerFeeTxRejected=ID{0}で識別されるオファーのためのメイカー手数料トランザクションがビットコインネットワークに拒否されました。\nトランザクションID= {1} 。\n更なる問題を避けるため、そのオファーは削除されました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Haveno Keybaseチームのサポートチャンネルに連絡して下さい。 popup.warning.trade.txRejected.tradeFee=トレード手数料 popup.warning.trade.txRejected.deposit=デポジット -popup.warning.trade.txRejected=ID{1}で識別されるトレードのための{0}トランザクションがビットコインネットワークに拒否されました。\nトランザクションID= {2} \nトレードは「失敗トレード」へ送られました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。 +popup.warning.trade.txRejected=ID{1}で識別されるトレードのための{0}トランザクションがビットコインネットワークに拒否されました。\nトランザクションID= {2} \nトレードは「失敗トレード」へ送られました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Haveno Keybaseチームのサポートチャンネルに連絡して下さい。 -popup.warning.openOfferWithInvalidMakerFeeTx=ID{0}で識別されるオファーのためのメイカー手数料トランザクションが無効とされました。\nトランザクションID= {1} 。\n更なる問題を避けるため、そのオファーは削除されました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。 +popup.warning.openOfferWithInvalidMakerFeeTx=ID{0}で識別されるオファーのためのメイカー手数料トランザクションが無効とされました。\nトランザクションID= {1} 。\n更なる問題を避けるため、そのオファーは削除されました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Haveno Keybaseチームのサポートチャンネルに連絡して下さい。 -popup.info.securityDepositInfo=両方の取引者がトレードプロトコルに従うことを保証するために、両方のトレーダーはセキュリティデポジットを支払う必要があります。\n\nこのデポジットはあなたのトレードがうまく完了するまであなたのトレードウォレットに保管され、それからあなたに返金されます。\n\n注意してください：あなたが新しいオファーを作成しているなら、他の取引者がそれを受けるためにBisqを実行しておく必要があります。オファーをオンラインにしておくには、Bisqを実行したままにして、このコンピュータもオンラインにしたままにします（つまり、スタンバイモードに切り替わらないようにします…モニターのスタンバイは大丈夫です）。 +popup.info.securityDepositInfo=両方の取引者がトレードプロトコルに従うことを保証するために、両方のトレーダーはセキュリティデポジットを支払う必要があります。\n\nこのデポジットはあなたのトレードがうまく完了するまであなたのトレードウォレットに保管され、それからあなたに返金されます。\n\n注意してください：あなたが新しいオファーを作成しているなら、他の取引者がそれを受けるためにHavenoを実行しておく必要があります。オファーをオンラインにしておくには、Havenoを実行したままにして、このコンピュータもオンラインにしたままにします（つまり、スタンバイモードに切り替わらないようにします…モニターのスタンバイは大丈夫です）。 popup.info.cashDepositInfo=あなたの地域の銀行支店が現金デポジットが作成できることを確認してください。\n売り手の銀行ID（BIC / SWIFT）は{0}です。 popup.info.cashDepositInfo.confirm=デポジットを作成できるか確認します -popup.info.shutDownWithOpenOffers=Bisqはシャットダウン中ですが、オファーはあります。\n\nこれらのオファーは、Bisqがシャットダウンされている間はP2Pネットワークでは利用できませんが、次回Bisqを起動したときにP2Pネットワークに再公開されます。\n\nオファーをオンラインに保つには、Bisqを実行したままにして、このコンピュータもオンラインにしたままにします（つまり、スタンバイモードにならないようにしてください。モニタースタンバイは問題ありません）。 -popup.info.qubesOSSetupInfo=Qubes OS内でBisqを実行しているようです。\n\nBisqのqubeはセットアップガイドに従って設定されていることを確かめて下さい: [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes] -popup.warn.downGradePrevention=バージョン{0}からバージョン{1}に戻すことはサポートされていません。最新のBisqバージョンを利用して下さい。 +popup.info.shutDownWithOpenOffers=Havenoはシャットダウン中ですが、オファーはあります。\n\nこれらのオファーは、Havenoがシャットダウンされている間はP2Pネットワークでは利用できませんが、次回Havenoを起動したときにP2Pネットワークに再公開されます。\n\nオファーをオンラインに保つには、Havenoを実行したままにして、このコンピュータもオンラインにしたままにします（つまり、スタンバイモードにならないようにしてください。モニタースタンバイは問題ありません）。 +popup.info.qubesOSSetupInfo=Qubes OS内でHavenoを実行しているようです。\n\nHavenoのqubeはセットアップガイドに従って設定されていることを確かめて下さい: [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes] +popup.warn.downGradePrevention=バージョン{0}からバージョン{1}に戻すことはサポートされていません。最新のHavenoバージョンを利用して下さい。 popup.privateNotification.headline=重要なプライベート通知！ popup.securityRecommendation.headline=重要なセキュリティ勧告 popup.securityRecommendation.msg=ウォレットのパスワード保護をまだ有効にしてない場合は、使用することを検討してください。\n\nウォレットシードワードを書き留めることも強くお勧めします。 これらのシードワードは、あなたのビットコインウォレットを復元するためのマスターパスワードのようなものです。\n「ウォレットシード」セクションにてより詳細な情報を確認できます。\n\nまた、「バックアップ」セクションのアプリケーションデータフォルダ全体をバックアップするべきでしょう。 -popup.bitcoinLocalhostNode.msg=Bisqはローカルで動作するビットコインコアノード（ローカルホストに）を検出しました。\n\n以下の点を確認して下さい：\n- Bisqを起動する前にノードは完全に同期されていること\n- プルーニングモードは無効にされること（bitcoin.confに'prune=0'）\n- ブルームフィルターは有効にされること（bitcoin.confに'peerbloomfilters=1'） +popup.bitcoinLocalhostNode.msg=Havenoはローカルで動作するビットコインコアノード（ローカルホストに）を検出しました。\n\n以下の点を確認して下さい：\n- Havenoを起動する前にノードは完全に同期されていること\n- プルーニングモードは無効にされること（bitcoin.confに'prune=0'）\n- ブルームフィルターは有効にされること（bitcoin.confに'peerbloomfilters=1'） popup.shutDownInProgress.headline=シャットダウン中 popup.shutDownInProgress.msg=アプリケーションのシャットダウンには数秒かかることがあります。\nこのプロセスを中断しないでください。 @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=トレードウォレット更新 notification.walletUpdate.msg=あなたのトレードウォレットは十分に入金されています。\n金額: {0} notification.takeOffer.walletUpdate.msg=あなたのトレードウォレットは、以前のオファー受け入れの試みからすでに十分な資金を得ています。\n金額: {0} notification.tradeCompleted.headline=取引完了 -notification.tradeCompleted.msg=あなたは今、外部のビットコインウォレットにあなたの資金を出金するか、それをBisqウォレットに送金することができます。 +notification.tradeCompleted.msg=あなたは今、外部のビットコインウォレットにあなたの資金を出金するか、それをHavenoウォレットに送金することができます。 #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=あなたは今、外部のビットコインウ systemTray.show=アプリケーションウィンドウを表示 systemTray.hide=アプリケーションウィンドウを隠す -systemTray.info=Bisqについての情報 +systemTray.info=Havenoについての情報 systemTray.exit=終了 -systemTray.tooltip=Bisq: 分散的ビットコイン取引ネットワーク +systemTray.tooltip=Haveno: 分散的ビットコイン取引ネットワーク #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=パスワードから鍵を引き出す password.walletDecrypted=ウォレットは正常に復号化され、パスワード保護が解除されました。 password.wrongPw=間違ったパスワードを入力しています。\n\nパスワードをもう一度入力してみてください。入力ミスやスペルミスがないか慎重に確認してください。 password.walletEncrypted=ウォレットは正常に暗号化され、パスワード保護が有効になりました。 -password.walletEncryptionFailed=ウォレットのパスワードを設定できませんでした。ウォレットデータベースと一致しないシードワードをインポートした可能性があります。Keybase ([HYPERLINK:https://keybase.io/team/bisq]) で開発者と連絡して下さい。 +password.walletEncryptionFailed=ウォレットのパスワードを設定できませんでした。ウォレットデータベースと一致しないシードワードをインポートした可能性があります。Keybase ([HYPERLINK:https://keybase.io/team/haveno]) で開発者と連絡して下さい。 password.passwordsDoNotMatch=入力した2つのパスワードが一致しません。 password.forgotPassword=パスワードを忘れましたか？ password.backupReminder=ウォレットパスワードを設定すると、暗号化されていないウォレットから自動的に作成されたすべてのバックアップが削除されます。\n\nパスワードを設定する前に、アプリケーションディレクトリのバックアップを作成してシードワードを書き留めておくことを強く推奨します。 @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=あなたのビットコインウォレットは空 seed.warn.walletNotEmpty.restore=とにかく復元したい seed.warn.walletNotEmpty.emptyWallet=最初にウォレットを空にしたい seed.warn.notEncryptedAnymore=あなたの財布は暗号化されています。\n\n復元後、ウォレットは暗号化されなくなり、新しいパスワードを設定する必要があります。\n\n続行しますか？ -seed.warn.walletDateEmpty=ウォレット日を特定しなかったため、Bisqは2013.10.09（BIP39エポック日）からブロックチェーンをスキャンしなければなりません。\n\nBIP39のウォレットは2017.06.28(リリースv0.5)にBisqに使われ始めたので、その日を利用して時間を節約できます。\n\n理想的に、ウォレット・シードが作成された日を特定すべきです。\n\n\nウォレット日を特定せずに続いても本当によろしいですか？ +seed.warn.walletDateEmpty=ウォレット日を特定しなかったため、Havenoは2013.10.09（BIP39エポック日）からブロックチェーンをスキャンしなければなりません。\n\nBIP39のウォレットは2017.06.28(リリースv0.5)にHavenoに使われ始めたので、その日を利用して時間を節約できます。\n\n理想的に、ウォレット・シードが作成された日を特定すべきです。\n\n\nウォレット日を特定せずに続いても本当によろしいですか？ seed.restore.success=ウォレットは、新しいシードワードで正常に復元されました。\n\nアプリケーションをシャットダウンして再起動する必要があります。 seed.restore.error=シードワードを使用したウォレットの復元中にエラーが発生しました。{0} seed.restore.openOffers.warn=シードワードから復元すると削除されるオープンオファーがあります。 \n本当に続いてもよろしいですか？ @@ -1949,17 +1949,17 @@ payment.accountType=口座種別 payment.checking=当座口座 payment.savings=普通口座 payment.personalId=個人ID -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelleは他の銀行を介して利用するとよりうまくいく送金サービスです。\n\n1. あなたの銀行がZelleと協力するか（そして利用の方法）をここから確認して下さい: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. 送金制限に注意して下さい。制限は銀行によって異なり、1日、1週、1月当たりの制限に分けられていることが多い。\n\n3. 銀行がZelleと協力しない場合でも、Zelleのモバイルアプリ版を使えますが、送金制限ははるかに低くなります。\n\n4. Bisqアカウントで特定される名前は必ずZelleアカウントと銀行口座に特定される名前と合う必要があります。\n\nトレード契約書とおりにZelleトランザクションを完了できなければ、一部（あるいは全て）のセキュリティデポジットを失う可能性はあります。\n\nZelleにおいてやや高い支払取り消しリスクがあるので、売り手はメールやSMSで無署名買い手に連絡して、Bisqに特定されるZelleアカウントの所有者かどうかを確かめるようにおすすめします。 -payment.fasterPayments.newRequirements.info=「Faster Payments」で送金する場合、銀行が受信者の姓名を確認するケースが最近多くなりました。現在の「Faster Payments」アカウントは姓名を特定しません。\n\nこれからの{0}買い手に姓名を提供するため、Bisq内に新しい「Faster Payments」アカウントを作成するのを検討して下さい。\n\n新しいアカウントを作成すると、完全に同じ分類コード、アカウントの口座番号、そしてアカウント年齢検証ソルト値を古いアカウントから新しいアカウントにコピーして下さい。こうやって現在のアカウントの年齢そして署名状況は維持されます。 +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelleは他の銀行を介して利用するとよりうまくいく送金サービスです。\n\n1. あなたの銀行がZelleと協力するか（そして利用の方法）をここから確認して下さい: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. 送金制限に注意して下さい。制限は銀行によって異なり、1日、1週、1月当たりの制限に分けられていることが多い。\n\n3. 銀行がZelleと協力しない場合でも、Zelleのモバイルアプリ版を使えますが、送金制限ははるかに低くなります。\n\n4. Havenoアカウントで特定される名前は必ずZelleアカウントと銀行口座に特定される名前と合う必要があります。\n\nトレード契約書とおりにZelleトランザクションを完了できなければ、一部（あるいは全て）のセキュリティデポジットを失う可能性はあります。\n\nZelleにおいてやや高い支払取り消しリスクがあるので、売り手はメールやSMSで無署名買い手に連絡して、Havenoに特定されるZelleアカウントの所有者かどうかを確かめるようにおすすめします。 +payment.fasterPayments.newRequirements.info=「Faster Payments」で送金する場合、銀行が受信者の姓名を確認するケースが最近多くなりました。現在の「Faster Payments」アカウントは姓名を特定しません。\n\nこれからの{0}買い手に姓名を提供するため、Haveno内に新しい「Faster Payments」アカウントを作成するのを検討して下さい。\n\n新しいアカウントを作成すると、完全に同じ分類コード、アカウントの口座番号、そしてアカウント年齢検証ソルト値を古いアカウントから新しいアカウントにコピーして下さい。こうやって現在のアカウントの年齢そして署名状況は維持されます。 payment.moneyGram.info=MoneyGramを使用する場合、BTCの買い手は認証番号と領収書の写真をEメールでBTCの売り手に送信する必要があります。領収書には、売り手の氏名、市区町村、国、金額を明確に記載する必要があります。トレードプロセスにて、売り手のEメールは買い手に表示されます。 payment.westernUnion.info=Western Unionを使用する場合、BTCの買い手はMTCN（追跡番号）と領収書の写真をEメールでBTCの売り手に送信する必要があります。領収書には、売り手の氏名、市区町村、国、金額を明確に記載する必要があります。トレードプロセスにて、売り手のEメールは買い手に表示されます。 payment.halCash.info=HalCashを使用する場合、BTCの買い手は携帯電話からのテキストメッセージを介してBTCの売り手にHalCashコードを送信する必要があります。\n\n銀行がHalCashで送金できる最大額を超えないようにしてください。 1回の出金あたりの最小金額は10EURで、最大金額は600EURです。繰り返し出金する場合は、1日に受取人1人あたり3000EUR、1ヶ月に受取人１人あたり6000EURです。あなたの銀行でも、ここに記載されているのと同じ制限を使用しているか、これらの制限を銀行と照合して確認してください。\n\n出金額は10の倍数EURでなければ、ATMから出金できません。 オファーの作成画面およびオファー受け入れ画面のUIは、EUR金額が正しくなるようにBTC金額を調整します。価格の変化とともにEURの金額は変化するため、市場ベースの価格を使用することはできません。\n\n係争が発生した場合、BTCの買い手はEURを送ったという証明を提出する必要があります。 # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=すべての銀行振込にはある程度の支払取り消しのリスクがあることに気を付けて下さい。\n\nこのリスクを軽減するために、Bisqは使用する支払い方法での支払取り消しリスクの推定レベルに基づいてトレードごとの制限を設定します。\n\n現在使用する支払い方法では、トレードごとの売買制限は{2}です。\n\n制限は各トレードの量のみに適用されることに注意して下さい。トレードできる合計回数には制限はありません。\n\n詳しくはWikiを調べて下さい [HYPERLINK:https://bisq.wiki/Account_limits] 。 +payment.limits.info=すべての銀行振込にはある程度の支払取り消しのリスクがあることに気を付けて下さい。\n\nこのリスクを軽減するために、Havenoは使用する支払い方法での支払取り消しリスクの推定レベルに基づいてトレードごとの制限を設定します。\n\n現在使用する支払い方法では、トレードごとの売買制限は{2}です。\n\n制限は各トレードの量のみに適用されることに注意して下さい。トレードできる合計回数には制限はありません。\n\n詳しくはWikiを調べて下さい [HYPERLINK:https://bisq.wiki/Account_limits] 。 # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=支払取り消しのリスクを軽減するために、Bisqはこの支払いアカウントに下記の2つの要因に基づいてトレードごとの制限を設定します。\n\n1.使用する支払い方法での支払取り消しリスクの推定レベル\n2.アカウントの署名状況\n\nこの支払いアカウントはまだ無署名ですので、トレードごとに{0}の買い制限があります。 アカウントが署名される後、トレードごとの制限は以下のように成長します：\n\n●署名の前、そして署名から30日間までに、1トレードあたりの買い制限は{0}になります\n●署名から30日間後に、1トレードあたりの買い制限は{1}になります\n●署名から60日間後に、1トレードあたりの買い制限は{2}になります\n\n売り制限は署名状況に関係がありません。現在のところ、1トレードあたりに{2}を売ることができます。\n\n制限は各トレードの量のみに適用されることに注意して下さい。取引できる合計回数には制限はありません。\n\n詳しくは: [HYPERLINK:https://bisq.wiki/Account_limits] +payment.limits.info.withSigning=支払取り消しのリスクを軽減するために、Havenoはこの支払いアカウントに下記の2つの要因に基づいてトレードごとの制限を設定します。\n\n1.使用する支払い方法での支払取り消しリスクの推定レベル\n2.アカウントの署名状況\n\nこの支払いアカウントはまだ無署名ですので、トレードごとに{0}の買い制限があります。 アカウントが署名される後、トレードごとの制限は以下のように成長します：\n\n●署名の前、そして署名から30日間までに、1トレードあたりの買い制限は{0}になります\n●署名から30日間後に、1トレードあたりの買い制限は{1}になります\n●署名から60日間後に、1トレードあたりの買い制限は{2}になります\n\n売り制限は署名状況に関係がありません。現在のところ、1トレードあたりに{2}を売ることができます。\n\n制限は各トレードの量のみに適用されることに注意して下さい。取引できる合計回数には制限はありません。\n\n詳しくは: [HYPERLINK:https://bisq.wiki/Account_limits] payment.cashDeposit.info=あなたの銀行が他の人の口座に現金入金を送ることを許可していることを確認してください。たとえば、Bank of America と Wells Fargo では、こうした預金は許可されなくなりました。 @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Bisqでアメリカ合衆国郵便為替（USPMO）をトレードするには、以下を理解する必要があります：\n\n-送る前に、BTC買い手は必ずBTC売り手の名前を支払人そして支払先フィールド両方に書いて、追跡証明も含めるUSPMOそして封筒の高解像度写真を取る必要があります。\n-BTC買い手は必ず配達確認を利用してBTC売り手にUSPMOを送る必要があります。\n\n調停が必要になる場合、あるいはトレード係争が開始される場合、調停者や調停人がアメリカ合衆国郵便のサイトで詳細を確認できるように、取った写真、USPMOシリアル番号、郵便局番号、そしてドル金額を送る必要があります。\n\n調停者や調停人に必要な情報を提供しなければ、係争で不利な裁定を下されます。\n\n全ての係争には、調停者や調停人に証明を提供するのは100%USPMO送付者の責任です。\n\n以上の条件を理解しない場合、BisqでUSPMOのトレードをしないで下さい。 +payment.usPostalMoneyOrder.info=Havenoでアメリカ合衆国郵便為替（USPMO）をトレードするには、以下を理解する必要があります：\n\n-送る前に、BTC買い手は必ずBTC売り手の名前を支払人そして支払先フィールド両方に書いて、追跡証明も含めるUSPMOそして封筒の高解像度写真を取る必要があります。\n-BTC買い手は必ず配達確認を利用してBTC売り手にUSPMOを送る必要があります。\n\n調停が必要になる場合、あるいはトレード係争が開始される場合、調停者や調停人がアメリカ合衆国郵便のサイトで詳細を確認できるように、取った写真、USPMOシリアル番号、郵便局番号、そしてドル金額を送る必要があります。\n\n調停者や調停人に必要な情報を提供しなければ、係争で不利な裁定を下されます。\n\n全ての係争には、調停者や調停人に証明を提供するのは100%USPMO送付者の責任です。\n\n以上の条件を理解しない場合、HavenoでUSPMOのトレードをしないで下さい。 -payment.cashByMail.info=Bisqで、郵送で現金（CBM)を利用してトレードするには、以下を理解する必要があります：\n● BTC買い手は現金を開封明示機構のある袋に入れるべき。\n● 送り先住所とトラッキング番号が袋に貼ってある状態で、包装過程の動画あるいはHD写真を取るべき。\n● 配達確認と保険を掛けて、BTC買い手はBTC売り手に袋を送るべき。\n● BTC売り手は送り手にもらったトラッキング番号が見えるように、袋の開梱の動画を撮影するべき。\n● オファーのメイカーは支払いアカウントの「追加情報」フィールドに特別な契約条件を述べるべき。\n● テイカーはオファーを受けることによってその契約条件に同意することを示す。\n\nCBMでトレードする場合では、正直に行動する責任は完全にトレードピアのみに負わされます。\n\n● 他の法定通貨トレードと比べて、CBTトレードには検証可能な行動は少ない。つまり、係争は処理しにくい。\n● 係争が発生した場合、取引者チャットで解決する方が一番効果的です。\n● 調停者が問題を検討し提案できますが、問題を解決できること保障されるものではない。\n● 調停者は取り組まれる場合、何れのトレードピアが調停者の提案を拒否したら両方のピアの資金はBisqの寄付アドレス [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] まで送られ、トレードは事実上に終了されることになります。\n● 1人の取引者が調停者の提案を拒否して仲裁を開始したら、両方のトレードピアのトレードとデポジット金額両方は失われる可能性があります。\n● 調停人は提供される証拠に基づいて決定を下すので、前もって係争の場合の準備として、以上のトレードプロセスを記録して下さい。郵送で現金トレードの場合、調停人の決定は最終的なものです。\n● 郵送で現金トレードから失われた金額はBisqのDAOから払い戻しできませんので、払い戻しリクエストは否定されます。\n\n以上の要件を十分に理解することを断言するため、Wikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nこれらの要件を理解していない場合は、BisqでCBMを利用してトレードしないで下さい。 +payment.cashByMail.info=Havenoで、郵送で現金（CBM)を利用してトレードするには、以下を理解する必要があります：\n● BTC買い手は現金を開封明示機構のある袋に入れるべき。\n● 送り先住所とトラッキング番号が袋に貼ってある状態で、包装過程の動画あるいはHD写真を取るべき。\n● 配達確認と保険を掛けて、BTC買い手はBTC売り手に袋を送るべき。\n● BTC売り手は送り手にもらったトラッキング番号が見えるように、袋の開梱の動画を撮影するべき。\n● オファーのメイカーは支払いアカウントの「追加情報」フィールドに特別な契約条件を述べるべき。\n● テイカーはオファーを受けることによってその契約条件に同意することを示す。\n\nCBMでトレードする場合では、正直に行動する責任は完全にトレードピアのみに負わされます。\n\n● 他の法定通貨トレードと比べて、CBTトレードには検証可能な行動は少ない。つまり、係争は処理しにくい。\n● 係争が発生した場合、取引者チャットで解決する方が一番効果的です。\n● 調停者が問題を検討し提案できますが、問題を解決できること保障されるものではない。\n● 調停者は取り組まれる場合、何れのトレードピアが調停者の提案を拒否したら両方のピアの資金はHavenoの寄付アドレス [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] まで送られ、トレードは事実上に終了されることになります。\n● 1人の取引者が調停者の提案を拒否して仲裁を開始したら、両方のトレードピアのトレードとデポジット金額両方は失われる可能性があります。\n● 調停人は提供される証拠に基づいて決定を下すので、前もって係争の場合の準備として、以上のトレードプロセスを記録して下さい。郵送で現金トレードの場合、調停人の決定は最終的なものです。\n● 郵送で現金トレードから失われた金額はHavenoのDAOから払い戻しできませんので、払い戻しリクエストは否定されます。\n\n以上の要件を十分に理解することを断言するため、Wikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nこれらの要件を理解していない場合は、HavenoでCBMを利用してトレードしないで下さい。 payment.cashByMail.contact=連絡情報 payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1996,7 +1996,7 @@ payment.japan.recipient=名義 payment.australia.payid=PayID payment.payid=金融機関と繋がっているPayID。例えばEメールアドレスそれとも携帯電話番号。 payment.payid.info=銀行、信用金庫、あるいは住宅金融組合アカウントと安全に繋がれるPayIDとして使われる電話番号、Eメールアドレス、それともオーストラリア企業番号（ABN）。すでにオーストラリアの金融機関とPayIDを作った必要があります。送金と受取の金融機関は両方PayIDをサポートする必要があります。詳しくは以下を訪れて下さい [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=アマゾンeGiftカードで支払うには、アマゾンアカウントを使ってeGiftカードをBTC売り手に送る必要があります。\n\nBisqはeGiftカードの送り先になるBTC売り手のメールアドレスそれとも電話番号を表示します。そしてeGiftカードのメッセージフィールドに、必ずトレードIDを入力して下さい。最良の慣行について詳しくはWikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Amazon_eGift_card]\n\n3つの注意点：\n- 可能であれば、100米ドル価格以下のeGiftカードを送って下さい。それ以上の価格はアマゾンに不正な取引というフラグが立てられることがあります。\n- eGiftカードのメッセージフィールドに、トレードIDと一緒に信ぴょう性のあるメッセージを入力して下さい。（例えば隆さん、「お誕生日おめでとう！」）。（そして確認のため、取引者チャットでトレードピアにメッセージの内容を伝えて下さい）。\n- アマゾンeGiftカードは買われたサイトのみに交換できます（例えば、amazon.jpから買われたカードはamazon.jpのみに交換できます）。 +payment.amazonGiftCard.info=アマゾンeGiftカードで支払うには、アマゾンアカウントを使ってeGiftカードをBTC売り手に送る必要があります。\n\nHavenoはeGiftカードの送り先になるBTC売り手のメールアドレスそれとも電話番号を表示します。そしてeGiftカードのメッセージフィールドに、必ずトレードIDを入力して下さい。最良の慣行について詳しくはWikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Amazon_eGift_card]\n\n3つの注意点：\n- 可能であれば、100米ドル価格以下のeGiftカードを送って下さい。それ以上の価格はアマゾンに不正な取引というフラグが立てられることがあります。\n- eGiftカードのメッセージフィールドに、トレードIDと一緒に信ぴょう性のあるメッセージを入力して下さい。（例えば隆さん、「お誕生日おめでとう！」）。（そして確認のため、取引者チャットでトレードピアにメッセージの内容を伝えて下さい）。\n- アマゾンeGiftカードは買われたサイトのみに交換できます（例えば、amazon.jpから買われたカードはamazon.jpのみに交換できます）。 # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 01df32ac..3ef4d5ad 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -103,14 +103,14 @@ shared.faq=Visit FAQ page shared.yesCancel=Sim, cancelar shared.nextStep=Próximo passo shared.selectTradingAccount=Selecionar conta de negociação -shared.fundFromSavingsWalletButton=Transferir fundos da carteira Bisq +shared.fundFromSavingsWalletButton=Transferir fundos da carteira Haveno shared.fundFromExternalWalletButton=Abrir sua carteira externa para prover fundos shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed? shared.belowInPercent=% abaixo do preço de mercado shared.aboveInPercent=% acima do preço de mercado shared.enterPercentageValue=Insira a % shared.OR=OU -shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds. +shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. shared.waitingForFunds=Aguardando pagamento... shared.TheBTCBuyer=O comprador de BTC shared.You=Você @@ -125,7 +125,7 @@ shared.notUsedYet=Ainda não usado shared.date=Data shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n +shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Copiar para área de transferência shared.language=Idioma shared.country=País @@ -238,8 +238,8 @@ mainView.menu.settings=Configurações mainView.menu.account=Conta mainView.marketPriceWithProvider.label=Preço de mercado por {0} -mainView.marketPrice.bisqInternalPrice=Preço da última negociação Bisq -mainView.marketPrice.tooltip.bisqInternalPrice=Não foi encontrado preço de mercado nos provedores externos.\nO preço exibido corresponde ao último preço de negociação no Bisq para essa moeda. +mainView.marketPrice.havenoInternalPrice=Preço da última negociação Haveno +mainView.marketPrice.tooltip.havenoInternalPrice=Não foi encontrado preço de mercado nos provedores externos.\nO preço exibido corresponde ao último preço de negociação no Haveno para essa moeda. mainView.marketPrice.tooltip=Preço de Mercado fornecido por {0}{1}\nÚltima atualização: {2}\nURL do provedor: {3} mainView.balance.available=Saldo disponível mainView.balance.reserved=Reservado em ofertas @@ -256,7 +256,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Conectando-se a mainView.footer.btcInfo.connectionFailed=Falha na conexão à -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1} +mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Conectando-se à rede Tor... mainView.bootstrapState.torNodeCreated=(2/4) Nó da rede Tor criado @@ -265,10 +265,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Dados iniciais recebidos mainView.bootstrapWarning.noSeedNodesAvailable=Nenhum nó semente disponível mainView.bootstrapWarning.noNodesAvailable=Sem nós semente e pares disponíveis -mainView.bootstrapWarning.bootstrappingToP2PFailed=A inicialização para a rede Bisq falhou +mainView.bootstrapWarning.bootstrappingToP2PFailed=A inicialização para a rede Haveno falhou mainView.p2pNetworkWarnMsg.noNodesAvailable=Não há nós semente ou pares persistentes para requisição de dados.\nPor gentileza verifique sua conexão com a internet ou tente reiniciar o programa. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Falha ao conectar com a rede Bisq (erro reportado: {0}).\nPor gentileza verifique sua conexão ou tente reiniciar o programa. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Falha ao conectar com a rede Haveno (erro reportado: {0}).\nPor gentileza verifique sua conexão ou tente reiniciar o programa. mainView.walletServiceErrorMsg.timeout=Não foi possível conectar-se à rede Bitcoin, pois o tempo limite expirou. mainView.walletServiceErrorMsg.connectionError=Não foi possível conectar-se à rede Bitcoin, devido ao seguinte erro: {0} @@ -276,7 +276,7 @@ mainView.walletServiceErrorMsg.connectionError=Não foi possível conectar-se à mainView.walletServiceErrorMsg.rejectedTxException=Uma transação foi rejeitada pela rede.\n\n{0} mainView.networkWarning.allConnectionsLost=Você perdeu sua conexão com todos os pontos da rede {0}.\nTalvez você tenha perdido a conexão com a internet ou seu computador estava em modo de espera. -mainView.networkWarning.localhostBitcoinLost=Você perdeu a conexão ao nó Bitcoin do localhost.\nPor favor, reinicie o aplicativo Bisq para conectar-se a outros nós Bitcoin ou reinicie o nó Bitcoin do localhost. +mainView.networkWarning.localhostBitcoinLost=Você perdeu a conexão ao nó Bitcoin do localhost.\nPor favor, reinicie o aplicativo Haveno para conectar-se a outros nós Bitcoin ou reinicie o nó Bitcoin do localhost. mainView.version.update=(Atualização disponível) @@ -392,11 +392,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=A quantia permitida para offerbook.warning.wrongTradeProtocol=Essa oferta requer uma versão do protocolo diferente da usada em sua versão do software.\n\nVerifique se você possui a versão mais nova instalada, caso contrário o usuário que criou a oferta usou uma versão ultrapassada.\n\nUsuários não podem negociar com uma versão incompatível do protocolo. offerbook.warning.userIgnored=Você adicionou o endereço onion à sua lista de endereços ignorados. -offerbook.warning.offerBlocked=Essa oferta foi bloqueada pelos desenvolvedores do Bisq.\nProvavelmente há um problema não resolvido associado àquela oferta. -offerbook.warning.currencyBanned=A moeda usada nesta oferta foi bloqueada pelos desenvolvedores do Bisq.\nPor favor, visite o Fórum do Bisq para maiores informações. -offerbook.warning.paymentMethodBanned=O método de pagamento usado nesta oferta foi bloqueado pelos desenvolvedores do Bisq.\nPor favor, visite o Fórum do Bisq para maiores informações. -offerbook.warning.nodeBlocked=O endereço onion daquele negociador foi bloqueado pelos desenvolvedores do Bisq.\nProvavelmente há um problema não resolvido associado àquele negociador. -offerbook.warning.requireUpdateToNewVersion=Your version of Bisq is not compatible for trading anymore.\nPlease update to the latest Bisq version at [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Essa oferta foi bloqueada pelos desenvolvedores do Haveno.\nProvavelmente há um problema não resolvido associado àquela oferta. +offerbook.warning.currencyBanned=A moeda usada nesta oferta foi bloqueada pelos desenvolvedores do Haveno.\nPor favor, visite o Fórum do Haveno para maiores informações. +offerbook.warning.paymentMethodBanned=O método de pagamento usado nesta oferta foi bloqueado pelos desenvolvedores do Haveno.\nPor favor, visite o Fórum do Haveno para maiores informações. +offerbook.warning.nodeBlocked=O endereço onion daquele negociador foi bloqueado pelos desenvolvedores do Haveno.\nProvavelmente há um problema não resolvido associado àquele negociador. +offerbook.warning.requireUpdateToNewVersion=Your version of Haveno is not compatible for trading anymore.\nPlease update to the latest Haveno version at [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. It could be that your previous take-offer attempt resulted in a failed trade. offerbook.info.sellAtMarketPrice=Você irá vender a preço de mercado (atualizado a cada minuto). @@ -426,7 +426,7 @@ createOffer.fundsBox.title=Financie sua oferta createOffer.fundsBox.offerFee=Taxa de negociação createOffer.fundsBox.networkFee=Taxa de mineração createOffer.fundsBox.placeOfferSpinnerInfo=Sua oferta está sendo publicada... -createOffer.fundsBox.paymentLabel=Negociação Bisq com ID {0} +createOffer.fundsBox.paymentLabel=Negociação Haveno com ID {0} createOffer.fundsBox.fundsStructure=({0} para o depósito de segurança, {1} para a taxa de transação e {2} para a taxa de mineração) createOffer.success.headline=Sua oferta foi publicada createOffer.success.info=Você pode gerenciar suas ofertas abertas em \"Portfolio/Minhas ofertas\". @@ -450,12 +450,12 @@ createOffer.placeOfferButton=Revisar: Criar oferta para {0} monero createOffer.createOfferFundWalletInfo.headline=Financiar sua oferta # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Quantia da negociação: {0} \n -createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos ficam reservados na sua carteira local e ficarão travados no endereço de depósito multisig quando alguém aceitar a sua oferta.\n\nA quantia equivale à soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode financiar sua negociação das seguintes maneiras:\n- Usando a sua carteira Bisq (conveniente, mas transações poderão ser associadas entre si) OU\n- Usando uma carteira externa (maior privacidade)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela. +createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos ficam reservados na sua carteira local e ficarão travados no endereço de depósito multisig quando alguém aceitar a sua oferta.\n\nA quantia equivale à soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode financiar sua negociação das seguintes maneiras:\n- Usando a sua carteira Haveno (conveniente, mas transações poderão ser associadas entre si) OU\n- Usando uma carteira externa (maior privacidade)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Um erro ocorreu ao emitir uma oferta:\n\n{0}\n\nNenhum fundo foi retirado de sua carteira até agora.\nPor favor, reinicie o programa e verifique sua conexão de internet. createOffer.setAmountPrice=Definir quantidade e preço -createOffer.warnCancelOffer=Você já havia financiado aquela oferta.\nSeus fundos foram movidos para sua carteira Bisq local e estão disponíveis para retirada na janela \"Fundos/Enviar fundos\".\nTem certeza que deseja cancelar? +createOffer.warnCancelOffer=Você já havia financiado aquela oferta.\nSeus fundos foram movidos para sua carteira Haveno local e estão disponíveis para retirada na janela \"Fundos/Enviar fundos\".\nTem certeza que deseja cancelar? createOffer.timeoutAtPublishing=Um erro ocorreu ao publicar a oferta: tempo esgotado. createOffer.errorInfo=\n\nA taxa já está paga. No pior dos casos, você perdeu essa taxa.\nPor favor, tente reiniciar o seu aplicativo e verifique sua conexão de rede para ver se você pode resolver o problema. createOffer.tooLowSecDeposit.warning=Você definiu o depósito de segurança para um valor mais baixo do que o valor padrão recomendado de {0}.\nVocê tem certeza de que deseja usar um depósito de segurança menor? @@ -494,7 +494,7 @@ takeOffer.fundsBox.tradeAmount=Quantia a ser vendida takeOffer.fundsBox.offerFee=Taxa de negociação takeOffer.fundsBox.networkFee=Total em taxas de mineração takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitação da oferta em progresso ... -takeOffer.fundsBox.paymentLabel=negociação Bisq com ID {0} +takeOffer.fundsBox.paymentLabel=negociação Haveno com ID {0} takeOffer.fundsBox.fundsStructure=({0} depósito de segurança, {1} taxa de transação, {2} taxa de mineração) takeOffer.success.headline=Você aceitou uma oferta com sucesso. takeOffer.success.info=Você pode ver o status de sua negociação em \"Portfolio/Negociações em aberto\". @@ -506,11 +506,11 @@ takeOffer.noPriceFeedAvailable=Você não pode aceitar essa oferta pois ela usa takeOffer.takeOfferFundWalletInfo.headline=Financiar sua negociação # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Quantia a negociar: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia equivale a soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxas de mineração: {4}\n\nVocê pode escolher entre duas opções para financiar sua negociação:\n- Usar a sua carteira Bisq (conveniente, mas transações podem ser associadas entre si) OU\n- Transferir a partir de uma carteira externa (potencialmente mais privado)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela. +takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia equivale a soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxas de mineração: {4}\n\nVocê pode escolher entre duas opções para financiar sua negociação:\n- Usar a sua carteira Haveno (conveniente, mas transações podem ser associadas entre si) OU\n- Transferir a partir de uma carteira externa (potencialmente mais privado)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela. takeOffer.alreadyPaidInFunds=Se você já pagou por essa oferta, você pode retirar seus fundos na seção \"Fundos/Enviar fundos\". takeOffer.paymentInfo=Informações de pagamento takeOffer.setAmountPrice=Definir quantia -takeOffer.alreadyFunded.askCancel=Você já financiou essa oferta.\nSe cancelar agora, seus fundos serão movidos para sua carteira Bisq local e estarão disponíveis para retirada na janela \"Fundos/Enviar fundos\".\nTem certeza que deseja cancelar? +takeOffer.alreadyFunded.askCancel=Você já financiou essa oferta.\nSe cancelar agora, seus fundos serão movidos para sua carteira Haveno local e estarão disponíveis para retirada na janela \"Fundos/Enviar fundos\".\nTem certeza que deseja cancelar? takeOffer.failed.offerNotAvailable=Pedido de aceitar oferta de negociação falhou pois a oferta não está mais disponível. Talvez outro negociador tenha aceitado a oferta neste período. takeOffer.failed.offerTaken=Não foi possível aceitar a oferta, pois ela já foi aceita por outro negociador. takeOffer.failed.offerRemoved=Não é possível aceitar a oferta pois ela foi removida. @@ -539,7 +539,7 @@ editOffer.confirmEdit=Editar oferta editOffer.publishOffer=Publicando a sua oferta. editOffer.failed=Erro ao editar oferta:\n{0} editOffer.success=A sua oferta foi editada com sucesso. -editOffer.invalidDeposit=O depósito de segurança do comprador não está dentro dos limites definidos pela DAO Bisq e não pode mais ser editado. +editOffer.invalidDeposit=O depósito de segurança do comprador não está dentro dos limites definidos pela DAO Haveno e não pode mais ser editado. #################################################################### # Portfolio @@ -599,7 +599,7 @@ portfolio.pending.step1.openForDispute=A transação de depósito ainda não foi # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -617,7 +617,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=IMPORTANTE:\nApós ter feito o # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Envie {0} através de \"US Postal Money Order\" para o vendedor de BTC.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -638,12 +638,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Enviar MTCN e compro portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Você precisa enviar o MTCN (número de rastreamento) e uma foto do recibo por e-mail para o vendedor de BTC.\nO recibo deve mostrar claramente o nome completo do vendedor, a cidade, o país e a quantia. O e-mail do vendedor é: {0}.\n\nVocê enviou o MTCN e o contrato para o vendedor? portfolio.pending.step2_buyer.halCashInfo.headline=Enviar código HalCash portfolio.pending.step2_buyer.halCashInfo.msg=Você precisa enviar uma mensagem de texto com o código HalCash, bem como o ID da negociação ({0}) para o vendedor BTC.\nO nº do telefone do vendedor é {1}.\n\nVocê enviou o código para o vendedor? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Alguns bancos podem verificar o nome do destinatário. Contas de pagamento rápido criadas numa versão antiga da Bisq não fornecem o nome do destinatário, então, por favor, use o chat de negociação pra obtê-lo (caso necessário). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Alguns bancos podem verificar o nome do destinatário. Contas de pagamento rápido criadas numa versão antiga da Haveno não fornecem o nome do destinatário, então, por favor, use o chat de negociação pra obtê-lo (caso necessário). portfolio.pending.step2_buyer.confirmStart.headline=Confirme que você iniciou o pagamento portfolio.pending.step2_buyer.confirmStart.msg=Você iniciou o pagamento {0} para o seu parceiro de negociação? portfolio.pending.step2_buyer.confirmStart.yes=Sim, iniciei o pagamento portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Bisq requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway portfolio.pending.step2_seller.waitPayment.headline=Aguardar pagamento @@ -653,7 +653,7 @@ portfolio.pending.step2_seller.warn=O comprador de BTC ainda não fez o pagament portfolio.pending.step2_seller.openForDispute=O comprador de BTC ainda não iniciou o pagamento!\nO período máximo permitido para a negociação expirou.\nVocê pode aguardar mais um pouco, dando mais tempo para o seu parceiro de negociação, ou você pode entrar em contato com o mediador para pedir assistência. tradeChat.chatWindowTitle=Abrir janela de conversa para a negociação com ID "{0}" tradeChat.openChat=Abrir janela de conversa -tradeChat.rules=Você pode conversar com seu par da negociação para resolver potenciais problemas desta negociação.\nNão é obrigatório responder no chat.\nSe um negociante violar qualquer das regras abaixo, abra uma disputa e reporte o caso ao mediador ou árbitro.\n\nRegras do chat:\n\t● Não envie nenhum link (risco de malware). Você pode enviar a ID de transação e o nome de um explorador de blocos.\n\t● Não envie suas palavras-semente, chaves privadas, senhas ou outras informações sensíveis!\n\t● Não encoraje negociações fora da Bisq (sem segurança).\n\t● Não tente aplicar golpes por meio de qualquer forma de engenharia social.\n\t● Se o par não responder e preferir não se comunicar pelo chat, respeite essa decisão.\n\t● Mantenha o escopo da conversa limitado à negociação. Este chat não é um substituto de aplicativos de mensagens ou local para trolagens.\n\t● Mantenha a conversa amigável e respeitosa. +tradeChat.rules=Você pode conversar com seu par da negociação para resolver potenciais problemas desta negociação.\nNão é obrigatório responder no chat.\nSe um negociante violar qualquer das regras abaixo, abra uma disputa e reporte o caso ao mediador ou árbitro.\n\nRegras do chat:\n\t● Não envie nenhum link (risco de malware). Você pode enviar a ID de transação e o nome de um explorador de blocos.\n\t● Não envie suas palavras-semente, chaves privadas, senhas ou outras informações sensíveis!\n\t● Não encoraje negociações fora da Haveno (sem segurança).\n\t● Não tente aplicar golpes por meio de qualquer forma de engenharia social.\n\t● Se o par não responder e preferir não se comunicar pelo chat, respeite essa decisão.\n\t● Mantenha o escopo da conversa limitado à negociação. Este chat não é um substituto de aplicativos de mensagens ou local para trolagens.\n\t● Mantenha a conversa amigável e respeitosa. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Indefinido @@ -728,7 +728,7 @@ portfolio.pending.step5_buyer.refunded=Depósito de segurança devolvido portfolio.pending.step5_buyer.withdrawBTC=Retirar seus bitcoins portfolio.pending.step5_buyer.amount=Quantia a ser retirada portfolio.pending.step5_buyer.withdrawToAddress=Enviar para o endereço -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToHavenoWallet=Keep funds in Haveno wallet portfolio.pending.step5_buyer.withdrawExternal=Retirar para carteira externa portfolio.pending.step5_buyer.alreadyWithdrawn=Seus fundos já foram retirados.\nFavor verifique o histórico de transações. portfolio.pending.step5_buyer.confirmWithdrawal=Confirmar solicitação de retirada @@ -743,8 +743,8 @@ portfolio.pending.step5_seller.received=Você recebeu tradeFeedbackWindow.title=Parabéns por concluir a negociação tradeFeedbackWindow.msg.part1=Gostaríamos de saber como está sendo a sua experiência. Ela nos ajuda a corrigir e aperfeiçoar o software. Caso queira nos deixar a sua opinião, preencha nosso pequeno questionário (não é necessário registrar-se) em: -tradeFeedbackWindow.msg.part2=Se você tem dúvidas ou está tendo problemas, por favor entre em contato com outros usuários e contribuidores através do fórum Bisq em: -tradeFeedbackWindow.msg.part3=Obrigado por usar Bisq! +tradeFeedbackWindow.msg.part2=Se você tem dúvidas ou está tendo problemas, por favor entre em contato com outros usuários e contribuidores através do fórum Haveno em: +tradeFeedbackWindow.msg.part3=Obrigado por usar Haveno! portfolio.pending.role=Minha função portfolio.pending.tradeInformation=Informação da negociação @@ -754,19 +754,19 @@ portfolio.pending.tradePeriodInfo=O período de negociação irá se iniciar ap portfolio.pending.tradePeriodWarning=Se o período expirar, os dois negociantes poderão abrir uma disputa. portfolio.pending.tradeNotCompleted=Negociação não completada a tempo (até {0}) portfolio.pending.tradeProcess=Processo de negociação -portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Bisq forum at [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Haveno forum at [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Abrir disputa novamente portfolio.pending.openSupportTicket.headline=Abrir ticket de suporte portfolio.pending.openSupportTicket.msg=Por favor, apenas use esta função em casos de emergência quando não houver um botão para "Abrir ticket de suporte" ou "Abrir disputa".\n\nQuando você abrir um ticket de suporte, a negociação será interrompida e tratada por um mediador ou árbitro. portfolio.pending.timeLockNotOver=Você precisa aguardar até ≈{0} (mais {1} blocos) para conseguir abrir uma disputa com um árbitro. -portfolio.pending.error.depositTxNull=A transação de depósito está ausente. Você não pode abrir uma disputa sem uma transação de depósito válida. Por favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\n\nPara mais informações, por favor acesse o canal #support do time da Bisq na Keybase. +portfolio.pending.error.depositTxNull=A transação de depósito está ausente. Você não pode abrir uma disputa sem uma transação de depósito válida. Por favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\n\nPara mais informações, por favor acesse o canal #support do time da Haveno na Keybase. portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the trade to failed trades. portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the trade to failed trades. -portfolio.pending.error.depositTxNotConfirmed=A transação de depósito não está confirmada. Você não pode abrir uma disputa com uma transação não-confirmada. Por favor, espere até que a transação seja confirmada ou vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\n\nPara mais informações, por favor acesse o canal #support do time da Bisq na Keybase. +portfolio.pending.error.depositTxNotConfirmed=A transação de depósito não está confirmada. Você não pode abrir uma disputa com uma transação não-confirmada. Por favor, espere até que a transação seja confirmada ou vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\n\nPara mais informações, por favor acesse o canal #support do time da Haveno na Keybase. portfolio.pending.support.headline.getHelp=Precisa de ajuda? -portfolio.pending.support.text.getHelp=Caso tenha problemas, você pode tentar contactar o par de negociação no chat ou solicitar ajuda na comunidade da Bisq em https://bisq.community. Se o problema persistir, você pode solicitar ajuda adicional a um mediador. +portfolio.pending.support.text.getHelp=Caso tenha problemas, você pode tentar contactar o par de negociação no chat ou solicitar ajuda na comunidade da Haveno em https://haveno.community. Se o problema persistir, você pode solicitar ajuda adicional a um mediador. portfolio.pending.support.button.getHelp=Abrir Chat de Negociante portfolio.pending.support.headline.halfPeriodOver=Verifique o pagamento portfolio.pending.support.headline.periodOver=O período de negociação acabou @@ -798,7 +798,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee trans portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\nWithout this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. You can make a request to be reimbursed the trade fee here: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nFeel free to move this trade to failed trades. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, but funds have been locked in the deposit transaction.\n\nPlease do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. The mediator should suggest that both peers each get back the the full amount of their security deposits (with seller receiving full trade amount back as well). This way, there is no security risk, and only trade fees are lost. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing but funds have been locked in the deposit transaction.\n\nIf the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\nIf the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of their security deposits (with seller receiving full trade amount back as well). Otherwise the trade amount should go to the buyer. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Bisq mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Haveno mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\nThe trade cannot be completed and you might have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\nDo you want to move the trade to failed trades?\n\nYou cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open trades screen any time. @@ -831,7 +831,7 @@ funds.tab.transactions=Transações funds.deposit.unused=Não utilizado funds.deposit.usedInTx=Utilizado em {0} transação(ões) -funds.deposit.fundHavenoWallet=Financiar carteira Bisq +funds.deposit.fundHavenoWallet=Financiar carteira Haveno funds.deposit.noAddresses=Nenhum endereço de depósito foi gerado ainda funds.deposit.fundWallet=Financiar sua carteira funds.deposit.withdrawFromWallet=Enviar fundos da carteira @@ -889,10 +889,10 @@ funds.tx.withdrawnFromWallet=Retirado da carteira funds.tx.memo=Memo funds.tx.noTxAvailable=Sem transações disponíveis funds.tx.revert=Reverter -funds.tx.txSent=Transação enviada com sucesso para um novo endereço em sua carteira Bisq local. +funds.tx.txSent=Transação enviada com sucesso para um novo endereço em sua carteira Haveno local. funds.tx.direction.self=Enviar para você mesmo funds.tx.dustAttackTx=Poeira recebida -funds.tx.dustAttackTx.popup=Esta transação está enviando uma quantia muito pequena de BTC para a sua carteira e pode ser uma tentativa das empresas de análise da blockchain para espionar a sua carteira.\n\nSe você usar esse output em uma transação eles decobrirão que você provavelmente também é o proprietário de outros endereços (mistura de moedas).\n\nPara proteger sua privacidade a carteira Bisq ignora tais outputs de poeira para fins de consumo e na tela de saldo. Você pode definir a quantia limite a partir da qual um output é considerado poeira nas configurações." +funds.tx.dustAttackTx.popup=Esta transação está enviando uma quantia muito pequena de BTC para a sua carteira e pode ser uma tentativa das empresas de análise da blockchain para espionar a sua carteira.\n\nSe você usar esse output em uma transação eles decobrirão que você provavelmente também é o proprietário de outros endereços (mistura de moedas).\n\nPara proteger sua privacidade a carteira Haveno ignora tais outputs de poeira para fins de consumo e na tela de saldo. Você pode definir a quantia limite a partir da qual um output é considerado poeira nas configurações." #################################################################### # Support @@ -925,7 +925,7 @@ support.sendingMessage=Enviando mensagem... support.receiverNotOnline=O recipiente não está online. A mensagem será salva na caixa postal dele. support.sendMessageError=Erro ao enviar a mensagem: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=A oferta nessa disputa foi criada com uma versão anterior do Bisq.\nVocê não pode fechar aquela disputa com a sua versão atual do programa.\n\nFavor utilizar uma versão mais velha com protocolo versão {0} +support.wrongVersion=A oferta nessa disputa foi criada com uma versão anterior do Haveno.\nVocê não pode fechar aquela disputa com a sua versão atual do programa.\n\nFavor utilizar uma versão mais velha com protocolo versão {0} support.openFile=Abrir arquivo para anexar (tamanho máximo: {0} kb) support.attachmentTooLarge=O tamanho total de seus arquivos anexados é {0} kb e excede o máximo permitido para mensagens de {1} kb. support.maxSize=O tamanho máximo permitido é {0} kB. @@ -956,15 +956,15 @@ support.sellerMaker=Vendedor de BTC / Ofertante support.buyerTaker=Comprador de BTC / Aceitador da oferta support.sellerTaker=Vendedor de BTC / Aceitador da oferta -support.backgroundInfo=Bisq não é uma empresa, então ela lida com disputas de uma forma diferente.\n\nComerciantes podem se comunicar dentro do aplicativo usando um chat seguro na tela de negociações em aberto para tentar resolver conflitos entre eles mesmos. Se isto não for o suficiente, um mediador pode intervir para ajudar. O mediador irá avaliar a situação e sugerir um pagamento. Se ambos comerciantes aceitarem essa sugestão, a transação de pagamento é finalizada e a negociação é fechada. Se um or ambos os comerciantes não concordarem com o pagamento sugerido pelo mediador, eles podem solicitar arbitragem. O árbitro irá reavaliar a situação e, se justificado, pagará pessoalmente o comerciante e então solicitará reembolso deste pagamento à DAO Bisq. -support.initialInfo=Por favor, entre a descrição do seu problema no campo de texto abaixo. Informe o máximo de informações que puder para agilizar a resolução da disputa.\n\nSegue uma lista com as informações que você deve fornecer:\n\t● Se você está comprando BTC: Você fez a transferência do dinheiro ou altcoin? Caso afirmativo, você clicou no botão 'pagamento iniciado' no aplicativo?\n\t● Se você está vendendo BTC: Você recebeu o pagamento em dinheiro ou em altcoin? Caso afirmativo, você clicou no botão 'pagamento recebido' no aplicativo?\n\t● Qual versão da Bisq você está usando?\n\t● Qual sistema operacional você está usando?\n\t● Se seu problema é com falhas em transações, por favor considere usar um novo diretório de dados.\n\t Às vezes, o diretório de dados pode ficar corrompido, causando bugs estranhos.\n\t Veja mais: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPor favor, familiarize-se com as regras básicas do processo de disputa:\n\t● Você precisa responder às solicitações de {0}' dentro do prazo de 2 dias.\n\t● Mediadores respondem dentro de 2 dias. Ábitros respondem dentro de 5 dias úteis.\n\t● O período máximo para uma disputa é de 14 dias.\n\t● Você deve cooperar com o {1} e providenciar as informações requisitadas para comprovar o seu caso.\n\t● Você aceitou as regras estipuladas nos termos de acordo do usuário que foi exibido na primeira vez em que você iniciou o aplicativo. \nVocê pode saber mais sobre o processo de disputa em: {2} +support.backgroundInfo=Haveno não é uma empresa, então ela lida com disputas de uma forma diferente.\n\nComerciantes podem se comunicar dentro do aplicativo usando um chat seguro na tela de negociações em aberto para tentar resolver conflitos entre eles mesmos. Se isto não for o suficiente, um mediador pode intervir para ajudar. O mediador irá avaliar a situação e sugerir um pagamento. Se ambos comerciantes aceitarem essa sugestão, a transação de pagamento é finalizada e a negociação é fechada. Se um or ambos os comerciantes não concordarem com o pagamento sugerido pelo mediador, eles podem solicitar arbitragem. O árbitro irá reavaliar a situação e, se justificado, pagará pessoalmente o comerciante e então solicitará reembolso deste pagamento à DAO Haveno. +support.initialInfo=Por favor, entre a descrição do seu problema no campo de texto abaixo. Informe o máximo de informações que puder para agilizar a resolução da disputa.\n\nSegue uma lista com as informações que você deve fornecer:\n\t● Se você está comprando BTC: Você fez a transferência do dinheiro ou altcoin? Caso afirmativo, você clicou no botão 'pagamento iniciado' no aplicativo?\n\t● Se você está vendendo BTC: Você recebeu o pagamento em dinheiro ou em altcoin? Caso afirmativo, você clicou no botão 'pagamento recebido' no aplicativo?\n\t● Qual versão da Haveno você está usando?\n\t● Qual sistema operacional você está usando?\n\t● Se seu problema é com falhas em transações, por favor considere usar um novo diretório de dados.\n\t Às vezes, o diretório de dados pode ficar corrompido, causando bugs estranhos.\n\t Veja mais: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPor favor, familiarize-se com as regras básicas do processo de disputa:\n\t● Você precisa responder às solicitações de {0}' dentro do prazo de 2 dias.\n\t● Mediadores respondem dentro de 2 dias. Ábitros respondem dentro de 5 dias úteis.\n\t● O período máximo para uma disputa é de 14 dias.\n\t● Você deve cooperar com o {1} e providenciar as informações requisitadas para comprovar o seu caso.\n\t● Você aceitou as regras estipuladas nos termos de acordo do usuário que foi exibido na primeira vez em que você iniciou o aplicativo. \nVocê pode saber mais sobre o processo de disputa em: {2} support.systemMsg=Mensagem do sistema: {0} -support.youOpenedTicket=Você abriu um pedido de suporte.\n\n{0}\n\nBisq versão: {1} -support.youOpenedDispute=Você abriu um pedido para uma disputa.\n\n{0}\n\nBisq versão: {1} -support.youOpenedDisputeForMediation=Você solicitou mediação.\n\n{0}\n\nVersão do Bisq: {1} -support.peerOpenedTicket=O seu parceiro de negociação solicitou suporte devido a problemas técnicos.\n\n{0}\n\nVersão do Bisq: {1} -support.peerOpenedDispute=O seu parceiro de negociação solicitou uma disputa.\n\n{0}\n\nVersão do Bisq: {1} -support.peerOpenedDisputeForMediation=O seu parceiro de negociação solicitou mediação.\n\n{0}\n\nVersão do Bisq: {1} +support.youOpenedTicket=Você abriu um pedido de suporte.\n\n{0}\n\nHaveno versão: {1} +support.youOpenedDispute=Você abriu um pedido para uma disputa.\n\n{0}\n\nHaveno versão: {1} +support.youOpenedDisputeForMediation=Você solicitou mediação.\n\n{0}\n\nVersão do Haveno: {1} +support.peerOpenedTicket=O seu parceiro de negociação solicitou suporte devido a problemas técnicos.\n\n{0}\n\nVersão do Haveno: {1} +support.peerOpenedDispute=O seu parceiro de negociação solicitou uma disputa.\n\n{0}\n\nVersão do Haveno: {1} +support.peerOpenedDisputeForMediation=O seu parceiro de negociação solicitou mediação.\n\n{0}\n\nVersão do Haveno: {1} support.mediatorsDisputeSummary=System message: Mediator''s dispute summary:\n{0} support.mediatorsAddress=Endereço do nó do mediador: {0} support.warning.disputesWithInvalidDonationAddress=The delayed payout transaction has used an invalid receiver address. It does not match any of the DAO parameter values for the valid donation addresses.\n\nThis might be a scam attempt. Please inform the developers about that incident and do not close that case before the situation is resolved!\n\nAddress used in the dispute: {0}\n\nAll DAO param donation addresses: {1}\n\nTrade ID: {2}{3} @@ -1025,7 +1025,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaction URL settings.preferences.editCustomExplorer.addressUrl=Address URL settings.net.btcHeader=Rede Bitcoin -settings.net.p2pHeader=Rede Bisq +settings.net.p2pHeader=Rede Haveno settings.net.onionAddressLabel=Meu endereço onion settings.net.btcNodesLabel=Usar nodos personalizados do Bitcoin Core settings.net.bitcoinPeersLabel=Pares conectados @@ -1034,12 +1034,12 @@ settings.net.bitcoinNodesLabel=Conexão a nodos do Bitcoin Core settings.net.useProvidedNodesRadio=Usar nodos do Bitcoin Core fornecidos settings.net.usePublicNodesRadio=Usar rede pública do Bitcoin settings.net.useCustomNodesRadio=Usar nodos personalizados do Bitcoin Core -settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? +settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Haveno). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? settings.net.warn.usePublicNodes.useProvided=Não, usar os nodos fornecidos settings.net.warn.usePublicNodes.usePublic=Sim, usar rede pública settings.net.warn.useCustomNodes.B2XWarning=Certifique-se de que o seu nodo Bitcoin é um nodo Bitcoin Core confiável!\n\nAo se conectar a nodos que não estão seguindo as regras de consenso do Bitcoin Core, você pode corromper a sua carteira e causar problemas no processo de negociação.\n\nOs usuários que se conectam a nodos que violam as regras de consenso são responsáveis pelos danos que forem criados por isso. As disputas causadas por esse motivo serão decididas a favor do outro negociante. Nenhum suporte técnico será fornecido para os usuários que ignorarem esse aviso e os mecanismos de proteção! settings.net.warn.invalidBtcConfig=A conexão com a rede Bitcoin falhou porque suas configurações são inválidas.\n\nSuas configurações foram resetadas para utilizar os nós fornecidos da rede Bitcoin. É necessário reiniciar o aplicativo. -settings.net.localhostBtcNodeInfo=Informações básicas: Bisq busca por um nó Bitcoin local na inicialização. Caso encontre, Bisq irá comunicar com a rede Bitcoin exclusivamente através deste nó. +settings.net.localhostBtcNodeInfo=Informações básicas: Haveno busca por um nó Bitcoin local na inicialização. Caso encontre, Haveno irá comunicar com a rede Bitcoin exclusivamente através deste nó. settings.net.p2PPeersLabel=Pares conectados settings.net.onionAddressColumn=Endereço onion settings.net.creationDateColumn=Estabelecida @@ -1075,17 +1075,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=O arquivo SPV chain foi removido. Por favor, tenha paciência, pois a ressincronização com a rede pode demorar. settings.net.reSyncSPVAfterRestartCompleted=A ressincronização terminou. Favor reiniciar o programa. settings.net.reSyncSPVFailed=Não foi possível apagar o arquivo da SPV chain.\nErro: {0} -setting.about.aboutBisq=Sobre Bisq -setting.about.about=Bisq é um software de código aberto que facilita a troca de Bitcoin por moedas nacionais (e outras criptomoedas) através de uma rede ponto-a-ponto descentralizada, protegendo a privacidade dos usuários. Descubra mais sobre o Bisq no site do projeto. -setting.about.web=Site do Bisq +setting.about.aboutHaveno=Sobre Haveno +setting.about.about=Haveno é um software de código aberto que facilita a troca de Bitcoin por moedas nacionais (e outras criptomoedas) através de uma rede ponto-a-ponto descentralizada, protegendo a privacidade dos usuários. Descubra mais sobre o Haveno no site do projeto. +setting.about.web=Site do Haveno setting.about.code=Código fonte setting.about.agpl=Licença AGPL -setting.about.support=Suporte Bisq -setting.about.def=Bisq não é uma empresa — é um projeto aberto à participação da comunidade. Se você tem interesse em participar do projeto ou apoiá-lo, visite os links abaixo. +setting.about.support=Suporte Haveno +setting.about.def=Haveno não é uma empresa — é um projeto aberto à participação da comunidade. Se você tem interesse em participar do projeto ou apoiá-lo, visite os links abaixo. setting.about.contribute=Contribuir setting.about.providers=Provedores de dados -setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation. -setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices. +setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation. +setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices. setting.about.pricesProvided=Preços de mercado fornecidos por setting.about.feeEstimation.label=Estimativa da taxa de mineração fornecida por setting.about.versionDetails=Detalhes da versão @@ -1099,7 +1099,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' ou ''alt + {0}'' ou ''cmd setting.about.shortcuts.menuNav=Navegar para o menu principal setting.about.shortcuts.menuNav.value=Para ir ao menu principal, pressione: "ctr" ou "alt" ou "cmd" com um botão numérico de 1 a 9 -setting.about.shortcuts.close=Fechar Bisq +setting.about.shortcuts.close=Fechar Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' ou ''cmd + {0}'' ou ''Ctrl + {1}'' ou ''cmd + {1}'' setting.about.shortcuts.closePopup=Fechar popup ou janela de diálogo @@ -1139,7 +1139,7 @@ setting.about.shortcuts.sendPrivateNotification=Enviar notificação privada ao setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0} setting.info.headline=New XMR auto-confirm Feature -setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Bisq uses explorer nodes run by Bisq contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1147,8 +1147,8 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t account.tab.mediatorRegistration=Registro de mediador account.tab.refundAgentRegistration=Registro de agente de reembolsos account.tab.signing=Signing -account.info.headline=Bem vindo à sua conta Bisq -account.info.msg=Aqui você pode adicionar contas de negociação para moedas nacionais & altcoins e criar um backup da sua carteira e dados da sua conta.\n\nUma nova carteira Bitcoin foi criada na primeira vez em que você iniciou a Bisq.\nNós encorajamos fortemente que você anote as palavras semente da sua carteira Bitcoin (veja a aba no topo) e considere adicionar uma senha antes de depositar fundos. Depósitos e retiradas de Bitcoin são gerenciados na seção "Fundos".\n\nNota de privacidade & segurança: visto que a Bisq é uma exchange decentralizada, todos os seus dados são mantidos no seu computador. Não existem servidores, então não temos acesso às suas informações pessoais, seus fundos ou até mesmo ao seu endereço IP. Dados como número de conta bancária, endereços de Bitcoin & altcoin, etc apenas são compartilhados com seu parceiro de negociação para completar as negociações iniciadas por você (em caso de disputa, o mediador ou árbitro verá as mesmas informações que seu parceiro de negociação). +account.info.headline=Bem vindo à sua conta Haveno +account.info.msg=Aqui você pode adicionar contas de negociação para moedas nacionais & altcoins e criar um backup da sua carteira e dados da sua conta.\n\nUma nova carteira Bitcoin foi criada na primeira vez em que você iniciou a Haveno.\nNós encorajamos fortemente que você anote as palavras semente da sua carteira Bitcoin (veja a aba no topo) e considere adicionar uma senha antes de depositar fundos. Depósitos e retiradas de Bitcoin são gerenciados na seção "Fundos".\n\nNota de privacidade & segurança: visto que a Haveno é uma exchange decentralizada, todos os seus dados são mantidos no seu computador. Não existem servidores, então não temos acesso às suas informações pessoais, seus fundos ou até mesmo ao seu endereço IP. Dados como número de conta bancária, endereços de Bitcoin & altcoin, etc apenas são compartilhados com seu parceiro de negociação para completar as negociações iniciadas por você (em caso de disputa, o mediador ou árbitro verá as mesmas informações que seu parceiro de negociação). account.menu.paymentAccount=Contas de moedas nacionais account.menu.altCoinsAccountView=Contas de altcoins @@ -1163,7 +1163,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1175,48 +1175,48 @@ account.arbitratorRegistration.registration=Registro de {0} account.arbitratorRegistration.revoke=Revogar account.arbitratorRegistration.info.msg=Por favor, note que você precisa estar disponível por 15 dias após a revogação visto que podem existir negociações em que você é usado como {0}. O período máximo de negociação é de 8 dias e o processo de disputa pode durar até 7 dias. account.arbitratorRegistration.warn.min1Language=Você precisa escolher pelo menos 1 idioma.\nNós adicionamos o idioma padrão para você. -account.arbitratorRegistration.removedSuccess=O seu registro foi removido com sucesso da rede Bisq. +account.arbitratorRegistration.removedSuccess=O seu registro foi removido com sucesso da rede Haveno. account.arbitratorRegistration.removedFailed=Não foi possível remover o registro.{0} -account.arbitratorRegistration.registerSuccess=Você se registrou com sucesso na rede Bisq. +account.arbitratorRegistration.registerSuccess=Você se registrou com sucesso na rede Haveno. account.arbitratorRegistration.registerFailed=Não foi possível completar o registro.{0} account.altcoin.yourAltcoinAccounts=Suas contas de altcoins account.altcoin.popup.wallet.msg=Por favor, certifique-se de seguir os requisitos para uso de carteiras {0} como descritos na página {1}.\nUsar carteiras de exchanges centralizadas onde (a) você não tem controle das suas chaves privadas ou (b) não se usa um software de carteira compatível é arriscado: você pode perder seus fundos negociados!\nO mediador ou árbitro não é um especialista em {2} e não pode ajudar em tais casos. account.altcoin.popup.wallet.confirm=Eu entendo e confirmo que sei qual carteira preciso usar. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. +account.altcoin.popup.upx.msg=Trading UPX on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Trading ARQ on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. +account.altcoin.popup.arq.msg=Trading ARQ on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Trading XMR on Haveno requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Haveno now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Negociar MSR Bisq requer que você entenda e cumpra os seguintes requisitos:\n\nPara enviar MSR, você deve usar uma destas: carteira oficial GUI Masari, carteira CLI Masari com a opção store-tx-info habilitada (habilitada por padrão) ou a carteira web Masari (https://wallet.getmasari.org). Por favor, certifique-se que você tenha acesso à chave da transação pois esta seria necessária em caso de uma disputa.\nmasari-wallet-cli (use o comando get_tx_key)\nmasari-wallet-gui (vá até a aba histórico e clique no botão (P) para prova de pagamento)\n\nCarteira Web Masari (vá até Conta -> histórico de transações e veja os detalhes da sua transação enviada.)\n\nVerificação pode ser feita dentro da carteira.\nmasari-wallet-cli : usando um comando (check_tx_key).\nmasari-wallet-gui : na página Avançado > Comprovar/Verificar.\nVerificação pode ser feita via explorador de blocos.\nAbra o explorador de blocos (https://explorer.getmasari.org) e use a barra de busca para encontrar o hash da sua transação.\nAssim que a transação for encontrada, role até o final da seção 'Comprovar envio' e preencha os detalhes conforme necessário.\nVocê precisa fornecer os seguintes dados ao mediador ou árbitro em caso de uma disputa:\n- Chave privada da transação\n- Hash da transação\n- Endereço público do destinatário\n\nA impossibilidade de fornecer as informações acima ou uso de uma carteira incompatível resultará na perda do caso de disputa. Em caso de uma disputa, o remetente de MSR é responsável por providenciar, ao mediador ou árbitro, a verificação do envio de MSR.\n\nNão é necessário um ID de pagamento, apenas o endereço público convencional.\nCaso tenha dúvidas sobre este processo, solicite ajuda no Discord oficial Masari (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Negociar MSR Haveno requer que você entenda e cumpra os seguintes requisitos:\n\nPara enviar MSR, você deve usar uma destas: carteira oficial GUI Masari, carteira CLI Masari com a opção store-tx-info habilitada (habilitada por padrão) ou a carteira web Masari (https://wallet.getmasari.org). Por favor, certifique-se que você tenha acesso à chave da transação pois esta seria necessária em caso de uma disputa.\nmasari-wallet-cli (use o comando get_tx_key)\nmasari-wallet-gui (vá até a aba histórico e clique no botão (P) para prova de pagamento)\n\nCarteira Web Masari (vá até Conta -> histórico de transações e veja os detalhes da sua transação enviada.)\n\nVerificação pode ser feita dentro da carteira.\nmasari-wallet-cli : usando um comando (check_tx_key).\nmasari-wallet-gui : na página Avançado > Comprovar/Verificar.\nVerificação pode ser feita via explorador de blocos.\nAbra o explorador de blocos (https://explorer.getmasari.org) e use a barra de busca para encontrar o hash da sua transação.\nAssim que a transação for encontrada, role até o final da seção 'Comprovar envio' e preencha os detalhes conforme necessário.\nVocê precisa fornecer os seguintes dados ao mediador ou árbitro em caso de uma disputa:\n- Chave privada da transação\n- Hash da transação\n- Endereço público do destinatário\n\nA impossibilidade de fornecer as informações acima ou uso de uma carteira incompatível resultará na perda do caso de disputa. Em caso de uma disputa, o remetente de MSR é responsável por providenciar, ao mediador ou árbitro, a verificação do envio de MSR.\n\nNão é necessário um ID de pagamento, apenas o endereço público convencional.\nCaso tenha dúvidas sobre este processo, solicite ajuda no Discord oficial Masari (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Trading BLUR on Haveno requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Negociar Solo na Bisq requer que você entenda e cumpra os seguintes requisitos:\n\nPara enviar Solo, você deve usar a carteira CLI Solo Network. \n\nSe você estiver usando a carteira CLI, um hash de transação (tx ID) será exibido após o envio de uma transferência. Você deve salvar essa informação. Imediatamente após o envio, você deve utilizar o comando 'get_tx_key' para obter a chave privada da transação. Se você não executar este passo devidamente, você pode não conseguir obter a chave depois.\n\nEm um evento onde uma arbitragem for necessária, você deve apresentar o seguinte para um árbitro ou mediador: 1.) ID da transação, 2.) a chave privada da transação, e 3.) o endereço do destinatário. O mediador ou árbitro irá então verificar a transferência Solo usando o explorador de blocos Solo, buscando pela transação e então usando a função "Provar envio" (https://explorer.minesolo.com/).\n\nA impossibilidade de fornecer as informações requeridas ao mediador ou árbitro resultará na perda do caso de disputa. Em todos os casos de disputa, In all cases of dispute, o remetente de Solo arca 100% com a responsabilidade de verificar as transações para um árbitro ou mediador.\n\nCaso não entenda estes requisitos, não negocie na Bisq. Procure ajuda no Discord da Solo Network primeiro. (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Negociar Solo na Haveno requer que você entenda e cumpra os seguintes requisitos:\n\nPara enviar Solo, você deve usar a carteira CLI Solo Network. \n\nSe você estiver usando a carteira CLI, um hash de transação (tx ID) será exibido após o envio de uma transferência. Você deve salvar essa informação. Imediatamente após o envio, você deve utilizar o comando 'get_tx_key' para obter a chave privada da transação. Se você não executar este passo devidamente, você pode não conseguir obter a chave depois.\n\nEm um evento onde uma arbitragem for necessária, você deve apresentar o seguinte para um árbitro ou mediador: 1.) ID da transação, 2.) a chave privada da transação, e 3.) o endereço do destinatário. O mediador ou árbitro irá então verificar a transferência Solo usando o explorador de blocos Solo, buscando pela transação e então usando a função "Provar envio" (https://explorer.minesolo.com/).\n\nA impossibilidade de fornecer as informações requeridas ao mediador ou árbitro resultará na perda do caso de disputa. Em todos os casos de disputa, In all cases of dispute, o remetente de Solo arca 100% com a responsabilidade de verificar as transações para um árbitro ou mediador.\n\nCaso não entenda estes requisitos, não negocie na Haveno. Procure ajuda no Discord da Solo Network primeiro. (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Negociar CASH2 na Bisq requer que você entenda e cumpra os seguintes requisitos:\n\nPara enviar CASH2, você deve usar a carteira Cash2 versão 3 ou superior. \n\nApós o envio de uma transação, o ID da transação será exibido. Você deve salvar essa informação. Imediatamente após enviar a transação, você deve utilizar o comando 'getTxKey' na simplewallet para obter a chave secreta da transação. Se você não executar este passo devidamente, você pode não conseguir obter a chave depois.\n\nEm um evento onde uma arbitragem for necessária, você deve apresentar o seguinte para um árbitro ou mediador: 1.) ID da transação, 2.) a chave secreta da transação, e 3.) o endereço do destinatário Cash2. O mediador ou árbitro irá então verificar a transferência CASH2 usando o explorador de blocos CASH2 (https://blocks.cash2.org).\n\nA impossibilidade de fornecer as informações requeridas ao mediador ou árbitro resultará na perda do caso de disputa. Em todos os casos de disputa, In all cases of dispute, o remetente de CASH2 arca 100% com a responsabilidade de verificar as transações para um árbitro ou mediador.\n\nCaso não entenda estes requisitos, não negocie na Bisq. Procure ajuda no Discord da Cash2 primeiro. (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Negociar CASH2 na Haveno requer que você entenda e cumpra os seguintes requisitos:\n\nPara enviar CASH2, você deve usar a carteira Cash2 versão 3 ou superior. \n\nApós o envio de uma transação, o ID da transação será exibido. Você deve salvar essa informação. Imediatamente após enviar a transação, você deve utilizar o comando 'getTxKey' na simplewallet para obter a chave secreta da transação. Se você não executar este passo devidamente, você pode não conseguir obter a chave depois.\n\nEm um evento onde uma arbitragem for necessária, você deve apresentar o seguinte para um árbitro ou mediador: 1.) ID da transação, 2.) a chave secreta da transação, e 3.) o endereço do destinatário Cash2. O mediador ou árbitro irá então verificar a transferência CASH2 usando o explorador de blocos CASH2 (https://blocks.cash2.org).\n\nA impossibilidade de fornecer as informações requeridas ao mediador ou árbitro resultará na perda do caso de disputa. Em todos os casos de disputa, In all cases of dispute, o remetente de CASH2 arca 100% com a responsabilidade de verificar as transações para um árbitro ou mediador.\n\nCaso não entenda estes requisitos, não negocie na Haveno. Procure ajuda no Discord da Cash2 primeiro. (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. +account.altcoin.popup.drgl.msg=Trading Dragonglass on Haveno requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Ao usar Zcash você só pode usar endereços transparentes(que começam com t), não os z-addresses (privados), pois o mediador e o árbitro não conseguiriam verificar a transação com endereços privados num explorador de blocos. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Ao usar Zcoin você só pode usar endereços transparentes(rastreáveis), não os inrrastreáveis, pois o mediador e o árbitro não conseguiriam verificar a transação com endereços irrastreáveis num explorador de blocos. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN requer um processo interativo entre o remetente e o destinatário para criar a transação. Certifique-se de seguir as instruções da página web do projeto GRIN para enviar e receber de forma confiável o GRIN (o destinatário precisa estar online ou pelo menos estar online durante um determinado período de tempo).\n\nBisq suporta apenas o formato de URL da carteira Grinbox (Wallet713).\n\nO remetente GRIN é obrigado a fornecer prova de que ele enviou GRIN com sucesso. Se a carteira não puder fornecer essa prova, uma potencial disputa será resolvida em favor do destinatário de GRIN. Certifique-se de usar o software Grinbox mais recente, que suporta a prova de transação e que você entende o processo de transferência e receção do GRIN, bem como criar a prova.\n\nConsulte https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only para obter mais informações sobre a ferramenta de prova Grinbox. +account.altcoin.popup.grin.msg=GRIN requer um processo interativo entre o remetente e o destinatário para criar a transação. Certifique-se de seguir as instruções da página web do projeto GRIN para enviar e receber de forma confiável o GRIN (o destinatário precisa estar online ou pelo menos estar online durante um determinado período de tempo).\n\nHaveno suporta apenas o formato de URL da carteira Grinbox (Wallet713).\n\nO remetente GRIN é obrigado a fornecer prova de que ele enviou GRIN com sucesso. Se a carteira não puder fornecer essa prova, uma potencial disputa será resolvida em favor do destinatário de GRIN. Certifique-se de usar o software Grinbox mais recente, que suporta a prova de transação e que você entende o processo de transferência e receção do GRIN, bem como criar a prova.\n\nConsulte https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only para obter mais informações sobre a ferramenta de prova Grinbox. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM requer um processo interativo entre o remetente e o destinatário para criar a transação.\n\nCertifique-se de seguir as instruções da página Web do projeto BEAM para enviar e receber BEAM de forma confiável (o destinatário precisa estar online ou pelo menos estar online durante um determinado período de tempo).\n\nO remetente BEAM é obrigado a fornecer prova de que ele enviou o BEAM com sucesso. Certifique-se de usar uma carteira que possa produzir tal prova. Se a carteira não puder fornecer a prova, uma disputa potencial será resolvida em favor do destinarário do BEAM. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Trading ParsiCoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Trading ParsiCoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Bisq, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. +account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Haveno, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Para negociar com L-BTC na Bisq é preciso entender o seguinte:\n\nQuando se recebe L-BTC de uma negociação na Bisq, você não pode usar a carteira móvel Blockstream Green ou uma carteira de exchange. Você só pode receber L-BTC numa carteira Liquid Elements Core, ou outra carteira L-BTC que lhe permita obter a blinding key para o seu endereço blinded de L-BTC.\n\nNo caso de mediação ou se uma disputa acontecer, você precisa divulgar ao mediador, ou agente de reembolsos, a blinding key do seu endereço receptor de L-BTC para que ele possa verificar os detalhes da sua Transação Confidencial no node próprio deles.\n\nCaso essa informação não seja fornecida ao mediador ou agente de reembolsos você corre o risco de perder a disputa. Em todos os casos de disputa o recebedor de L-BTC tem 100% de responsabilidade em fornecer a prova criptográfica ao mediador ou agente de reembolsos.\n\nSe você não entendeu esses requisitos, por favor não negocie L-BTC na Bisq. +account.altcoin.popup.liquidbitcoin.msg=Para negociar com L-BTC na Haveno é preciso entender o seguinte:\n\nQuando se recebe L-BTC de uma negociação na Haveno, você não pode usar a carteira móvel Blockstream Green ou uma carteira de exchange. Você só pode receber L-BTC numa carteira Liquid Elements Core, ou outra carteira L-BTC que lhe permita obter a blinding key para o seu endereço blinded de L-BTC.\n\nNo caso de mediação ou se uma disputa acontecer, você precisa divulgar ao mediador, ou agente de reembolsos, a blinding key do seu endereço receptor de L-BTC para que ele possa verificar os detalhes da sua Transação Confidencial no node próprio deles.\n\nCaso essa informação não seja fornecida ao mediador ou agente de reembolsos você corre o risco de perder a disputa. Em todos os casos de disputa o recebedor de L-BTC tem 100% de responsabilidade em fornecer a prova criptográfica ao mediador ou agente de reembolsos.\n\nSe você não entendeu esses requisitos, por favor não negocie L-BTC na Haveno. account.fiat.yourFiatAccounts=Suas contas de moeda nacional @@ -1237,13 +1237,13 @@ account.password.setPw.headline=Definir proteção de senha da carteira account.password.info=Ao proteger a carteira com uma senha, você precisará digitá-la sempre que abrir o programa, retirar bitcoins da carteira e restaurar a carteira a partir da semente. account.seed.backup.title=Fazer backup das palavras-semente da carteira -account.seed.info=Por favor, anote em um papel a data e as palavras-semente da carteira! Com essas informações, você poderá recuperar sua carteira à qualquer momento.\nA semente exibida é usada tanto para a carteira BTC quanto para a carteira BSQ.\n\nVocê deve anotá-las em uma folha de papel. Jamais anote as palavras em um arquivo no seu computador ou em seu e-mail.\n\nNote que a semente da carteira NÃO substitui um backup.\nPara fazer isso, você precisa fazer backup da pasta do Bisq na seção \"Conta/Backup\".\nA importação da semente da carteira só é recomendada em casos de emergência. O programa não funcionará corretamente se você não recuperá-lo através de um backup! +account.seed.info=Por favor, anote em um papel a data e as palavras-semente da carteira! Com essas informações, você poderá recuperar sua carteira à qualquer momento.\nA semente exibida é usada tanto para a carteira BTC quanto para a carteira BSQ.\n\nVocê deve anotá-las em uma folha de papel. Jamais anote as palavras em um arquivo no seu computador ou em seu e-mail.\n\nNote que a semente da carteira NÃO substitui um backup.\nPara fazer isso, você precisa fazer backup da pasta do Haveno na seção \"Conta/Backup\".\nA importação da semente da carteira só é recomendada em casos de emergência. O programa não funcionará corretamente se você não recuperá-lo através de um backup! account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page [HYPERLINK:https://bisq.wiki/Backing_up_application_data] for extended info. account.seed.warn.noPw.msg=Você não definiu uma senha para carteira, que protegeria a exibição das palavras-semente.\n\nGostaria de exibir as palavras-semente? account.seed.warn.noPw.yes=Sim, e não me pergunte novamente account.seed.enterPw=Digite a senha para ver a semente da carteira account.seed.restore.info=Faça um backup antes de aplicar a restauração a partir de palavras-semente. Esteja ciente de que a restauração da carteira é apenas para casos de emergência e pode causar problemas com a base de dados interna da carteira.\nNão é uma maneira de aplicar um backup! Por favor, use um backup do diretório de dados do programa para restaurar um estado anterior do programa.\n\nDepois de restaurado, o programa será desligado automaticamente. Após ser reiniciado, o programa será ressincronizado com a rede Bitcoin. Isso pode demorar um pouco e aumenta ro consumo de CPU, especialmente se a carteira for mais antiga e tiver muitas transações. Por favor, evite interromper esse processo, caso contrário, você pode precisar excluir o diretório da corrente SPV novamente ou repetir o processo de restauração. -account.seed.restore.ok=Ok, restaurar e desligar o Bisq +account.seed.restore.ok=Ok, restaurar e desligar o Haveno #################################################################### @@ -1272,7 +1272,7 @@ account.notifications.priceAlert.low.label=Avisar se o preço do BTC estiver aba account.notifications.priceAlert.setButton=Definir alerta de preço account.notifications.priceAlert.removeButton=Remover alerta de preço account.notifications.trade.message.title=O estado da negociação mudou -account.notifications.trade.message.msg.conf=A transação de depósito para a negociação com o ID {0} foi confirmada. Por favor, abra o seu aplicativo Bisq e realize o pagamento. +account.notifications.trade.message.msg.conf=A transação de depósito para a negociação com o ID {0} foi confirmada. Por favor, abra o seu aplicativo Haveno e realize o pagamento. account.notifications.trade.message.msg.started=O comprador de BTC iniciou o pagarmento para a negociação com o ID {0}. account.notifications.trade.message.msg.completed=A negociação com o ID {0} foi completada. account.notifications.offer.message.title=A sua oferta foi aceita @@ -1297,10 +1297,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Tipo de oferta account.notifications.marketAlert.message.title=Alerta de oferta account.notifications.marketAlert.message.msg.below=abaixo account.notifications.marketAlert.message.msg.above=acima -account.notifications.marketAlert.message.msg=Uma nova oferta ''{0} {1}'' com preço {2} ({3} {4} preço de mercado) e com o método de pagamento ''{5}'' foi publicada no livro de ofertas do Bisq.\nID da oferta: {6}. +account.notifications.marketAlert.message.msg=Uma nova oferta ''{0} {1}'' com preço {2} ({3} {4} preço de mercado) e com o método de pagamento ''{5}'' foi publicada no livro de ofertas do Haveno.\nID da oferta: {6}. account.notifications.priceAlert.message.title=Alerta de preço para {0} account.notifications.priceAlert.message.msg=O seu preço de alerta foi atingido. O preço atual da {0} é {1} {2} -account.notifications.noWebCamFound.warning=Nenhuma webcam foi encontrada.\n\nPor favor, use a opção e-mail para enviar o token e a chave de criptografia do seu celular para o Bisq +account.notifications.noWebCamFound.warning=Nenhuma webcam foi encontrada.\n\nPor favor, use a opção e-mail para enviar o token e a chave de criptografia do seu celular para o Haveno account.notifications.priceAlert.warning.highPriceTooLow=O preço mais alto deve ser maior do que o preço mais baixo account.notifications.priceAlert.warning.lowerPriceTooHigh=O preço mais baixo deve ser menor do que o preço mais alto @@ -1331,7 +1331,7 @@ displayUpdateDownloadWindow.status.verifying=Verificando assinatura... displayUpdateDownloadWindow.button.label=Baixar instalador e verificar assinatura displayUpdateDownloadWindow.button.downloadLater=Baixar depois displayUpdateDownloadWindow.button.ignoreDownload=Ignorar essa versão -displayUpdateDownloadWindow.headline=Uma nova atualização para o Bisq está disponível! +displayUpdateDownloadWindow.headline=Uma nova atualização para o Haveno está disponível! displayUpdateDownloadWindow.download.failed.headline=Erro no download displayUpdateDownloadWindow.download.failed=Download failed.\nPlease download and verify manually at [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unable to determine the correct installer. Please download and verify manually at [HYPERLINK:https://bisq.network/downloads] @@ -1405,7 +1405,7 @@ disputeSummaryWindow.close.noPayout.headline=Close without any payout disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout? emptyWalletWindow.headline={0} ferramenta de emergência da carteira -emptyWalletWindow.info=Por favor, utilize essa opção apenas em caso de emergência, caso você não consiga acessar seus fundos a partir do programa.\n\nNote que todas as ofertas abertas serão fechadas automaticamente quando você utilizar esta ferramenta.\n\nAntes de usar esta ferramenta, faça um backup da sua pasta de dados. Você pode fazer isso em \"Conta/Backup\".\n\nHavendo qualquer problema, avise-nos através do GitHub ou do fórum Bisq, para que assim possamos investigar o que causou o problema. +emptyWalletWindow.info=Por favor, utilize essa opção apenas em caso de emergência, caso você não consiga acessar seus fundos a partir do programa.\n\nNote que todas as ofertas abertas serão fechadas automaticamente quando você utilizar esta ferramenta.\n\nAntes de usar esta ferramenta, faça um backup da sua pasta de dados. Você pode fazer isso em \"Conta/Backup\".\n\nHavendo qualquer problema, avise-nos através do GitHub ou do fórum Haveno, para que assim possamos investigar o que causou o problema. emptyWalletWindow.balance=Seu saldo disponível na carteira emptyWalletWindow.address=Seu endereço de destino @@ -1458,7 +1458,7 @@ offerDetailsWindow.creationDate=Criada em offerDetailsWindow.makersOnion=Endereço onion do ofertante qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Please use this QR code for funding your Bisq wallet from your external wallet. +qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet. qRCodeWindow.request=Solicitação de pagamento:\n{0} selectDepositTxWindow.headline=Selecionar transação de depósito para disputa @@ -1568,7 +1568,7 @@ popup.headline.error=Erro popup.doNotShowAgain=Não mostrar novamente popup.reportError.log=Abrir arquivo de log popup.reportError.gitHub=Reportar à lista de problemas no GitHub -popup.reportError={0}\n\nPara nos ajudar a melhorar o aplicativo, reporte o bug criando um relatório (Issue) em nossa página do GitHub em https://github.com/bisq-network/bisq/issues.\n\nA mensagem de erro exibida acima será copiada para a área de transferência quando você clicar qualquer um dos botões abaixo.\nA solução de problemas será mais fácil se você anexar o arquivo bisq.log ao clicar em "Abrir arquivo de log", salvando uma cópia e incluindo-a em seu relatório do problema (Issue) no GitHub. +popup.reportError={0}\n\nPara nos ajudar a melhorar o aplicativo, reporte o bug criando um relatório (Issue) em nossa página do GitHub em https://github.com/bisq-network/bisq/issues.\n\nA mensagem de erro exibida acima será copiada para a área de transferência quando você clicar qualquer um dos botões abaixo.\nA solução de problemas será mais fácil se você anexar o arquivo haveno.log ao clicar em "Abrir arquivo de log", salvando uma cópia e incluindo-a em seu relatório do problema (Issue) no GitHub. popup.error.tryRestart=Por favor, reinicie o aplicativo e verifique sua conexão de Internet para ver se o problema foi resolvido. popup.error.takeOfferRequestFailed=Houve um quando alguém tentou aceitar uma de suas ofertas:\n{0} @@ -1579,10 +1579,10 @@ error.closedTradeWithUnconfirmedDepositTx=A transação de depósito da negocia error.closedTradeWithNoDepositTx=A transação de depósito da negociação já fechada com ID {0} está ausente.\n\nPor favor, reinicie o aplicativo para atualizar a lista de negociações encerradas. popup.warning.walletNotInitialized=A carteira ainda não foi inicializada -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. -popup.warning.wrongVersion=Você provavelmente está usando a versão incorreta do Bisq para este computador.\nA arquitetura do seu computador é: {0}.\nO binário do Bisq que você instalou é: {1}.\nPor favor, feche o programa e instale a versão correta ({2}). -popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. -popup.warning.startupFailed.twoInstances=O Bisq já está sendo executado. Você não pode executar duas instâncias do Bisq ao mesmo tempo. +popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\nHaveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. +popup.warning.wrongVersion=Você provavelmente está usando a versão incorreta do Haveno para este computador.\nA arquitetura do seu computador é: {0}.\nO binário do Haveno que você instalou é: {1}.\nPor favor, feche o programa e instale a versão correta ({2}). +popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Haveno installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. +popup.warning.startupFailed.twoInstances=O Haveno já está sendo executado. Você não pode executar duas instâncias do Haveno ao mesmo tempo. popup.warning.tradePeriod.halfReached=Sua negociação com ID {0} chegou à metade do período máximo permitido e ainda não foi concluída.\n\nO período de negociação acaba em {1}\n\nFavor verifique o estado de sua negociação em \"Portfolio/Negociações em aberto\" para mais informações. popup.warning.tradePeriod.ended=Sua negociação com ID {0} atingiu o período máximo de negociação e não foi finalizada.\n\nO período de negociação terminou em {1}.\n\nPor favor, verifique sua negociação em "Portfolio/Negociações em aberto" para contactar o mediador. popup.warning.noTradingAccountSetup.headline=Você ainda não configurou uma conta para negociação @@ -1592,7 +1592,7 @@ popup.warning.noMediatorsAvailable=Não há mediadores disponíveis. popup.warning.notFullyConnected=Você precisa aguardar até estar totalmente conectado à rede.\nIsto pode levar até 2 minutos na inicialização do programa. popup.warning.notSufficientConnectionsToBtcNetwork=Você precisa esperar até ter pelo menos {0} conexões à rede Bitcoin. popup.warning.downloadNotComplete=Você precisa aguardar até que termine o download dos blocos de Bitcoin restantes -popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=The Haveno wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Tem certeza que deseja remover essa oferta?\nA taxa de oferta de {0} será perdida se você removê-la. popup.warning.tooLargePercentageValue=Você não pode definir uma porcentagem superior a 100%. popup.warning.examplePercentageValue=Digite um número percentual, como \"5.4\" para 5.4% @@ -1612,32 +1612,32 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. # suppress inspection "UnusedProperty" popup.warning.priceRelay=transmissão de preço popup.warning.seed=semente -popup.warning.mandatoryUpdate.trading=Faça o update para a última versão do Bisq. Um update obrigatório foi lançado e desabilita negociações em versões antigas. Por favor, veja o Fórum do Bisq para mais informações. -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=Faça o update para a última versão do Haveno. Um update obrigatório foi lançado e desabilita negociações em versões antigas. Por favor, veja o Fórum do Haveno para mais informações. +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=Esta transação não é possível, pois as taxas de mineração de {0} excederiam o montante a transferir de {1}. Aguarde até que as taxas de mineração estejam novamente baixas ou até você ter acumulado mais BTC para transferir. -popup.warning.openOffer.makerFeeTxRejected=A transação de taxa de ofertante para a oferta com ID {0} foi rejeitada pela rede Bitcoin.\nID da transação: {1}.\nA oferta foi removida para evitar problemas adicionais.\nPor favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\nPara mais informações, por favor acesse o canal #support do time da Bisq na Keybase. +popup.warning.openOffer.makerFeeTxRejected=A transação de taxa de ofertante para a oferta com ID {0} foi rejeitada pela rede Bitcoin.\nID da transação: {1}.\nA oferta foi removida para evitar problemas adicionais.\nPor favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\nPara mais informações, por favor acesse o canal #support do time da Haveno na Keybase. popup.warning.trade.txRejected.tradeFee=taxa de negociação popup.warning.trade.txRejected.deposit=depósito -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=A transação de taxa de ofertante para a oferta com ID {0} é inválida.\nID da transação: {1}.\nPor favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\nPara mais informações, por favor acesse o canal #support do time da Bisq na Keybase. +popup.warning.openOfferWithInvalidMakerFeeTx=A transação de taxa de ofertante para a oferta com ID {0} é inválida.\nID da transação: {1}.\nPor favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\nPara mais informações, por favor acesse o canal #support do time da Haveno na Keybase. -popup.info.securityDepositInfo=Para garantir que ambas as partes sigam o protocolo de negociação, tanto o vendedor quanto o comprador precisam fazer um depósito de segurança.\n\nEste depósito permanecerá em sua carteira local até que a negociação seja concluída com sucesso. Depois, ele será devolvido para você.\n\nAtenção: se você está criando uma nova oferta, é necessário que você mantenha o programa aberto, para que outro usuário possa aceitar a sua oferta. Para manter suas ofertas online, mantenha o Bisq sempre aberto e conectado à internet (por exemplo: verifique-se de que as funções de economia de energia do seu computador estão desativadas). +popup.info.securityDepositInfo=Para garantir que ambas as partes sigam o protocolo de negociação, tanto o vendedor quanto o comprador precisam fazer um depósito de segurança.\n\nEste depósito permanecerá em sua carteira local até que a negociação seja concluída com sucesso. Depois, ele será devolvido para você.\n\nAtenção: se você está criando uma nova oferta, é necessário que você mantenha o programa aberto, para que outro usuário possa aceitar a sua oferta. Para manter suas ofertas online, mantenha o Haveno sempre aberto e conectado à internet (por exemplo: verifique-se de que as funções de economia de energia do seu computador estão desativadas). popup.info.cashDepositInfo=Certifique-se de que você possui uma agência bancária em sua região para poder fazer o depósito em dinheiro.\nO ID (BIC/SWIFT) do banco do vendedor é: {0}. popup.info.cashDepositInfo.confirm=Eu confirmo que posso fazer o depósito -popup.info.shutDownWithOpenOffers=O Bisq está desligando, mas há ofertas abertas.\n\nEstas ofertas não ficarão disponíveis na rede P2P enquanto o Bisq estiver desligado, mas elas serão republicadas na rede assim que você reiniciar o programa.\n\nPara manter suas ofertas online, mantenha o Bisq aberto e certifique-se de que o seu computador continua online (ex: certifique-se de que o computador não está entrando em modo de hibernação). -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\nPlease make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.info.shutDownWithOpenOffers=O Haveno está desligando, mas há ofertas abertas.\n\nEstas ofertas não ficarão disponíveis na rede P2P enquanto o Haveno estiver desligado, mas elas serão republicadas na rede assim que você reiniciar o programa.\n\nPara manter suas ofertas online, mantenha o Haveno aberto e certifique-se de que o seu computador continua online (ex: certifique-se de que o computador não está entrando em modo de hibernação). +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\nPlease make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.privateNotification.headline=Notificação privada importante! popup.securityRecommendation.headline=Recomendação de segurança importante popup.securityRecommendation.msg=Lembre-se de proteger a sua carteira com uma senha, caso você já não tenha criado uma.\n\nRecomendamos que você escreva num papel as palavras da semente de sua carteira. Essas palavras funcionam como uma senha mestra para recuperar a sua carteira Bitcoin, caso o seu computador apresente algum problema.\nVocê irá encontrar mais informações na seção \"Semente da carteira\".\n\nTambém aconselhamos que você faça um backup completo da pasta de dados do programa na seção \"Backup\". -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=Desligando popup.shutDownInProgress.msg=O desligamento do programa pode levar alguns segundos.\nPor favor, não interrompa este processo. @@ -1697,10 +1697,10 @@ notification.trade.selectTrade=Selecionar negociação notification.trade.peerOpenedDispute=Seu parceiro de negociação abriu um {0}. notification.trade.disputeClosed=A {0} foi fechada. notification.walletUpdate.headline=Update da carteira de negociação -notification.walletUpdate.msg=Sua carteira Bisq tem saldo suficiente.\nQuantia: {0} -notification.takeOffer.walletUpdate.msg=Sua carteira Bisq já tinha saldo suficiente de uma tentativa anterior de aceitar oferta.\nQuantia: {0} +notification.walletUpdate.msg=Sua carteira Haveno tem saldo suficiente.\nQuantia: {0} +notification.takeOffer.walletUpdate.msg=Sua carteira Haveno já tinha saldo suficiente de uma tentativa anterior de aceitar oferta.\nQuantia: {0} notification.tradeCompleted.headline=Negociação concluída -notification.tradeCompleted.msg=Você pode retirar seus fundos agora para sua carteira Bitcoin externa ou transferi-los para a carteira Bisq. +notification.tradeCompleted.msg=Você pode retirar seus fundos agora para sua carteira Bitcoin externa ou transferi-los para a carteira Haveno. #################################################################### @@ -1709,9 +1709,9 @@ notification.tradeCompleted.msg=Você pode retirar seus fundos agora para sua ca systemTray.show=Mostrar janela do applicativo systemTray.hide=Esconder janela do applicativo -systemTray.info=Informações sobre Bisq +systemTray.info=Informações sobre Haveno systemTray.exit=Sair -systemTray.tooltip=Bisq: a rede de exchange decentralizada de bitcoin +systemTray.tooltip=Haveno: a rede de exchange decentralizada de bitcoin #################################################################### @@ -1853,7 +1853,7 @@ password.deriveKey=Derivando chave a partir da senha password.walletDecrypted=A carteira foi decifrada com sucesso e a proteção por senha removida password.wrongPw=Você digitou a senha incorreta.\n\nFavor tentar novamente, verificando com cuidado erros de digitação ou ortografia. password.walletEncrypted=A carteira foi encriptada e a proteção por senha foi ativada com sucesso. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=As 2 senhas inseridas não são iguais. password.forgotPassword=Esqueceu a senha? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\nIt is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! @@ -1871,7 +1871,7 @@ seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\nYou must empty seed.warn.walletNotEmpty.restore=Desejo recuperar mesmo assim seed.warn.walletNotEmpty.emptyWallet=Esvaziarei as carteiras primeiro seed.warn.notEncryptedAnymore=Suas carteiras estão encriptadas.\n\nApós a restauração, as carteiras não estarão mais encriptadas e você deverá definir uma nova senha.\n\nDeseja continuar? -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? seed.restore.success=Carteiras recuperadas com sucesso com as novas palavras semente.\n\nVocê precisa desligar e reiniciar o aplicativo. seed.restore.error=Ocorreu um erro ao restaurar as carteiras com palavras semente.{0} seed.restore.openOffers.warn=You have open offers which will be removed if you restore from seed words.\nAre you sure that you want to continue? @@ -1957,17 +1957,17 @@ payment.accountType=Tipo de conta payment.checking=Conta Corrente payment.savings=Poupança payment.personalId=Identificação pessoal -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. -payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Bisq to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Haveno account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Haveno. +payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Haveno to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=Ao usar o HalCash, o comprador de BTC precisa enviar ao vendedor de BTC o código HalCash através de uma mensagem de texto do seu telefone.\n\nPor favor, certifique-se de não exceder a quantia máxima que seu banco lhe permite enviar com o HalCash. O valor mínimo de saque é de 10 euros e valor máximo é de 600 EUR. Para saques repetidos é de 3000 euros por destinatário por dia e 6000 euros por destinatário por mês. Por favor confirme esses limites com seu banco para ter certeza de que eles usam os mesmos limites mencionados aqui.\n\nO valor de saque deve ser um múltiplo de 10 euros, pois você não pode sacar notas diferentes de uma ATM. Esse valor em BTC será ajustado na telas de criar e aceitar ofertas para que a quantia de EUR esteja correta. Você não pode usar o preço com base no mercado, pois o valor do EUR estaria mudando com a variação dos preços.\n\nEm caso de disputa, o comprador de BTC precisa fornecer a prova de que enviou o EUR. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Bisq sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Certifique-se de que o seu banco permite a realização de depósitos em espécie na conta de terceiros. @@ -1979,9 +1979,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=Informações para contato payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -2004,7 +2004,7 @@ payment.japan.recipient=Nome payment.australia.payid=PayID payment.payid=PayID linked to financial institution. Like email address or mobile phone. payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 30c1a6e2..2ea2ea9a 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -103,14 +103,14 @@ shared.faq=Visit FAQ page shared.yesCancel=Sim, cancelar shared.nextStep=Próximo passo shared.selectTradingAccount=Selecionar conta de negociação -shared.fundFromSavingsWalletButton=Transferir fundos da carteira Bisq +shared.fundFromSavingsWalletButton=Transferir fundos da carteira Haveno shared.fundFromExternalWalletButton=Abrir sua carteira externa para o financiamento shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed? shared.belowInPercent=Abaixo % do preço de mercado shared.aboveInPercent=Acima % do preço de mercado shared.enterPercentageValue=Insira % do valor shared.OR=OU -shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds. +shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. shared.waitingForFunds=Esperando pelos fundos... shared.TheBTCBuyer=O comprador de BTC shared.You=Você @@ -125,7 +125,7 @@ shared.notUsedYet=Ainda não usado shared.date=Data shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n +shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Copiar para área de transferência shared.language=Idioma shared.country=País @@ -235,8 +235,8 @@ mainView.menu.settings=Definições mainView.menu.account=Conta mainView.marketPriceWithProvider.label=Preço de mercado por {0} -mainView.marketPrice.bisqInternalPrice=Preço do último negócio do Bisq -mainView.marketPrice.tooltip.bisqInternalPrice=Não há preço de mercado de fornecedores de feed de preço externos disponíveis.\nO preço exibido é o mais recente preço de negócio do Bisq para essa moeda. +mainView.marketPrice.havenoInternalPrice=Preço do último negócio do Haveno +mainView.marketPrice.tooltip.havenoInternalPrice=Não há preço de mercado de fornecedores de feed de preço externos disponíveis.\nO preço exibido é o mais recente preço de negócio do Haveno para essa moeda. mainView.marketPrice.tooltip=O preço de mercado é fornecido por {0} {1}\nÚltima atualização: {2}\nURL do nó do provedor: {3} mainView.balance.available=Saldo disponível mainView.balance.reserved=Reservado em ofertas @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Conectando à mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1} +mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Conectando à rede Tor.... mainView.bootstrapState.torNodeCreated=(2/4) Nó da rede Tor criado @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Dados iniciais recebidos mainView.bootstrapWarning.noSeedNodesAvailable=Nenhum nó semente disponível mainView.bootstrapWarning.noNodesAvailable=Sem nós semente e pares disponíveis -mainView.bootstrapWarning.bootstrappingToP2PFailed=O bootstrap para a rede do Bisq falhou +mainView.bootstrapWarning.bootstrappingToP2PFailed=O bootstrap para a rede do Haveno falhou mainView.p2pNetworkWarnMsg.noNodesAvailable=Não há nós de semente ou pares persistentes disponíveis para solicitar dados.\nPor favor, verifique a sua conexão de Internet ou tente reiniciar o programa. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=A conexão com a rede do Bisq falhou (erro reportado: {0}).\nPor favor, verifique sua conexão com a Internet ou tente reiniciar o programa. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=A conexão com a rede do Haveno falhou (erro reportado: {0}).\nPor favor, verifique sua conexão com a Internet ou tente reiniciar o programa. mainView.walletServiceErrorMsg.timeout=A conexão com a rede Bitcoin falhou por causa de tempo esgotado. mainView.walletServiceErrorMsg.connectionError=A conexão com a rede Bitcoin falhou devido ao erro: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=A conexão com a rede Bitcoin fal mainView.walletServiceErrorMsg.rejectedTxException=Uma transação foi rejeitada pela rede.\n\n{0} mainView.networkWarning.allConnectionsLost=Você perdeu a conexão com todos os pares de rede de {0} .\nTalvez você tenha perdido sua conexão de internet ou o seu computador estivesse no modo de espera. -mainView.networkWarning.localhostBitcoinLost=Perdeu a conexão ao nó Bitcoin do localhost.\nPor favor recomeçar o programa do Bisq para conectar à outros nós Bitcoin ou recomeçar o nó Bitcoin do localhost. +mainView.networkWarning.localhostBitcoinLost=Perdeu a conexão ao nó Bitcoin do localhost.\nPor favor recomeçar o programa do Haveno para conectar à outros nós Bitcoin ou recomeçar o nó Bitcoin do localhost. mainView.version.update=(Atualização disponível) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=A quantia de negócio é offerbook.warning.wrongTradeProtocol=Essa oferta requer uma versão de protocolo diferente da usada na sua versão do software.\n\nPor favor, verifique se você tem a versão mais recente instalada, caso contrário, o usuário que criou a oferta usou uma versão mais antiga.\n\nOs utilizadores não podem negociar com uma versão de protocolo de negócio incompatível. offerbook.warning.userIgnored=Você adicionou o endereço onion daquele utilizador à sua lista de endereços ignorados. -offerbook.warning.offerBlocked=Essa oferta foi bloqueada pelos desenvolvedores do Bisq.\nProvavelmente, há um erro não tratado causando problemas ao aceitar a oferta. -offerbook.warning.currencyBanned=A moeda usada nessa oferta foi bloqueada pelos desenvolvedores do Bisq.\nPor favor, visite o Fórum Bisq para mais informações. -offerbook.warning.paymentMethodBanned=O método de pagamento usado nessa oferta foi bloqueado pelos desenvolvedores do Bisq.\nPor favor, visite o Fórum Bisq para mais informações. -offerbook.warning.nodeBlocked=O endereço onion desse negociador foi bloqueado pelos desenvolvedores do Bisq.\nProvavelmente, há um erro não tratado causando problemas ao aceitar ofertas desse negociador. -offerbook.warning.requireUpdateToNewVersion=Your version of Bisq is not compatible for trading anymore.\nPlease update to the latest Bisq version at [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Essa oferta foi bloqueada pelos desenvolvedores do Haveno.\nProvavelmente, há um erro não tratado causando problemas ao aceitar a oferta. +offerbook.warning.currencyBanned=A moeda usada nessa oferta foi bloqueada pelos desenvolvedores do Haveno.\nPor favor, visite o Fórum Haveno para mais informações. +offerbook.warning.paymentMethodBanned=O método de pagamento usado nessa oferta foi bloqueado pelos desenvolvedores do Haveno.\nPor favor, visite o Fórum Haveno para mais informações. +offerbook.warning.nodeBlocked=O endereço onion desse negociador foi bloqueado pelos desenvolvedores do Haveno.\nProvavelmente, há um erro não tratado causando problemas ao aceitar ofertas desse negociador. +offerbook.warning.requireUpdateToNewVersion=Your version of Haveno is not compatible for trading anymore.\nPlease update to the latest Haveno version at [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. It could be that your previous take-offer attempt resulted in a failed trade. offerbook.info.sellAtMarketPrice=Venderá ao preço de mercado (atualizado à cada minuto). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Financiar sua oferta createOffer.fundsBox.offerFee=Taxa de negócio createOffer.fundsBox.networkFee=Taxa de mineração createOffer.fundsBox.placeOfferSpinnerInfo=Oferta sendo publicada... -createOffer.fundsBox.paymentLabel=negócio do Bisq com ID {0} +createOffer.fundsBox.paymentLabel=negócio do Haveno com ID {0} createOffer.fundsBox.fundsStructure=({0} depósito de segurança, {1} taxa de negócio, {2} taxa de mineração) createOffer.success.headline=Sua oferta foi publicada. createOffer.success.info=Você pode gerir as suas ofertas abertas em \"Portefólio/As minhas ofertas abertas\". @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Rever: Colocar oferta para {0} monero createOffer.createOfferFundWalletInfo.headline=Financiar sua oferta # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Quantia de negócio: {0} \n -createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos estão reservados na sua carteira local e serão bloqueados no endereço de depósito multi-assinatura assim que alguém aceitar a sua oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Bisq (conveniente, mas as transações podem ser conectadas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup. +createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos estão reservados na sua carteira local e serão bloqueados no endereço de depósito multi-assinatura assim que alguém aceitar a sua oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Haveno (conveniente, mas as transações podem ser conectadas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Ocorreu um erro ao colocar a oferta:\n\n{0}\n\nAinda nenhuns fundos saíram da sua carteira.\nPor favor, reinicie seu programa e verifique sua conexão de rede. createOffer.setAmountPrice=Definir preço e quantia -createOffer.warnCancelOffer=Você já financiou essa oferta.\nSe você cancelar agora, seus fundos serão transferidos para sua carteira Bisq local e estarão disponíveis para levantamento no ecrã \"Fundos/Enviar fundos\".\nVocê tem certeza que deseja cancelar? +createOffer.warnCancelOffer=Você já financiou essa oferta.\nSe você cancelar agora, seus fundos serão transferidos para sua carteira Haveno local e estarão disponíveis para levantamento no ecrã \"Fundos/Enviar fundos\".\nVocê tem certeza que deseja cancelar? createOffer.timeoutAtPublishing=Tempo esgotado durante a publicação da oferta. createOffer.errorInfo=\n\nA taxa de ofertante já está paga. No pior dos casos você perdeu essa taxa.\nPor favor tente recomeçar o seu programa e verificar a sua conexão de rede para ver se consegue resolver o problema. createOffer.tooLowSecDeposit.warning=Você definiu o depósito de segurança para um valor inferior ao valor padrão recomendado de {0}.\nTem certeza de que deseja usar um depósito de segurança inferior? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Quantia para vender takeOffer.fundsBox.offerFee=Taxa de negócio takeOffer.fundsBox.networkFee=Total de taxas de mineração takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitação da oferta em progresso ... -takeOffer.fundsBox.paymentLabel=negócio do Bisq com ID {0} +takeOffer.fundsBox.paymentLabel=negócio do Haveno com ID {0} takeOffer.fundsBox.fundsStructure=({0} depósito de segurança, {1} taxa de negócio, {2} taxa de mineração) takeOffer.success.headline=Você aceitou uma oferta com sucesso. takeOffer.success.info=Você pode ver o estado de seu negócio em \"Portefólio/Negócios abertos\". @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=Você não pode aceitar aquela oferta pois ela ut takeOffer.takeOfferFundWalletInfo.headline=Financiar seu negócio # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Quantia de negócio: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Total das taxas de mineração: {4}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Bisq (conveniente, mas as transações podem ser conectas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup. +takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Total das taxas de mineração: {4}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Haveno (conveniente, mas as transações podem ser conectas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup. takeOffer.alreadyPaidInFunds=Se você já pagou com seus fundos você pode levantá-los na janela \"Fundos/Enviar fundos\". takeOffer.paymentInfo=Informações de pagamento takeOffer.setAmountPrice=Definir quantia -takeOffer.alreadyFunded.askCancel=Você já financiou essa oferta.\nSe você cancelar agora, seus fundos serão transferidos para sua carteira Bisq local e estarão disponíveis para levantamento no ecrã \"Fundos/Enviar fundos\".\nVocê tem certeza que deseja cancelar? +takeOffer.alreadyFunded.askCancel=Você já financiou essa oferta.\nSe você cancelar agora, seus fundos serão transferidos para sua carteira Haveno local e estarão disponíveis para levantamento no ecrã \"Fundos/Enviar fundos\".\nVocê tem certeza que deseja cancelar? takeOffer.failed.offerNotAvailable=Pedido para aceitar oferta falhou porque a oferta já não está disponível. Talvez um outro negociador aceitou a oferta entretanto. takeOffer.failed.offerTaken=Não é possível aceitar a oferta pois ela já foi aceita por outro negociador. takeOffer.failed.offerRemoved=Não é possível aceitar a oferta pois ela foi removida. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Confirmar: Editar oferta editOffer.publishOffer=Publicando sua oferta. editOffer.failed=A edição da oferta falhou:\n{0} editOffer.success=Sua oferta foi editada com sucesso. -editOffer.invalidDeposit=O depósito de segurança do comprador não está dentro dos limites definidos pela OAD do Bisq e não pode mais ser editado. +editOffer.invalidDeposit=O depósito de segurança do comprador não está dentro dos limites definidos pela OAD do Haveno e não pode mais ser editado. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=A transação de depósito ainda não foi # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=REQUISITO IMPORTANTE:\nDepois d # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Por favor envie {0} por \"US Postal Money Order\" para o vendedor de BTC.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Enviar MTCN e recibo portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Você precisa enviar o MTCN (número de rastreamento) e uma foto do recibo por e-mail para o vendedor de BTC.\nO recibo deve mostrar claramente o nome completo do vendedor, a cidade, o país e a quantia. O e-mail do vendedor é: {0}.\n\nVocê enviou o MTCN e o contrato para o vendedor? portfolio.pending.step2_buyer.halCashInfo.headline=Enviar o código HalCash portfolio.pending.step2_buyer.halCashInfo.msg=Você precisa enviar uma mensagem de texto com o código HalCash, bem como o ID da negociação ({0}) para o vendedor BTC.\nO nº do telemóvel do vendedor é {1}.\n\nVocê enviou o código para o vendedor? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Bisq clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Haveno clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). portfolio.pending.step2_buyer.confirmStart.headline=Confirme que você iniciou o pagamento portfolio.pending.step2_buyer.confirmStart.msg=Você iniciou o pagamento de {0} para o seu parceiro de negociação? portfolio.pending.step2_buyer.confirmStart.yes=Sim, iniciei o pagamento portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Bisq requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway portfolio.pending.step2_seller.waitPayment.headline=Aguardar o pagamento @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=O comprador do BTC ainda não efetuou o paga portfolio.pending.step2_seller.openForDispute=O comprador de BTC não iniciou o seu pagamento!\nO período máx. permitido para o negócio acabou.\nVocê pode esperar e dar mais tempo ao seu par de negociação ou entrar em contacto com o mediador para assistência. tradeChat.chatWindowTitle=Janela de chat para o negócio com o ID ''{0}'' tradeChat.openChat=Abrir janela de chat -tradeChat.rules=Você pode comunicar com o seu par de negociação para resolver problemas com este negócio.\nNão é obrigatório responder no chat.\nSe algum negociante infringir alguma das regras abaixo, abra uma disputa e reporte-o ao mediador ou ao árbitro.\n\nRegras do chat:\n\t● Não envie nenhum link (risco de malware). Você pode enviar o ID da transação e o nome de um explorador de blocos.\n\t● Não envie as suas palavras-semente, chaves privadas, senhas ou outra informação sensitiva!\n\t● Não encoraje negócios fora do Bisq (sem segurança).\n\t● Não engaje em nenhuma forma de scams de engenharia social.\n\t● Se um par não responde e prefere não comunicar pelo chat, respeite a sua decisão.\n\t● Mantenha o âmbito da conversa limitado ao negócio. Este chat não é um substituto para o messenger ou uma caixa para trolls.\n\t● Mantenha a conversa amigável e respeitosa. +tradeChat.rules=Você pode comunicar com o seu par de negociação para resolver problemas com este negócio.\nNão é obrigatório responder no chat.\nSe algum negociante infringir alguma das regras abaixo, abra uma disputa e reporte-o ao mediador ou ao árbitro.\n\nRegras do chat:\n\t● Não envie nenhum link (risco de malware). Você pode enviar o ID da transação e o nome de um explorador de blocos.\n\t● Não envie as suas palavras-semente, chaves privadas, senhas ou outra informação sensitiva!\n\t● Não encoraje negócios fora do Haveno (sem segurança).\n\t● Não engaje em nenhuma forma de scams de engenharia social.\n\t● Se um par não responde e prefere não comunicar pelo chat, respeite a sua decisão.\n\t● Mantenha o âmbito da conversa limitado ao negócio. Este chat não é um substituto para o messenger ou uma caixa para trolls.\n\t● Mantenha a conversa amigável e respeitosa. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Indefinido @@ -671,7 +671,7 @@ portfolio.pending.step3_buyer.wait.msgStateInfo.label=Pagamento iniciado mensage portfolio.pending.step3_buyer.warn.part1a=na blockchain {0} portfolio.pending.step3_buyer.warn.part1b=no seu provedor de pagamentos (ex: banco) portfolio.pending.step3_buyer.warn.part2=O vendedor de BTC ainda não confirmou o seu pagamento. Por favor confirme se o envio do pagamento de {0} foi bem-sucedido. -portfolio.pending.step3_buyer.openForDispute=O vendedor de Bisq não confirmou o seu pagamento! O período máx. para o negócio acabou. Você pode esperar e dar mais tempo ao seu par de negociação or pedir assistência de um mediador. +portfolio.pending.step3_buyer.openForDispute=O vendedor de Haveno não confirmou o seu pagamento! O período máx. para o negócio acabou. Você pode esperar e dar mais tempo ao seu par de negociação or pedir assistência de um mediador. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step3_seller.part=O seu parceiro de negociação confirmou que começou o pagamento de {0}.\n\n portfolio.pending.step3_seller.altcoin.explorer=no seu explorador de blockchain de {0} favorito @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=Depósito de segurança reembolsado portfolio.pending.step5_buyer.withdrawBTC=Levantar seus bitcoins portfolio.pending.step5_buyer.amount=Quantia a levantar portfolio.pending.step5_buyer.withdrawToAddress=Levantar para o endereço -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToHavenoWallet=Keep funds in Haveno wallet portfolio.pending.step5_buyer.withdrawExternal=Levantar para carteira externa portfolio.pending.step5_buyer.alreadyWithdrawn=Seus fundos já foram levantados.\nPor favor, verifique o histórico de transações. portfolio.pending.step5_buyer.confirmWithdrawal=Confirmar solicitação de levantamento @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=Você recebeu tradeFeedbackWindow.title=Felicitações por completar o seu negócio tradeFeedbackWindow.msg.part1=Adoraríamos ouvir sobre sua experiência. Isso nos ajudará a aperfeiçoar o software e a suavizar as arestas. Se você gostaria de fornecer feedback, preencha este pequeno questionário (sem necessidade de registo) em: -tradeFeedbackWindow.msg.part2=Se tiver alguma dúvida ou algum problema, entre em contacto com outros usuários e colaboradores através do fórum Bisq em: -tradeFeedbackWindow.msg.part3=Obrigado por usar Bisq! +tradeFeedbackWindow.msg.part2=Se tiver alguma dúvida ou algum problema, entre em contacto com outros usuários e colaboradores através do fórum Haveno em: +tradeFeedbackWindow.msg.part3=Obrigado por usar Haveno! portfolio.pending.role=O meu cargo portfolio.pending.tradeInformation=Informação do negócio @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=Após a primeira confirmação da blockchain, portfolio.pending.tradePeriodWarning=Se o período é excedido ambos os negociadores podem abrir disputa. portfolio.pending.tradeNotCompleted=Negócio não completo à tempo (até {0}) portfolio.pending.tradeProcess=Processo de negócio -portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Bisq forum at [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Haveno forum at [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Abrir disputa novamente portfolio.pending.openSupportTicket.headline=Abrir bilhete de apoio portfolio.pending.openSupportTicket.msg=Por favor, use esta função apenas em casos de emergência, se você não vir o botão \"Abrir apoio\" ou \"Abrir disputa\".\n\nQuando você abre um bilhete de apoio, o negócio será interrompido e tratado por um mediador ou árbitro. portfolio.pending.timeLockNotOver=Você deve esperar ≈{0} (mais {1} blocos) antes que você possa abrir uma disputa de arbitragem. -portfolio.pending.error.depositTxNull=A transação de depósito é null. Você não pode abrir a disputa sem uma transação de depósito válida. Por favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\n\nPara mais ajuda por favor contacte o canal de apoio do Bisq na equipa Keybase do Bisq. +portfolio.pending.error.depositTxNull=A transação de depósito é null. Você não pode abrir a disputa sem uma transação de depósito válida. Por favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\n\nPara mais ajuda por favor contacte o canal de apoio do Haveno na equipa Keybase do Haveno. portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the trade to failed trades. portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the trade to failed trades. -portfolio.pending.error.depositTxNotConfirmed=A transação de depósito não foi confirmada. Você pode abrir uma disputa de arbitragem com uma transação de depósito não confirmada. Por favor espere até que seja confirmada ou vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\n\nPara mais ajuda por favor contacte o canal de apoio do Bisq na equipa Keybase do Bisq. +portfolio.pending.error.depositTxNotConfirmed=A transação de depósito não foi confirmada. Você pode abrir uma disputa de arbitragem com uma transação de depósito não confirmada. Por favor espere até que seja confirmada ou vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\n\nPara mais ajuda por favor contacte o canal de apoio do Haveno na equipa Keybase do Haveno. portfolio.pending.support.headline.getHelp=Precisa de ajuda? -portfolio.pending.support.text.getHelp=Se tiver algum problema você pode tentar contactar o par de negociação no chat do negócio or perguntar à comunidade do Bisq em https://bisq.community. Se o seu problema ainda não for resolvido, você pode pedir mais ajuda à um mediador. +portfolio.pending.support.text.getHelp=Se tiver algum problema você pode tentar contactar o par de negociação no chat do negócio or perguntar à comunidade do Haveno em https://haveno.community. Se o seu problema ainda não for resolvido, você pode pedir mais ajuda à um mediador. portfolio.pending.support.button.getHelp=Open Trader Chat portfolio.pending.support.headline.halfPeriodOver=Verificar o pagamento portfolio.pending.support.headline.periodOver=O período de negócio acabou @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee trans portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\nWithout this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. You can make a request to be reimbursed the trade fee here: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nFeel free to move this trade to failed trades. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, but funds have been locked in the deposit transaction.\n\nPlease do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. The mediator should suggest that both peers each get back the the full amount of their security deposits (with seller receiving full trade amount back as well). This way, there is no security risk, and only trade fees are lost. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing but funds have been locked in the deposit transaction.\n\nIf the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\nIf the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of their security deposits (with seller receiving full trade amount back as well). Otherwise the trade amount should go to the buyer. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Bisq mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Haveno mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\nThe trade cannot be completed and you might have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\nDo you want to move the trade to failed trades?\n\nYou cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open trades screen any time. @@ -828,7 +828,7 @@ funds.tab.transactions=Transações funds.deposit.unused=Não utilizado funds.deposit.usedInTx=Utilizado em {0} transação(s) -funds.deposit.fundHavenoWallet=Financiar carteira Bisq +funds.deposit.fundHavenoWallet=Financiar carteira Haveno funds.deposit.noAddresses=Ainda não foi gerado um endereço de depósito funds.deposit.fundWallet=Financiar sua carteira funds.deposit.withdrawFromWallet=Enviar fundos da carteira @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=Levantado da carteira funds.tx.memo=Memo funds.tx.noTxAvailable=Sem transações disponíveis funds.tx.revert=Reverter -funds.tx.txSent=Transação enviada com sucesso para um novo endereço em sua carteira Bisq local. +funds.tx.txSent=Transação enviada com sucesso para um novo endereço em sua carteira Haveno local. funds.tx.direction.self=Enviado à você mesmo funds.tx.dustAttackTx=Poeira recebida -funds.tx.dustAttackTx.popup=Esta transação está enviando uma quantia muito pequena de BTC para a sua carteira e pode ser uma tentativa das empresas de análise da blockchain para espionar a sua carteira.\n\nSe você usar esse output em uma transação eles decobrirão que você provavelmente também é o proprietário de outros endereços (mistura de moedas).\n\nPara proteger sua privacidade a carteira Bisq ignora tais outputs de poeira para fins de consumo e no ecrã de saldo. Você pode definir a quantia limite a partir da qual um output é considerado poeira nas definições." +funds.tx.dustAttackTx.popup=Esta transação está enviando uma quantia muito pequena de BTC para a sua carteira e pode ser uma tentativa das empresas de análise da blockchain para espionar a sua carteira.\n\nSe você usar esse output em uma transação eles decobrirão que você provavelmente também é o proprietário de outros endereços (mistura de moedas).\n\nPara proteger sua privacidade a carteira Haveno ignora tais outputs de poeira para fins de consumo e no ecrã de saldo. Você pode definir a quantia limite a partir da qual um output é considerado poeira nas definições." #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=Enviando mensagem... support.receiverNotOnline=O recipiente não está online. A mensagem foi guardada na caixa de correio. support.sendMessageError=Falha de envio de mensagem. Erro: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=A oferta nessa disputa foi criada com uma versão mais antiga do Bisq.\nVocê não pode fechar essa disputa com sua versão do programa.\n\nPor favor, use uma versão mais antiga com a versão do protocolo {0} +support.wrongVersion=A oferta nessa disputa foi criada com uma versão mais antiga do Haveno.\nVocê não pode fechar essa disputa com sua versão do programa.\n\nPor favor, use uma versão mais antiga com a versão do protocolo {0} support.openFile=Abrir ficheiro para anexar (tamanho máx.: {0} kb) support.attachmentTooLarge=O tamanho total de seus anexos anexados é {0} kb e excede o máximo permitido para mensagens de {1} kb. support.maxSize=O tamanho de ficheiro máx. permitido é {0} kB. @@ -953,15 +953,15 @@ support.sellerMaker=Vendedor de BTC/Ofertante support.buyerTaker=Comprador de BTC/Aceitador support.sellerTaker=Vendedor de BTC/Aceitador -support.backgroundInfo=O Bisq não é uma empresa, por isso as disputas são tratadas diferentemente.\n\nOs negociadores podem se comunicar dentro do programa via chat seguro no ecrã de negócios abertos para tentar resolver disputas por conta própria. Se isso não for suficiente, um mediador pode ajudar. O mediador avaliará a situação e sugerirá um pagamento dos fundos de negócio. Se ambos os negociadores aceitarem essa sugestão, a transação de pagamento será concluída e o negócio será encerrado. Se um ou ambos os negociadores não concordarem com o pagamento sugerido pelo mediador, eles podem solicitar a arbitragem. O árbitro reavaliará a situação e, se justificado, pagará pessoalmente o comerciante de volta e solicitará reembolso à OAD do Bisq. -support.initialInfo=Digite uma descrição do seu problema no campo de texto abaixo. Adicione o máximo de informações possível para acelerar o tempo de resolução da disputa.\n\nAqui está uma lista do que você deve fornecer:\n● Se você é o comprador de BTC: Você fez a transferência da Fiat ou Altcoin? Se sim, você clicou no botão 'pagamento iniciado' no programa?\n● Se você é o vendedor de BTC: Você recebeu o pagamento da Fiat ou Altcoin? Se sim, você clicou no botão 'pagamento recebido' no programa?\n\t● Qual versão do Bisq você está usando?\n\t● Qual sistema operacional você está usando?\n\t ● Se você encontrou um problema com transações com falha, considere mudar para um novo diretório de dados.\n\t Às vezes, o diretório de dados é corrompido e leva a erros estranhos.\n\t Consulte: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nFamiliarize-se com as regras básicas do processo de disputa:\n\t● Você precisa responder às solicitações do {0} dentro de 2 dias.\n\t● Os mediadores respondem entre 2 dias. Os árbitros respondem dentro de 5 dias úteis.\n\t ● O período máximo para uma disputa é de 14 dias.\n\t ● Você precisa cooperar com o {1} e fornecer as informações solicitadas para justificar o seu caso.\n\t● Você aceitou as regras descritas no documento de disputa no contrato do usuário quando iniciou o programa.\n\nVocê pode ler mais sobre o processo de disputa em: {2} +support.backgroundInfo=O Haveno não é uma empresa, por isso as disputas são tratadas diferentemente.\n\nOs negociadores podem se comunicar dentro do programa via chat seguro no ecrã de negócios abertos para tentar resolver disputas por conta própria. Se isso não for suficiente, um mediador pode ajudar. O mediador avaliará a situação e sugerirá um pagamento dos fundos de negócio. Se ambos os negociadores aceitarem essa sugestão, a transação de pagamento será concluída e o negócio será encerrado. Se um ou ambos os negociadores não concordarem com o pagamento sugerido pelo mediador, eles podem solicitar a arbitragem. O árbitro reavaliará a situação e, se justificado, pagará pessoalmente o comerciante de volta e solicitará reembolso à OAD do Haveno. +support.initialInfo=Digite uma descrição do seu problema no campo de texto abaixo. Adicione o máximo de informações possível para acelerar o tempo de resolução da disputa.\n\nAqui está uma lista do que você deve fornecer:\n● Se você é o comprador de BTC: Você fez a transferência da Fiat ou Altcoin? Se sim, você clicou no botão 'pagamento iniciado' no programa?\n● Se você é o vendedor de BTC: Você recebeu o pagamento da Fiat ou Altcoin? Se sim, você clicou no botão 'pagamento recebido' no programa?\n\t● Qual versão do Haveno você está usando?\n\t● Qual sistema operacional você está usando?\n\t ● Se você encontrou um problema com transações com falha, considere mudar para um novo diretório de dados.\n\t Às vezes, o diretório de dados é corrompido e leva a erros estranhos.\n\t Consulte: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nFamiliarize-se com as regras básicas do processo de disputa:\n\t● Você precisa responder às solicitações do {0} dentro de 2 dias.\n\t● Os mediadores respondem entre 2 dias. Os árbitros respondem dentro de 5 dias úteis.\n\t ● O período máximo para uma disputa é de 14 dias.\n\t ● Você precisa cooperar com o {1} e fornecer as informações solicitadas para justificar o seu caso.\n\t● Você aceitou as regras descritas no documento de disputa no contrato do usuário quando iniciou o programa.\n\nVocê pode ler mais sobre o processo de disputa em: {2} support.systemMsg=Mensagem do sistema: {0} -support.youOpenedTicket=Você abriu um pedido para apoio.\n\n{0}\n\nBisq versão: {1} -support.youOpenedDispute=Você abriu um pedido para uma disputa.\n\n{0}\n\nBisq versão: {1} -support.youOpenedDisputeForMediation=Você solicitou mediação.\n\n{0}\n\nVersão Bisq: {1} -support.peerOpenedTicket=O seu par de negociação solicitou suporte devido a problemas técnicos.\n\n{0}\n\nVersão Bisq: {1} -support.peerOpenedDispute=O seu par de negociação solicitou uma disputa.\n\n{0}\n\nVersão Bisq: {1} -support.peerOpenedDisputeForMediation=O seu par de negociação solicitou uma mediação.\n\n{0}\n\nVersão Bisq: {1} +support.youOpenedTicket=Você abriu um pedido para apoio.\n\n{0}\n\nHaveno versão: {1} +support.youOpenedDispute=Você abriu um pedido para uma disputa.\n\n{0}\n\nHaveno versão: {1} +support.youOpenedDisputeForMediation=Você solicitou mediação.\n\n{0}\n\nVersão Haveno: {1} +support.peerOpenedTicket=O seu par de negociação solicitou suporte devido a problemas técnicos.\n\n{0}\n\nVersão Haveno: {1} +support.peerOpenedDispute=O seu par de negociação solicitou uma disputa.\n\n{0}\n\nVersão Haveno: {1} +support.peerOpenedDisputeForMediation=O seu par de negociação solicitou uma mediação.\n\n{0}\n\nVersão Haveno: {1} support.mediatorsDisputeSummary=System message: Mediator''s dispute summary:\n{0} support.mediatorsAddress=Endereço do nó do mediador: {0} support.warning.disputesWithInvalidDonationAddress=The delayed payout transaction has used an invalid receiver address. It does not match any of the DAO parameter values for the valid donation addresses.\n\nThis might be a scam attempt. Please inform the developers about that incident and do not close that case before the situation is resolved!\n\nAddress used in the dispute: {0}\n\nAll DAO param donation addresses: {1}\n\nTrade ID: {2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaction URL settings.preferences.editCustomExplorer.addressUrl=Address URL settings.net.btcHeader=Rede Bitcoin -settings.net.p2pHeader=Rede do Bisq +settings.net.p2pHeader=Rede do Haveno settings.net.onionAddressLabel=O meu endereço onion settings.net.btcNodesLabel=Usar nós de Bitcoin Core personalizados settings.net.bitcoinPeersLabel=Pares conectados @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=Nós de Bitcoin Core para conectar settings.net.useProvidedNodesRadio=Usar nós de Bitcoin Core providenciados settings.net.usePublicNodesRadio=Usar rede de Bitcoin pública settings.net.useCustomNodesRadio=Usar nós de Bitcoin Core personalizados -settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? +settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Haveno). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? settings.net.warn.usePublicNodes.useProvided=Não, usar nós providenciados settings.net.warn.usePublicNodes.usePublic=Sim, usar a rede pública settings.net.warn.useCustomNodes.B2XWarning=Por favor, certifique-se de que seu nó Bitcoin é um nó confiável do Bitcoin Core!\n\nConectar-se a nós que não seguem as regras de consenso do Bitcoin Core pode corromper a sua carteira e causar problemas no processo de negócio.\n\nOs usuários que se conectam a nós que violam regras de consenso são responsáveis por qualquer dano resultante. Quaisquer disputas resultantes serão decididas em favor do outro par. Nenhum suporte técnico será dado aos usuários que ignorarem esses alertas e mecanismos de proteção! settings.net.warn.invalidBtcConfig=A conexão à rede Bitcoin falhou porque sua configuração é inválida.\n\nA sua configuração foi redefinida para usar os nós de Bitcoin fornecidos. Você precisará reiniciar o programa. -settings.net.localhostBtcNodeInfo=Background information: Bisq looks for a local Bitcoin node when starting. If it is found, Bisq will communicate with the Bitcoin network exclusively through it. +settings.net.localhostBtcNodeInfo=Background information: Haveno looks for a local Bitcoin node when starting. If it is found, Haveno will communicate with the Bitcoin network exclusively through it. settings.net.p2PPeersLabel=Pares conectados settings.net.onionAddressColumn=Endereço onion settings.net.creationDateColumn=Estabelecida @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=O ficheiro da corrente SPV foi apagado. Por favor, seja paciente. Pode demorar um pouco para re-sincronizar com a rede. settings.net.reSyncSPVAfterRestartCompleted=A resincronização concluiu. Por favor reiniciar o programa. settings.net.reSyncSPVFailed=Não foi possível remover o ficherio da corrente SPV\nErro: {0} -setting.about.aboutBisq=Sobre Bisq -setting.about.about=O Bisq é um software de código aberto que facilita a troca de bitcoins com moedas nacionais (e outras criptomoedas) por meio de uma rede par-à-par descentralizada, de uma maneira que protege fortemente a privacidade do utilizador. Saiba mais sobre o Bisq na nossa página web do projeto. -setting.about.web=página da web do Bisq +setting.about.aboutHaveno=Sobre Haveno +setting.about.about=O Haveno é um software de código aberto que facilita a troca de bitcoins com moedas nacionais (e outras criptomoedas) por meio de uma rede par-à-par descentralizada, de uma maneira que protege fortemente a privacidade do utilizador. Saiba mais sobre o Haveno na nossa página web do projeto. +setting.about.web=página da web do Haveno setting.about.code=Código fonte setting.about.agpl=Licença AGPL -setting.about.support=Apoio Bisq -setting.about.def=O Bisq não é uma empresa - é um projeto aberto à comunidade. Se você quiser participar ou apoiar o Bisq, siga os links abaixo. +setting.about.support=Apoio Haveno +setting.about.def=O Haveno não é uma empresa - é um projeto aberto à comunidade. Se você quiser participar ou apoiar o Haveno, siga os links abaixo. setting.about.contribute=Contribuir setting.about.providers=Provedores de dados -setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation. -setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices. +setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation. +setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices. setting.about.pricesProvided=Preços de mercado fornecidos por setting.about.feeEstimation.label=Taxa de mineração fornecida por setting.about.versionDetails=Detalhes da versão @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' ou ''alt + {0}'' ou ''cmd setting.about.shortcuts.menuNav=Navigar o menu principal setting.about.shortcuts.menuNav.value=Para navigar o menu principal pressione:: 'Ctrl' ou 'alt' ou 'cmd' juntamente com uma tecla numérica entre '1-9' -setting.about.shortcuts.close=Fechar o Bisq +setting.about.shortcuts.close=Fechar o Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' ou ''cmd + {0}'' ou ''Ctrl + {1}'' ou ''cmd + {1}'' setting.about.shortcuts.closePopup=Fechar popup ou janela de diálogo @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Enviar notificação privada ao setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0} setting.info.headline=New XMR auto-confirm Feature -setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Bisq uses explorer nodes run by Bisq contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t account.tab.mediatorRegistration=Registo do Mediador account.tab.refundAgentRegistration=Registro de agente de reembolso account.tab.signing=Signing -account.info.headline=Bem vindo à sua conta Bisq -account.info.msg=Aqui você pode adicionar contas de negociação para moedas nacionais e altcoins e criar um backup da sua carteira e dos dados da conta.\n\nUma nova carteira de Bitcoin foi criada na primeira vez que você iniciou o Bisq.\n\nÉ altamente recomendável que você anote as sua palavras-semente da carteira do Bitcoin (consulte a guia na parte superior) e considere adicionar uma senha antes do financiamento. Depósitos e retiradas de Bitcoin são gerenciados na secção \"Fundos\".\n\nNota sobre privacidade e segurança: como o Bisq é uma exchange descentralizada, todos os seus dados são mantidos no seu computador. Como não há servidores, não temos acesso às suas informações pessoais, fundos ou mesmo seu endereço IP. Dados como números de contas bancárias, endereços de altcoin e Bitcoin etc. são compartilhados apenas com seu par de negociação para realizar negociações iniciadas (no caso de uma disputa, o mediador ou o árbitro verá os mesmos dados que o seu parceiro de negociação). +account.info.headline=Bem vindo à sua conta Haveno +account.info.msg=Aqui você pode adicionar contas de negociação para moedas nacionais e altcoins e criar um backup da sua carteira e dos dados da conta.\n\nUma nova carteira de Bitcoin foi criada na primeira vez que você iniciou o Haveno.\n\nÉ altamente recomendável que você anote as sua palavras-semente da carteira do Bitcoin (consulte a guia na parte superior) e considere adicionar uma senha antes do financiamento. Depósitos e retiradas de Bitcoin são gerenciados na secção \"Fundos\".\n\nNota sobre privacidade e segurança: como o Haveno é uma exchange descentralizada, todos os seus dados são mantidos no seu computador. Como não há servidores, não temos acesso às suas informações pessoais, fundos ou mesmo seu endereço IP. Dados como números de contas bancárias, endereços de altcoin e Bitcoin etc. são compartilhados apenas com seu par de negociação para realizar negociações iniciadas (no caso de uma disputa, o mediador ou o árbitro verá os mesmos dados que o seu parceiro de negociação). account.menu.paymentAccount=Contas de moedas nacionais account.menu.altCoinsAccountView=Contas de altcoins @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration=Registro de {0} account.arbitratorRegistration.revoke=Revogar account.arbitratorRegistration.info.msg=Saiba que precisa estar disponível até 15 dias depois depois da revogação porque podem existir negócios que o estejam a usar como {0}. O período máx. de negócio permitido é de 8 dias e a disputa pode levar até 7 dias. account.arbitratorRegistration.warn.min1Language=Precisa definir pelo menos 1 idioma.\nAdicionamos o idioma padrão para você. -account.arbitratorRegistration.removedSuccess=Você removeu com sucesso seu registro da rede do Bisq. +account.arbitratorRegistration.removedSuccess=Você removeu com sucesso seu registro da rede do Haveno. account.arbitratorRegistration.removedFailed=Não foi possível remover o registro.{0} -account.arbitratorRegistration.registerSuccess=Você se registrou com sucesso na rede do Bisq. +account.arbitratorRegistration.registerSuccess=Você se registrou com sucesso na rede do Haveno. account.arbitratorRegistration.registerFailed=Não foi possível completar o registro.{0} account.altcoin.yourAltcoinAccounts=As suas contas de altcoins account.altcoin.popup.wallet.msg=Certifique-se de seguir os requisitos para o uso das carteiras de {0}, conforme descrito na página da web de {1}.\nO uso de carteiras de exchanges centralizadas nas quais (a) você não controla suas chaves ou (b) que não utiliza software de carteira compatível é arriscado: pode levar à perda dos fundos negociados!\nO mediador ou árbitro não é um especialista em {2} e não pode ajudar nesses casos. account.altcoin.popup.wallet.confirm=Eu entendo e confirmo que eu sei qual carteira que preciso usar. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Negociar UPX no Bisq exige que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o UPX, você precisa usar a carteira GUI oficial do uPlexa ou a carteira CLI do uPlexa com o sinalizador store-tx-info ativado (padrão em novas versões). Certifique-se de que você pode acessar a chave da tx, pois isso seria necessário em caso de disputa.\nuplexa-wallet-cli (use o comando get_tx_key)\nuplexa-wallet-gui (vá para a aba do histoórico e clique no botão (P) para prova de pagamento)\n\nEm exploradores de blocos normais, a transferência não é verificável.\n\nVocê precisa fornecer ao árbitro os seguintes dados em caso de disputa:\n- A chave privada da tx\n- O hash da transação\n- Endereço público do destinatário\n\nA falha no fornecimento dos dados acima, ou se você usou uma carteira incompatível, resultará na perda do caso da disputa. O remetente de UPX é responsável por fornecer a verificação da transferência de UPX ao árbitro em caso de disputa.\n\nNão é necessário um ID de pagamento, apenas o endereço público normal.\nSe você não tiver certeza sobre esse processo, visite o canal de discord do uPlexa (https://discord.gg/vhdNSrV) ou o chat do Telegram do uPlexa (https://t.me/uplexaOfficial) para encontrar mais informações. +account.altcoin.popup.upx.msg=Negociar UPX no Haveno exige que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o UPX, você precisa usar a carteira GUI oficial do uPlexa ou a carteira CLI do uPlexa com o sinalizador store-tx-info ativado (padrão em novas versões). Certifique-se de que você pode acessar a chave da tx, pois isso seria necessário em caso de disputa.\nuplexa-wallet-cli (use o comando get_tx_key)\nuplexa-wallet-gui (vá para a aba do histoórico e clique no botão (P) para prova de pagamento)\n\nEm exploradores de blocos normais, a transferência não é verificável.\n\nVocê precisa fornecer ao árbitro os seguintes dados em caso de disputa:\n- A chave privada da tx\n- O hash da transação\n- Endereço público do destinatário\n\nA falha no fornecimento dos dados acima, ou se você usou uma carteira incompatível, resultará na perda do caso da disputa. O remetente de UPX é responsável por fornecer a verificação da transferência de UPX ao árbitro em caso de disputa.\n\nNão é necessário um ID de pagamento, apenas o endereço público normal.\nSe você não tiver certeza sobre esse processo, visite o canal de discord do uPlexa (https://discord.gg/vhdNSrV) ou o chat do Telegram do uPlexa (https://t.me/uplexaOfficial) para encontrar mais informações. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Negociar o ARQ no Bisq requer que você entenda e atenda aos seguintes requerimentos:\n\nPara enviar o ARQ, você precisa usar a wallet oficial do ArQmA GUI ou a carteira do ArQmA CLI com o marcador store-tx-info ativado (padrão em novas versões). Por favor, certifique-se que você pode acessar a chave da tx porque isso seria necessário em caso de uma disputa.\narqma-wallet-cli (use o comando get_tx_key)\narqma-wallet-gui (vá para a aba do histórico e clique no botão (P) para comprovar o pagamento)\n\nEm exploradores de blocos normais, a transferência não é verificável.\n\nVocê precisa fornecer ao mediador ou árbitro os seguintes dados em caso de disputa:\n- A chave privada da tx\n- O hash da transação\n- o endereço público do destinatário\n\nA falha em fornecer os dados acima, ou se você usou uma carteira incompatível, resultará na perda do caso de disputa. O remetente do ARQ é responsável por fornecer a verificação da transferência do ARQ ao mediador ou árbitro em caso de disputa.\n\nNão é necessário um código de pagamento, apenas o endereço público normal.\nSe você não tiver certeza sobre esse processo, visite o canal de discord do ArQmA (https://discord.gg/s9BQpJT) ou o fórum do ArQmA (https://labs.arqma.com) para obter mais informações. +account.altcoin.popup.arq.msg=Negociar o ARQ no Haveno requer que você entenda e atenda aos seguintes requerimentos:\n\nPara enviar o ARQ, você precisa usar a wallet oficial do ArQmA GUI ou a carteira do ArQmA CLI com o marcador store-tx-info ativado (padrão em novas versões). Por favor, certifique-se que você pode acessar a chave da tx porque isso seria necessário em caso de uma disputa.\narqma-wallet-cli (use o comando get_tx_key)\narqma-wallet-gui (vá para a aba do histórico e clique no botão (P) para comprovar o pagamento)\n\nEm exploradores de blocos normais, a transferência não é verificável.\n\nVocê precisa fornecer ao mediador ou árbitro os seguintes dados em caso de disputa:\n- A chave privada da tx\n- O hash da transação\n- o endereço público do destinatário\n\nA falha em fornecer os dados acima, ou se você usou uma carteira incompatível, resultará na perda do caso de disputa. O remetente do ARQ é responsável por fornecer a verificação da transferência do ARQ ao mediador ou árbitro em caso de disputa.\n\nNão é necessário um código de pagamento, apenas o endereço público normal.\nSe você não tiver certeza sobre esse processo, visite o canal de discord do ArQmA (https://discord.gg/s9BQpJT) ou o fórum do ArQmA (https://labs.arqma.com) para obter mais informações. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Trading XMR on Haveno requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Haveno now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Negociar MSR no Bisq requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar MSR, você precisa usar a carteira GUI oficial do Masari ou a carteira CLI do Masari com o marcador store-tx-info ativado (ativado por padrão) ou a carteira web do Masari (https://wallet.getmasari.org). Por favor, certifique-se que você pode acessar a chave da tx porque isso seria necessário em caso de uma disputa.\nmasari-wallet-cli (use o comando get_tx_key)\nmasari-wallet-gui (vá para a aba do histórico e clique no botão (P) para comprovar o pagamento)\n\nMasari Web Wallet (vá para Account -> histórico de transação e veja os detalhes da sua transação enviada)\n\nA verificação pode ser realizada na carteira.\nmasari-wallet-cli: usando o comando (check_tx_key).\nmasari-wallet-gui: na aba Advanced > Prove/Check.\nA verificação pode ser realizada no eplorador de blocos\nExplorador de blocos aberto (https://explorer.getmasari.org), use a barra de procurar para encontrar o hash da transação.\nUma que vez que a transação for encontrada, desça até ao baixo da àrea 'Prove Sending' e preencha os detalhes necessários.\nVocê precisa fornecer ao mediador ou ao árbitro os seguintes dados em caso de disputa:\n- A chave privada da tx\n- O hash da transação\n- o endereço público do destinatário\n\nFalha em fornecer os dados acima, ou se você usou uma carteira incompatível, resultará na perda do caso de disputa. O remetente da XMR é responsável por fornecer a verificação da transferência da MSR para o mediador ou o árbitro no caso de uma disputa.\n\nNão é necessário um código de pagamento, apenas o endereço público normal.\nSe você não tem certeza sobre o processo, peça ajuda no Discord official do Masari (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Negociar MSR no Haveno requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar MSR, você precisa usar a carteira GUI oficial do Masari ou a carteira CLI do Masari com o marcador store-tx-info ativado (ativado por padrão) ou a carteira web do Masari (https://wallet.getmasari.org). Por favor, certifique-se que você pode acessar a chave da tx porque isso seria necessário em caso de uma disputa.\nmasari-wallet-cli (use o comando get_tx_key)\nmasari-wallet-gui (vá para a aba do histórico e clique no botão (P) para comprovar o pagamento)\n\nMasari Web Wallet (vá para Account -> histórico de transação e veja os detalhes da sua transação enviada)\n\nA verificação pode ser realizada na carteira.\nmasari-wallet-cli: usando o comando (check_tx_key).\nmasari-wallet-gui: na aba Advanced > Prove/Check.\nA verificação pode ser realizada no eplorador de blocos\nExplorador de blocos aberto (https://explorer.getmasari.org), use a barra de procurar para encontrar o hash da transação.\nUma que vez que a transação for encontrada, desça até ao baixo da àrea 'Prove Sending' e preencha os detalhes necessários.\nVocê precisa fornecer ao mediador ou ao árbitro os seguintes dados em caso de disputa:\n- A chave privada da tx\n- O hash da transação\n- o endereço público do destinatário\n\nFalha em fornecer os dados acima, ou se você usou uma carteira incompatível, resultará na perda do caso de disputa. O remetente da XMR é responsável por fornecer a verificação da transferência da MSR para o mediador ou o árbitro no caso de uma disputa.\n\nNão é necessário um código de pagamento, apenas o endereço público normal.\nSe você não tem certeza sobre o processo, peça ajuda no Discord official do Masari (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Negociar o BLUR no Bisq requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o BLUR você deve usar a carteira CLI da Blur Network ou a carteira GUI.\n\nSe você estiver usando a carteira CLI, um hash da transação (tx ID) será exibido após uma transferência ser enviada. Você deve guardar esta informação. Imediatamente após o envio da transferência, você deve usar o comando 'get_tx_key' para recuperar a chave privada da transação. Se você não conseguir executar essa etapa, talvez não consiga recuperar a chave mais tarde.\n\nSe você estiver usando a carteira GUI do Blur Network, a chave privada da transação e a ID da transação podem ser encontradas convenientemente na aba "Histórico". Imediatamente após o envio, localize a transação de interesse. Clique no símbolo "?" no canto inferior direito da caixa que contém a transação. Você deve guardar esta informação.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1.) a ID da transação, 2.) a chave privada da transação e 3.) o endereço do destinatário. O mediador ou árbitro verificará a transferência do BLUR usando o Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente de BLUR tem 100% de responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos não negocie no Bisq. Primeiro, procure ajuda no Discord da Rede de Blur (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Negociar o BLUR no Haveno requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o BLUR você deve usar a carteira CLI da Blur Network ou a carteira GUI.\n\nSe você estiver usando a carteira CLI, um hash da transação (tx ID) será exibido após uma transferência ser enviada. Você deve guardar esta informação. Imediatamente após o envio da transferência, você deve usar o comando 'get_tx_key' para recuperar a chave privada da transação. Se você não conseguir executar essa etapa, talvez não consiga recuperar a chave mais tarde.\n\nSe você estiver usando a carteira GUI do Blur Network, a chave privada da transação e a ID da transação podem ser encontradas convenientemente na aba "Histórico". Imediatamente após o envio, localize a transação de interesse. Clique no símbolo "?" no canto inferior direito da caixa que contém a transação. Você deve guardar esta informação.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1.) a ID da transação, 2.) a chave privada da transação e 3.) o endereço do destinatário. O mediador ou árbitro verificará a transferência do BLUR usando o Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente de BLUR tem 100% de responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos não negocie no Haveno. Primeiro, procure ajuda no Discord da Rede de Blur (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Negociar Solo no Bisq requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o Solo, você deve usar a carteira CLI do Solo.\n\nSe você está a usar a carteira CLI, um hash da transação (tx ID) aparecerá depois de a transação ser feita. Você deve guardar esta informação. Imediatamente após o envio da transação, você deve usar o comando 'get_tx_key' para recuperar a chave secreta da transação. Se você não conseguir executar este passo, talvez não seja possível recuperar a chave mais tarde.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1.) o ID da transação, 2.) a chave privada da transação e 3.) o endereço do recipiente. O mediador ou árbitro então verificará a transferência do Solo usando o Explorador de Blocos Solo (https://explorer.minesolo.com/).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente de Solo tem 100% da responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Bisq. Primeiro, procure ajuda no Discord da Rede do Solo (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Negociar Solo no Haveno requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o Solo, você deve usar a carteira CLI do Solo.\n\nSe você está a usar a carteira CLI, um hash da transação (tx ID) aparecerá depois de a transação ser feita. Você deve guardar esta informação. Imediatamente após o envio da transação, você deve usar o comando 'get_tx_key' para recuperar a chave secreta da transação. Se você não conseguir executar este passo, talvez não seja possível recuperar a chave mais tarde.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1.) o ID da transação, 2.) a chave privada da transação e 3.) o endereço do recipiente. O mediador ou árbitro então verificará a transferência do Solo usando o Explorador de Blocos Solo (https://explorer.minesolo.com/).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente de Solo tem 100% da responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Haveno. Primeiro, procure ajuda no Discord da Rede do Solo (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Negociar o CASH2 no Bisq requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar CASH2, você deve usar a versão Cash2 Wallet versão 3 ou superior.\n\nDepois que uma transação é enviada, a ID da transação será exibida. Você deve guardar esta informação. Imediatamente após o envio da transação, você deve usar o comando 'getTxKey' no simplewallet para recuperar a chave secreta da transação.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1) a ID da transação, 2) a chave secreta da transação e 3) o endereço Cash2 do destinatário. O mediador ou árbitro irá então verificar a transferência do CASH2 usando o Explorador de Blocos do Cash2 (https://blocks.cash2.org).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente do CASH2 tem 100% de responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Bisq. Primeiro procure ajuda no Discord do Cash2 (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Negociar o CASH2 no Haveno requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar CASH2, você deve usar a versão Cash2 Wallet versão 3 ou superior.\n\nDepois que uma transação é enviada, a ID da transação será exibida. Você deve guardar esta informação. Imediatamente após o envio da transação, você deve usar o comando 'getTxKey' no simplewallet para recuperar a chave secreta da transação.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1) a ID da transação, 2) a chave secreta da transação e 3) o endereço Cash2 do destinatário. O mediador ou árbitro irá então verificar a transferência do CASH2 usando o Explorador de Blocos do Cash2 (https://blocks.cash2.org).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente do CASH2 tem 100% de responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Haveno. Primeiro procure ajuda no Discord do Cash2 (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Negociar Qwertycoin no Bisq requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o QWC, você deve usar a versão oficial do QWC Wallet 5.1.3 ou superior.\n\nDepois que uma transação é enviada, o ID da transação será exibida. Você deve guardar esta informação. Imediatamente após o envio da transação, você deve usar o comando 'get_Tx_Key' na simplewallet para recuperar a chave secreta da transação.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1) o ID da transação, 2) a chave secreta da transação e 3) o endereço QWC do destinatário. O mediador ou árbitro então verificará a transferência do QWC usando o Explorador de Blocos QWC (https://explorer.qwertycoin.org).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente QWC tem 100% da responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Bisq. Primeiro, procure ajuda no QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Negociar Qwertycoin no Haveno requer que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar o QWC, você deve usar a versão oficial do QWC Wallet 5.1.3 ou superior.\n\nDepois que uma transação é enviada, o ID da transação será exibida. Você deve guardar esta informação. Imediatamente após o envio da transação, você deve usar o comando 'get_Tx_Key' na simplewallet para recuperar a chave secreta da transação.\n\nCaso a arbitragem seja necessária, você deve apresentar o seguinte à um mediador ou árbitro: 1) o ID da transação, 2) a chave secreta da transação e 3) o endereço QWC do destinatário. O mediador ou árbitro então verificará a transferência do QWC usando o Explorador de Blocos QWC (https://explorer.qwertycoin.org).\n\nO não fornecimento das informações necessárias ao mediador ou árbitro resultará na perda da disputa. Em todos os casos de disputa, o remetente QWC tem 100% da responsabilidade na verificação de transações para um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Haveno. Primeiro, procure ajuda no QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Negociar Dragonglass no Bisq requer que você entenda e cumpra os seguintes requerimentos:\n\nPor causa da privacidade que a Dragonglass fornece, uma transação não é verificável na blockchain pública. Se necessário, você pode comprovar seu pagamento através do uso de sua chave privada TXN.\nA chave privade TXN é uma chave única gerada automaticamente para cada transação que só pode ser acessada dentro da sua carteira DRGL.\nTanto pela GUI do DRGL-wallet (dentro da janela de detalhes da transação) ou pelo simplewallet da CLI do Dragonglass (usando o comando "get_tx_key").\n\nA versão do DRGL 'Oathkeeper' e superior são NECESSÁRIAS para ambos.\n\nEm caso de disputa, você deve fornecer ao mediador ou árbitro os seguintes dados:\n- A chave privada TXN\n- O hash da transação\n- o endereço público do destinatário\n\nA verificação do pagamento pode ser feita usando os dados acima como inputs em (http://drgl.info/#check_txn).\n\nA falha em fornecer os dados acima, ou se você usou uma carteira incompatível, resultará na perda disputa. O remetente da Dragonglass é responsável por fornecer a verificação da transferência do DRGL para o mediador ou árbitro em caso de disputa. O uso de PaymentID não é obrigatório.\n\nSe você não tiver certeza sobre qualquer parte deste processo, visite Dragonglass on Discord (http://discord.drgl.info) para obter ajuda. +account.altcoin.popup.drgl.msg=Negociar Dragonglass no Haveno requer que você entenda e cumpra os seguintes requerimentos:\n\nPor causa da privacidade que a Dragonglass fornece, uma transação não é verificável na blockchain pública. Se necessário, você pode comprovar seu pagamento através do uso de sua chave privada TXN.\nA chave privade TXN é uma chave única gerada automaticamente para cada transação que só pode ser acessada dentro da sua carteira DRGL.\nTanto pela GUI do DRGL-wallet (dentro da janela de detalhes da transação) ou pelo simplewallet da CLI do Dragonglass (usando o comando "get_tx_key").\n\nA versão do DRGL 'Oathkeeper' e superior são NECESSÁRIAS para ambos.\n\nEm caso de disputa, você deve fornecer ao mediador ou árbitro os seguintes dados:\n- A chave privada TXN\n- O hash da transação\n- o endereço público do destinatário\n\nA verificação do pagamento pode ser feita usando os dados acima como inputs em (http://drgl.info/#check_txn).\n\nA falha em fornecer os dados acima, ou se você usou uma carteira incompatível, resultará na perda disputa. O remetente da Dragonglass é responsável por fornecer a verificação da transferência do DRGL para o mediador ou árbitro em caso de disputa. O uso de PaymentID não é obrigatório.\n\nSe você não tiver certeza sobre qualquer parte deste processo, visite Dragonglass on Discord (http://discord.drgl.info) para obter ajuda. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=Ao usar o Zcash você só pode usar os endereços transparentes (começando com t), e não os endereços z (privados), porque o mediador ou árbitro não seria capaz de verificar a transação com endereços z. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=Ao usar a Zcoin, você só pode usar os endereços transparentes (rastreáveis) e não os endereços não rastreáveis, porque o mediador ou árbitro não seria capaz de verificar a transação com endereços não rastreáveis num explorador de blocos. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN requer um processo interativo entre o remetente e o recipiente para criar a transação. Certifique-se de seguir as instruções da página web do projeto GRIN para enviar e receber de forma confiável o GRIN (o recipiente precisa estar online ou pelo menos estar online durante um determinado período de tempo).\n\nO Bisq suporta apenas o formato de URL da carteira Grinbox (Wallet713).\n\nO remetente GRIN é obrigado a fornecer prova de que eles enviaram GRIN com sucesso. Se a carteira não puder fornecer essa prova, uma disputa potencial será resolvida em favor do recipiente de GRIN. Por favor, certifique-se de usar o software Grinbox mais recente que suporta a prova da transação e que você entende o processo de transferência e receção do GRIN, bem como criar a prova.\n\nConsulte https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only para obter mais informações sobre a ferramenta de prova Grinbox. +account.altcoin.popup.grin.msg=GRIN requer um processo interativo entre o remetente e o recipiente para criar a transação. Certifique-se de seguir as instruções da página web do projeto GRIN para enviar e receber de forma confiável o GRIN (o recipiente precisa estar online ou pelo menos estar online durante um determinado período de tempo).\n\nO Haveno suporta apenas o formato de URL da carteira Grinbox (Wallet713).\n\nO remetente GRIN é obrigado a fornecer prova de que eles enviaram GRIN com sucesso. Se a carteira não puder fornecer essa prova, uma disputa potencial será resolvida em favor do recipiente de GRIN. Por favor, certifique-se de usar o software Grinbox mais recente que suporta a prova da transação e que você entende o processo de transferência e receção do GRIN, bem como criar a prova.\n\nConsulte https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only para obter mais informações sobre a ferramenta de prova Grinbox. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=O BEAM requer um processo interativo entre o remetente e o recipiente para criar a transação.\n\nCertifique-se de seguir as instruções da página Web do projeto BEAM para enviar e receber BEAM de forma confiável (o recipiente precisa estar online ou pelo menos estar online durante um determinado período de tempo).\n\nO remetente BEAM é obrigado a fornecer prova de que eles enviaram o BEAM com sucesso. Certifique-se de usar software de carteira que pode produzir tal prova. Se a carteira não puder fornecer a prova, uma disputa potencial será resolvida em favor do recipiente de BEAM. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=A negociação de ParsiCoin no Bisq exige que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar PARS você deve usar a versão oficial da Carteira ParsiCoin 3.0.0 ou superior.\n\nVocê pode verificar o Hash da Transação e a Chave da Transação na secção das Transações na sua carteira GUI (ParsiPay) Você precisa clicar com o lado direito na transação e, em seguida, clicar em mostrar detalhes.\n\nEm caso de arbitragem, você deve apresentar o seguinte para um mediador ou árbitro: 1) o Hash da Transação, 2) a Chave da Transação, e 3) endereço PARS do recipiente. O mediador ou árbitro irá então verificar a transferência PARS usando o Explorador de Blocos da ParsiCoin (http://explorer.parsicoin.net/#check_payment).\n\nFalha em fornecer as informações necessárias ao mediador ou árbitro resultará na perda do caso de disputa. Em todos os casos de disputa, o remetente da ParsiCoin carrega 100% da carga de responsabilidade em verificar as transações à um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Bisq. Primeiro procure ajuda no Discord da ParsiCoin (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=A negociação de ParsiCoin no Haveno exige que você entenda e cumpra os seguintes requerimentos:\n\nPara enviar PARS você deve usar a versão oficial da Carteira ParsiCoin 3.0.0 ou superior.\n\nVocê pode verificar o Hash da Transação e a Chave da Transação na secção das Transações na sua carteira GUI (ParsiPay) Você precisa clicar com o lado direito na transação e, em seguida, clicar em mostrar detalhes.\n\nEm caso de arbitragem, você deve apresentar o seguinte para um mediador ou árbitro: 1) o Hash da Transação, 2) a Chave da Transação, e 3) endereço PARS do recipiente. O mediador ou árbitro irá então verificar a transferência PARS usando o Explorador de Blocos da ParsiCoin (http://explorer.parsicoin.net/#check_payment).\n\nFalha em fornecer as informações necessárias ao mediador ou árbitro resultará na perda do caso de disputa. Em todos os casos de disputa, o remetente da ParsiCoin carrega 100% da carga de responsabilidade em verificar as transações à um mediador ou árbitro.\n\nSe você não entender esses requerimentos, não negocie no Haveno. Primeiro procure ajuda no Discord da ParsiCoin (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=Para negociar blackcoins queimados, você precisa saber o seguinte:\n\nBlackcoins queimados não podem ser gastos. Para os negociar no Bisq, os output scripts precisam estar na forma: OP_RETURN OP_PUSHDATA, seguido pelos data bytes que, após serem codificados em hex, constituem endereços. Por exemplo, blackcoins queimados com um endereço 666f6f (“foo” em UTF-8) terá o seguinte script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nPara criar blackcoins queimados, deve-se usar o comando RPC “burn” disponível em algumas carteiras.\n\nPara casos possíveis, confira https://ibo.laboratorium.ee .\n\nComo os blackcoins queimados não podem ser gastos, eles não podem voltar a ser vendidos. “Vender” blackcoins queimados significa queimar blackcoins comuns (com os dados associados iguais ao endereço de destino).\n\nEm caso de disputa, o vendedor de BLK precisa providenciar o hash da transação. +account.altcoin.popup.blk-burnt.msg=Para negociar blackcoins queimados, você precisa saber o seguinte:\n\nBlackcoins queimados não podem ser gastos. Para os negociar no Haveno, os output scripts precisam estar na forma: OP_RETURN OP_PUSHDATA, seguido pelos data bytes que, após serem codificados em hex, constituem endereços. Por exemplo, blackcoins queimados com um endereço 666f6f (“foo” em UTF-8) terá o seguinte script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nPara criar blackcoins queimados, deve-se usar o comando RPC “burn” disponível em algumas carteiras.\n\nPara casos possíveis, confira https://ibo.laboratorium.ee .\n\nComo os blackcoins queimados não podem ser gastos, eles não podem voltar a ser vendidos. “Vender” blackcoins queimados significa queimar blackcoins comuns (com os dados associados iguais ao endereço de destino).\n\nEm caso de disputa, o vendedor de BLK precisa providenciar o hash da transação. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=A negociação de L-BTC no Bisq exige que você entenda o seguinte:\n\nAo receber L-BTC para um negócio no Bisq, você não pode usar a aplicação móvel Blockstream Green Wallet ou uma carteira de custódia / exchange. Você só deve receber o L-BTC na carteira Liquid Elements Core ou em outra carteira L-BTC que permita obter a chave ofuscante para o seu endereço L-BTC cego.\n\nNo caso de ser necessária mediação, ou se surgir uma disputa de negócio, você deve divulgar a chave ofuscante do seu endereço L-BTC de recebimento ao mediador ou agente de reembolso Bisq, para que eles possam verificar os detalhes da sua Transação Confidencial no seu próprio Elements Core full node.\n\nO não fornecimento das informações necessárias ao mediador ou ao agente de reembolso resultará na perda do caso de disputa. Em todos os casos de disputa, o recipiente de L-BTC suporta 100% da responsabilidade ao fornecer prova criptográfica ao mediador ou ao agente de reembolso.\n\nSe você não entender esses requerimentos, não negocie o L-BTC no Bisq. +account.altcoin.popup.liquidbitcoin.msg=A negociação de L-BTC no Haveno exige que você entenda o seguinte:\n\nAo receber L-BTC para um negócio no Haveno, você não pode usar a aplicação móvel Blockstream Green Wallet ou uma carteira de custódia / exchange. Você só deve receber o L-BTC na carteira Liquid Elements Core ou em outra carteira L-BTC que permita obter a chave ofuscante para o seu endereço L-BTC cego.\n\nNo caso de ser necessária mediação, ou se surgir uma disputa de negócio, você deve divulgar a chave ofuscante do seu endereço L-BTC de recebimento ao mediador ou agente de reembolso Haveno, para que eles possam verificar os detalhes da sua Transação Confidencial no seu próprio Elements Core full node.\n\nO não fornecimento das informações necessárias ao mediador ou ao agente de reembolso resultará na perda do caso de disputa. Em todos os casos de disputa, o recipiente de L-BTC suporta 100% da responsabilidade ao fornecer prova criptográfica ao mediador ou ao agente de reembolso.\n\nSe você não entender esses requerimentos, não negocie o L-BTC no Haveno. account.fiat.yourFiatAccounts=A sua conta de moeda nacional @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=Você não definiu uma senha da carteira que proteger account.seed.warn.noPw.yes=Sim, e não me pergunte novamente account.seed.enterPw=Digite a senha para ver palavras-semente account.seed.restore.info=Por favor, faça um backup antes de aplicar a restauração a partir de palavras-semente. Esteja ciente de que a restauração da carteira é apenas para casos de emergência e pode causar problemas com a base de dados interna da carteira.\nNão é uma maneira de aplicar um backup! Por favor, use um backup do diretório de dados do programa para restaurar um estado anterior do programa.\n\nDepois de restaurar o programa será desligado automaticamente. Depois de ter reiniciado o programa, ele será ressincronizado com a rede Bitcoin. Isso pode demorar um pouco e consumir muito do CPU, especialmente se a carteira for mais antiga e tiver muitas transações. Por favor, evite interromper esse processo, caso contrário, você pode precisar excluir o ficheiro da corrente do SPV novamente ou repetir o processo de restauração. -account.seed.restore.ok=Ok, restaurar e desligar Bisq +account.seed.restore.ok=Ok, restaurar e desligar Haveno #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=Notificar se o preço de BTC está ab account.notifications.priceAlert.setButton=Definir alerta de preço account.notifications.priceAlert.removeButton=Remover alerta de preço account.notifications.trade.message.title=Estado do negócio mudou -account.notifications.trade.message.msg.conf=A transação do depósito para o negócio com o ID {0} está confirmada. Por favor, abra seu programa Bisq e inicie o pagamento. +account.notifications.trade.message.msg.conf=A transação do depósito para o negócio com o ID {0} está confirmada. Por favor, abra seu programa Haveno e inicie o pagamento. account.notifications.trade.message.msg.started=O comprador do BTC iniciou o pagamento para o negócio com o ID {0}. account.notifications.trade.message.msg.completed=O negócio com o ID {0} está completo. account.notifications.offer.message.title=A sua oferta foi aceite @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Tipo de oferta account.notifications.marketAlert.message.title=Alerta de oferta account.notifications.marketAlert.message.msg.below=abaixo de account.notifications.marketAlert.message.msg.above=acima de -account.notifications.marketAlert.message.msg=Uma nova ''{0} {1}'' com o preço de {2} ({3} {4} preço de mercado) e método de pagamento ''{5}'' foi publicada no livro de ofertas do Bisq.\nID da oferta: {6}. +account.notifications.marketAlert.message.msg=Uma nova ''{0} {1}'' com o preço de {2} ({3} {4} preço de mercado) e método de pagamento ''{5}'' foi publicada no livro de ofertas do Haveno.\nID da oferta: {6}. account.notifications.priceAlert.message.title=Alerta de preço para {0} account.notifications.priceAlert.message.msg=O teu alerta de preço foi desencadeado. O preço atual de {0} é de {1} {2} -account.notifications.noWebCamFound.warning=Nenhuma webcam foi encontrada.\n\nPor favor use a opção email para enviar o token e a chave de criptografia do seu telemóvel para o programa da Bisq. +account.notifications.noWebCamFound.warning=Nenhuma webcam foi encontrada.\n\nPor favor use a opção email para enviar o token e a chave de criptografia do seu telemóvel para o programa da Haveno. account.notifications.priceAlert.warning.highPriceTooLow=O preço mais alto deve ser maior que o preço mais baixo. account.notifications.priceAlert.warning.lowerPriceTooHigh=O preço mais baixo deve ser menor que o preço mais alto. @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=Verificando assinatura... displayUpdateDownloadWindow.button.label=Descarregar o instalador e verificar a assinatura displayUpdateDownloadWindow.button.downloadLater=Descarregar depois displayUpdateDownloadWindow.button.ignoreDownload=Ignorar esta versão -displayUpdateDownloadWindow.headline=Uma nova atualização do Bisq está disponível! +displayUpdateDownloadWindow.headline=Uma nova atualização do Haveno está disponível! displayUpdateDownloadWindow.download.failed.headline=Download falhou displayUpdateDownloadWindow.download.failed=Download failed.\nPlease download and verify manually at [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unable to determine the correct installer. Please download and verify manually at [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Close without any payout disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout? emptyWalletWindow.headline={0} ferramenta de emergência da carteira -emptyWalletWindow.info=Por favor, use isso apenas em caso de emergência, se você não puder aceder o seu fundo a partir da interface do utilizador.\n\nPor favor, note que todas as ofertas abertas serão fechadas automaticamente ao usar esta ferramenta.\n\nAntes de usar essa ferramenta, faça backup do seu diretório de dados. Você pode fazer isso em \"Conta/Backup\".\n\nPor favor comunique-nos o seu problema e envie um relatório de erros no Github ou no fórum Bisq para que possamos investigar o que causou o problema. +emptyWalletWindow.info=Por favor, use isso apenas em caso de emergência, se você não puder aceder o seu fundo a partir da interface do utilizador.\n\nPor favor, note que todas as ofertas abertas serão fechadas automaticamente ao usar esta ferramenta.\n\nAntes de usar essa ferramenta, faça backup do seu diretório de dados. Você pode fazer isso em \"Conta/Backup\".\n\nPor favor comunique-nos o seu problema e envie um relatório de erros no Github ou no fórum Haveno para que possamos investigar o que causou o problema. emptyWalletWindow.balance=O saldo disponível da sua carteira: emptyWalletWindow.address=Seu endereço de destino emptyWalletWindow.button=Enviar todos os fundos @@ -1451,7 +1451,7 @@ offerDetailsWindow.creationDate=Data de criação offerDetailsWindow.makersOnion=Endereço onion do ofertante qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Please use this QR code for funding your Bisq wallet from your external wallet. +qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet. qRCodeWindow.request=Pedido de pagamento:\n{0} selectDepositTxWindow.headline=Selecionar transação de depósito para disputa @@ -1560,7 +1560,7 @@ popup.headline.error=Erro popup.doNotShowAgain=Não mostrar novamente popup.reportError.log=Abrir ficheiro de log popup.reportError.gitHub=Relatar ao GitHub issue tracker -popup.reportError={0}\n\nPara nos ajudar a melhorar o software, por favor reporte este erro abrindo um novo issue em https://github.com/bisq-network/bisq/issues.\nA mensagem de erro acima será copiada para a área de transferência quando você clicar num dos botões abaixo.\nSerá mais fácil fazer a depuração se você incluir o ficheiro bisq.log clicando "Abrir arquivo de log", salvando uma cópia e anexando-a ao seu relatório de erros. +popup.reportError={0}\n\nPara nos ajudar a melhorar o software, por favor reporte este erro abrindo um novo issue em https://github.com/bisq-network/bisq/issues.\nA mensagem de erro acima será copiada para a área de transferência quando você clicar num dos botões abaixo.\nSerá mais fácil fazer a depuração se você incluir o ficheiro haveno.log clicando "Abrir arquivo de log", salvando uma cópia e anexando-a ao seu relatório de erros. popup.error.tryRestart=Por favor tente reiniciar o programa e verifique a sua conexão de Internet para ver se pode resolver o problema. popup.error.takeOfferRequestFailed=Ocorreu um erro quando alguém tentou aceitar uma das suas ofertas:\n{0} @@ -1571,10 +1571,10 @@ error.closedTradeWithUnconfirmedDepositTx=A transação de depósito do negócio error.closedTradeWithNoDepositTx=A transação de depósito do negócio fechado com o ID de negócio {0} é null.\n\nPor favor reinicie o programa para limpar a lista de negócios fechados. popup.warning.walletNotInitialized=A carteira ainda não foi inicializada -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. -popup.warning.wrongVersion=Você provavelmente tem a versão errada do Bisq para este computador.\nA arquitetura do seu computador é: {0}.\nO binário Bisq que você instalou é: {1}.\nPor favor, desligue e reinstale a versão correta ({2}). -popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. -popup.warning.startupFailed.twoInstances=Bisq já está em execução. Você não pode executar duas instâncias do Bisq. +popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\nHaveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. +popup.warning.wrongVersion=Você provavelmente tem a versão errada do Haveno para este computador.\nA arquitetura do seu computador é: {0}.\nO binário Haveno que você instalou é: {1}.\nPor favor, desligue e reinstale a versão correta ({2}). +popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Haveno installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. +popup.warning.startupFailed.twoInstances=Haveno já está em execução. Você não pode executar duas instâncias do Haveno. popup.warning.tradePeriod.halfReached=Sua negociação com o ID {0} atingiu a metade do valor máx. do período de negociação permitido e ainda não está concluído.\n\nO período de negócio termina em {1}\n\nPor favor, verifique o seu estado de negócio em \"Portefólio/Ofertas abertas\" para mais informações. popup.warning.tradePeriod.ended=O seu negócio com o ID {0} atingiu o limite do máx. período de negociação permitido e não está concluído.\n\nO período de negócio terminou em {1}\n\nPor favor, verifique o seu negócio em \"Portefólio/Negócios abertos\" para entrar em contacto com o mediador. popup.warning.noTradingAccountSetup.headline=Você ainda não configurou uma conta de negociação @@ -1584,7 +1584,7 @@ popup.warning.noMediatorsAvailable=Não há mediadores disponíveis. popup.warning.notFullyConnected=Você precisa esperar até estar totalmente conectado à rede.\nIsso pode levar cerca de 2 minutos na inicialização. popup.warning.notSufficientConnectionsToBtcNetwork=Você precisa esperar até que você tenha pelo menos {0} conexões com a rede Bitcoin. popup.warning.downloadNotComplete=Você precisa esperar até que o download dos blocos de Bitcoin ausentes esteja completo. -popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=The Haveno wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Tem certeza de que deseja remover essa oferta?\nA taxa de ofertante de {0} será perdida se você remover essa oferta. popup.warning.tooLargePercentageValue=Você não pode definir uma percentagem superior à 100%. popup.warning.examplePercentageValue=Por favor digitar um número percentual como \"5.4\" para 5.4% @@ -1602,32 +1602,32 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. # suppress inspection "UnusedProperty" popup.warning.priceRelay=transmissão de preço popup.warning.seed=semente -popup.warning.mandatoryUpdate.trading=Por favor, atualize para a versão mais recente do Bisq. Uma atualização obrigatória que desativa negociação para versões antigas foi lançada. Por favor, confira o Fórum Bisq para mais informações. -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=Por favor, atualize para a versão mais recente do Haveno. Uma atualização obrigatória que desativa negociação para versões antigas foi lançada. Por favor, confira o Fórum Haveno para mais informações. +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=Esta transação não é possível, pois as taxas de mineração de {0} excederia o montante a transferir de {1}. Aguarde até que as taxas de mineração estejam novamente baixas ou até você ter acumulado mais BTC para transferir. -popup.warning.openOffer.makerFeeTxRejected=A transação da taxa de ofertante para a oferta com o ID {0} foi rejeitada pela rede do Bitcoin.\nID da transação={1}.\nA oferta foi removida para evitar futuros problemas.\nPor favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\nPara mais ajuda por favor contacte o canal de apoio do Bisq na equipa Keybase do Bisq. +popup.warning.openOffer.makerFeeTxRejected=A transação da taxa de ofertante para a oferta com o ID {0} foi rejeitada pela rede do Bitcoin.\nID da transação={1}.\nA oferta foi removida para evitar futuros problemas.\nPor favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\nPara mais ajuda por favor contacte o canal de apoio do Haveno na equipa Keybase do Haveno. popup.warning.trade.txRejected.tradeFee=taxa de negócio popup.warning.trade.txRejected.deposit=depósito -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=A transação de taxa de ofertante para a oferta com o ID {0} é inválida\nID da transação={1}.\nPor favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\nPara mais ajuda por favor contacte o canal de apoio do Bisq na equipa Keybase do Bisq. +popup.warning.openOfferWithInvalidMakerFeeTx=A transação de taxa de ofertante para a oferta com o ID {0} é inválida\nID da transação={1}.\nPor favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\nPara mais ajuda por favor contacte o canal de apoio do Haveno na equipa Keybase do Haveno. -popup.info.securityDepositInfo=Para garantir que ambos os negociadores seguem o protocolo de negócio, ambos os negociadores precisam pagar um depósito de segurança.\n\nEsse depósito é mantido na sua carteira de negócio até que o seu negócio seja concluído com sucesso, e então lhe será reembolsado.\n\nPor favor note: se você está criando uma nova oferta, o Bisq precisa estar em execução para que um outro negociador a aceite. Para manter suas ofertas online, mantenha o Bisq em execução e certifique-se de que este computador permaneça online também (ou seja, certifique-se de que ele não alterne para o modo de espera... o modo de espera do monitor não causa problema). +popup.info.securityDepositInfo=Para garantir que ambos os negociadores seguem o protocolo de negócio, ambos os negociadores precisam pagar um depósito de segurança.\n\nEsse depósito é mantido na sua carteira de negócio até que o seu negócio seja concluído com sucesso, e então lhe será reembolsado.\n\nPor favor note: se você está criando uma nova oferta, o Haveno precisa estar em execução para que um outro negociador a aceite. Para manter suas ofertas online, mantenha o Haveno em execução e certifique-se de que este computador permaneça online também (ou seja, certifique-se de que ele não alterne para o modo de espera... o modo de espera do monitor não causa problema). popup.info.cashDepositInfo=Por favor, certifique-se de que você tem uma agência bancária na sua área para poder fazer o depósito em dinheiro.\nO ID do banco (BIC/SWIFT) do vendedor é: {0}. popup.info.cashDepositInfo.confirm=Eu confirmo que eu posso fazer o depósito -popup.info.shutDownWithOpenOffers=Bisq está sendo fechado, mas há ofertas abertas. \n\nEstas ofertas não estarão disponíveis na rede P2P enquanto o Bisq estiver desligado, mas elas serão publicadas novamente na rede P2P na próxima vez que você iniciar o Bisq.\n\nPara manter suas ofertas on-line, mantenha o Bisq em execução e certifique-se de que este computador também permaneça online (ou seja, certifique-se de que ele não entra no modo de espera... o modo de espera do monitor não causa problema). -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\nPlease make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.info.shutDownWithOpenOffers=Haveno está sendo fechado, mas há ofertas abertas. \n\nEstas ofertas não estarão disponíveis na rede P2P enquanto o Haveno estiver desligado, mas elas serão publicadas novamente na rede P2P na próxima vez que você iniciar o Haveno.\n\nPara manter suas ofertas on-line, mantenha o Haveno em execução e certifique-se de que este computador também permaneça online (ou seja, certifique-se de que ele não entra no modo de espera... o modo de espera do monitor não causa problema). +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\nPlease make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.privateNotification.headline=Notificação privada importante! popup.securityRecommendation.headline=Recomendação de segurança importante popup.securityRecommendation.msg=Gostaríamos de lembrá-lo de considerar a possibilidade de usar a proteção por senha para sua carteira, caso você ainda não tenha ativado isso.\n\nTambém é altamente recomendável anotar as palavras-semente da carteira. Essas palavras-semente são como uma senha mestre para recuperar sua carteira Bitcoin.\nNa secção \"Semente da Carteira\", você encontrará mais informações.\n\nAlém disso, você deve fazer o backup da pasta completa de dados do programa na secção \"Backup\". -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=Desligando popup.shutDownInProgress.msg=Desligar o programa pode demorar alguns segundos.\nPor favor não interrompa este processo. @@ -1690,7 +1690,7 @@ notification.walletUpdate.headline=Atualização da carteira de negociação notification.walletUpdate.msg=A sua carteira está suficientemente financiada.\nQuantia: {0} notification.takeOffer.walletUpdate.msg=A sua carteira de negociação já estava suficientemente financiada por uma tentativa de aceitação de oferta anterior.\nQuantia: {0} notification.tradeCompleted.headline=Negócio concluído -notification.tradeCompleted.msg=Você pode levantar seus fundos agora para sua carteira Bitcoin externa ou transferi-la para a carteira Bisq. +notification.tradeCompleted.msg=Você pode levantar seus fundos agora para sua carteira Bitcoin externa ou transferi-la para a carteira Haveno. #################################################################### @@ -1699,9 +1699,9 @@ notification.tradeCompleted.msg=Você pode levantar seus fundos agora para sua c systemTray.show=Mostrar janela do programa systemTray.hide=Esconder janela do programa -systemTray.info=Informação sobre Bisq +systemTray.info=Informação sobre Haveno systemTray.exit=Sair -systemTray.tooltip=Bisq: Uma rede de echange de bitcoin descentralizada +systemTray.tooltip=Haveno: Uma rede de echange de bitcoin descentralizada #################################################################### @@ -1843,7 +1843,7 @@ password.deriveKey=Derivar chave a partir da senha password.walletDecrypted=A carteira foi descriptografada com sucesso e a proteção por senha removida. password.wrongPw=Você digitou a senha errada.\n\nPor favor, tente digitar sua senha novamente, verificando com atenção se há erros de ortografia. password.walletEncrypted=Carteira encriptada com sucesso e proteção por senha ativada. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=As 2 senhas inseridas não são iguais. password.forgotPassword=Esqueceu a senha? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\nIt is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! @@ -1861,7 +1861,7 @@ seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\nYou must empty seed.warn.walletNotEmpty.restore=Eu desejo restaurar de qualquer forma seed.warn.walletNotEmpty.emptyWallet=Eu esvaziarei as carteiras primeiro seed.warn.notEncryptedAnymore=Suas carteiras são encriptadas.\n\nApós a restauração, as carteiras não serão mais encriptadas e você deverá definir uma nova senha.\n\nVocê quer continuar? -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? seed.restore.success=Carteiras restauradas com sucesso com as novas palavras-semente.\n\nVocê precisa desligar e reiniciar o programa. seed.restore.error=Um erro ocorreu ao restaurar as carteiras com palavras-semente.{0} seed.restore.openOffers.warn=You have open offers which will be removed if you restore from seed words.\nAre you sure that you want to continue? @@ -1947,17 +1947,17 @@ payment.accountType=Tipo de conta payment.checking=Conta Corrente payment.savings=Poupança payment.personalId=ID pessoal -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. -payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Bisq to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Haveno account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Haveno. +payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Haveno to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=Ao usar o HalCash, o comprador de BTC precisa enviar ao vendedor de BTC o código HalCash através de uma mensagem de texto do seu telemóvel.\n\nPor favor, certifique-se de não exceder a quantia máxima que seu banco lhe permite enviar com o HalCash. A quantia mín. de levantamento é de 10 euros e a quantia máx. é de 600 EUR. Para levantamentos repetidos é de 3000 euros por recipiente por dia e 6000 euros por recipiente por mês. Por favor confirme esses limites com seu banco para ter certeza de que eles usam os mesmos limites mencionados aqui.\n\nA quantia de levantamento deve ser um múltiplo de 10 euros, pois você não pode levantar outras quantias de uma ATM. A interface do utilizador no ecrã para criar oferta e aceitar ofertas ajustará a quantia de BTC para que a quantia de EUR esteja correta. Você não pode usar o preço com base no mercado, pois o valor do EUR estaria mudando com a variação dos preços.\n\nEm caso de disputa, o comprador de BTC precisa fornecer a prova de que enviou o EUR. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Bisq sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Por favor, confirme que seu banco permite-lhe enviar depósitos em dinheiro para contas de outras pessoas. Por exemplo, o Bank of America e o Wells Fargo não permitem mais esses depósitos. @@ -1969,9 +1969,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=Informação de contacto payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1994,7 +1994,7 @@ payment.japan.recipient=Nome payment.australia.payid=PayID payment.payid=PayID linked to financial institution. Like email address or mobile phone. payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 795697cd..82fd9ce5 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -103,14 +103,14 @@ shared.faq=Visit FAQ page shared.yesCancel=Да, отменить shared.nextStep=Далее shared.selectTradingAccount=Выбрать торговый счёт -shared.fundFromSavingsWalletButton=Перевести средства с кошелька Bisq +shared.fundFromSavingsWalletButton=Перевести средства с кошелька Haveno shared.fundFromExternalWalletButton=Открыть внешний кошелёк для пополнения shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed? shared.belowInPercent=% ниже рыночного курса shared.aboveInPercent=% выше рыночного курса shared.enterPercentageValue=Ввести величину в % shared.OR=ИЛИ -shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds. +shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. shared.waitingForFunds=Ожидание средств... shared.TheBTCBuyer=Покупатель ВТС shared.You=Вы @@ -125,7 +125,7 @@ shared.notUsedYet=Ещё не использовано shared.date=Дата shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n +shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Скопировать в буфер shared.language=Язык shared.country=Страна @@ -235,8 +235,8 @@ mainView.menu.settings=Настройки mainView.menu.account=Счёт mainView.marketPriceWithProvider.label=Рыночный курс {0} -mainView.marketPrice.bisqInternalPrice=Курс последней сделки в Bisq -mainView.marketPrice.tooltip.bisqInternalPrice=Нет данных от источника рыночного курса.\nПредоставлен курс последней сделки в Bisq для этой валютной пары. +mainView.marketPrice.havenoInternalPrice=Курс последней сделки в Haveno +mainView.marketPrice.tooltip.havenoInternalPrice=Нет данных от источника рыночного курса.\nПредоставлен курс последней сделки в Haveno для этой валютной пары. mainView.marketPrice.tooltip=Рыночный курс предоставлен {0}{1}\nОбновление: {2}\nURL источника данных: {3} mainView.balance.available=Доступный баланс mainView.balance.reserved=Выделено на предложения @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Подключение к mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1} +mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Подключение к сети Tor... mainView.bootstrapState.torNodeCreated=(2/4) Создан узел Tor @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Исходные данные mainView.bootstrapWarning.noSeedNodesAvailable=Нет доступных исходных узлов mainView.bootstrapWarning.noNodesAvailable=Нет доступных исходных узлов и пиров -mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Bisq network failed +mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Haveno network failed mainView.p2pNetworkWarnMsg.noNodesAvailable=Отсутствуют исходные узлы или постоянные пиры для запроса данных.\nПроверьте подключение к интернету или перезапустите приложение. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Bisq network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Haveno network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. mainView.walletServiceErrorMsg.timeout=Подключение к сети Биткойн не удалось из-за истечения времени ожидания. mainView.walletServiceErrorMsg.connectionError=Не удалось подключиться к сети Биткойн из-за ошибки: {0} @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount offerbook.warning.wrongTradeProtocol=Это предложение требует другой версии протокола, чем та, что используется в вашей версии приложения.\n\nПроверьте, установлена ли у вас новейшая версия приложения. Если да, то пользователь, создавший предложение, использовал старую версию.\n\nПри использовании несовместимой версии торгового протокола торговля невозможна. offerbook.warning.userIgnored=Onion-адрес данного пользователя добавлен в чёрный список. -offerbook.warning.offerBlocked=Это предложение заблокировано разработчиками Bisq.\nВероятно, принятие этого предложения вызывает необрабатываемую ошибку. -offerbook.warning.currencyBanned=Валюта, используемая в этом предложении, заблокирована разработчиками Bisq.\nПодробности можно узнать на форуме Bisq. -offerbook.warning.paymentMethodBanned=Метод платежа, использованный в этом предложении, заблокирован разработчиками Bisq.\nПодробности можно узнать на форуме Bisq. -offerbook.warning.nodeBlocked=Onion-адрес этого трейдера заблокирован разработчиками Bisq.\nВероятно, принятие предложения от данного трейдера вызывает необрабатываемую ошибку. -offerbook.warning.requireUpdateToNewVersion=Your version of Bisq is not compatible for trading anymore.\nPlease update to the latest Bisq version at [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Это предложение заблокировано разработчиками Haveno.\nВероятно, принятие этого предложения вызывает необрабатываемую ошибку. +offerbook.warning.currencyBanned=Валюта, используемая в этом предложении, заблокирована разработчиками Haveno.\nПодробности можно узнать на форуме Haveno. +offerbook.warning.paymentMethodBanned=Метод платежа, использованный в этом предложении, заблокирован разработчиками Haveno.\nПодробности можно узнать на форуме Haveno. +offerbook.warning.nodeBlocked=Onion-адрес этого трейдера заблокирован разработчиками Haveno.\nВероятно, принятие предложения от данного трейдера вызывает необрабатываемую ошибку. +offerbook.warning.requireUpdateToNewVersion=Your version of Haveno is not compatible for trading anymore.\nPlease update to the latest Haveno version at [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. It could be that your previous take-offer attempt resulted in a failed trade. offerbook.info.sellAtMarketPrice=Продажа по рыночному курсу (обновляется ежеминутно). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Обеспечить своё предложение createOffer.fundsBox.offerFee=Комиссия за сделку createOffer.fundsBox.networkFee=Комиссия майнера createOffer.fundsBox.placeOfferSpinnerInfo=Публикация предложения... -createOffer.fundsBox.paymentLabel=Сделка Bisq с идентификатором {0} +createOffer.fundsBox.paymentLabel=Сделка Haveno с идентификатором {0} createOffer.fundsBox.fundsStructure=({0} — залог, {1} — комиссия за сделку, {2} — комиссия майнера) createOffer.success.headline=Ваше предложение опубликовано createOffer.success.info=Вы можете управлять текущими предложениями в разделе \«Сделки/Мои текущие предложения\». @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Проверка: разместить предло createOffer.createOfferFundWalletInfo.headline=Обеспечить своё предложение # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Сумма сделки: {0} \n -createOffer.createOfferFundWalletInfo.msg=Вы должны внести {0} для обеспечения этого предложения.\n\nЭти средства будут зарезервированы в вашем локальном кошельке, а когда кто-то примет ваше предложение — заблокированы на депозитном multisig-адресе.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3},\n- комиссии майнера: {4}.\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Bisq (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна. +createOffer.createOfferFundWalletInfo.msg=Вы должны внести {0} для обеспечения этого предложения.\n\nЭти средства будут зарезервированы в вашем локальном кошельке, а когда кто-то примет ваше предложение — заблокированы на депозитном multisig-адресе.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3},\n- комиссии майнера: {4}.\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Haveno (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Ошибка при создании предложения:\n\n{0}\n\nВаши средства остались в кошельке.\nПерезагрузите приложение и проверьте сетевое соединение. createOffer.setAmountPrice=Указать сумму и курс -createOffer.warnCancelOffer=Вы уже обеспечили это предложение.\nВ случае его отмены ваши средства переместятся в ваш локальный кошелёк Bisq и будут доступны для вывода в разделе \«Средства/Отправить средства\».\nОтменить? +createOffer.warnCancelOffer=Вы уже обеспечили это предложение.\nВ случае его отмены ваши средства переместятся в ваш локальный кошелёк Haveno и будут доступны для вывода в разделе \«Средства/Отправить средства\».\nОтменить? createOffer.timeoutAtPublishing=Время для публикации предложения истекло. createOffer.errorInfo=\n\nКомиссия мейкера уже оплачена. В худшем случае вы её потеряете.\nПерезагрузите приложение и проверьте сетевое соединение, чтобы попытаться устранить проблему. createOffer.tooLowSecDeposit.warning=Установленная сумма залога ниже рекомендуемой по умолчанию ({0}).\nИспользовать более низкую сумму залога? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Сумма для продажи takeOffer.fundsBox.offerFee=Комиссия за сделку takeOffer.fundsBox.networkFee=Oбщая комиссия майнера takeOffer.fundsBox.takeOfferSpinnerInfo=Принятие предложения... -takeOffer.fundsBox.paymentLabel=Сделка в Bisq с идентификатором {0} +takeOffer.fundsBox.paymentLabel=Сделка в Haveno с идентификатором {0} takeOffer.fundsBox.fundsStructure=({0} — залог, {1} — комиссия за сделку, {2} — комиссия майнера) takeOffer.success.headline=Вы успешно приняли предложение. takeOffer.success.info=Статус вашей сделки отображается в разделе \«Папка/Текущие сделки\». @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=Нельзя принять это предлож takeOffer.takeOfferFundWalletInfo.headline=Обеспечьте свою сделку # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Сумма сделки: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Вы должны внести {0} для принятия этого предложения.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3},\n- общей комиссии майнера: {4}.\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Bisq (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна. +takeOffer.takeOfferFundWalletInfo.msg=Вы должны внести {0} для принятия этого предложения.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3},\n- общей комиссии майнера: {4}.\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Haveno (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна. takeOffer.alreadyPaidInFunds=Если вы уже внесли средства, их можно вывести в разделе \«Средства/Отправить средства\». takeOffer.paymentInfo=Информация о платеже takeOffer.setAmountPrice=Задайте сумму -takeOffer.alreadyFunded.askCancel=Вы уже обеспечили это предложение.\nВ случае его отмены ваши средства переместятся в ваш локальный кошелёк Bisq и будут доступны для вывода в разделе \«Средства/Отправить средства\».\nОтменить? +takeOffer.alreadyFunded.askCancel=Вы уже обеспечили это предложение.\nВ случае его отмены ваши средства переместятся в ваш локальный кошелёк Haveno и будут доступны для вывода в разделе \«Средства/Отправить средства\».\nОтменить? takeOffer.failed.offerNotAvailable=Запрос принять предложение отменён, так как предложение больше недоступно. Возможно, его уже принял другой трейдер. takeOffer.failed.offerTaken=Невозможно принять это предложение, так как его уже принял другой трейдер. takeOffer.failed.offerRemoved=Невозможно принять это предложение, так как оно уже удалено. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Подтвердите: изменить предложе editOffer.publishOffer=Публикация вашего предложения. editOffer.failed=Не удалось изменить предложение:\n{0} editOffer.success=Ваше предложение успешно отредактировано. -editOffer.invalidDeposit=Сумма залога покупателя не регулируется ДАО Bisq и больше не подлежит изменению. +editOffer.invalidDeposit=Сумма залога покупателя не регулируется ДАО Haveno и больше не подлежит изменению. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=The deposit transaction is still not conf # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=ВАЖНОЕ ТРЕБОВАНИ # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Отправьте {0} \«Почтовым денежным переводом США\» продавцу BTC.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Отправить M portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Вам необходимо отправить по электронной почте продавцу BTC контрольный номер MTCN и фотографию квитанции.\nВ квитанции должно быть четко указано полное имя продавца, город, страна и сумма. Адрес электронной почты продавца: {0}. \n\nВы отправили MTCN и контракт продавцу? portfolio.pending.step2_buyer.halCashInfo.headline=Отправить код HalCash portfolio.pending.step2_buyer.halCashInfo.msg=Вам необходимо отправить сообщение с кодом HalCash и идентификатором сделки ({0}) продавцу BTC.\nНомер моб. тел. продавца: {1}\n\nВы отправили код продавцу? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Bisq clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Haveno clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). portfolio.pending.step2_buyer.confirmStart.headline=Подтвердите начало платежа portfolio.pending.step2_buyer.confirmStart.msg=Вы начали платеж {0} своему контрагенту? portfolio.pending.step2_buyer.confirmStart.yes=Да portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Bisq requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway portfolio.pending.step2_seller.waitPayment.headline=Ожидайте платеж @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=Покупатель BTC все еще не portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started their payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the mediator for assistance. tradeChat.chatWindowTitle=Chat window for trade with ID ''{0}'' tradeChat.openChat=Open chat window -tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Bisq (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. +tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Haveno (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Неопределено @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=Сумма возмещённого за portfolio.pending.step5_buyer.withdrawBTC=Вывести биткойны portfolio.pending.step5_buyer.amount=Сумма для вывода portfolio.pending.step5_buyer.withdrawToAddress=Вывести на адрес -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToHavenoWallet=Keep funds in Haveno wallet portfolio.pending.step5_buyer.withdrawExternal=Вывести на внешний кошелёк portfolio.pending.step5_buyer.alreadyWithdrawn=Ваши средства уже сняты.\nПросмотрите журнал транзакций. portfolio.pending.step5_buyer.confirmWithdrawal=Подтвердите запрос на вывод @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=Вы получили tradeFeedbackWindow.title=Поздравляем с завершением сделки! tradeFeedbackWindow.msg.part1=Мы были бы рады услышать ваши отзывы. Они помогут нам улучшить приложение и исправить любые ошибки. Если вы хотите оставить отзыв, заполните эту небольшую форму (регистрация не требуется): -tradeFeedbackWindow.msg.part2=Если у вас возникли вопросы или сложности, свяжитесь с другими пользователями и разработчиками приложения на форуме Bisq: -tradeFeedbackWindow.msg.part3=Спасибо, что пользуетесь Bisq! +tradeFeedbackWindow.msg.part2=Если у вас возникли вопросы или сложности, свяжитесь с другими пользователями и разработчиками приложения на форуме Haveno: +tradeFeedbackWindow.msg.part3=Спасибо, что пользуетесь Haveno! portfolio.pending.role=Моя роль portfolio.pending.tradeInformation=Информация о сделке @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=Начало отсчета срока сде portfolio.pending.tradePeriodWarning=При превышении срока оба трейдера могут начать спор. portfolio.pending.tradeNotCompleted=Сделка не завершена вовремя (до {0}) portfolio.pending.tradeProcess=Процесс сделки -portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Bisq forum at [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Haveno forum at [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Начать спор заново portfolio.pending.openSupportTicket.headline=Обратиться за поддержкой portfolio.pending.openSupportTicket.msg=Please use this function only in emergency cases if you don't see a \"Open support\" or \"Open dispute\" button.\n\nWhen you open a support ticket the trade will be interrupted and handled by a mediator or arbitrator. portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute. -portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the trade to failed trades. portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the trade to failed trades. -portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.support.headline.getHelp=Need help? -portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Bisq community at https://bisq.community. If your issue still isn't resolved, you can request more help from a mediator. +portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Haveno community at https://haveno.community. If your issue still isn't resolved, you can request more help from a mediator. portfolio.pending.support.button.getHelp=Open Trader Chat portfolio.pending.support.headline.halfPeriodOver=Check payment portfolio.pending.support.headline.periodOver=Время сделки истекло @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee trans portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\nWithout this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. You can make a request to be reimbursed the trade fee here: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nFeel free to move this trade to failed trades. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, but funds have been locked in the deposit transaction.\n\nPlease do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. The mediator should suggest that both peers each get back the the full amount of their security deposits (with seller receiving full trade amount back as well). This way, there is no security risk, and only trade fees are lost. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing but funds have been locked in the deposit transaction.\n\nIf the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\nIf the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of their security deposits (with seller receiving full trade amount back as well). Otherwise the trade amount should go to the buyer. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Bisq mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Haveno mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\nThe trade cannot be completed and you might have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\nDo you want to move the trade to failed trades?\n\nYou cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open trades screen any time. @@ -828,7 +828,7 @@ funds.tab.transactions=Транзакции funds.deposit.unused=Не использован funds.deposit.usedInTx=Использован в {0} транзакциях -funds.deposit.fundHavenoWallet=Пополнить кошелёк Bisq +funds.deposit.fundHavenoWallet=Пополнить кошелёк Haveno funds.deposit.noAddresses=Адреса для перевода средств ещё не созданы funds.deposit.fundWallet=Пополнить кошелёк funds.deposit.withdrawFromWallet=Отправить средства из кошелька @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=Выведено из кошелька funds.tx.memo=Memo funds.tx.noTxAvailable=Транзакции отсутствуют funds.tx.revert=Отменить -funds.tx.txSent=Транзакция успешно отправлена на новый адрес локального кошелька Bisq. +funds.tx.txSent=Транзакция успешно отправлена на новый адрес локального кошелька Haveno. funds.tx.direction.self=Транзакция внутри кошелька funds.tx.dustAttackTx=Полученная «пыль» -funds.tx.dustAttackTx.popup=Вы получили очень маленькую сумму BTC, что может являться попыткой компаний, занимающихся анализом блокчейна, проследить за вашим кошельком.\n\nЕсли вы воспользуетесь этими средствами для совершения исходящей транзакции, они смогут узнать, что вы также являетесь вероятным владельцем другого адреса (т. н. «объединение монет»).\n\nДля защиты вашей конфиденциальности кошелёк Bisq игнорирует такую «пыль» при совершении исходящих транзакций и отображении баланса. Вы можете самостоятельно установить сумму, которая будет рассматриваться в качестве «пыли» в настройках. +funds.tx.dustAttackTx.popup=Вы получили очень маленькую сумму BTC, что может являться попыткой компаний, занимающихся анализом блокчейна, проследить за вашим кошельком.\n\nЕсли вы воспользуетесь этими средствами для совершения исходящей транзакции, они смогут узнать, что вы также являетесь вероятным владельцем другого адреса (т. н. «объединение монет»).\n\nДля защиты вашей конфиденциальности кошелёк Haveno игнорирует такую «пыль» при совершении исходящих транзакций и отображении баланса. Вы можете самостоятельно установить сумму, которая будет рассматриваться в качестве «пыли» в настройках. #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=Отправка сообщения... support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox. support.sendMessageError=Сбой отправки сообщения. Ошибка: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=Предложение, по которому открыт этот спор, было создано в устаревшей версии Bisq.\nНевозможно закрыть спор с помощью текущей версии приложения.\n\nВоспользуйтесь старой версией протокола: {0} +support.wrongVersion=Предложение, по которому открыт этот спор, было создано в устаревшей версии Haveno.\nНевозможно закрыть спор с помощью текущей версии приложения.\n\nВоспользуйтесь старой версией протокола: {0} support.openFile=Открыть файл для отправки (макс. размер файла: {0} Кб) support.attachmentTooLarge=Общий объём вложенных файлов составляет {0} Кб, что превышает максимально допустимый размер сообщения ({1} Кб). support.maxSize=Максимально допустимый объём файла: {0} Кб. @@ -953,15 +953,15 @@ support.sellerMaker=Продавец ВТС/мейкер support.buyerTaker=Покупатель ВТС/тейкер support.sellerTaker=Продавец BTC/тейкер -support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.backgroundInfo=Haveno is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Haveno DAO. +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Haveno are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Системное сообщение: {0} -support.youOpenedTicket=Вы запросили поддержку.\n\n{0}\n\nВерсия Bisq: {1} -support.youOpenedDispute=Вы начали спор.\n\n{0}\n\nВерсия Bisq: {1} -support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nBisq version: {1} -support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nBisq version: {1} +support.youOpenedTicket=Вы запросили поддержку.\n\n{0}\n\nВерсия Haveno: {1} +support.youOpenedDispute=Вы начали спор.\n\n{0}\n\nВерсия Haveno: {1} +support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nHaveno version: {1} support.mediatorsDisputeSummary=System message: Mediator''s dispute summary:\n{0} support.mediatorsAddress=Mediator''s node address: {0} support.warning.disputesWithInvalidDonationAddress=The delayed payout transaction has used an invalid receiver address. It does not match any of the DAO parameter values for the valid donation addresses.\n\nThis might be a scam attempt. Please inform the developers about that incident and do not close that case before the situation is resolved!\n\nAddress used in the dispute: {0}\n\nAll DAO param donation addresses: {1}\n\nTrade ID: {2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaction URL settings.preferences.editCustomExplorer.addressUrl=Address URL settings.net.btcHeader=Сеть Биткойн -settings.net.p2pHeader=Bisq network +settings.net.p2pHeader=Haveno network settings.net.onionAddressLabel=Мой onion-адрес settings.net.btcNodesLabel=Использовать особые узлы Bitcoin Core settings.net.bitcoinPeersLabel=Подключенные пиры @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=Узлы Bitcoin Core для подключени settings.net.useProvidedNodesRadio=Использовать предоставленные узлы Bitcoin Core settings.net.usePublicNodesRadio=Использовать общедоступную сеть Bitcoin settings.net.useCustomNodesRadio=Использовать особые узлы Bitcoin Core -settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? +settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Haveno). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? settings.net.warn.usePublicNodes.useProvided=Нет, использовать предоставленные узлы settings.net.warn.usePublicNodes.usePublic=Да, использовать общедоступную сеть settings.net.warn.useCustomNodes.B2XWarning=Убедитесь, что ваш узел Биткойн является доверенным узлом Bitcoin Core! \n\nПодключение к узлам, не следующим правилам консенсуса Bitcoin Core, может повредить ваш кошелек и вызвать проблемы в процессе торговли.\n\nПользователи, подключающиеся к узлам, нарушающим правила консенсуса, несут ответственность за любой причиненный ущерб. Любые споры в таком случае будут решаться в пользу вашего контрагента. Пользователям, игнорирующим это предупреждение и механизмы защиты, техническая поддержка предоставляться не будет! settings.net.warn.invalidBtcConfig=Connection to the Bitcoin network failed because your configuration is invalid.\n\nYour configuration has been reset to use the provided Bitcoin nodes instead. You will need to restart the application. -settings.net.localhostBtcNodeInfo=Background information: Bisq looks for a local Bitcoin node when starting. If it is found, Bisq will communicate with the Bitcoin network exclusively through it. +settings.net.localhostBtcNodeInfo=Background information: Haveno looks for a local Bitcoin node when starting. If it is found, Haveno will communicate with the Bitcoin network exclusively through it. settings.net.p2PPeersLabel=Подключенные пиры settings.net.onionAddressColumn=Onion-адрес settings.net.creationDateColumn=Создано @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=Файл цепи SPV удален. Подождите. Повторная синхронизации с сетью может занять некоторое время. settings.net.reSyncSPVAfterRestartCompleted=Повторная синхронизация завершена. Перезагрузите приложение. settings.net.reSyncSPVFailed=Не удалось удалить файл цепи SPV.\nОшибка: {0} -setting.about.aboutBisq=О Bisq -setting.about.about=Bisq — это программа с открытым исходным кодом, предназначенная для обмена биткойна на национальные валюты (и другие криптовалюты) через децентрализованную Р2Р-сеть, обеспечивающая надежную защиту конфиденциальности. Узнайте больше о Bisq на веб-странице нашего проекта. -setting.about.web=Веб-страница Bisq +setting.about.aboutHaveno=О Haveno +setting.about.about=Haveno — это программа с открытым исходным кодом, предназначенная для обмена биткойна на национальные валюты (и другие криптовалюты) через децентрализованную Р2Р-сеть, обеспечивающая надежную защиту конфиденциальности. Узнайте больше о Haveno на веб-странице нашего проекта. +setting.about.web=Веб-страница Haveno setting.about.code=Исходный код setting.about.agpl=Лицензия AGPL -setting.about.support=Поддержать Bisq -setting.about.def=Bisq не является компанией, а представляет собой общественный проект, открытый для участия. Если вы хотите принять участие или поддержать Bisq, перейдите по ссылкам ниже. +setting.about.support=Поддержать Haveno +setting.about.def=Haveno не является компанией, а представляет собой общественный проект, открытый для участия. Если вы хотите принять участие или поддержать Haveno, перейдите по ссылкам ниже. setting.about.contribute=Помочь setting.about.providers=Источники данных -setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation. -setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices. +setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation. +setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices. setting.about.pricesProvided=Рыночный курс предоставлен setting.about.feeEstimation.label=Расчёт комиссии майнера предоставлен setting.about.versionDetails=Подробности версии @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' or ''alt + {0}'' or ''cmd setting.about.shortcuts.menuNav=Navigate main menu setting.about.shortcuts.menuNav.value=To navigate the main menu press: 'Ctrl' or 'alt' or 'cmd' with a numeric key between '1-9' -setting.about.shortcuts.close=Close Bisq +setting.about.shortcuts.close=Close Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' or ''cmd + {0}'' or ''Ctrl + {1}'' or ''cmd + {1}'' setting.about.shortcuts.closePopup=Close popup or dialog window @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Send private notification to pee setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0} setting.info.headline=New XMR auto-confirm Feature -setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Bisq uses explorer nodes run by Bisq contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t account.tab.mediatorRegistration=Mediator registration account.tab.refundAgentRegistration=Refund agent registration account.tab.signing=Signing -account.info.headline=Добро пожаловать в ваш счёт Bisq -account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). +account.info.headline=Добро пожаловать в ваш счёт Haveno +account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Haveno.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Haveno is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). account.menu.paymentAccount=Счета в нац. валюте account.menu.altCoinsAccountView=Альткойн-счета @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} registration account.arbitratorRegistration.revoke=Аннулировать account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as {0}. The max. allowed trade period is 8 days and the dispute process might take up to 7 days. account.arbitratorRegistration.warn.min1Language=Необходимо указать хотя бы 1 язык.\nМы добавили язык по умолчанию. -account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Bisq network. +account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Haveno network. account.arbitratorRegistration.removedFailed=Could not remove registration.{0} -account.arbitratorRegistration.registerSuccess=You have successfully registered to the Bisq network. +account.arbitratorRegistration.registerSuccess=You have successfully registered to the Haveno network. account.arbitratorRegistration.registerFailed=Could not complete registration.{0} account.altcoin.yourAltcoinAccounts=Ваши альткойн-счета account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (b) which don''t use compatible wallet software is risky: it can lead to loss of the traded funds!\nThe mediator or arbitrator is not a {2} specialist and cannot help in such cases. account.altcoin.popup.wallet.confirm=Я понимаю и подтверждаю, что знаю, какой кошелёк нужно использовать. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. +account.altcoin.popup.upx.msg=Trading UPX on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Trading ARQ on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. +account.altcoin.popup.arq.msg=Trading ARQ on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Trading XMR on Haveno requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Haveno now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Trading MSR on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Trading BLUR on Haveno requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Trading Solo on Bisq requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Trading Solo on Haveno requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Trading CASH2 on Bisq requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Trading CASH2 on Haveno requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. +account.altcoin.popup.drgl.msg=Trading Dragonglass on Haveno requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=When using Zcash you can only use the transparent addresses (starting with t), not the z-addresses (private), because the mediator or arbitrator would not be able to verify the transaction with z-addresses. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=When using Zcoin you can only use the transparent (traceable) addresses, not the untraceable addresses, because the mediator or arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=При создании транзакции в GRIN требуется взаимодействие в реальном времени между отправителем и получателем. Следуйте инструкциям на веб-сайте проекта GRIN, чтобы узнать, как отправлять и получать GRIN (получатель должен находиться в сети в момент отправки перевода или в течение определенного периода). \n\nBisq поддерживает кошельки только в формате Grinbox (Wallet713). \n\nОтправитель GRIN должен предоставить доказательство успешной отправки перевода. Если отправитель не сможет предоставить это доказательство, потенциальный спор будет решен в пользу получателя GRIN. Убедитесь, что используете последнюю версию Grinbox с поддержкой доказательства транзакций и что понимаете, как нужно отправлять и получать GRIN, а также как создавать доказательство перевода. \n\nЧтобы узнать подробности работы с инструментом доказательства транзакции в Grinbox, см. https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only. +account.altcoin.popup.grin.msg=При создании транзакции в GRIN требуется взаимодействие в реальном времени между отправителем и получателем. Следуйте инструкциям на веб-сайте проекта GRIN, чтобы узнать, как отправлять и получать GRIN (получатель должен находиться в сети в момент отправки перевода или в течение определенного периода). \n\nHaveno поддерживает кошельки только в формате Grinbox (Wallet713). \n\nОтправитель GRIN должен предоставить доказательство успешной отправки перевода. Если отправитель не сможет предоставить это доказательство, потенциальный спор будет решен в пользу получателя GRIN. Убедитесь, что используете последнюю версию Grinbox с поддержкой доказательства транзакций и что понимаете, как нужно отправлять и получать GRIN, а также как создавать доказательство перевода. \n\nЧтобы узнать подробности работы с инструментом доказательства транзакции в Grinbox, см. https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=При создании транзакции в BEAM требуется взаимодействие в реальном времени между отправителем и получателем. \n\nСледуйте инструкциям на веб-сайте проекта BEAM, чтобы узнать, как отправлять и получать BEAM (получатель должен находиться в сети в момент отправки перевода или в течение определенного периода). \n\nОтправитель BEAM должен предоставить доказательство успешной отправки перевода. Используйте кошелёк, позволяющий получить доказательство перевода. Если отправитель не сможет предоставить это доказательство, потенциальный спор будет решен в пользу получателя BEAM. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Trading ParsiCoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Trading ParsiCoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Bisq, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. +account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Haveno, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Bisq requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Bisq, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Bisq mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Bisq. +account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Haveno requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Haveno, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Haveno mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Haveno. account.fiat.yourFiatAccounts=Ваши счета в нац. валюте @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=Вы не установили пароль от ко account.seed.warn.noPw.yes=Да и не спрашивать снова account.seed.enterPw=Введите пароль, чтобы увидеть мнемоническую фразу account.seed.restore.info=Создайте резервную копию перед восстановлением с помощью мнемонической фразы. Помните, что восстановление кошелька используется в экстренных случаях и может вызвать сбой внутренней базы данных кошелька.\nЭто не способ резервного копирования! Используйте резервную копию из каталога данных приложения для восстановления его предыдущего состояния.\n\nПосле восстановления приложение автоматически закроется. Когда вы повторно запустите приложение, оно снова синхронизируется с сетью Биткойн. Это может занять долгое время и привести к высокой нагрузке на центральный процессор, особенно если кошелёк был создан давно и хранил много транзакций. Не прерывайте данный процесс. Иначе вам придется удалить файл цепи SPV или повторить процесс восстановления сначала. -account.seed.restore.ok=Восстановить и закрыть Bisq +account.seed.restore.ok=Восстановить и закрыть Haveno #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=Уведомить, если курс account.notifications.priceAlert.setButton=Установить оповещение о курсе account.notifications.priceAlert.removeButton=Удалить оповещение о курсе account.notifications.trade.message.title=Состояние сделки изменилось -account.notifications.trade.message.msg.conf=Депозит по сделке с идентификатором {0} внесен. Откройте приложение Bisq и начните платеж. +account.notifications.trade.message.msg.conf=Депозит по сделке с идентификатором {0} внесен. Откройте приложение Haveno и начните платеж. account.notifications.trade.message.msg.started=Покупатель BTC начал платеж по сделке с идентификатором {0}. account.notifications.trade.message.msg.completed=Сделка с идентификатором {0} завершена. account.notifications.offer.message.title=Ваше предложение было принято @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Тип пред account.notifications.marketAlert.message.title=Оповещение о предложении account.notifications.marketAlert.message.msg.below=ниже account.notifications.marketAlert.message.msg.above=выше -account.notifications.marketAlert.message.msg=Новое предложение «{0} {1}» с ценой {2} (рыночная цена — {3} {4}) и методом платежа «{5}» было опубликовано в Bisq.\nИдент. предложения: {6}. +account.notifications.marketAlert.message.msg=Новое предложение «{0} {1}» с ценой {2} (рыночная цена — {3} {4}) и методом платежа «{5}» было опубликовано в Haveno.\nИдент. предложения: {6}. account.notifications.priceAlert.message.title=Оповещение о цене для {0} account.notifications.priceAlert.message.msg=Ваше оповещение о цене сработало. Текущая цена {0} — {1} {2} -account.notifications.noWebCamFound.warning=Веб-камера не найдена.\n\nВоспользуйтесь электронной почтой для отправки токена и ключа шифрования с вашего мобильного телефона в приложение Bisq. +account.notifications.noWebCamFound.warning=Веб-камера не найдена.\n\nВоспользуйтесь электронной почтой для отправки токена и ключа шифрования с вашего мобильного телефона в приложение Haveno. account.notifications.priceAlert.warning.highPriceTooLow=Более высокая цена должна быть выше более низкой цены. account.notifications.priceAlert.warning.lowerPriceTooHigh=Более низкая цена должна быть ниже более высокой цены. @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=Проверка подписи... displayUpdateDownloadWindow.button.label=Загрузите установщик и проверьте подпись displayUpdateDownloadWindow.button.downloadLater=Скачать позже displayUpdateDownloadWindow.button.ignoreDownload=Игнорировать эту версию -displayUpdateDownloadWindow.headline=Доступно новое обновление Bisq! +displayUpdateDownloadWindow.headline=Доступно новое обновление Haveno! displayUpdateDownloadWindow.download.failed.headline=Загрузка не удалась displayUpdateDownloadWindow.download.failed=Download failed.\nPlease download and verify manually at [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unable to determine the correct installer. Please download and verify manually at [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Close without any payout disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout? emptyWalletWindow.headline=Аварийный кошелёк {0} -emptyWalletWindow.info=Используйте этот инструмент только в экстренном случае, если вам недоступны средства из пользовательского интерфейса.\n\nУчтите, что все открытые предложения будут автоматически закрыты при использовании этого инструмента.\n\nПрежде чем воспользоваться этим инструментом, создайте резервную копию своего каталога данных. Это можно сделать в разделе \«Счёт/Резервное копирование\».\n\nСообщите нам о неисправности и создайте отчёт о ней в Github или на форуме Bisq, чтобы мы могли выявить её причину. +emptyWalletWindow.info=Используйте этот инструмент только в экстренном случае, если вам недоступны средства из пользовательского интерфейса.\n\nУчтите, что все открытые предложения будут автоматически закрыты при использовании этого инструмента.\n\nПрежде чем воспользоваться этим инструментом, создайте резервную копию своего каталога данных. Это можно сделать в разделе \«Счёт/Резервное копирование\».\n\nСообщите нам о неисправности и создайте отчёт о ней в Github или на форуме Haveno, чтобы мы могли выявить её причину. emptyWalletWindow.balance=Доступный баланс кошелька emptyWalletWindow.address=Адрес получателя emptyWalletWindow.button=Отправить все средства @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=Дата создания offerDetailsWindow.makersOnion=Onion-адрес мейкера qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Please use this QR code for funding your Bisq wallet from your external wallet. +qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet. qRCodeWindow.request=Запрос платежа:\n{0} selectDepositTxWindow.headline=Выберите транзакцию ввода средств для включения в спор @@ -1562,7 +1562,7 @@ popup.headline.error=Ошибка popup.doNotShowAgain=Не показывать снова popup.reportError.log=Открыть файл журнала popup.reportError.gitHub=Сообщить о проблеме в Github -popup.reportError={0}\n\nЧтобы помочь нам улучшить приложение, просьба сообщить об ошибке, открыв новую тему на https://github.com/bisq-network/bisq/issues. \nСообщение об ошибке будет скопировано в буфер обмена при нажатии любой из кнопок ниже.\nЕсли вы прикрепите к отчету о неисправности файл журнала bisq.log, нажав «Открыть файл журнала» и сохранив его копию, это поможет нам разобраться с проблемой быстрее. +popup.reportError={0}\n\nЧтобы помочь нам улучшить приложение, просьба сообщить об ошибке, открыв новую тему на https://github.com/bisq-network/bisq/issues. \nСообщение об ошибке будет скопировано в буфер обмена при нажатии любой из кнопок ниже.\nЕсли вы прикрепите к отчету о неисправности файл журнала haveno.log, нажав «Открыть файл журнала» и сохранив его копию, это поможет нам разобраться с проблемой быстрее. popup.error.tryRestart=Попробуйте перезагрузить приложение и проверьте подключение к сети, чтобы попробовать решить проблему. popup.error.takeOfferRequestFailed=Произошла ошибка, когда контрагент попытался принять одно из ваших предложений:\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=Кошелёк ещё не инициализирован -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. -popup.warning.wrongVersion=Вероятно, у вас установлена не та версия Bisq.\nАрхитектура Вашего компьютера: {0}.\nУстановленная версия Bisq: {1}.\nЗакройте приложение и установите нужную версию ({2}). -popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. -popup.warning.startupFailed.twoInstances=Bisq уже запущен. Нельзя запустить два экземпляра Bisq. +popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\nHaveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. +popup.warning.wrongVersion=Вероятно, у вас установлена не та версия Haveno.\nАрхитектура Вашего компьютера: {0}.\nУстановленная версия Haveno: {1}.\nЗакройте приложение и установите нужную версию ({2}). +popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Haveno installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. +popup.warning.startupFailed.twoInstances=Haveno уже запущен. Нельзя запустить два экземпляра Haveno. popup.warning.tradePeriod.halfReached=Половина макс. допустимого срока сделки с идентификатором {0} истекла, однако она до сих пор не завершена.\n\nСрок сделки заканчивается {1}\n\nДополнительную информацию о состоянии сделки можно узнать в разделе \«Сделки/Текущие сделки\». popup.warning.tradePeriod.ended=Your trade with ID {0} has reached the max. allowed trading period and is not completed.\n\nThe trade period ended on {1}\n\nPlease check your trade at \"Portfolio/Open trades\" for contacting the arbitrator. popup.warning.noTradingAccountSetup.headline=Вы не создали торговый счёт @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=There are no mediators available. popup.warning.notFullyConnected=Необходимо дождаться полного подключения к сети.\nОно может занять до 2 минут. popup.warning.notSufficientConnectionsToBtcNetwork=Необходимо дождаться не менее {0} соединений с сетью Биткойн. popup.warning.downloadNotComplete=Необходимо дождаться завершения загрузки недостающих блоков сети Биткойн. -popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=The Haveno wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Действительно хотите удалить это предложение?\nКомиссия мейкера в размере {0} компенсации не подлежит. popup.warning.tooLargePercentageValue=Нельзя установить процент в размере 100% или выше. popup.warning.examplePercentageValue=Введите процент, например \«5,4\» для 5,4% @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. # suppress inspection "UnusedProperty" popup.warning.priceRelay=ретранслятор курса popup.warning.seed=мнемоническая фраза -popup.warning.mandatoryUpdate.trading=Обновите Bisq до последней версии. Вышло обязательное обновление, которое делает невозможной торговлю в старых версиях приложения. Посетите форум Bisq, чтобы узнать подробности. -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=Обновите Haveno до последней версии. Вышло обязательное обновление, которое делает невозможной торговлю в старых версиях приложения. Посетите форум Haveno, чтобы узнать подробности. +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=Данную транзакцию невозможно завершить, так как плата за нее ({0}) превышает сумму перевода ({1}). Подождите, пока плата за транзакцию не снизится или пока у вас не появится больше BTC для завершения перевода. -popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. popup.warning.trade.txRejected.tradeFee=trade fee popup.warning.trade.txRejected.deposit=deposit -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.info.securityDepositInfo=Чтобы гарантировать соблюдение торгового протокола трейдерами, им обоим необходимо внести залог.\n\nЗалог останется в вашем кошельке до успешного завершения сделки, а затем будет возвращен вам.\n\nОбратите внимание, что если вы создаёте новое предложение, приложение Bisq должно быть подключено к сети, чтобы его могли принять другие трейдеры. Чтобы ваши предложения были доступны в сети, компьютер и приложение должны быть включены и подключены к сети (убедитесь, что компьютер не перешёл в режим ожидания; переход монитора в спящий режим не влияет на работу приложения). +popup.info.securityDepositInfo=Чтобы гарантировать соблюдение торгового протокола трейдерами, им обоим необходимо внести залог.\n\nЗалог останется в вашем кошельке до успешного завершения сделки, а затем будет возвращен вам.\n\nОбратите внимание, что если вы создаёте новое предложение, приложение Haveno должно быть подключено к сети, чтобы его могли принять другие трейдеры. Чтобы ваши предложения были доступны в сети, компьютер и приложение должны быть включены и подключены к сети (убедитесь, что компьютер не перешёл в режим ожидания; переход монитора в спящий режим не влияет на работу приложения). popup.info.cashDepositInfo=Убедитесь, что в вашем районе есть отделение банка, где можно произвести перевод наличных.\nИдентификатор (BIC/SWIFT) банка продавца: {0}. popup.info.cashDepositInfo.confirm=Я подтверждаю, что могу внести оплату -popup.info.shutDownWithOpenOffers=Bisq закрывается, но у вас есть открытые предложения.\n\nЭти предложения будут недоступны в сети P2P, пока приложение Bisq закрыто, но будут повторно опубликованы в сети P2P при следующем запуске Bisq.\n\nЧтобы ваши предложения были доступны в сети, компьютер и приложение должны быть включены и подключены к сети (убедитесь, что компьютер не перешёл в режим ожидания; переход монитора в спящий режим не влияет на работу приложения). -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\nPlease make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.info.shutDownWithOpenOffers=Haveno закрывается, но у вас есть открытые предложения.\n\nЭти предложения будут недоступны в сети P2P, пока приложение Haveno закрыто, но будут повторно опубликованы в сети P2P при следующем запуске Haveno.\n\nЧтобы ваши предложения были доступны в сети, компьютер и приложение должны быть включены и подключены к сети (убедитесь, что компьютер не перешёл в режим ожидания; переход монитора в спящий режим не влияет на работу приложения). +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\nPlease make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.privateNotification.headline=Важное личное уведомление! popup.securityRecommendation.headline=Важная рекомендация по безопасности popup.securityRecommendation.msg=Рекомендуем вам защитить свой кошелёк паролем, если вы ещё этого не сделали.\n\nТакже убедительно рекомендуем записать вашу мнемоническую фразу. Она поможет восстановить ваш кошелёк Биткойн.\nДополнительная информация указана в разделе \«Мнемоническая фраза\».\n\nВам также следует сохранить копию папки со всеми данными программы в разделе \«Резервное копирование\». -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=Завершение работы popup.shutDownInProgress.msg=Завершение работы приложения может занять несколько секунд.\nПросьба не прерывать этот процесс. @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=Обновление торгового ко notification.walletUpdate.msg=Ваш торговый кошелёк содержит достаточно средств.\nСумма: {0} notification.takeOffer.walletUpdate.msg=Ваш торговый кошелёк уже содержит достаточно средств с прошлой попытки принять предложение.\nСумма: {0} notification.tradeCompleted.headline=Сделка завершена -notification.tradeCompleted.msg=Теперь вы можете вывести свои средства на свой внешний кошелёк Биткойн или перевести их в кошелёк Bisq. +notification.tradeCompleted.msg=Теперь вы можете вывести свои средства на свой внешний кошелёк Биткойн или перевести их в кошелёк Haveno. #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=Теперь вы можете вывести с systemTray.show=Показать окно приложения systemTray.hide=Скрыть окно приложения -systemTray.info=Информация о Bisq +systemTray.info=Информация о Haveno systemTray.exit=Выход -systemTray.tooltip=Bisq: A decentralized bitcoin exchange network +systemTray.tooltip=Haveno: A decentralized bitcoin exchange network #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=Извлечь ключ из пароля password.walletDecrypted=Кошелёк успешно расшифрован, защита паролем удалена. password.wrongPw=Вы ввели неверный пароль.\n\nПопробуйте снова, обратив внимание на возможные ошибки ввода. password.walletEncrypted=Кошелёк успешно зашифрован, защита паролем включена. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=Введённые вами 2 пароля не совпадают. password.forgotPassword=Забыли пароль? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\nIt is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\nYou must empty seed.warn.walletNotEmpty.restore=Всё равно хочу восстановить seed.warn.walletNotEmpty.emptyWallet=Вывести все средства с моих кошельков seed.warn.notEncryptedAnymore=Ваши кошельки зашифрованы.\n\nПосле восстановления кошельки больше не будут зашифрованы, и вам потребуется установить новый пароль.\n\nПродолжить? -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? seed.restore.success=Кошельки успешно восстановлены с новой мнемонической фразой.\n\nЗакройте и перезапустите приложение. seed.restore.error=Произошла ошибка при восстановлении кошельков с помощью мнемонической фразы.{0} seed.restore.openOffers.warn=You have open offers which will be removed if you restore from seed words.\nAre you sure that you want to continue? @@ -1949,17 +1949,17 @@ payment.accountType=Тип счёта payment.checking=Текущий payment.savings=Сберегательный payment.personalId=Личный идентификатор -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. -payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Bisq to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Haveno account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Haveno. +payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Haveno to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=Используя HalCash, покупатель BTC обязуется отправить продавцу BTC код HalCash через СМС с мобильного телефона.\n\nУбедитесь, что не вы не превысили максимальную сумму, которую ваш банк позволяет отправить с HalCash. Минимальная сумма на вывод средств составляет 10 EUR, а и максимальная — 600 EUR. При повторном выводе средств лимит составляет 3000 EUR на получателя в день и 6000 EUR на получателя в месяц. Просьба сверить эти лимиты с вашим банком и убедиться, что лимиты банка соответствуют лимитам, указанным здесь.\n\nВыводимая сумма должна быть кратна 10 EUR, так как другие суммы снять из банкомата невозможно. Приложение само отрегулирует сумму BTC, чтобы она соответствовала сумме в EUR, во время создания или принятия предложения. Вы не сможете использовать текущий рыночный курс, так как сумма в EUR будет меняться с изменением курса.\n\nВ случае спора покупателю BTC необходимо предоставить доказательство отправки EUR. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Bisq sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Убедитесь, что ваш банк позволяет отправлять денежные переводы на счета других лиц. Например, Bank of America и Wells Fargo больше не разрешают такие переводы. @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=Контактная информация payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1996,7 +1996,7 @@ payment.japan.recipient=Имя payment.australia.payid=PayID payment.payid=PayID linked to financial institution. Like email address or mobile phone. payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 64484157..396f6cf5 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -103,14 +103,14 @@ shared.faq=Visit FAQ page shared.yesCancel=ใช่ ยกเลิก shared.nextStep=ขั้นถัดไป shared.selectTradingAccount=เลือกบัญชีการซื้อขาย -shared.fundFromSavingsWalletButton=โอนเงินจาก Bisq wallet +shared.fundFromSavingsWalletButton=โอนเงินจาก Haveno wallet shared.fundFromExternalWalletButton=เริ่มทำการระดมเงินทุนหาแหล่งเงินจากกระเป๋าสตางค์ภายนอกของคุณ shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed? shared.belowInPercent=ต่ำกว่า % จากราคาตลาด shared.aboveInPercent=สูงกว่า % จากราคาตาด shared.enterPercentageValue=เข้าสู่ % ตามมูลค่า shared.OR=หรือ -shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds. +shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. shared.waitingForFunds=กำลังรอเงิน ... shared.TheBTCBuyer=ผู้ซื้อ BTC shared.You=คุณ @@ -125,7 +125,7 @@ shared.notUsedYet=ยังไม่ได้ใช้งาน shared.date=วันที่ shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n +shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=คัดลอกไปที่คลิปบอร์ด shared.language=ภาษา shared.country=ประเทศ @@ -235,8 +235,8 @@ mainView.menu.settings=ตั้งค่า mainView.menu.account=บัญชี mainView.marketPriceWithProvider.label=ราคาตลาดโดย {0} -mainView.marketPrice.bisqInternalPrice=ราคาของการซื้อขาย Bisq ล่าสุด -mainView.marketPrice.tooltip.bisqInternalPrice=ไม่มีราคาตลาดจากผู้ให้บริการด้านราคาภายนอก\nราคาที่แสดงเป็นราคาล่าสุดของ Bisq สำหรับสกุลเงินนั้น +mainView.marketPrice.havenoInternalPrice=ราคาของการซื้อขาย Haveno ล่าสุด +mainView.marketPrice.tooltip.havenoInternalPrice=ไม่มีราคาตลาดจากผู้ให้บริการด้านราคาภายนอก\nราคาที่แสดงเป็นราคาล่าสุดของ Haveno สำหรับสกุลเงินนั้น mainView.marketPrice.tooltip=ราคาตลาดจัดทำโดย {0} {1} \nอัปเดตล่าสุด: {2} \nnode URL ของผู้ให้บริการ: {3} mainView.balance.available=ยอดคงเหลือที่พร้อมใช้งาน mainView.balance.reserved=ข้อเสนอได้รับการจองแล้ว @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Connecting to mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1} +mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) เชื่อมต่อไปยัง Tor network... mainView.bootstrapState.torNodeCreated=(2/4) Tor node ถูกสร้างแล้ว @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) ได้รับข้อม mainView.bootstrapWarning.noSeedNodesAvailable=ไม่มีแหล่งข้อมูลในโหนดเครือข่ายให้ใช้งาน mainView.bootstrapWarning.noNodesAvailable=ไม่มีแหล่งข้อมูลในโหนดเครือข่ายและpeers(ระบบเพียร์)ให้ใช้งาน -mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Bisq network failed +mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Haveno network failed mainView.p2pNetworkWarnMsg.noNodesAvailable=ไม่มีแหล่งข้อมูลในโหนดเครือข่ายและ peers (ระบบเพียร์) พร้อมให้บริการสำหรับการขอข้อมูล\nโปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณหรือลองรีสตาร์ทแอพพลิเคชัน -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Bisq network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Haveno network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. mainView.walletServiceErrorMsg.timeout=การเชื่อมต่อกับเครือข่าย Bitcoin ล้มเหลวเนื่องจากหมดเวลา mainView.walletServiceErrorMsg.connectionError=การเชื่อมต่อกับเครือข่าย Bitcoin ล้มเหลวเนื่องจากข้อผิดพลาด: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=การเชื่อมต่ mainView.walletServiceErrorMsg.rejectedTxException=A transaction was rejected from the network.\n\n{0} mainView.networkWarning.allConnectionsLost=คุณสูญเสียการเชื่อมต่อกับ {0} เครือข่าย peers\nบางทีคุณอาจขาดการเชื่อมต่ออินเทอร์เน็ตหรืออาจเป็นเพราะคอมพิวเตอร์ของคุณอยู่ในโหมดสแตนด์บาย -mainView.networkWarning.localhostBitcoinLost=คุณสูญเสียการเชื่อมต่อไปยังโหนดเครือข่าย Bitcoin localhost (แม่ข่ายเฉพาะที่)\nโปรดรีสตาร์ทแอ็พพลิเคชัน Bisq เพื่อเชื่อมต่อโหนด Bitcoin อื่นหรือรีสตาร์ทโหนด Bitcoin localhost +mainView.networkWarning.localhostBitcoinLost=คุณสูญเสียการเชื่อมต่อไปยังโหนดเครือข่าย Bitcoin localhost (แม่ข่ายเฉพาะที่)\nโปรดรีสตาร์ทแอ็พพลิเคชัน Haveno เพื่อเชื่อมต่อโหนด Bitcoin อื่นหรือรีสตาร์ทโหนด Bitcoin localhost mainView.version.update=(การอัพเดตพร้อมใช้งาน) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount offerbook.warning.wrongTradeProtocol=ข้อเสนอดังกล่าวต้องใช้โปรโตคอลเวอร์ชันอื่นเหมือนกับเวอร์ชันที่ใช้ในซอฟต์แวร์เวอร์ชันของคุณ\n\nโปรดตรวจสอบว่าคุณได้ติดตั้งเวอร์ชั่นล่าสุด อีกนัยหนึ่งผู้ใช้ที่สร้างข้อเสนอได้ใช้รุ่นที่เก่ากว่า\n\nผู้ใช้ไม่สามารถซื้อขายกับโปรโตคอลการค้าเวอร์ชั่นซอฟต์แวร์ที่แตกต่างกันได้ offerbook.warning.userIgnored=คุณได้เพิ่มที่อยู่ onion ของผู้ใช้ลงในรายการที่ไม่สนใจแล้ว -offerbook.warning.offerBlocked=ข้อเสนอดังกล่าวถูกบล็อกโดยนักพัฒนาซอฟต์แวร์ Bisq\nอาจมีข้อบกพร่องที่ไม่ได้รับการจัดการซึ่งก่อให้เกิดปัญหาเมื่อมีข้อเสนอนั้น -offerbook.warning.currencyBanned=สกุลเงินที่ใช้ในข้อเสนอนั้นถูกบล็อกโดยนักพัฒนา Bisq\nสามารถอ่านข้อมูลเพิ่มเติมได้ที่ฟอรั่มของ Bisq -offerbook.warning.paymentMethodBanned=วิธีการชำระเงินที่ใช้ในข้อเสนอนั้นถูกบล็อกโดยนักพัฒนา Bisq\nกรุณาเข้าไปอ่านที่ Forum ของ Bisq สำหรับข้อมูลเพิ่มเติม -offerbook.warning.nodeBlocked=ที่อยู่ onion ของผู้ซื้อขายรายนั้นถูกบล็อกโดยนักพัฒนา Bisq\nอาจมีข้อบกพร่องที่ไม่ได้รับการจัดการ ซึ่งก่อให้เกิดปัญหาเมื่อรับข้อเสนอจากผู้ซื้อขายรายนั้น -offerbook.warning.requireUpdateToNewVersion=Your version of Bisq is not compatible for trading anymore.\nPlease update to the latest Bisq version at [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=ข้อเสนอดังกล่าวถูกบล็อกโดยนักพัฒนาซอฟต์แวร์ Haveno\nอาจมีข้อบกพร่องที่ไม่ได้รับการจัดการซึ่งก่อให้เกิดปัญหาเมื่อมีข้อเสนอนั้น +offerbook.warning.currencyBanned=สกุลเงินที่ใช้ในข้อเสนอนั้นถูกบล็อกโดยนักพัฒนา Haveno\nสามารถอ่านข้อมูลเพิ่มเติมได้ที่ฟอรั่มของ Haveno +offerbook.warning.paymentMethodBanned=วิธีการชำระเงินที่ใช้ในข้อเสนอนั้นถูกบล็อกโดยนักพัฒนา Haveno\nกรุณาเข้าไปอ่านที่ Forum ของ Haveno สำหรับข้อมูลเพิ่มเติม +offerbook.warning.nodeBlocked=ที่อยู่ onion ของผู้ซื้อขายรายนั้นถูกบล็อกโดยนักพัฒนา Haveno\nอาจมีข้อบกพร่องที่ไม่ได้รับการจัดการ ซึ่งก่อให้เกิดปัญหาเมื่อรับข้อเสนอจากผู้ซื้อขายรายนั้น +offerbook.warning.requireUpdateToNewVersion=Your version of Haveno is not compatible for trading anymore.\nPlease update to the latest Haveno version at [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. It could be that your previous take-offer attempt resulted in a failed trade. offerbook.info.sellAtMarketPrice=คุณจะขายในราคาตลาด (อัปเดตทุกนาที) @@ -423,7 +423,7 @@ createOffer.fundsBox.title=เงินทุนสำหรับข้อเ createOffer.fundsBox.offerFee=ค่าธรรมเนียมการซื้อขาย createOffer.fundsBox.networkFee=ค่าธรรมเนียมการขุด createOffer.fundsBox.placeOfferSpinnerInfo=การประกาศข้อเสนออยู่ระหว่างดำเนินการ ... -createOffer.fundsBox.paymentLabel=การซื้อขาย Bisq ด้วย ID {0} +createOffer.fundsBox.paymentLabel=การซื้อขาย Haveno ด้วย ID {0} createOffer.fundsBox.fundsStructure=({0} เงินประกัน {1} ค่าธรรมเนียมการซื้อขาย {2} ค่าธรรมเนียมการขุด) createOffer.success.headline=ข้อเสนอของคุณได้รับการเผยแพร่แล้ว createOffer.success.info=คุณสามารถจัดการข้อเสนอแบบเปิดของคุณได้ที่ \"Portfolio (แฟ้มผลงาน) / My open offers (ข้อเสนอแบบเปิดของฉัน) \" @@ -447,12 +447,12 @@ createOffer.placeOfferButton=รีวิว: ใส่ข้อเสนอไ createOffer.createOfferFundWalletInfo.headline=เงินทุนสำหรับข้อเสนอของคุณ # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- ปริมาณการซื้อขาย: {0} -createOffer.createOfferFundWalletInfo.msg=คุณต้องวางเงินมัดจำ {0} ข้อเสนอนี้\n\nเงินเหล่านั้นจะถูกสงวนไว้ใน wallet ภายในประเทศของคุณและจะถูกล็อคไว้ในที่อยู่ที่ฝากเงิน multisig เมื่อมีคนรับข้อเสนอของคุณ\n\nผลรวมของจำนวนของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n- ค่าขุด: {4} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อมีการระดุมทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Bisq ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากเงินภายนอกเข้ามา (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการระดมทุนทั้งหมดหลังจากปิดป๊อปอัปนี้ +createOffer.createOfferFundWalletInfo.msg=คุณต้องวางเงินมัดจำ {0} ข้อเสนอนี้\n\nเงินเหล่านั้นจะถูกสงวนไว้ใน wallet ภายในประเทศของคุณและจะถูกล็อคไว้ในที่อยู่ที่ฝากเงิน multisig เมื่อมีคนรับข้อเสนอของคุณ\n\nผลรวมของจำนวนของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n- ค่าขุด: {4} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อมีการระดุมทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Haveno ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากเงินภายนอกเข้ามา (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการระดมทุนทั้งหมดหลังจากปิดป๊อปอัปนี้ # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=เกิดข้อผิดพลาดขณะใส่ข้อเสนอ: \n\n{0} \n\nยังไม่มีการโอนเงินจาก wallet ของคุณเลย\nโปรดเริ่มแอปพลิเคชันใหม่และตรวจสอบการเชื่อมต่อเครือข่ายของคุณ createOffer.setAmountPrice=กำหนดจำนวนและราคา -createOffer.warnCancelOffer=คุณได้รับเงินจากข้อเสนอนั้นแล้ว\nหากคุณยกเลิกตอนนี้เงินของคุณจะถูกย้ายไปที่กระเป๋าสตางค์ Bisq ในประเทศของคุณและพร้อมสำหรับการถอนเงินโดยไปที่หน้า \"เงิน / ส่งเงิน \" \nคุณแน่ใจหรือไม่ว่าต้องการยกเลิก +createOffer.warnCancelOffer=คุณได้รับเงินจากข้อเสนอนั้นแล้ว\nหากคุณยกเลิกตอนนี้เงินของคุณจะถูกย้ายไปที่กระเป๋าสตางค์ Haveno ในประเทศของคุณและพร้อมสำหรับการถอนเงินโดยไปที่หน้า \"เงิน / ส่งเงิน \" \nคุณแน่ใจหรือไม่ว่าต้องการยกเลิก createOffer.timeoutAtPublishing=มีกำหนดเวลาในการเผยแพร่ข้อเสนอ createOffer.errorInfo=\n\nมีการชำระค่าธรรมเนียมผู้สร้างแล้ว ในกรณีที่คุณต้องสูญเสียค่าธรรมเนียมนั้นไป\nโปรดลองเริ่มแอปพลิเคชันของคุณใหม่และตรวจสอบการเชื่อมต่อเครือข่ายของคุณเพื่อดูว่าคุณสามารถแก้ไขปัญหาได้หรือไม่ createOffer.tooLowSecDeposit.warning=คุณได้ตั้งค่าเงินประกันเป็นค่าต่ำกว่าค่าเริ่มต้นที่แนะนำไว้ที่ {0} \nคุณแน่ใจหรือไม่ว่าต้องการใช้เงินประกันที่ต่ำกว่า @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=จำนวนที่จะขาย takeOffer.fundsBox.offerFee=ค่าธรรมเนียมการซื้อขาย takeOffer.fundsBox.networkFee=ยอดรวมค่าธรรมเนียมการขุด takeOffer.fundsBox.takeOfferSpinnerInfo=การรับข้อเสนออยู่ระหว่างการดำเนินการ... -takeOffer.fundsBox.paymentLabel=การซื้อขาย Bisq ด้วย ID {0} +takeOffer.fundsBox.paymentLabel=การซื้อขาย Haveno ด้วย ID {0} takeOffer.fundsBox.fundsStructure=({0} เงินประกัน {1} ค่าธรรมเนียมการซื้อขาย {2} ค่าธรรมเนียมการขุด) takeOffer.success.headline=คุณได้รับข้อเสนอเป็นที่เรีบยร้อยแล้ว takeOffer.success.info=คุณสามารถดูสถานะการค้าของคุณได้ที่ \ "Portfolio (แฟ้มผลงาน) / เปิดการซื้อขาย \" @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=คุณไม่สามารถรับข takeOffer.takeOfferFundWalletInfo.headline=ทุนการซื้อขายของคุณ # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- ปริมาณการซื้อขาย: {0} -takeOffer.takeOfferFundWalletInfo.msg=คุณต้องวางเงินประกัน {0} เพื่อรับข้อเสนอนี้\n\nจำนวนเงินคือผลรวมของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n- ค่าธรรมเนียมการขุดทั้งหมด: {4} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อลงทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Bisq ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากแหล่งเงินภายนอก (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการลงทุนทั้งหมดหลังจากปิดป๊อปอัปนี้ +takeOffer.takeOfferFundWalletInfo.msg=คุณต้องวางเงินประกัน {0} เพื่อรับข้อเสนอนี้\n\nจำนวนเงินคือผลรวมของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n- ค่าธรรมเนียมการขุดทั้งหมด: {4} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อลงทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Haveno ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากแหล่งเงินภายนอก (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการลงทุนทั้งหมดหลังจากปิดป๊อปอัปนี้ takeOffer.alreadyPaidInFunds=หากคุณได้ชำระเงินแล้วคุณสามารถถอนเงินออกได้ในหน้าจอ \"เงิน / ส่งเงิน \" takeOffer.paymentInfo=ข้อมูลการชำระเงิน takeOffer.setAmountPrice=ตั้งยอดจำนวน -takeOffer.alreadyFunded.askCancel=คุณได้รับเงินจากข้อเสนอนั้นแล้ว\nหากคุณยกเลิกตอนนี้เงินของคุณจะถูกย้ายไปที่กระเป๋าสตางค์ Bisq ในประเทศของคุณและพร้อมสำหรับการถอนเงินโดยไปที่หน้า \"เงิน / ส่งเงิน \"\nคุณแน่ใจหรือไม่ว่าต้องการยกเลิก +takeOffer.alreadyFunded.askCancel=คุณได้รับเงินจากข้อเสนอนั้นแล้ว\nหากคุณยกเลิกตอนนี้เงินของคุณจะถูกย้ายไปที่กระเป๋าสตางค์ Haveno ในประเทศของคุณและพร้อมสำหรับการถอนเงินโดยไปที่หน้า \"เงิน / ส่งเงิน \"\nคุณแน่ใจหรือไม่ว่าต้องการยกเลิก takeOffer.failed.offerNotAvailable=การขอข้อเสนอล้มเหลวเนื่องจากข้อเสนอไม่พร้อมใช้งานอีกต่อไป บางทีผู้ค้ารายอื่นอาจรับข้อเสนอนี้ไปแล้ว takeOffer.failed.offerTaken=คุณไม่สามารถรับข้อเสนอดังกล่าวได้เนื่องจากข้อเสนอนี้ได้ถูกดำเนินการโดยผู้ค้ารายอื่นแล้ว takeOffer.failed.offerRemoved=คุณไม่สามารถรับข้อเสนอดังกล่าวได้เนื่องจากข้อเสนอถูกลบออกไปแล้ว @@ -536,7 +536,7 @@ editOffer.confirmEdit=ยืนยัน: แก้ไขข้อเสนอ editOffer.publishOffer=กำลังเผยแพร่ข้อเสนอของคุณ editOffer.failed=การแก้ไขข้อเสนอล้มเหลว: \n{0} editOffer.success=ข้อเสนอของคุณได้รับการแก้ไขเรียบร้อยแล้ว -editOffer.invalidDeposit=The buyer's security deposit is not within the constraints defined by the Bisq DAO and can no longer be edited. +editOffer.invalidDeposit=The buyer's security deposit is not within the constraints defined by the Haveno DAO and can no longer be edited. #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=The deposit transaction is still not conf # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=ข้อกำหนดที # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=โปรดส่ง {0} โดยธนาณัติ \"US Postal Money Order \" ไปยังผู้ขาย BTC\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=ส่ง MTCN (ห portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=คุณต้องส่ง MTCN (หมายเลขติดตาม) และรูปใบเสร็จรับเงินทางอีเมลไปยังผู้ขาย BTC \nใบเสร็จจะต้องแสดงชื่อเต็ม เมือง ประเทศ และจำนวนเงินทั้งหมดของผู้ขาย อีเมลของผู้ขายคือ: {0} .\n\nคุณได้ส่ง MTCN และทำสัญญากับผู้ขายหรือไม่ portfolio.pending.step2_buyer.halCashInfo.headline=ส่งรหัส HalCash portfolio.pending.step2_buyer.halCashInfo.msg=คุณต้องส่งข้อความที่มีรหัส HalCash พร้อมกับ IDการค้า ({0}) ไปยังผู้ขาย BTC \nเบอร์โทรศัพท์มือถือของผู้ขาย คือ {1}\n\nคุณได้ส่งรหัสให้กับผู้ขายหรือยัง? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Bisq clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Haveno clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). portfolio.pending.step2_buyer.confirmStart.headline=ยืนยันว่าคุณได้เริ่มต้นการชำระเงินแล้ว portfolio.pending.step2_buyer.confirmStart.msg=คุณได้เริ่มต้นการ {0} การชำระเงินให้กับคู่ค้าของคุณแล้วหรือยัง portfolio.pending.step2_buyer.confirmStart.yes=ใช่ฉันได้เริ่มต้นการชำระเงินแล้ว portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Bisq requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway portfolio.pending.step2_seller.waitPayment.headline=รอการชำระเงิน @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=ผู้ซื้อ BTC ยังไม่ portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started their payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the mediator for assistance. tradeChat.chatWindowTitle=Chat window for trade with ID ''{0}'' tradeChat.openChat=Open chat window -tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Bisq (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. +tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Haveno (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. # suppress inspection "UnusedProperty" message.state.UNDEFINED=ไม่ได้กำหนด @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=เงินประกันควา portfolio.pending.step5_buyer.withdrawBTC=ถอนเงิน bitcoin ของคุณ portfolio.pending.step5_buyer.amount=จำนวนเงินที่จะถอน portfolio.pending.step5_buyer.withdrawToAddress=ถอนไปยังที่อยู่ -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToHavenoWallet=Keep funds in Haveno wallet portfolio.pending.step5_buyer.withdrawExternal=ถอนไปยัง wallet ภายนอก portfolio.pending.step5_buyer.alreadyWithdrawn=เงินทุนของคุณถูกถอนออกไปแล้ว\nโปรดตรวจสอบประวัติการทำธุรกรรม portfolio.pending.step5_buyer.confirmWithdrawal=ยืนยันคำขอถอนเงิน @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=คุณได้รับ tradeFeedbackWindow.title=ขอแสดงความยินดีกับการซื้อขายที่เสร็จสมบูรณ์ของคุณ tradeFeedbackWindow.msg.part1=เรายินดีที่จะฟังความเห็นเกี่ยวกับประสบการณ์ของคุณ มันจะช่วยให้เราปรับปรุงซอฟต์แวร์และระบบดียิ่งขึ้น หากคุณต้องการแสดงความคิดเห็นโปรดกรอกแบบสำรวจสั้น ๆ (ไม่ต้องลงทะเบียน) ที่: -tradeFeedbackWindow.msg.part2=หากคุณมีข้อสงสัยหรือประสบปัญหาใด ๆ โปรดติดต่อกับผู้ใช้และผู้สนับสนุนคนอื่น ๆ ผ่านทางฟอรัม Bisq ที่: -tradeFeedbackWindow.msg.part3=ขอบคุณที่ใช้ Bisq! +tradeFeedbackWindow.msg.part2=หากคุณมีข้อสงสัยหรือประสบปัญหาใด ๆ โปรดติดต่อกับผู้ใช้และผู้สนับสนุนคนอื่น ๆ ผ่านทางฟอรัม Haveno ที่: +tradeFeedbackWindow.msg.part3=ขอบคุณที่ใช้ Haveno! portfolio.pending.role=บทบาทของฉัน portfolio.pending.tradeInformation=ข้อมูลทางการซื้อขาย @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=หลังจากการยืนยั portfolio.pending.tradePeriodWarning=หากเกินระยะเวลานักซื้อขายทั้งสองฝ่ายสามารถเปิดข้อพิพาทได้ portfolio.pending.tradeNotCompleted=การซื้อขายไม่เสร็จสิ้นภายในเวลา (จนถึง {0}) portfolio.pending.tradeProcess=กระบวนการทางการซื้อขาย -portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Bisq forum at [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Haveno forum at [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=เปิดข้อพิพาทอีกครั้ง portfolio.pending.openSupportTicket.headline=เปิดปุ่มช่วยเหลือ portfolio.pending.openSupportTicket.msg=Please use this function only in emergency cases if you don't see a \"Open support\" or \"Open dispute\" button.\n\nWhen you open a support ticket the trade will be interrupted and handled by a mediator or arbitrator. portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute. -portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the trade to failed trades. portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the trade to failed trades. -portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.support.headline.getHelp=Need help? -portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Bisq community at https://bisq.community. If your issue still isn't resolved, you can request more help from a mediator. +portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Haveno community at https://haveno.community. If your issue still isn't resolved, you can request more help from a mediator. portfolio.pending.support.button.getHelp=Open Trader Chat portfolio.pending.support.headline.halfPeriodOver=Check payment portfolio.pending.support.headline.periodOver=Trade period is over @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee trans portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\nWithout this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. You can make a request to be reimbursed the trade fee here: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nFeel free to move this trade to failed trades. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, but funds have been locked in the deposit transaction.\n\nPlease do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. The mediator should suggest that both peers each get back the the full amount of their security deposits (with seller receiving full trade amount back as well). This way, there is no security risk, and only trade fees are lost. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing but funds have been locked in the deposit transaction.\n\nIf the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\nIf the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of their security deposits (with seller receiving full trade amount back as well). Otherwise the trade amount should go to the buyer. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Bisq mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Haveno mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\nThe trade cannot be completed and you might have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\nDo you want to move the trade to failed trades?\n\nYou cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open trades screen any time. @@ -828,7 +828,7 @@ funds.tab.transactions=การทำธุรกรรม funds.deposit.unused=ไม่ได้ใช้ funds.deposit.usedInTx=ใช้ใน {0} ธุรกรรม(ต่าง ๆ ) -funds.deposit.fundHavenoWallet=เติมเงิน Bisq wallet +funds.deposit.fundHavenoWallet=เติมเงิน Haveno wallet funds.deposit.noAddresses=ยังไม่มีการสร้างที่อยู่ของเงินฝาก funds.deposit.fundWallet=เติมเงินใน wallet ของคุณ funds.deposit.withdrawFromWallet=ส่งเงินทุนจากกระเป๋าสตางค์ของคุณ @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=ถอนออกจาก wallet funds.tx.memo=Memo funds.tx.noTxAvailable=ไม่มีธุรกรรมใด ๆ funds.tx.revert=กลับสู่สภาพเดิม -funds.tx.txSent=ธุรกรรมถูกส่งสำเร็จไปยังที่อยู่ใหม่ใน Bisq wallet ท้องถิ่นแล้ว +funds.tx.txSent=ธุรกรรมถูกส่งสำเร็จไปยังที่อยู่ใหม่ใน Haveno wallet ท้องถิ่นแล้ว funds.tx.direction.self=ส่งถึงตัวคุณเอง funds.tx.dustAttackTx=Received dust -funds.tx.dustAttackTx.popup=This transaction is sending a very small BTC amount to your wallet and might be an attempt from chain analysis companies to spy on your wallet.\n\nIf you use that transaction output in a spending transaction they will learn that you are likely the owner of the other address as well (coin merge).\n\nTo protect your privacy the Bisq wallet ignores such dust outputs for spending purposes and in the balance display. You can set the threshold amount when an output is considered dust in the settings. +funds.tx.dustAttackTx.popup=This transaction is sending a very small BTC amount to your wallet and might be an attempt from chain analysis companies to spy on your wallet.\n\nIf you use that transaction output in a spending transaction they will learn that you are likely the owner of the other address as well (coin merge).\n\nTo protect your privacy the Haveno wallet ignores such dust outputs for spending purposes and in the balance display. You can set the threshold amount when an output is considered dust in the settings. #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=กำลังส่งข้อความ... support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox. support.sendMessageError=การส่งข้อความล้มเหลว ข้อผิดพลาด: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=ข้อเสนอในข้อพิพาทดังกล่าวได้รับการสร้างขึ้นโดยใช้ Bisq เวอร์ชั่นเก่ากว่า\nคุณไม่สามารถปิดข้อพิพาทดังกล่าวกับแอปพลิเคชั่นเวอร์ชั่นของคุณได้\n\nโปรดใช้เวอร์ชันที่เก่ากว่ากับเวอร์ชั่นโปรโตคอล {0} +support.wrongVersion=ข้อเสนอในข้อพิพาทดังกล่าวได้รับการสร้างขึ้นโดยใช้ Haveno เวอร์ชั่นเก่ากว่า\nคุณไม่สามารถปิดข้อพิพาทดังกล่าวกับแอปพลิเคชั่นเวอร์ชั่นของคุณได้\n\nโปรดใช้เวอร์ชันที่เก่ากว่ากับเวอร์ชั่นโปรโตคอล {0} support.openFile=เปิดไฟล์ที่จะแนบ (ขนาดไฟล์สูงสุด: {0} kb) support.attachmentTooLarge=ขนาดไฟล์แนบทั้งหมด {0} กิโลไบต์และเกินจำนวนไฟล์สูงสุด ขนาดข้อความที่อนุญาตเท่ากับ {1} kB support.maxSize=ขนาดไฟล์สูงสุดที่อนุญาตคือ {0} kB @@ -953,15 +953,15 @@ support.sellerMaker= BTC ผู้ขาย/ ผู้สร้าง support.buyerTaker=BTC ผู้ซื้อ / ผู้รับ support.sellerTaker=BTC ผู้ขาย / ผู้รับ -support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.backgroundInfo=Haveno is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Haveno DAO. +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Haveno are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=ระบบข้อความ: {0} -support.youOpenedTicket=You opened a request for support.\n\n{0}\n\nBisq version: {1} -support.youOpenedDispute=You opened a request for a dispute.\n\n{0}\n\nBisq version: {1} -support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nBisq version: {1} -support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nBisq version: {1} +support.youOpenedTicket=You opened a request for support.\n\n{0}\n\nHaveno version: {1} +support.youOpenedDispute=You opened a request for a dispute.\n\n{0}\n\nHaveno version: {1} +support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nHaveno version: {1} support.mediatorsDisputeSummary=System message: Mediator''s dispute summary:\n{0} support.mediatorsAddress=Mediator''s node address: {0} support.warning.disputesWithInvalidDonationAddress=The delayed payout transaction has used an invalid receiver address. It does not match any of the DAO parameter values for the valid donation addresses.\n\nThis might be a scam attempt. Please inform the developers about that incident and do not close that case before the situation is resolved!\n\nAddress used in the dispute: {0}\n\nAll DAO param donation addresses: {1}\n\nTrade ID: {2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaction URL settings.preferences.editCustomExplorer.addressUrl=Address URL settings.net.btcHeader=เครือข่าย Bitcoin -settings.net.p2pHeader=Bisq network +settings.net.p2pHeader=Haveno network settings.net.onionAddressLabel=ที่อยู่ onion ของฉัน settings.net.btcNodesLabel=ใช้โหนดเครือข่าย Bitcoin Core ที่กำหนดเอง settings.net.bitcoinPeersLabel=เชื่อมต่อกับเน็ตเวิร์ก peers แล้ว @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=ใช้โหนดเครือข่าย settings.net.useProvidedNodesRadio=ใช้โหนดเครือข่าย Bitcoin ที่ให้มา settings.net.usePublicNodesRadio=ใช้เครือข่าย Bitcoin สาธารณะ settings.net.useCustomNodesRadio=ใช้โหนดเครือข่าย Bitcoin Core ที่กำหนดเอง -settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? +settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Haveno). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? settings.net.warn.usePublicNodes.useProvided=ไม่ ใช้โหนดที่ให้มา settings.net.warn.usePublicNodes.usePublic=ใช่ ใช้เครือข่ายสาธารณะ settings.net.warn.useCustomNodes.B2XWarning=โปรดตรวจสอบว่าโหนด Bitcoin ของคุณเป็นโหนด Bitcoin Core ที่เชื่อถือได้!\n\nการเชื่อมต่อกับโหนดที่ไม่ปฏิบัติตามกฎกติกาการยินยอมของ Bitcoin Core อาจทำให้ wallet ของคุณเกิดปัญหาในกระบวนการทางการซื้อขายได้\n\nผู้ใช้ที่เชื่อมต่อกับโหนดที่ละเมิดกฎเป็นเอกฉันท์นั้นจำเป็นต้องรับผิดชอบต่อความเสียหายที่สร้างขึ้น ข้อพิพาทที่เกิดจากการที่จะได้รับการตัดสินใจจาก เน็ตกเวิร์ก Peer คนอื่น ๆ จะไม่มีการสนับสนุนด้านเทคนิคแก่ผู้ใช้ที่ไม่สนใจคำเตือนและกลไกการป้องกันของเรา! settings.net.warn.invalidBtcConfig=Connection to the Bitcoin network failed because your configuration is invalid.\n\nYour configuration has been reset to use the provided Bitcoin nodes instead. You will need to restart the application. -settings.net.localhostBtcNodeInfo=Background information: Bisq looks for a local Bitcoin node when starting. If it is found, Bisq will communicate with the Bitcoin network exclusively through it. +settings.net.localhostBtcNodeInfo=Background information: Haveno looks for a local Bitcoin node when starting. If it is found, Haveno will communicate with the Bitcoin network exclusively through it. settings.net.p2PPeersLabel=เชื่อมต่อกับเน็ตเวิร์ก peers แล้ว settings.net.onionAddressColumn=ที่อยู่ Onion settings.net.creationDateColumn=ที่จัดตั้งขึ้น @@ -1058,7 +1058,7 @@ settings.net.needRestart=คุณต้องรีสตาร์ทแอ็ settings.net.notKnownYet=ยังไม่ทราบ ... settings.net.sentData=Sent data: {0}, {1} messages, {2} messages/sec settings.net.receivedData=Received data: {0}, {1} messages, {2} messages/sec -settings.net.chainHeight=Bisq DAO chain height: {0} | Bitcoin Peers chain height: {1} +settings.net.chainHeight=Haveno DAO chain height: {0} | Bitcoin Peers chain height: {1} settings.net.ips=[ที่อยู่ IP: พอร์ต | ชื่อโฮสต์: พอร์ต | ที่อยู่ onion: พอร์ต] (คั่นด้วยเครื่องหมายจุลภาค) Port สามารถละเว้นได้ถ้าใช้ค่าเริ่มต้น (8333) settings.net.seedNode=แหล่งโหนดข้อมูล settings.net.directPeer=Peer (โดยตรง) @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=ไฟล์ SPV chain ถูกลบแล้ว โปรดอดใจรอ อาจใช้เวลาสักครู่เพื่อทำการซิงค์ครั้งใหม่กับเครือข่าย settings.net.reSyncSPVAfterRestartCompleted=การซิงค์เสร็จสมบูรณ์แล้ว โปรดรีสตาร์ทแอ็พพลิเคชั่น settings.net.reSyncSPVFailed=ไม่สามารถลบไฟล์ SPV chain ได้\nข้อผิดพลาด: {0} -setting.about.aboutBisq=เกี่ยวกับ Bisq -setting.about.about=Bisq เป็นโครงการอิสระโดยอำนวยความสะดวกในการแลกเงินบิตคอยน์กับสกุลเงินของประเทศต่างๆ (และสกุลเงินดิจิตอลอื่นๆ) ผ่านเครือข่ายเข้าถึงกระจายอำนาจอย่างถัดเทียมในรูปแบบการปกป้องข้อมูลส่วนบุคคล เรียนรู้เพิ่มเติมเกี่ยวกับ Bisq ในหน้าเว็บของโปรเจคของเรา -setting.about.web=หน้าเว็บ Bisq +setting.about.aboutHaveno=เกี่ยวกับ Haveno +setting.about.about=Haveno เป็นโครงการอิสระโดยอำนวยความสะดวกในการแลกเงินบิตคอยน์กับสกุลเงินของประเทศต่างๆ (และสกุลเงินดิจิตอลอื่นๆ) ผ่านเครือข่ายเข้าถึงกระจายอำนาจอย่างถัดเทียมในรูปแบบการปกป้องข้อมูลส่วนบุคคล เรียนรู้เพิ่มเติมเกี่ยวกับ Haveno ในหน้าเว็บของโปรเจคของเรา +setting.about.web=หน้าเว็บ Haveno setting.about.code=โค๊ดแหล่งที่มา setting.about.agpl=ใบอนุญาต AGPL -setting.about.support=สนับสนุน Bisq -setting.about.def=Bisq ไม่ใช่ บริษัท แต่เป็นโปรเจคชุมชนและเปิดให้คนมีส่วนร่วม ถ้าคุณต้องการจะเข้าร่วมหรือสนับสนุน Bisq โปรดทำตามลิงค์ข้างล่างนี้ +setting.about.support=สนับสนุน Haveno +setting.about.def=Haveno ไม่ใช่ บริษัท แต่เป็นโปรเจคชุมชนและเปิดให้คนมีส่วนร่วม ถ้าคุณต้องการจะเข้าร่วมหรือสนับสนุน Haveno โปรดทำตามลิงค์ข้างล่างนี้ setting.about.contribute=สนับสนุน setting.about.providers=ผู้ให้บริการข้อมูล -setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation. -setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices. +setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation. +setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices. setting.about.pricesProvided=ราคาตลาดจัดโดย setting.about.feeEstimation.label=การประมาณค่าธรรมเนียมการขุดโดย setting.about.versionDetails=รายละเอียดของเวอร์ชั่น @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' or ''alt + {0}'' or ''cmd setting.about.shortcuts.menuNav=Navigate main menu setting.about.shortcuts.menuNav.value=To navigate the main menu press: 'Ctrl' or 'alt' or 'cmd' with a numeric key between '1-9' -setting.about.shortcuts.close=Close Bisq +setting.about.shortcuts.close=Close Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' or ''cmd + {0}'' or ''Ctrl + {1}'' or ''cmd + {1}'' setting.about.shortcuts.closePopup=Close popup or dialog window @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=Send private notification to pee setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0} setting.info.headline=New XMR auto-confirm Feature -setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Bisq uses explorer nodes run by Bisq contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t account.tab.mediatorRegistration=Mediator registration account.tab.refundAgentRegistration=Refund agent registration account.tab.signing=Signing -account.info.headline=ยินดีต้อนรับสู่บัญชี Bisq ของคุณ -account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). +account.info.headline=ยินดีต้อนรับสู่บัญชี Haveno ของคุณ +account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Haveno.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Haveno is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). account.menu.paymentAccount=บัญชีสกุลเงินของประเทศ account.menu.altCoinsAccountView=บัญชี Altcoin (เหรียญทางเลือก) @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} registration account.arbitratorRegistration.revoke=เพิกถอน account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as {0}. The max. allowed trade period is 8 days and the dispute process might take up to 7 days. account.arbitratorRegistration.warn.min1Language=คุณต้องตั้งค่าภาษาอย่างน้อย 1 ภาษา\nเราได้เพิ่มภาษาเริ่มต้นให้กับคุณแล้ว -account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Bisq network. +account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Haveno network. account.arbitratorRegistration.removedFailed=Could not remove registration.{0} -account.arbitratorRegistration.registerSuccess=You have successfully registered to the Bisq network. +account.arbitratorRegistration.registerSuccess=You have successfully registered to the Haveno network. account.arbitratorRegistration.registerFailed=Could not complete registration.{0} account.altcoin.yourAltcoinAccounts=บัญชี altcoin (เหรียญทางเลือก) ของคุณ account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (b) which don''t use compatible wallet software is risky: it can lead to loss of the traded funds!\nThe mediator or arbitrator is not a {2} specialist and cannot help in such cases. account.altcoin.popup.wallet.confirm=ฉันเข้าใจและยืนยันว่าฉันรู้ว่า wallet ใดที่ฉันต้องการใช้ # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. +account.altcoin.popup.upx.msg=Trading UPX on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Trading ARQ on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. +account.altcoin.popup.arq.msg=Trading ARQ on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Trading XMR on Haveno requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Haveno now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Trading MSR on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Trading BLUR on Haveno requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Trading Solo on Bisq requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Trading Solo on Haveno requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Trading CASH2 on Bisq requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Trading CASH2 on Haveno requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. +account.altcoin.popup.drgl.msg=Trading Dragonglass on Haveno requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=When using Zcash you can only use the transparent addresses (starting with t), not the z-addresses (private), because the mediator or arbitrator would not be able to verify the transaction with z-addresses. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=When using Zcoin you can only use the transparent (traceable) addresses, not the untraceable addresses, because the mediator or arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN requires an interactive process between the sender and receiver to create the transaction. Be sure to follow the instructions from the GRIN project web page to reliably send and receive GRIN (the receiver needs to be online or at least be online during a certain time frame). \n\nBisq supports only the Grinbox (Wallet713) wallet URL format. \n\nThe GRIN sender is required to provide proof that they have sent GRIN successfully. If the wallet cannot provide that proof, a potential dispute will be resolved in favor of the GRIN receiver. Please be sure that you use the latest Grinbox software which supports the transaction proof and that you understand the process of transferring and receiving GRIN as well as how to create the proof. \n\nSee https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only for more information about the Grinbox proof tool. +account.altcoin.popup.grin.msg=GRIN requires an interactive process between the sender and receiver to create the transaction. Be sure to follow the instructions from the GRIN project web page to reliably send and receive GRIN (the receiver needs to be online or at least be online during a certain time frame). \n\nHaveno supports only the Grinbox (Wallet713) wallet URL format. \n\nThe GRIN sender is required to provide proof that they have sent GRIN successfully. If the wallet cannot provide that proof, a potential dispute will be resolved in favor of the GRIN receiver. Please be sure that you use the latest Grinbox software which supports the transaction proof and that you understand the process of transferring and receiving GRIN as well as how to create the proof. \n\nSee https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only for more information about the Grinbox proof tool. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM requires an interactive process between the sender and receiver to create the transaction. \n\nBe sure to follow the instructions from the BEAM project web page to reliably send and receive BEAM (the receiver needs to be online or at least be online during a certain time frame). \n\nThe BEAM sender is required to provide proof that they sent BEAM successfully. Be sure to use wallet software which can produce such a proof. If the wallet cannot provide the proof a potential dispute will be resolved in favor of the BEAM receiver. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Trading ParsiCoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Trading ParsiCoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Bisq, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. +account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Haveno, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Bisq requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Bisq, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Bisq mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Bisq. +account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Haveno requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Haveno, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Haveno mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Haveno. account.fiat.yourFiatAccounts=บัญชีสกุลเงินของคุณ @@ -1240,7 +1240,7 @@ account.seed.warn.noPw.msg=คุณยังไม่ได้ตั้งร account.seed.warn.noPw.yes=ใช่ และไม่ต้องถามฉันอีก account.seed.enterPw=ป้อนรหัสผ่านเพื่อดูรหัสสำรองข้อมูล wallet account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.\n\nAfter restoring the application will shut down automatically. After you have restarted the application it will resync with the Bitcoin network. This can take a while and can consume a lot of CPU, especially if the wallet was older and had many transactions. Please avoid interrupting that process, otherwise you might need to delete the SPV chain file again or repeat the restore process. -account.seed.restore.ok=Ok, do the restore and shut down Bisq +account.seed.restore.ok=Ok, do the restore and shut down Haveno #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=แจ้งเตือนหาก account.notifications.priceAlert.setButton=ตั้งค่าการเตือนราคา account.notifications.priceAlert.removeButton=ลบการเตือนราคา account.notifications.trade.message.title=การเปลี่ยนแปลงสถานะทางการค้า -account.notifications.trade.message.msg.conf=ธุรกรรมทางการค้าจากผู้ค้า ID {0} ได้รับการยืนยันแล้ว โปรดเปิดแอปพลิเคชัน Bisq ของคุณและเริ่มการรับการชำระเงิน +account.notifications.trade.message.msg.conf=ธุรกรรมทางการค้าจากผู้ค้า ID {0} ได้รับการยืนยันแล้ว โปรดเปิดแอปพลิเคชัน Haveno ของคุณและเริ่มการรับการชำระเงิน account.notifications.trade.message.msg.started=ผู้ซื้อ BTC ได้เริ่มต้นการชำระเงินสำหรับผู้ค้าที่มี ID {0} account.notifications.trade.message.msg.completed=การค้ากับ ID {0} เสร็จสมบูรณ์ account.notifications.offer.message.title=ข้อเสนอของคุณถูกยอมรับ @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=ประเภ account.notifications.marketAlert.message.title=แจ้งเตือนข้อเสนอ account.notifications.marketAlert.message.msg.below=ต่ำกว่า account.notifications.marketAlert.message.msg.above=สูงกว่า -account.notifications.marketAlert.message.msg=ข้อเสนอใหม่ '{0} {1}' 'ด้วยราคา {2} ({3} {4} ราคาตลาด) และวิธีการชำระเงิน' '{5}' 'ถูกเผยแพร่ลงในหนังสือข้อเสนอ Bisq\nรหัสข้อเสนอพิเศษ: {6} +account.notifications.marketAlert.message.msg=ข้อเสนอใหม่ '{0} {1}' 'ด้วยราคา {2} ({3} {4} ราคาตลาด) และวิธีการชำระเงิน' '{5}' 'ถูกเผยแพร่ลงในหนังสือข้อเสนอ Haveno\nรหัสข้อเสนอพิเศษ: {6} account.notifications.priceAlert.message.title=การแจ้งเตือนราคาสำหรับ {0} account.notifications.priceAlert.message.msg=คุณได้รับการแจ้งเตือนราคาของคุณ {0} ราคาปัจจุบันคือ {1} {2} -account.notifications.noWebCamFound.warning=ไม่พบเว็บแคม\n\nโปรดใช้ตัวเลือกอีเมลเพื่อส่งรหัสโทเค็น (รหัสเหรียญ) และคีย์เข้ารหัสจากโทรศัพท์มือถือของคุณไปยังแอพพลิเคชัน Bisq +account.notifications.noWebCamFound.warning=ไม่พบเว็บแคม\n\nโปรดใช้ตัวเลือกอีเมลเพื่อส่งรหัสโทเค็น (รหัสเหรียญ) และคีย์เข้ารหัสจากโทรศัพท์มือถือของคุณไปยังแอพพลิเคชัน Haveno account.notifications.priceAlert.warning.highPriceTooLow=ราคาที่สูงกว่าต้องเป็นจำนวนที่มากเหนือราคาที่ต่ำกว่า account.notifications.priceAlert.warning.lowerPriceTooHigh=ราคาที่ต่ำกว่าต้องต่ำกว่าราคาที่สูงขึ้น @@ -1327,7 +1327,7 @@ displayUpdateDownloadWindow.status.verifying=กำลังตรวจสอ displayUpdateDownloadWindow.button.label=ดาวน์โหลดตัวติดตั้งและยืนยันลายเซ็น displayUpdateDownloadWindow.button.downloadLater=ดาวน์โหลดในภายหลัง displayUpdateDownloadWindow.button.ignoreDownload=ไม่สนใจเวอร์ชั่นนี้ -displayUpdateDownloadWindow.headline=การอัปเดต Bisq ใหม่พร้อมแล้ว! +displayUpdateDownloadWindow.headline=การอัปเดต Haveno ใหม่พร้อมแล้ว! displayUpdateDownloadWindow.download.failed.headline=การดาวน์โหลดล้มเหลว displayUpdateDownloadWindow.download.failed=Download failed.\nPlease download and verify manually at [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unable to determine the correct installer. Please download and verify manually at [HYPERLINK:https://bisq.network/downloads] @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=Close without any payout disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout? emptyWalletWindow.headline={0} กระเป๋าสตางค์ฉุกเฉิน -emptyWalletWindow.info=โปรดใช้ในกรณีฉุกเฉินเท่านั้นหากคุณไม่สามารถเข้าถึงเงินจาก UI ได้\n\nโปรดทราบว่าข้อเสนอแบบเปิดทั้งหมดจะถูกปิดโดยอัตโนมัติเมื่อใช้เครื่องมือนี้\n\nก่อนที่คุณจะใช้เครื่องมือนี้โปรดสำรองข้อมูลในสารบบข้อมูลของคุณ คุณสามารถดำเนินการได้ที่ \"บัญชี / การสำรองข้อมูล \" \n\nโปรดรายงานปัญหาของคุณและส่งรายงานข้อบกพร่องเกี่ยวกับ GitHub หรือที่ฟอรัม Bisq เพื่อให้เราสามารถตรวจสอบสิ่งที่เป็นสาเหตุของปัญหาได้ +emptyWalletWindow.info=โปรดใช้ในกรณีฉุกเฉินเท่านั้นหากคุณไม่สามารถเข้าถึงเงินจาก UI ได้\n\nโปรดทราบว่าข้อเสนอแบบเปิดทั้งหมดจะถูกปิดโดยอัตโนมัติเมื่อใช้เครื่องมือนี้\n\nก่อนที่คุณจะใช้เครื่องมือนี้โปรดสำรองข้อมูลในสารบบข้อมูลของคุณ คุณสามารถดำเนินการได้ที่ \"บัญชี / การสำรองข้อมูล \" \n\nโปรดรายงานปัญหาของคุณและส่งรายงานข้อบกพร่องเกี่ยวกับ GitHub หรือที่ฟอรัม Haveno เพื่อให้เราสามารถตรวจสอบสิ่งที่เป็นสาเหตุของปัญหาได้ emptyWalletWindow.balance=ยอดในกระเป๋าสตางค์ที่คงเหลือที่มีอยู่ emptyWalletWindow.address=ที่อยู่ปลายทางของคุณ emptyWalletWindow.button=ส่งเงินทั้งหมด @@ -1453,7 +1453,7 @@ offerDetailsWindow.creationDate=วันที่สร้าง offerDetailsWindow.makersOnion=ที่อยู่ onion ของผู้สร้าง qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Please use this QR code for funding your Bisq wallet from your external wallet. +qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet. qRCodeWindow.request=คำขอชำระเงิน: \n{0} selectDepositTxWindow.headline=เลือกรายการเงินฝากสำหรับกรณีพิพาท @@ -1562,7 +1562,7 @@ popup.headline.error=ผิดพลาด popup.doNotShowAgain=ไม่ต้องแสดงอีกครั้ง popup.reportError.log=เปิดไฟล์ที่บันทึก popup.reportError.gitHub=รายงานไปที่ตัวติดตามปัญหา GitHub -popup.reportError={0}\n\nTo help us to improve the software please report this bug by opening a new issue at https://github.com/bisq-network/bisq/issues.\nThe above error message will be copied to the clipboard when you click either of the buttons below.\nIt will make debugging easier if you include the bisq.log file by pressing "Open log file", saving a copy, and attaching it to your bug report. +popup.reportError={0}\n\nTo help us to improve the software please report this bug by opening a new issue at https://github.com/bisq-network/bisq/issues.\nThe above error message will be copied to the clipboard when you click either of the buttons below.\nIt will make debugging easier if you include the haveno.log file by pressing "Open log file", saving a copy, and attaching it to your bug report. popup.error.tryRestart=โปรดลองเริ่มแอปพลิเคชั่นของคุณใหม่และตรวจสอบการเชื่อมต่อเครือข่ายของคุณเพื่อดูว่าคุณสามารถแก้ไขปัญหาได้หรือไม่ popup.error.takeOfferRequestFailed=เกิดข้อผิดพลาดขึ้นเมื่อมีคนพยายามรับข้อเสนอของคุณ: \n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=wallet ยังไม่ได้เริ่มต้น -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. -popup.warning.wrongVersion=คุณอาจมีเวอร์ชั่น Bisq ไม่เหมาะสำหรับคอมพิวเตอร์นี้\nสถาปัตยกรรมคอมพิวเตอร์ของคุณคือ: {0} .\nเลขฐานสอง Bisq ที่คุณติดตั้งคือ: {1} .\nโปรดปิดตัวลงและติดตั้งรุ่นที่ถูกต้องอีกครั้ง ({2}) -popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. -popup.warning.startupFailed.twoInstances=Bisq กำลังทำงานอยู่ คุณไม่สามารถเรียกใช้ Bisq พร้อมกันได้ +popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\nHaveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. +popup.warning.wrongVersion=คุณอาจมีเวอร์ชั่น Haveno ไม่เหมาะสำหรับคอมพิวเตอร์นี้\nสถาปัตยกรรมคอมพิวเตอร์ของคุณคือ: {0} .\nเลขฐานสอง Haveno ที่คุณติดตั้งคือ: {1} .\nโปรดปิดตัวลงและติดตั้งรุ่นที่ถูกต้องอีกครั้ง ({2}) +popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Haveno installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. +popup.warning.startupFailed.twoInstances=Haveno กำลังทำงานอยู่ คุณไม่สามารถเรียกใช้ Haveno พร้อมกันได้ popup.warning.tradePeriod.halfReached=การซื้อขายของคุณที่มีรหัส ID {0} ได้ถึงครึ่งหนึ่งของจำนวนสูงสุดแล้ว อนุญาตให้ซื้อขายได้และยังไม่สมบูรณ์\n\nช่วงเวลาการซื้อขายสิ้นสุดวันที่ {1} \n\nโปรดตรวจสอบสถานะการค้าของคุณที่ \"Portfolio (แฟ้มผลงาน) / เปิดการซื้อขาย \" สำหรับข้อมูลเพิ่มเติม popup.warning.tradePeriod.ended=Your trade with ID {0} has reached the max. allowed trading period and is not completed.\n\nThe trade period ended on {1}\n\nPlease check your trade at \"Portfolio/Open trades\" for contacting the arbitrator. popup.warning.noTradingAccountSetup.headline=คุณยังไม่ได้ตั้งค่าบัญชีการซื้อขาย @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=There are no mediators available. popup.warning.notFullyConnected=คุณต้องรอจนกว่าคุณจะเชื่อมต่อกับเครือข่ายอย่างสมบูรณ์\nอาจใช้เวลาประมาณ 2 นาทีเมื่อเริ่มต้น popup.warning.notSufficientConnectionsToBtcNetwork=คุณต้องรอจนกว่าจะมีการเชื่อมต่อกับเครือข่าย Bitcoin อย่างน้อย {0} รายการ popup.warning.downloadNotComplete=คุณต้องรอจนกว่าการดาวน์โหลดบล็อค Bitcoin ที่ขาดหายไปจะเสร็จสมบูรณ์ -popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=The Haveno wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=คุณแน่ใจหรือไม่ว่าต้องการนำข้อเสนอนั้นออก\nค่าธรรมเนียมของผู้สร้าง {0} จะสูญหายไปหากคุณนำข้อเสนอนั้นออก popup.warning.tooLargePercentageValue=คุณไม่สามารถกำหนดเปอร์เซ็นต์เป็น 100% หรือมากกว่าได้ popup.warning.examplePercentageValue=โปรดป้อนตัวเลขเปอร์เซ็นต์เช่น \"5.4 \" เป็น 5.4% @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. # suppress inspection "UnusedProperty" popup.warning.priceRelay=ราคาผลัดเปลี่ยน popup.warning.seed=รหัสลับเพื่อกู้ข้อมูล -popup.warning.mandatoryUpdate.trading=Please update to the latest Bisq version. A mandatory update was released which disables trading for old versions. Please check out the Bisq Forum for more information. -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=Please update to the latest Haveno version. A mandatory update was released which disables trading for old versions. Please check out the Haveno Forum for more information. +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=This transaction is not possible, as the mining fees of {0} would exceed the amount to transfer of {1}. Please wait until the mining fees are low again or until you''ve accumulated more BTC to transfer. -popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. popup.warning.trade.txRejected.tradeFee=trade fee popup.warning.trade.txRejected.deposit=deposit -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.info.securityDepositInfo=เพื่อให้แน่ใจว่าเทรดเดอร์ทั้งคู่นั้นได้ปฏิบัติตามข้อสนธิสัญญาในการค้า เทรดเดอร์จำเป็นต้องทำการชำระค่าประกัน\n\nค่าประกันนี้คือถูกเก็บไว้ในกระเป๋าสตางค์การเทรดของคุณจนกว่าการเทรดของคุณจะดำเนินการสำเร็จ และคุณจะได้รับมันคืนหลังจากนั้น \n\nโปรดทราบ: หากคุณกำลังสร้างข้อเสนอขึ้นมาใหม่ Bisq จำเป็นที่ต้องดำเนินงานต่อเนื่องไปยังเทรดเดอร์รายอื่น และเพื่อที่สถานะข้อเสนอทางออนไลน์ของคุณจะยังคงอยู่ Bisq จะยังคงดำเนินงานต่อเนื่อง และโปรดมั่นใจว่าเครื่องคอมพิวเตอร์นี้กำลังออนไลน์อยู่ด้วยเช่นกัน (ยกตัวอย่างเช่น ตรวจเช็คว่าสวิทช์ไฟไม่ได้อยู่ในโหมดแสตนบายด์...หน้าจอแสตนบายด์คือปกติดี) +popup.info.securityDepositInfo=เพื่อให้แน่ใจว่าเทรดเดอร์ทั้งคู่นั้นได้ปฏิบัติตามข้อสนธิสัญญาในการค้า เทรดเดอร์จำเป็นต้องทำการชำระค่าประกัน\n\nค่าประกันนี้คือถูกเก็บไว้ในกระเป๋าสตางค์การเทรดของคุณจนกว่าการเทรดของคุณจะดำเนินการสำเร็จ และคุณจะได้รับมันคืนหลังจากนั้น \n\nโปรดทราบ: หากคุณกำลังสร้างข้อเสนอขึ้นมาใหม่ Haveno จำเป็นที่ต้องดำเนินงานต่อเนื่องไปยังเทรดเดอร์รายอื่น และเพื่อที่สถานะข้อเสนอทางออนไลน์ของคุณจะยังคงอยู่ Haveno จะยังคงดำเนินงานต่อเนื่อง และโปรดมั่นใจว่าเครื่องคอมพิวเตอร์นี้กำลังออนไลน์อยู่ด้วยเช่นกัน (ยกตัวอย่างเช่น ตรวจเช็คว่าสวิทช์ไฟไม่ได้อยู่ในโหมดแสตนบายด์...หน้าจอแสตนบายด์คือปกติดี) popup.info.cashDepositInfo=โปรดตรวจสอบว่าคุณมีสาขาธนาคารในพื้นที่ของคุณเพื่อสามารถฝากเงินได้\nรหัสธนาคาร (BIC / SWIFT) ของธนาคารผู้ขายคือ: {0} popup.info.cashDepositInfo.confirm=ฉันยืนยันว่าฉันสามารถฝากเงินได้ -popup.info.shutDownWithOpenOffers=Bisq คือกำลังจะปิดลง แต่ยังคงมีการเปิดขายข้อเสนอปกติ\nข้อเสนอเหล่านี้จะไม่ใข้งานได้บนเครือข่าย P2P network ในขณะที่ Bisq ปิดตัวลง แต่จะมีการเผยแพร่บนเครือข่าย P2P ครั้งถัดไปเมื่อคุณมีการเริ่มใช้งาน Bisq.\n\nในการคงสถานะข้อเสนอแบบออนไลน์ คือเปิดใข้งาน Bisq และทำให้มั่นใจว่าคอมพิวเตอร์เครื่องนี้กำลังออนไลน์อยู่ด้วยเช่นกัน (เช่น ตรวจสอบว่าคอมพิวเตอร์ไม่ได้อยู่ในโหมดแสตนบายด์...หน้าจอแสตนบายด์ไม่มีปัญหา) -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\nPlease make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.info.shutDownWithOpenOffers=Haveno คือกำลังจะปิดลง แต่ยังคงมีการเปิดขายข้อเสนอปกติ\nข้อเสนอเหล่านี้จะไม่ใข้งานได้บนเครือข่าย P2P network ในขณะที่ Haveno ปิดตัวลง แต่จะมีการเผยแพร่บนเครือข่าย P2P ครั้งถัดไปเมื่อคุณมีการเริ่มใช้งาน Haveno.\n\nในการคงสถานะข้อเสนอแบบออนไลน์ คือเปิดใข้งาน Haveno และทำให้มั่นใจว่าคอมพิวเตอร์เครื่องนี้กำลังออนไลน์อยู่ด้วยเช่นกัน (เช่น ตรวจสอบว่าคอมพิวเตอร์ไม่ได้อยู่ในโหมดแสตนบายด์...หน้าจอแสตนบายด์ไม่มีปัญหา) +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\nPlease make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.privateNotification.headline=การแจ้งเตือนส่วนตัวที่สำคัญ! popup.securityRecommendation.headline=ข้อเสนอแนะด้านความปลอดภัยที่สำคัญ popup.securityRecommendation.msg=เราขอแจ้งเตือนให้คุณพิจารณาใช้การป้องกันด้วยรหัสผ่านสำหรับ wallet ของคุณ หากยังไม่ได้เปิดใช้งาน\n\nขอแนะนำให้เขียนรหัสลับป้องกัน wallet รหัสลับเหล่านี้เหมือนกับรหัสผ่านหลักสำหรับการกู้คืน Bitcoin wallet ของคุณ\nไปที่ \"กระเป๋าสตางค์ \" คุณจะพบข้อมูลเพิ่มเติม\n\nนอกจากนี้คุณควรสำรองโฟลเดอร์ข้อมูลแอ็พพลิเคชั่นทั้งหมดไว้ที่ส่วน \"สำรองข้อมูล \" -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=การปิดระบบอยู่ระหว่างดำเนินการ popup.shutDownInProgress.msg=การปิดแอพพลิเคชั่นอาจใช้เวลาสักครู่\nโปรดอย่าขัดจังหวะกระบวนการนี้ @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=อัพเดตกระเป๋าสต notification.walletUpdate.msg=กระเป๋าสตางค์ของคุณได้รับเงินเพียงพอ\nจำนวนเงิน: {0} notification.takeOffer.walletUpdate.msg=wallet ของคุณได้รับการสนับสนุนจากการเสนอราคาก่อนหน้านี้\nจำนวนเงิน: {0} notification.tradeCompleted.headline=การื้อขายเสร็จสิ้น -notification.tradeCompleted.msg=คุณสามารถถอนเงินของคุณตอนนี้ไปยังแหล่งเงินกระเป๋าสตางค์นอก Bitcoin ของคุณหรือโอนเงินไปที่กระเป๋าสตางค์ของ Bisq +notification.tradeCompleted.msg=คุณสามารถถอนเงินของคุณตอนนี้ไปยังแหล่งเงินกระเป๋าสตางค์นอก Bitcoin ของคุณหรือโอนเงินไปที่กระเป๋าสตางค์ของ Haveno #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=คุณสามารถถอนเงิน systemTray.show=แสดงหน้าต่างแอ็พพลิเคชั่น systemTray.hide=ซ่อนหน้าต่างแอ็พพลิเคชั่น -systemTray.info=ข้อมูลเกี่ยวกับ Bisq +systemTray.info=ข้อมูลเกี่ยวกับ Haveno systemTray.exit=ออก -systemTray.tooltip=Bisq: A decentralized bitcoin exchange network +systemTray.tooltip=Haveno: A decentralized bitcoin exchange network #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=ดึงข้อมูลจากรหัสผ่าน password.walletDecrypted=กระเป๋าสตางค์ถูกถอดรหัสสำเร็จและการป้องกันรหัสผ่านได้มีการออกแล้ว password.wrongPw=คุณป้อนรหัสผ่านไม่ถูกต้อง\n\nโปรดลองป้อนรหัสผ่านอีกครั้งโดยละเอียด เพื่อตรวจสอบความผิดพลาดในการพิมพ์หรือสะกด password.walletEncrypted=เปิดใช้งานกระเป๋าสตางค์ที่เข้ารหัสแล้วและเปิดใช้งานการป้องกันด้วยรหัสผ่านแล้ว -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=รหัสผ่าน 2 รายการที่คุณป้อนไม่ตรงกัน password.forgotPassword=ลืมรหัสผ่านหรือเปล่า? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\nIt is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\nYou must empty seed.warn.walletNotEmpty.restore=ฉันต้องการเรียกคืนอีกครั้ง seed.warn.walletNotEmpty.emptyWallet=ฉันจะทำให้กระเป๋าสตางค์ของฉันว่างเปล่าก่อน seed.warn.notEncryptedAnymore=กระเป๋าสตางค์ของคุณได้รับการเข้ารหัสแล้ว\n\nหลังจากเรียกคืน wallets จะไม่ได้รับการเข้ารหัสและคุณต้องตั้งรหัสผ่านใหม่\n\nคุณต้องการดำเนินการต่อหรือไม่ -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? seed.restore.success=กระเป๋าสตางค์ได้รับการกู้คืนข้อมูลด้วยรหัสลับเพื่อป้องกันและกู้คืนกระเป๋าสตางค์ด้วยรหัสลับใหม่แล้ว\n\nคุณจำเป็นต้องปิดและรีสตาร์ทแอ็พพลิเคชั่น seed.restore.error=เกิดข้อผิดพลาดขณะกู้คืนกระเป๋าสตางค์ด้วยรหัสลับ {0} seed.restore.openOffers.warn=You have open offers which will be removed if you restore from seed words.\nAre you sure that you want to continue? @@ -1949,17 +1949,17 @@ payment.accountType=ประเภทบัญชี payment.checking=การตรวจสอบ payment.savings=ออมทรัพย์ payment.personalId=รหัส ID ประจำตัวบุคคล -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. -payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Bisq to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Haveno account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Haveno. +payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Haveno to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=เมื่อมีการใช้งาน HalCash ผู้ซื้อ BTC จำเป็นต้องส่งรหัส Halcash ให้กับผู้ขายทางข้อความโทรศัพท์มือถือ\n\nโปรดตรวจสอบว่าไม่เกินจำนวนเงินสูงสุดที่ธนาคารของคุณอนุญาตให้คุณส่งด้วย HalCash จำนวนเงินขั้นต่ำในการเบิกถอนคือ 10 EUR และสูงสุดในจำนวนเงิน 600 EUR สำหรับการถอนซ้ำเป็น 3000 EUR ต่อผู้รับและต่อวัน และ 6000 EUR ต่อผู้รับและต่อเดือน โปรดตรวจสอบข้อจำกัดจากทางธนาคารคุณเพื่อให้มั่นใจได้ว่าทางธนาคารได้มีการใช้มาตรฐานข้อกำหนดเดียวกันกับดังที่ระบุไว้ ณ ที่นี่\n\nจำนวนเงินที่ถอนจะต้องเป็นจำนวนเงินหลาย 10 EUR เนื่องจากคุณไม่สามารถถอนเงินอื่น ๆ ออกจากตู้เอทีเอ็มได้ UI ในหน้าจอสร้างข้อเสนอและรับข้อเสนอจะปรับจำนวนเงิน BTC เพื่อให้จำนวนเงิน EUR ถูกต้อง คุณไม่สามารถใช้ราคาตลาดเป็นจำนวนเงิน EUR ซึ่งจะเปลี่ยนแปลงไปตามราคาที่มีการปรับเปลี่ยน\n\nในกรณีที่มีข้อพิพาทผู้ซื้อ BTC ต้องแสดงหลักฐานว่าได้ส่ง EUR แล้ว # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Bisq sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=โปรดยืนยันว่าธนาคารของคุณได้อนุมัติให้คุณสามารถส่งเงินสดให้กับบัญชีบุคคลอื่นได้ ตัวอย่างเช่น บางธนาคารที่ไม่ได้มีการบริการถ่ายโอนเงินสดอย่าง Bank of America และ Wells Fargo @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=ข้อมูลติดต่อ payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1996,7 +1996,7 @@ payment.japan.recipient=ชื่อ payment.australia.payid=PayID payment.payid=PayID linked to financial institution. Like email address or mobile phone. payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 252684f1..898a9503 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -103,14 +103,14 @@ shared.faq=Visit FAQ page shared.yesCancel=Có, hủy shared.nextStep=Bước tiếp theo shared.selectTradingAccount=Chọn tài khoản giao dịch -shared.fundFromSavingsWalletButton=Chuyển tiền từ Ví Bisq +shared.fundFromSavingsWalletButton=Chuyển tiền từ Ví Haveno shared.fundFromExternalWalletButton=Mở ví ngoài để nộp tiền shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed? shared.belowInPercent=Thấp hơn % so với giá thị trường shared.aboveInPercent=Cao hơn % so với giá thị trường shared.enterPercentageValue=Nhập giá trị % shared.OR=HOẶC -shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Bisq wallet at Funds > Receive Funds. +shared.notEnoughFunds=You don''t have enough funds in your Haveno wallet for this transaction—{0} is needed but only {1} is available.\n\nPlease add funds from an external wallet, or fund your Haveno wallet at Funds > Receive Funds. shared.waitingForFunds=Đợi nộp tiền... shared.TheBTCBuyer=Người mua BTC shared.You=Bạn @@ -125,7 +125,7 @@ shared.notUsedYet=Chưa được sử dụng shared.date=Ngày shared.sendFundsDetailsWithFee=Sending: {0}\nFrom address: {1}\nTo receiving address: {2}.\nRequired mining fee is: {3} ({4} satoshis/vbyte)\nTransaction vsize: {5} vKb\n\nThe recipient will receive: {6}\n\nAre you sure you want to withdraw this amount? # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n +shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Bitcoin consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n shared.copyToClipboard=Sao chép đến clipboard shared.language=Ngôn ngữ shared.country=Quốc gia @@ -235,8 +235,8 @@ mainView.menu.settings=Cài đặt mainView.menu.account=Tài khoản mainView.marketPriceWithProvider.label=Giá thị trường theo {0} -mainView.marketPrice.bisqInternalPrice=Giá giao dịch Bisq gần nhất -mainView.marketPrice.tooltip.bisqInternalPrice=Không có giá thị trường từ nhà cung cấp bên ngoài.\nGiá hiển thị là giá giao dịch Bisq gần nhất với đồng tiền này. +mainView.marketPrice.havenoInternalPrice=Giá giao dịch Haveno gần nhất +mainView.marketPrice.tooltip.havenoInternalPrice=Không có giá thị trường từ nhà cung cấp bên ngoài.\nGiá hiển thị là giá giao dịch Haveno gần nhất với đồng tiền này. mainView.marketPrice.tooltip=Giá thị trường được cung cấp bởi {0}{1}\nCập nhật mới nhất: {2}\nURL nút nhà cung cấp: {3} mainView.balance.available=Số dư hiện có mainView.balance.reserved=Phần được bảo lưu trong báo giá @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Đang kết nối với mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Bisq network peers: {1} +mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} mainView.bootstrapState.connectionToTorNetwork=(1/4) Kết nối với mạng ... mainView.bootstrapState.torNodeCreated=(2/4) Nút Tor được tạo @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Nhận dữ liệu ban đầu mainView.bootstrapWarning.noSeedNodesAvailable=Không có seed nodes khả dụng mainView.bootstrapWarning.noNodesAvailable=Không có seed nodes và đối tác ngang hàng khả dụng -mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Bisq network failed +mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Haveno network failed mainView.p2pNetworkWarnMsg.noNodesAvailable=Không có seed nodes hay đối tác ngang hàng để yêu cầu dữ liệu.\nVui lòng kiểm tra kết nối internet hoặc thử khởi động lại ứng dụng. -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Bisq network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Haveno network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application. mainView.walletServiceErrorMsg.timeout=Kết nối tới mạng Bitcoin không thành công do hết thời gian chờ. mainView.walletServiceErrorMsg.connectionError=Kết nối tới mạng Bitcoin không thành công do lỗi: {0} @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=Kết nối tới mạng Bitcoin mainView.walletServiceErrorMsg.rejectedTxException=A transaction was rejected from the network.\n\n{0} mainView.networkWarning.allConnectionsLost=Mất kết nối tới tất cả mạng ngang hàng {0}.\nCó thể bạn mất kết nối internet hoặc máy tính đang ở chế độ standby. -mainView.networkWarning.localhostBitcoinLost=Mất kết nối tới nút Bitcoin máy chủ nội bộ.\nVui lòng khởi động lại ứng dụng Bisq để nối với nút Bitcoin khác hoặc khởi động lại nút Bitcoin máy chủ nội bộ. +mainView.networkWarning.localhostBitcoinLost=Mất kết nối tới nút Bitcoin máy chủ nội bộ.\nVui lòng khởi động lại ứng dụng Haveno để nối với nút Bitcoin khác hoặc khởi động lại nút Bitcoin máy chủ nội bộ. mainView.version.update=(Có cập nhật) @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount offerbook.warning.wrongTradeProtocol=Lệnh này cần phiên bản giao thức khác với được sử dụng trong phiên bản phần mềm của bạn.\n\nHãy kiểm tra xem bạn đã cài đặt phiên bản mới nhất chưa, nếu không người dùng đã tạo lệnh đã sử dụng phiên bản cũ.\n\nNgười dùng không thể giao dịch với phiên bản giao thức giao dịch không tương thích. offerbook.warning.userIgnored=Bạn đã thêm địa chỉ onion của người dùng vào danh sách bỏ qua. -offerbook.warning.offerBlocked=Báo giá này bị chặn bởi các lập trình viên Bisq.\nCó thể có sự cố chưa được xử lý dẫn tới vấn đề khi nhận lệnh này. -offerbook.warning.currencyBanned=Loại tiền sử dụng trong báo giá này bị chặn bởi các lập trình viên Bisq.\nTruy cập diễn đàn Bisq để biết thêm thông tin. -offerbook.warning.paymentMethodBanned=Phương thức thanh toán sử dụng trong báo giá này bị chặn bởi các lập trình viên Bisq.\nTruy cập diễn đàn Bisq để biết thêm thông tin. -offerbook.warning.nodeBlocked=Địa chỉ onion của Thương gia bị chặn bởi các lập trình viên Bisq.\nCó thể có sự cố chưa được xử lý dẫn tới vấn đề khi nhận báo giá từ Thương gia này. -offerbook.warning.requireUpdateToNewVersion=Your version of Bisq is not compatible for trading anymore.\nPlease update to the latest Bisq version at [HYPERLINK:https://bisq.network/downloads]. +offerbook.warning.offerBlocked=Báo giá này bị chặn bởi các lập trình viên Haveno.\nCó thể có sự cố chưa được xử lý dẫn tới vấn đề khi nhận lệnh này. +offerbook.warning.currencyBanned=Loại tiền sử dụng trong báo giá này bị chặn bởi các lập trình viên Haveno.\nTruy cập diễn đàn Haveno để biết thêm thông tin. +offerbook.warning.paymentMethodBanned=Phương thức thanh toán sử dụng trong báo giá này bị chặn bởi các lập trình viên Haveno.\nTruy cập diễn đàn Haveno để biết thêm thông tin. +offerbook.warning.nodeBlocked=Địa chỉ onion của Thương gia bị chặn bởi các lập trình viên Haveno.\nCó thể có sự cố chưa được xử lý dẫn tới vấn đề khi nhận báo giá từ Thương gia này. +offerbook.warning.requireUpdateToNewVersion=Your version of Haveno is not compatible for trading anymore.\nPlease update to the latest Haveno version at [HYPERLINK:https://bisq.network/downloads]. offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. It could be that your previous take-offer attempt resulted in a failed trade. offerbook.info.sellAtMarketPrice=Bạn sẽ bán với giá thị trường (cập nhật mỗi phút). @@ -423,7 +423,7 @@ createOffer.fundsBox.title=Nộp tiền cho chào giá của bạn createOffer.fundsBox.offerFee=Phí giao dịch createOffer.fundsBox.networkFee=Phí đào createOffer.fundsBox.placeOfferSpinnerInfo=Báo giá đang được công bố -createOffer.fundsBox.paymentLabel=giao dịch Bisq với ID {0} +createOffer.fundsBox.paymentLabel=giao dịch Haveno với ID {0} createOffer.fundsBox.fundsStructure=({0} tiền đặt cọc, {1} phí giao dịch, {2} phí đào) createOffer.success.headline=Chào giá của bạn đã được công bố createOffer.success.info=Bạn có thể quản lý báo giá hiện hành của bạn tại \"Portfolio/ báo giá hiện tại của bạn\". @@ -447,12 +447,12 @@ createOffer.placeOfferButton=Kiểm tra:: Đặt báo giá cho {0} monero createOffer.createOfferFundWalletInfo.headline=Nộp tiền cho báo giá của bạn # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Khoản tiền giao dịch: {0} \n -createOffer.createOfferFundWalletInfo.msg=Bạn cần đặt cọc {0} cho báo giá này.\n\nCác khoản tiền này sẽ được giữ trong ví nội bộ của bạn và sẽ bị khóa vào địa chỉ đặt cọc multisig khi có người nhận báo giá của bạn.\n\nKhoản tiền này là tổng của:\n{1}- tiền gửi đại lý của bạn: {2}\n- Phí giao dịch: {3}\n- Phí đào: {4}\n\nBạn có thể chọn giữa hai phương án khi nộp tiền cho giao dịch:\n- Sử dụng ví Bisq của bạn (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví bên ngoài (riêng tư hơn)\n\nBạn sẽ xem các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này. +createOffer.createOfferFundWalletInfo.msg=Bạn cần đặt cọc {0} cho báo giá này.\n\nCác khoản tiền này sẽ được giữ trong ví nội bộ của bạn và sẽ bị khóa vào địa chỉ đặt cọc multisig khi có người nhận báo giá của bạn.\n\nKhoản tiền này là tổng của:\n{1}- tiền gửi đại lý của bạn: {2}\n- Phí giao dịch: {3}\n- Phí đào: {4}\n\nBạn có thể chọn giữa hai phương án khi nộp tiền cho giao dịch:\n- Sử dụng ví Haveno của bạn (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví bên ngoài (riêng tư hơn)\n\nBạn sẽ xem các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này. # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=Có lỗi xảy ra khi đặt chào giá:\n\n{0}\n\nKhông còn tiền trong ví của bạn.\nHãy khởi động lại ứng dụng và kiểm tra kết nối mạng. createOffer.setAmountPrice=Đặt số tiền và giá -createOffer.warnCancelOffer=Bạn đã nộp tiền cho báo giá.\nNếu bạn hủy bây giờ, số tiền của bạn sẽ chuyển sang ví Bisq nội bộ của bạn và sẵn sàng để rút tại màn hình \"Vốn/Gửi vốn\".\nBạn có chắc muốn hủy? +createOffer.warnCancelOffer=Bạn đã nộp tiền cho báo giá.\nNếu bạn hủy bây giờ, số tiền của bạn sẽ chuyển sang ví Haveno nội bộ của bạn và sẵn sàng để rút tại màn hình \"Vốn/Gửi vốn\".\nBạn có chắc muốn hủy? createOffer.timeoutAtPublishing=Lỗi hết thời gian xảy ra khi công bố lệnh createOffer.errorInfo=\n\nPhí người tạo đã được thanh toán. Trong trường hợp xấu nhất bạn mất phí này.\nHãy khởi động lại ứng dụng và kiểm tra kết nối mạng để xem bạn có thể xử lý vấn đề này không. createOffer.tooLowSecDeposit.warning=Bạn đã cài đặt tiền gửi đặt cọc thấp hơn giá trị mặc định khuyến cáo {0}.\nBạn có chắc bạn muốn sử dụng tiền gửi đặt cọc thấp hơn không? @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=Số tiền để bán takeOffer.fundsBox.offerFee=Phí giao dịch takeOffer.fundsBox.networkFee=Tổng phí đào takeOffer.fundsBox.takeOfferSpinnerInfo=Đang nhận chào giá ... -takeOffer.fundsBox.paymentLabel=giao dịch Bisq có ID {0} +takeOffer.fundsBox.paymentLabel=giao dịch Haveno có ID {0} takeOffer.fundsBox.fundsStructure=({0} tiền gửi đại lý, {1} phí giao dịch, {2} phí đào) takeOffer.success.headline=Bạn đã nhận báo giá thành công. takeOffer.success.info=Bạn có thể xem trạng thái giao dịch của bạn tại \"Portfolio/Các giao dịch mở\". @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=Bạn không thể nhận báo giá này do sử takeOffer.takeOfferFundWalletInfo.headline=Nộp tiền cho giao dịch của bạn # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Giá trị giao dịch: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Bạn cần nộp {0} để nhận báo giá này.\n\nGiá trị này là tổng của:\n{1}- Tiền ứng trước của bạn: {2}\n- phí giao dịch: {3}\n- Tổng phí đào: {4}\n\nBạn có thể chọn một trong hai phương án khi nộp tiền cho giao dịch của bạn:\n- Sử dụng ví Bisq (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví ngoài (riêng tư hơn)\n\nBạn sẽ thấy các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này. +takeOffer.takeOfferFundWalletInfo.msg=Bạn cần nộp {0} để nhận báo giá này.\n\nGiá trị này là tổng của:\n{1}- Tiền ứng trước của bạn: {2}\n- phí giao dịch: {3}\n- Tổng phí đào: {4}\n\nBạn có thể chọn một trong hai phương án khi nộp tiền cho giao dịch của bạn:\n- Sử dụng ví Haveno (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví ngoài (riêng tư hơn)\n\nBạn sẽ thấy các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này. takeOffer.alreadyPaidInFunds=Bạn đã thanh toán, bạn có thể rút số tiền này tại màn hình \"Vốn/Gửi vốn\". takeOffer.paymentInfo=Thông tin thanh toán takeOffer.setAmountPrice=Cài đặt số tiền -takeOffer.alreadyFunded.askCancel=Bạn đã nộp tiền cho chào giá này.\nNếu bạn hủy bây giờ, số tiền của bạn sẽ được chuyển sang ví Bisq nội bộ của bạn và sẵn sàng để rút tại màn hình Màn hình \"Vốn/Gửi vốn\".\nBạn có chắc muốn hủy? +takeOffer.alreadyFunded.askCancel=Bạn đã nộp tiền cho chào giá này.\nNếu bạn hủy bây giờ, số tiền của bạn sẽ được chuyển sang ví Haveno nội bộ của bạn và sẵn sàng để rút tại màn hình Màn hình \"Vốn/Gửi vốn\".\nBạn có chắc muốn hủy? takeOffer.failed.offerNotAvailable=Nhận yêu cầu chào giá không thành công do chào giá không còn tồn tại. Có thể trong lúc chờ đợi, Thương gia khác đã nhận chào giá này. takeOffer.failed.offerTaken=Bạn không thể nhận chào giá này vì đã được nhận bởi Thương gia khác. takeOffer.failed.offerRemoved=Bạn không thể nhận chào giá này vì trong lúc chời đợi, chào giá này đã bị gỡ bỏ. @@ -536,7 +536,7 @@ editOffer.confirmEdit=Xác nhận: Chỉnh sửa báo giá editOffer.publishOffer=Công bố báo giá. editOffer.failed=Chỉnh sửa báo giá không thành công:\n{0} editOffer.success=Báo giá của bạn đã được chỉnh sửa thành công. -editOffer.invalidDeposit=Số tiền đặt cọc cho người mua không nằm trong giới hạn quy định bởi DAO Bisq và không thể chỉnh sửa được nữa +editOffer.invalidDeposit=Số tiền đặt cọc cho người mua không nằm trong giới hạn quy định bởi DAO Haveno và không thể chỉnh sửa được nữa #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=The deposit transaction is still not conf # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=YÊU CẦU QUAN TRỌNG:\nSau k # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=Hãy gửi {0} bằng \"Phiếu chuyển tiền US\" cho người bán BTC.\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Gửi MTCN và biên portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Bạn cần phải gửi MTCN (số theo dõi) và ảnh chụp giấy biên nhận bằng email cho người bán BTC.\nGiấy biên nhận phải nêu rõ họ tên, thành phố, quốc gia của người bán và số tiền. Địa chỉ email của người bán là: {0}.\n\nBạn đã gửi MTCN và hợp đồng cho người bán chưa? portfolio.pending.step2_buyer.halCashInfo.headline=Gửi mã HalCash portfolio.pending.step2_buyer.halCashInfo.msg=Bạn cần nhắn tin mã HalCash và mã giao dịch ({0}) tới người bán BTC. \nSố điện thoại của người bán là {1}.\n\nBạn đã gửi mã tới người bán chưa? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Bisq clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might verify the receiver's name. Faster Payments accounts created in old Haveno clients do not provide the receiver's name, so please use trade chat to obtain it (if needed). portfolio.pending.step2_buyer.confirmStart.headline=Xác nhận rằng bạn đã bắt đầu thanh toán portfolio.pending.step2_buyer.confirmStart.msg=Bạn đã kích hoạt thanh toán {0} cho Đối tác giao dịch của bạn chưa? portfolio.pending.step2_buyer.confirmStart.yes=Có, tôi đã bắt đầu thanh toán portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Bisq requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\nBy not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\nBeside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\nSee more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway portfolio.pending.step2_seller.waitPayment.headline=Đợi thanh toán @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=Người mua BTC vẫn chưa thanh toán {0} portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started their payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the mediator for assistance. tradeChat.chatWindowTitle=Chat window for trade with ID ''{0}'' tradeChat.openChat=Open chat window -tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Bisq (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. +tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\nIt is not mandatory to reply in the chat.\nIf a trader violates any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\nChat rules:\n\t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\t● Do not send your seed words, private keys, passwords or other sensitive information!\n\t● Do not encourage trading outside of Haveno (no security).\n\t● Do not engage in any form of social engineering scam attempts.\n\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or troll-box.\n\t● Keep conversation friendly and respectful. # suppress inspection "UnusedProperty" message.state.UNDEFINED=Không xác định @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=tiền gửi đặt cọc được hoàn portfolio.pending.step5_buyer.withdrawBTC=Rút bitcoin của bạn portfolio.pending.step5_buyer.amount=Số tiền được rút portfolio.pending.step5_buyer.withdrawToAddress=rút tới địa chỉ -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToHavenoWallet=Keep funds in Haveno wallet portfolio.pending.step5_buyer.withdrawExternal=rút tới ví ngoài portfolio.pending.step5_buyer.alreadyWithdrawn=Số tiền của bạn đã được rút.\nVui lòng kiểm tra lịch sử giao dịch. portfolio.pending.step5_buyer.confirmWithdrawal=Xác nhận yêu cầu rút @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=Bạn đã nhận tradeFeedbackWindow.title=Chúc mừng giao dịch của bạn được hoàn thành. tradeFeedbackWindow.msg.part1=Chúng tôi rất vui lòng được nghe phản hồi của bạn. Điều đó sẽ giúp chúng tôi cải thiện phần mềm và hoàn thiện trải nghiệm người dùng. Nếu bạn muốn cung cấp phản hồi, vui lòng điền vào cuộc khảo sát ngắn dưới đây (không yêu cầu đăng nhập) ở: -tradeFeedbackWindow.msg.part2=nếu bạn có câu hỏi hay vấn đề, vui lòng liên hệ với người dùng khác và các nhàn đóng góp qua Bisq forum ở: -tradeFeedbackWindow.msg.part3=Cám ơn bạn đã sử dụng Bisq! +tradeFeedbackWindow.msg.part2=nếu bạn có câu hỏi hay vấn đề, vui lòng liên hệ với người dùng khác và các nhàn đóng góp qua Haveno forum ở: +tradeFeedbackWindow.msg.part3=Cám ơn bạn đã sử dụng Haveno! portfolio.pending.role=Vai trò của tôi portfolio.pending.tradeInformation=Thông tin giao dịch @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=Sau xác nhận blockchain đầu tiên, thờ portfolio.pending.tradePeriodWarning=Nếu quá thời gian giao dịch, cả hai Thương gia đều có thể mở khiếu nại. portfolio.pending.tradeNotCompleted=giao dịch không được hoàn thành đúng thời gian (cho đến khi {0}) portfolio.pending.tradeProcess=Quá trình giao dịch -portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Bisq forum at [HYPERLINK:https://bisq.community]. +portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask for additional help on the Haveno forum at [HYPERLINK:https://haveno.community]. portfolio.pending.openAgainDispute.button=Mở khiếu nại lần nữa portfolio.pending.openSupportTicket.headline=Mở vé hỗ trợ portfolio.pending.openSupportTicket.msg=Please use this function only in emergency cases if you don't see a \"Open support\" or \"Open dispute\" button.\n\nWhen you open a support ticket the trade will be interrupted and handled by a mediator or arbitrator. portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute. -portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the trade to failed trades. portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the trade to failed trades. -portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\nFor further help please contact the Haveno support channel at the Haveno Keybase team. portfolio.pending.support.headline.getHelp=Need help? -portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Bisq community at https://bisq.community. If your issue still isn't resolved, you can request more help from a mediator. +portfolio.pending.support.text.getHelp=If you have any problems you can try to contact the trade peer in the trade chat or ask the Haveno community at https://haveno.community. If your issue still isn't resolved, you can request more help from a mediator. portfolio.pending.support.button.getHelp=Open Trader Chat portfolio.pending.support.headline.halfPeriodOver=Check payment portfolio.pending.support.headline.periodOver=Trade period is over @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee trans portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\nWithout this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. You can make a request to be reimbursed the trade fee here: [HYPERLINK:https://github.com/bisq-network/support/issues]\n\nFeel free to move this trade to failed trades. portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, but funds have been locked in the deposit transaction.\n\nPlease do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. The mediator should suggest that both peers each get back the the full amount of their security deposits (with seller receiving full trade amount back as well). This way, there is no security risk, and only trade fees are lost. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing but funds have been locked in the deposit transaction.\n\nIf the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\nIf the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of their security deposits (with seller receiving full trade amount back as well). Otherwise the trade amount should go to the buyer. \n\nYou can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] -portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Bisq mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] +portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\nError: {0}\n\nIt might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation ticket to get advice from Haveno mediators. \n\nIf the error was critical and the trade cannot be completed, you might have lost your trade fee. Request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\nThe trade cannot be completed and you might have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: [HYPERLINK:https://github.com/bisq-network/support/issues] portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\nDo you want to move the trade to failed trades?\n\nYou cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open trades screen any time. @@ -828,7 +828,7 @@ funds.tab.transactions=Giao dịch funds.deposit.unused=Không sử dụng funds.deposit.usedInTx=Sử dụng trong {0} giao dịch -funds.deposit.fundHavenoWallet=Nộp tiền ví Bisq +funds.deposit.fundHavenoWallet=Nộp tiền ví Haveno funds.deposit.noAddresses=Chưa có địa chỉ nộp tiền được tạo funds.deposit.fundWallet=Nộp tiền cho ví của bạn funds.deposit.withdrawFromWallet=Chuyển tiền từ ví @@ -886,12 +886,12 @@ funds.tx.withdrawnFromWallet=rút từ ví funds.tx.memo=Memo funds.tx.noTxAvailable=Không có giao dịch nào funds.tx.revert=Khôi phục -funds.tx.txSent=GIao dịch đã gửi thành công tới địa chỉ mới trong ví Bisq nội bộ. +funds.tx.txSent=GIao dịch đã gửi thành công tới địa chỉ mới trong ví Haveno nội bộ. funds.tx.direction.self=Gửi cho chính bạn funds.tx.reimbursementRequestTxFee=Yêu cầu bồi hoàn funds.tx.compensationRequestTxFee=Yêu cầu bồi thường funds.tx.dustAttackTx=Số dư nhỏ đã nhận -funds.tx.dustAttackTx.popup=Giao dịch này đang gửi một lượng BTC rất nhỏ vào ví của bạn và có thể đây là cách các công ty phân tích chuỗi đang tìm cách theo dõi ví của bạn.\nNếu bạn sử dụng đầu ra giao dịch đó cho một giao dịch chi tiêu, họ sẽ phát hiện ra rằng rất có thể bạn cũng là người sở hửu cái ví kia (nhập coin). \n\nĐể bảo vệ quyền riêng tư của bạn, ví Bisq sẽ bỏ qua các đầu ra có số dư nhỏ dành cho mục đích chi tiêu cũng như hiển thị số dư. Bạn có thể thiết lập ngưỡng khi một đầu ra được cho là có số dư nhỏ trong phần cài đặt. +funds.tx.dustAttackTx.popup=Giao dịch này đang gửi một lượng BTC rất nhỏ vào ví của bạn và có thể đây là cách các công ty phân tích chuỗi đang tìm cách theo dõi ví của bạn.\nNếu bạn sử dụng đầu ra giao dịch đó cho một giao dịch chi tiêu, họ sẽ phát hiện ra rằng rất có thể bạn cũng là người sở hửu cái ví kia (nhập coin). \n\nĐể bảo vệ quyền riêng tư của bạn, ví Haveno sẽ bỏ qua các đầu ra có số dư nhỏ dành cho mục đích chi tiêu cũng như hiển thị số dư. Bạn có thể thiết lập ngưỡng khi một đầu ra được cho là có số dư nhỏ trong phần cài đặt. #################################################################### # Support @@ -924,7 +924,7 @@ support.sendingMessage=Đang gửi tin nhắn... support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox. support.sendMessageError=Gửi tin nhắn thất bại. Lỗi: {0} support.receiverNotKnown=Receiver not known -support.wrongVersion=Báo giá trong khiếu nại này được tạo với phiên bản Bisq cũ.\nBạn không thể đóng khiếu nại với phiên bản ứng dụng của bạn.\n\nVui lòng sử dụng phiên bản giao thức cũ hơn {0} +support.wrongVersion=Báo giá trong khiếu nại này được tạo với phiên bản Haveno cũ.\nBạn không thể đóng khiếu nại với phiên bản ứng dụng của bạn.\n\nVui lòng sử dụng phiên bản giao thức cũ hơn {0} support.openFile=Mở file để đính kèm (dung lượng file tối đa: {0} kb) support.attachmentTooLarge=Tổng dung lượng file đính kèm là {0} kb và vượt quá dung lượng tối đa cho phép {1} kB. support.maxSize=Dung lượng file tối đa cho phép là {0} kB. @@ -955,15 +955,15 @@ support.sellerMaker=Người bán BTC/Người tạo support.buyerTaker=Người mua BTC/Người nhận support.sellerTaker=Người bán BTC/Người nhận -support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.backgroundInfo=Haveno is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Haveno DAO. +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Haveno are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Tin nhắn hệ thống: {0} -support.youOpenedTicket=Bạn đã mở yêu cầu hỗ trợ.\n\n{0}\n\nPhiên bản Bisq: {1} -support.youOpenedDispute=Bạn đã mở yêu cầu giải quyết tranh chấp.\n\n{0}\n\nPhiên bản Bisq: {1} -support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nBisq version: {1} -support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nBisq version: {1} -support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nBisq version: {1} +support.youOpenedTicket=Bạn đã mở yêu cầu hỗ trợ.\n\n{0}\n\nPhiên bản Haveno: {1} +support.youOpenedDispute=Bạn đã mở yêu cầu giải quyết tranh chấp.\n\n{0}\n\nPhiên bản Haveno: {1} +support.youOpenedDisputeForMediation=You requested mediation.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedTicket=Your trading peer has requested support due to technical problems.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDispute=Your trading peer has requested a dispute.\n\n{0}\n\nHaveno version: {1} +support.peerOpenedDisputeForMediation=Your trading peer has requested mediation.\n\n{0}\n\nHaveno version: {1} support.mediatorsDisputeSummary=System message: Mediator''s dispute summary:\n{0} support.mediatorsAddress=Mediator''s node address: {0} support.warning.disputesWithInvalidDonationAddress=The delayed payout transaction has used an invalid receiver address. It does not match any of the DAO parameter values for the valid donation addresses.\n\nThis might be a scam attempt. Please inform the developers about that incident and do not close that case before the situation is resolved!\n\nAddress used in the dispute: {0}\n\nAll DAO param donation addresses: {1}\n\nTrade ID: {2}{3} @@ -1024,7 +1024,7 @@ settings.preferences.editCustomExplorer.txUrl=Transaction URL settings.preferences.editCustomExplorer.addressUrl=Address URL settings.net.btcHeader=Mạng Bitcoin -settings.net.p2pHeader=Bisq network +settings.net.p2pHeader=Haveno network settings.net.onionAddressLabel=Địa chỉ onion của tôi settings.net.btcNodesLabel=Sử dụng nút Bitcoin Core thông dụng settings.net.bitcoinPeersLabel=Các đối tác được kết nối @@ -1033,12 +1033,12 @@ settings.net.bitcoinNodesLabel=nút Bitcoin Core để kết nối settings.net.useProvidedNodesRadio=Sử dụng các nút Bitcoin Core đã cung cấp settings.net.usePublicNodesRadio=Sử dụng mạng Bitcoin công cộng settings.net.useCustomNodesRadio=Sử dụng nút Bitcoin Core thông dụng -settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? +settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Haveno). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at [HYPERLINK:https://bisq.network/blog/privacy-in-bitsquare].\n\nAre you sure you want to use the public nodes? settings.net.warn.usePublicNodes.useProvided=Không, sử dụng nút được cung cấp settings.net.warn.usePublicNodes.usePublic=Vâng, sử dụng nút công cộng settings.net.warn.useCustomNodes.B2XWarning=Vui lòng chắc chắn rằng nút Bitcoin của bạn là nút Bitcoin Core đáng tin cậy!\n\nKết nối với nút không tuân thủ nguyên tắc đồng thuận Bitcoin Core có thể làm hỏng ví của bạn và gây ra các vấn đề trong quá trình giao dịch.\n\nNgười dùng kết nối với nút vi phạm nguyên tắc đồng thuận chịu trách nhiệm đối với các thiệt hại mà việc này gây ra. Các khiếu nại do điều này gây ra sẽ được quyết định theo hướng có lợi cho đối tác bên kia. Sẽ không có hỗ trợ về mặt kỹ thuật nào cho người dùng không tuân thủ cơ chế cảnh báo và bảo vệ của chúng tôi! settings.net.warn.invalidBtcConfig=Connection to the Bitcoin network failed because your configuration is invalid.\n\nYour configuration has been reset to use the provided Bitcoin nodes instead. You will need to restart the application. -settings.net.localhostBtcNodeInfo=Background information: Bisq looks for a local Bitcoin node when starting. If it is found, Bisq will communicate with the Bitcoin network exclusively through it. +settings.net.localhostBtcNodeInfo=Background information: Haveno looks for a local Bitcoin node when starting. If it is found, Haveno will communicate with the Bitcoin network exclusively through it. settings.net.p2PPeersLabel=Các đối tác được kết nối settings.net.onionAddressColumn=Địa chỉ onion settings.net.creationDateColumn=Đã thiết lập @@ -1074,17 +1074,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=File chuỗi SPV đã được xóa. Vui lòng đợi, có thể mất một lúc để đồng bộ hóa với mạng. settings.net.reSyncSPVAfterRestartCompleted=Đồng bộ hóa đã xong. Vui lòng khởi động lại ứng dụng. settings.net.reSyncSPVFailed=Không thể xóa SPV chain file.\nLỗi: {0} -setting.about.aboutBisq=Về Bisq -setting.about.about=Bisq là một phần mềm mã nguồn mở nhằm hỗ trợ quá trình trao đổi giữa bitcoin và tiền tệ quốc gia (và các loại tiền crypto khác) thông qua một mạng lưới ngang hàng phi tập trung hoạt động trên cơ sở bảo vệ tối đa quyền riêng tư của người dùng. Vui lòng tìm hiểu thêm về Bisq trên trang web dự án của chúng tôi. -setting.about.web=Trang web Bisq +setting.about.aboutHaveno=Về Haveno +setting.about.about=Haveno là một phần mềm mã nguồn mở nhằm hỗ trợ quá trình trao đổi giữa bitcoin và tiền tệ quốc gia (và các loại tiền crypto khác) thông qua một mạng lưới ngang hàng phi tập trung hoạt động trên cơ sở bảo vệ tối đa quyền riêng tư của người dùng. Vui lòng tìm hiểu thêm về Haveno trên trang web dự án của chúng tôi. +setting.about.web=Trang web Haveno setting.about.code=Mã nguồn setting.about.agpl=Giấy phép AGPL -setting.about.support=Hỗ trợ Bisq -setting.about.def=Bisq không phải là một công ty mà là một dự án mở cho cả cộng đồng. Nếu bạn muốn tham gia hoặc hỗ trợ Bisq, vui lòng truy cập link dưới đây. +setting.about.support=Hỗ trợ Haveno +setting.about.def=Haveno không phải là một công ty mà là một dự án mở cho cả cộng đồng. Nếu bạn muốn tham gia hoặc hỗ trợ Haveno, vui lòng truy cập link dưới đây. setting.about.contribute=Góp vốn setting.about.providers=Nhà cung cấp dữ liệu -setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation. -setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices. +setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation. +setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices. setting.about.pricesProvided=Giá thị trường cung cấp bởi setting.about.feeEstimation.label=Ước tính phí đào cung cấp bởi setting.about.versionDetails=Thông tin về phiên bản @@ -1098,7 +1098,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' or ''alt + {0}'' or ''cmd setting.about.shortcuts.menuNav=Navigate main menu setting.about.shortcuts.menuNav.value=To navigate the main menu press: 'Ctrl' or 'alt' or 'cmd' with a numeric key between '1-9' -setting.about.shortcuts.close=Close Bisq +setting.about.shortcuts.close=Close Haveno setting.about.shortcuts.close.value=''Ctrl + {0}'' or ''cmd + {0}'' or ''Ctrl + {1}'' or ''cmd + {1}'' setting.about.shortcuts.closePopup=Close popup or dialog window @@ -1138,7 +1138,7 @@ setting.about.shortcuts.sendPrivateNotification=Send private notification to pee setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0} setting.info.headline=New XMR auto-confirm Feature -setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Bisq uses explorer nodes run by Bisq contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Bisq wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] +setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\nAuto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your own XMR explorer node for maximum privacy and security.\n\nYou can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required confirmations here in Settings.\n\nSee more details (including how to set up your own explorer node) on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades] #################################################################### # Account #################################################################### @@ -1146,8 +1146,8 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t account.tab.mediatorRegistration=Mediator registration account.tab.refundAgentRegistration=Refund agent registration account.tab.signing=Signing -account.info.headline=Chào mừng đến với tài khoản Bisq của bạn -account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). +account.info.headline=Chào mừng đến với tài khoản Haveno của bạn +account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Haveno.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Haveno is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the mediator or arbitrator will see the same data as your trading peer). account.menu.paymentAccount=Tài khoản tiền tệ quốc gia account.menu.altCoinsAccountView=Tài khoản Altcoin @@ -1162,7 +1162,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1174,48 +1174,48 @@ account.arbitratorRegistration.registration={0} registration account.arbitratorRegistration.revoke=Hủy account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as {0}. The max. allowed trade period is 8 days and the dispute process might take up to 7 days. account.arbitratorRegistration.warn.min1Language=Bạn cần cài đặt ít nhất 1 ngôn ngữ.\nChúng tôi thêm ngôn ngữ mặc định cho bạn. -account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Bisq network. +account.arbitratorRegistration.removedSuccess=You have successfully removed your registration from the Haveno network. account.arbitratorRegistration.removedFailed=Could not remove registration.{0} -account.arbitratorRegistration.registerSuccess=You have successfully registered to the Bisq network. +account.arbitratorRegistration.registerSuccess=You have successfully registered to the Haveno network. account.arbitratorRegistration.registerFailed=Could not complete registration.{0} account.altcoin.yourAltcoinAccounts=Tài khoản altcoin của bạn account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (b) which don''t use compatible wallet software is risky: it can lead to loss of the traded funds!\nThe mediator or arbitrator is not a {2} specialist and cannot help in such cases. account.altcoin.popup.wallet.confirm=Tôi hiểu và xác nhận rằng tôi đã biết loại ví mình cần sử dụng. # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. +account.altcoin.popup.upx.msg=Trading UPX on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=Trading ARQ on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. +account.altcoin.popup.arq.msg=Trading ARQ on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information. # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. +account.altcoin.popup.xmr.msg=Trading XMR on Haveno requires that you understand the following requirement.\n\nIf selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nSee the wiki for details on where to find this information on popular Monero wallets [HYPERLINK:https://bisq.wiki/Trading_Monero#Proving_payments].\nFailure to provide the required transaction data will result in losing disputes.\n\nAlso note that Haveno now offers automatic confirming for XMR transactions to make trades quicker, but you need to enable it in Settings.\n\nSee the wiki for more information about the auto-confirm feature: [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]. # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). +account.altcoin.popup.msr.msg=Trading MSR on Haveno requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs). # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). +account.altcoin.popup.blur.msg=Trading BLUR on Haveno requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab. Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW). # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=Trading Solo on Bisq requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). +account.altcoin.popup.solo.msg=Trading Solo on Haveno requires that you understand and fulfill the following requirements:\n\nTo send Solo you must use the Solo Network CLI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address. The mediator or arbitrator will then verify the Solo transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\nfailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the Solo sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Solo Network Discord (https://discord.minesolo.com/). # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=Trading CASH2 on Bisq requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). +account.altcoin.popup.cash2.msg=Trading CASH2 on Haveno requires that you understand and fulfill the following requirements:\n\nTo send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'getTxKey' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's Cash2 address. The mediator or arbitrator will then verify the CASH2 transfer using the Cash2 Block Explorer (https://blocks.cash2.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the CASH2 sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the Cash2 Discord (https://discord.gg/FGfXAYN). # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). +account.altcoin.popup.qwertycoin.msg=Trading Qwertycoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send QWC you must use the official QWC Wallet version 5.1.3 or higher. \n\nAfter a transaction is sent, the transaction ID will be displayed. You must save this information. Immediately after sending the transaction, you must use the command 'get_Tx_Key' in simplewallet to retrieve the transaction secret key. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the transaction ID, 2) the transaction secret key, and 3) the recipient's QWC address. The mediator or arbitrator will then verify the QWC transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. +account.altcoin.popup.drgl.msg=Trading Dragonglass on Haveno requires that you understand and fulfill the following requirements:\n\nBecause of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you can prove your payment through the use of your TXN-Private-Key.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the mediator or arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=When using Zcash you can only use the transparent addresses (starting with t), not the z-addresses (private), because the mediator or arbitrator would not be able to verify the transaction with z-addresses. # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=When using Zcoin you can only use the transparent (traceable) addresses, not the untraceable addresses, because the mediator or arbitrator would not be able to verify the transaction with untraceable addresses at a block explorer. # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN yêu cầu một quá trình tương tác giữa người gửi và người nhận để thực hiện một giao dịch. Vui lòng làm theo hướng dẫn từ trang web của dự án GRIN để gửi và nhận GRIN đúng cách. (người nhận cần phải trực tuyến hoặc ít nhất là trực tuyến trong một khung thời gian nhất định).\n\nBisq chỉ hỗ trợ ví Grinbox(wallet713) theo định dạng URL.\n\nNgười gửi GRIN phải cung cấp bằng chứng là họ đã gửi GRIN thành công. Nếu ví không thể cung cấp bằng chứng đó, nếu có tranh chấp thì sẽ được giải quyết theo hướng có lợi cho người nhận GRIN. Vui lòng đảm bảo rằng bạn sử dụng phần mềm Grinbox mới nhất có hỗ trợ bằng chứng giao dịch và bạn hiểu quy trình chuyển và nhận GRIN cũng như tạo bằng chứng. \n\nXem https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only để biết thêm thông tin về công cụ bằng chứng Grinbox. +account.altcoin.popup.grin.msg=GRIN yêu cầu một quá trình tương tác giữa người gửi và người nhận để thực hiện một giao dịch. Vui lòng làm theo hướng dẫn từ trang web của dự án GRIN để gửi và nhận GRIN đúng cách. (người nhận cần phải trực tuyến hoặc ít nhất là trực tuyến trong một khung thời gian nhất định).\n\nHaveno chỉ hỗ trợ ví Grinbox(wallet713) theo định dạng URL.\n\nNgười gửi GRIN phải cung cấp bằng chứng là họ đã gửi GRIN thành công. Nếu ví không thể cung cấp bằng chứng đó, nếu có tranh chấp thì sẽ được giải quyết theo hướng có lợi cho người nhận GRIN. Vui lòng đảm bảo rằng bạn sử dụng phần mềm Grinbox mới nhất có hỗ trợ bằng chứng giao dịch và bạn hiểu quy trình chuyển và nhận GRIN cũng như tạo bằng chứng. \n\nXem https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only để biết thêm thông tin về công cụ bằng chứng Grinbox. # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM yêu cầu một quá trình tương tác giữa người gửi và người nhận để thực hiện một giao dịch. \n\nVui lòng làm theo hướng dẫn từ trang web của dự án BEAM để gửi và nhận BEAM đúng cách. (người nhận cần phải trực tuyến hoặc ít nhất là trực tuyến trong một khung thời gian nhất định).\n\nNgười gửi BEAM phải cung cấp bằng chứng là họ đã gửi BEAM thành công. Vui lòng đảm bảo là bạn sử dụng phần mềm ví có thể tạo ra một bằng chứng như vậy. Nếu ví không thể cung cấp bằng chứng đó, nếu có tranh chấp thì sẽ được giải quyết theo hướng có lợi cho người nhận BEAM. # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=Trading ParsiCoin on Bisq requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). +account.altcoin.popup.pars.msg=Trading ParsiCoin on Haveno requires that you understand and fulfill the following requirements:\n\nTo send PARS you must use the official ParsiCoin Wallet version 3.0.0 or higher. \n\nYou can Check your Transaction Hash and Transaction Key on Transactions Section on your GUI Wallet (ParsiPay) You need to right Click on the Transaction and then click on show details. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1) the Transaction Hash, 2) the Transaction Key, and 3) the recipient's PARS address. The mediator or arbitrator will then verify the PARS transfer using the ParsiCoin Block Explorer (http://explorer.parsicoin.net/#check_payment).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the ParsiCoin sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Haveno. First, seek help at the ParsiCoin Discord (https://discord.gg/c7qmFNh). # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Bisq, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. +account.altcoin.popup.blk-burnt.msg=To trade burnt blackcoins, you need to know the following:\n\nBurnt blackcoins are unspendable. To trade them on Haveno, output scripts need to be in the form: OP_RETURN OP_PUSHDATA, followed by associated data bytes which, after being hex-encoded, constitute addresses. For example, burnt blackcoins with an address 666f6f (“foo” in UTF-8) will have the following script:\n\nOP_RETURN OP_PUSHDATA 666f6f\n\nTo create burnt blackcoins, one may use the “burn” RPC command available in some wallets.\n\nFor possible use cases, one may look at https://ibo.laboratorium.ee .\n\nAs burnt blackcoins are unspendable, they can not be reselled. “Selling” burnt blackcoins means burning ordinary blackcoins (with associated data equal to the destination address).\n\nIn case of a dispute, the BLK seller needs to provide the transaction hash. # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Bisq requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Bisq, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Bisq mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Bisq. +account.altcoin.popup.liquidbitcoin.msg=Trading L-BTC on Haveno requires that you understand the following:\n\nWhen receiving L-BTC for a trade on Haveno, you cannot use the mobile Blockstream Green Wallet app or a custodial/exchange wallet. You must only receive L-BTC into the Liquid Elements Core wallet, or another L-BTC wallet which allows you to obtain the blinding key for your blinded L-BTC address.\n\nIn the event mediation is necessary, or if a trade dispute arises, you must disclose the blinding key for your receiving L-BTC address to the Haveno mediator or refund agent so they can verify the details of your Confidential Transaction on their own Elements Core full node.\n\nFailure to provide the required information to the mediator or refund agent will result in losing the dispute case. In all cases of dispute, the L-BTC receiver bears 100% of the burden of responsibility in providing cryptographic proof to the mediator or refund agent.\n\nIf you do not understand these requirements, do not trade L-BTC on Haveno. account.fiat.yourFiatAccounts=Các tài khoản tiền tệ quốc gia của bạn @@ -1242,7 +1242,7 @@ account.seed.warn.noPw.msg=Bạn đã tạo mật khẩu ví để bảo vệ tr account.seed.warn.noPw.yes=Có và không hỏi lại account.seed.enterPw=Nhập mật khẩu để xem seed words account.seed.restore.info=Vui lòng tạo sao lưu dự phòng trước khi tiến hành khôi phục ví từ các từ khởi tạo. Phải hiểu rằng việc khôi phục ví chỉ nên thực hiện trong các trường hợp khẩn cấp và có thể gây sự cố với cơ sở dữ liệu ví bên trong.\nĐây không phải là một cách sao lưu dự phòng! Vui lòng sử dụng sao lưu dự phòng từ thư mục dữ liệu của ứng dụng để khôi phục trạng thái ban đầu của ứng dụng.\n\nSau khi khôi phục ứng dụng sẽ tự động tắt. Sau khi bạn khởi động lại, ứng dụng sẽ tái đồng bộ với mạng Bitcoin. Quá trình này có thể mất một lúc và tiêu tốn khá nhiều CPU, đặc biệt là khi ví đã cũ và có nhiều giao dịch. Vui lòng không làm gián đoạn quá trình này, nếu không bạn có thể sẽ phảỉ xóa file chuỗi SPV một lần nữa hoặc lặp lại quy trình khôi phục. -account.seed.restore.ok=Được, hãy thực hiện khôi phục và tắt ứng dụng Bisq +account.seed.restore.ok=Được, hãy thực hiện khôi phục và tắt ứng dụng Haveno #################################################################### @@ -1271,7 +1271,7 @@ account.notifications.priceAlert.low.label=Thông báo nếu giá BTC thấp hơ account.notifications.priceAlert.setButton=Đặt thông báo giá account.notifications.priceAlert.removeButton=Gỡ thông báo giá account.notifications.trade.message.title=Trạng thái giao dịch thay đổi -account.notifications.trade.message.msg.conf=Lệnh nạp tiền cho giao dịch có mã là {0} đã được xác nhận. Vui lòng mở ứng dụng Bisq và bắt đầu thanh toán. +account.notifications.trade.message.msg.conf=Lệnh nạp tiền cho giao dịch có mã là {0} đã được xác nhận. Vui lòng mở ứng dụng Haveno và bắt đầu thanh toán. account.notifications.trade.message.msg.started=Người mua BTC đã tiến hành thanh toán cho giao dịch có mã là {0}. account.notifications.trade.message.msg.completed=Giao dịch có mã là {0} đã hoàn thành. account.notifications.offer.message.title=Chào giá của bạn đã được chấp nhận @@ -1296,10 +1296,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=Loại chào gi account.notifications.marketAlert.message.title=Thông báo chào giá account.notifications.marketAlert.message.msg.below=cao hơn account.notifications.marketAlert.message.msg.above=thấp hơn -account.notifications.marketAlert.message.msg=một ''{0} {1}'' chào giá mới với giá {2} ({3} {4} giá thị trường) và hình thức thanh toán ''{5}''đã được đăng lên danh mục chào giá của Bisq.\nMã chào giá: {6}. +account.notifications.marketAlert.message.msg=một ''{0} {1}'' chào giá mới với giá {2} ({3} {4} giá thị trường) và hình thức thanh toán ''{5}''đã được đăng lên danh mục chào giá của Haveno.\nMã chào giá: {6}. account.notifications.priceAlert.message.title=Thông báo giá cho {0} account.notifications.priceAlert.message.msg=Thông báo giá của bạn đã được kích hoạt. Giá {0} hiện tại là {1} {2} -account.notifications.noWebCamFound.warning=Không tìm thấy webcam.\n\nVui lòng sử dụng lựa chọn email để gửi mã bảo mật và khóa mã hóa từ điện thoại di động của bạn tới ứng dùng Bisq. +account.notifications.noWebCamFound.warning=Không tìm thấy webcam.\n\nVui lòng sử dụng lựa chọn email để gửi mã bảo mật và khóa mã hóa từ điện thoại di động của bạn tới ứng dùng Haveno. account.notifications.priceAlert.warning.highPriceTooLow=Giá cao hơn phải lớn hơn giá thấp hơn. account.notifications.priceAlert.warning.lowerPriceTooHigh=Giá thấp hơn phải nhỏ hơn giá cao hơn. @@ -1329,7 +1329,7 @@ displayUpdateDownloadWindow.status.verifying=Xác minh chữ ký ... displayUpdateDownloadWindow.button.label=Download chương trình cài đặt và xác minh chữ ký displayUpdateDownloadWindow.button.downloadLater=Download sau displayUpdateDownloadWindow.button.ignoreDownload=Bỏ qua phiên bản này -displayUpdateDownloadWindow.headline=Hiện có một cập nhật Bisq mới! +displayUpdateDownloadWindow.headline=Hiện có một cập nhật Haveno mới! displayUpdateDownloadWindow.download.failed.headline=Download không thành công displayUpdateDownloadWindow.download.failed=Download failed.\nPlease download and verify manually at [HYPERLINK:https://bisq.network/downloads] displayUpdateDownloadWindow.installer.failed=Unable to determine the correct installer. Please download and verify manually at [HYPERLINK:https://bisq.network/downloads] @@ -1403,7 +1403,7 @@ disputeSummaryWindow.close.noPayout.headline=Close without any payout disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout? emptyWalletWindow.headline=Công cụ ví khẩn cấp -emptyWalletWindow.info=Vui lòng chỉ sử dụng trong trường hợp khẩn cấp nếu bạn không thể truy cập vốn của bạn từ UI.\n\nLưu ý rằng tất cả Báo giá mở sẽ được tự động đóng khi sử dụng công cụ này.\n\nTrước khi sử dụng công cụ này, vui lòng sao lưu dự phòng thư mục dữ liệu của bạn. Bạn có thể sao lưu tại \"Tài khoản/Sao lưu dự phòng\".\n\nVui lòng báo với chúng tôi vấn đề của bạn và lập báo cáo sự cố trên GitHub hoặc diễn đàn Bisq để chúng tôi có thể điều tra điều gì gây nên vấn đề đó. +emptyWalletWindow.info=Vui lòng chỉ sử dụng trong trường hợp khẩn cấp nếu bạn không thể truy cập vốn của bạn từ UI.\n\nLưu ý rằng tất cả Báo giá mở sẽ được tự động đóng khi sử dụng công cụ này.\n\nTrước khi sử dụng công cụ này, vui lòng sao lưu dự phòng thư mục dữ liệu của bạn. Bạn có thể sao lưu tại \"Tài khoản/Sao lưu dự phòng\".\n\nVui lòng báo với chúng tôi vấn đề của bạn và lập báo cáo sự cố trên GitHub hoặc diễn đàn Haveno để chúng tôi có thể điều tra điều gì gây nên vấn đề đó. emptyWalletWindow.balance=Số dư ví hiện tại của bạn emptyWalletWindow.address=Địa chỉ đến của bạn emptyWalletWindow.button=Gửi tất cả vốn @@ -1455,7 +1455,7 @@ offerDetailsWindow.creationDate=Ngày tạo offerDetailsWindow.makersOnion=Địa chỉ onion của người tạo qRCodeWindow.headline=QR Code -qRCodeWindow.msg=Please use this QR code for funding your Bisq wallet from your external wallet. +qRCodeWindow.msg=Please use this QR code for funding your Haveno wallet from your external wallet. qRCodeWindow.request=Yêu cầu thanh toán:\n{0} selectDepositTxWindow.headline=Chọn giao dịch tiền gửi để khiếu nại @@ -1564,7 +1564,7 @@ popup.headline.error=Lỗi popup.doNotShowAgain=Không hiển thị lại popup.reportError.log=Mở log file popup.reportError.gitHub=Báo cáo cho người theo dõi vấn đề GitHub -popup.reportError={0}\n\nĐể giúp chúng tôi cải tiến phần mềm, vui lòng báo cáo lỗi này bằng cách mở một thông báo vấn đề mới tại https://github.com/bisq-network/bisq/issues.\nTin nhắn lỗi phía trên sẽ được sao chép tới clipboard khi bạn ấn vào một nút bên dưới.\nSự cố sẽ được xử lý dễ dàng hơn nếu bạn đính kèm bisq.log file bằng cách nhấn "Mở log file", lưu bản sao, và đính kèm vào báo cáo lỗi. +popup.reportError={0}\n\nĐể giúp chúng tôi cải tiến phần mềm, vui lòng báo cáo lỗi này bằng cách mở một thông báo vấn đề mới tại https://github.com/bisq-network/bisq/issues.\nTin nhắn lỗi phía trên sẽ được sao chép tới clipboard khi bạn ấn vào một nút bên dưới.\nSự cố sẽ được xử lý dễ dàng hơn nếu bạn đính kèm haveno.log file bằng cách nhấn "Mở log file", lưu bản sao, và đính kèm vào báo cáo lỗi. popup.error.tryRestart=Hãy khởi động lại ứng dụng và kiểm tra kết nối mạng để xem bạn có thể xử lý vấn đề này hay không. popup.error.takeOfferRequestFailed=Có lỗi xảy ra khi ai đó cố gắng để nhận một trong các chào giá của bạn:\n{0} @@ -1575,10 +1575,10 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=Ví chưa được kích hoạt -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. -popup.warning.wrongVersion=Có thể máy tính của bạn có phiên bản Bisq không đúng.\nCấu trúc máy tính của bạn là: {0}.\nHệ nhị phân Bisq bạn cài đặt là: {1}.\nVui lòng tắt máy và cài đặt lại phiên bản đúng ({2}). -popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. -popup.warning.startupFailed.twoInstances=Bisq đã chạy. Bạn không thể chạy hai chương trình Bisq. +popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\nHaveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. +popup.warning.wrongVersion=Có thể máy tính của bạn có phiên bản Haveno không đúng.\nCấu trúc máy tính của bạn là: {0}.\nHệ nhị phân Haveno bạn cài đặt là: {1}.\nVui lòng tắt máy và cài đặt lại phiên bản đúng ({2}). +popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Haveno installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. +popup.warning.startupFailed.twoInstances=Haveno đã chạy. Bạn không thể chạy hai chương trình Haveno. popup.warning.tradePeriod.halfReached=giao dịch của bạn với ID {0} đã qua một nửa thời gian giao dịch cho phép tối đa và vẫn chưa hoàn thành.\n\nThời gian giao dịch kết thúc vào {1}\n\nVui lòng kiểm tra trạng thái giao dịch của bạn tại \"Portfolio/Các giao dịch mở\" để biết thêm thông tin. popup.warning.tradePeriod.ended=Your trade with ID {0} has reached the max. allowed trading period and is not completed.\n\nThe trade period ended on {1}\n\nPlease check your trade at \"Portfolio/Open trades\" for contacting the arbitrator. popup.warning.noTradingAccountSetup.headline=Bạn chưa thiết lập tài khoản giao dịch @@ -1588,7 +1588,7 @@ popup.warning.noMediatorsAvailable=There are no mediators available. popup.warning.notFullyConnected=Bạn cần phải đợi cho đến khi kết nối hoàn toàn với mạng.\nĐiều này mất khoảng 2 phút khi khởi động. popup.warning.notSufficientConnectionsToBtcNetwork=Bạn cần phải đợi cho đến khi bạn có ít nhất {0} kết nối với mạng Bitcoin. popup.warning.downloadNotComplete=Bạn cần phải đợi cho đến khi download xong các block Bitcoin còn thiếu. -popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] +popup.warning.chainNotSynced=The Haveno wallet blockchain height is not synced correctly. If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info. If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file] popup.warning.removeOffer=Bạn có chắc bạn muốn gỡ bỏ Báo giá này?\nPhí người khởi tạo {0} sẽ bị mất nếu bạn gỡ bỏ Báo giá. popup.warning.tooLargePercentageValue=Bạn không thể cài đặt phần trăm là 100% hoặc cao hơn. popup.warning.examplePercentageValue=Vui lòng nhập số phần trăm như \"5.4\" cho 5,4% @@ -1606,32 +1606,32 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. # suppress inspection "UnusedProperty" popup.warning.priceRelay=rơle giá popup.warning.seed=seed -popup.warning.mandatoryUpdate.trading=Please update to the latest Bisq version. A mandatory update was released which disables trading for old versions. Please check out the Bisq Forum for more information. -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=Please update to the latest Haveno version. A mandatory update was released which disables trading for old versions. Please check out the Haveno Forum for more information. +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=Không thể thực hiện giao dịch, vì phí đào {0} vượt quá số lượng {1} cần chuyển. Vui lòng chờ tới khi phí đào thấp xuống hoặc khi bạn tích lũy đủ BTC để chuyển. -popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. popup.warning.trade.txRejected.tradeFee=trade fee popup.warning.trade.txRejected.deposit=deposit -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer with ID {0} is invalid.\nTransaction ID={1}.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.info.securityDepositInfo=Để đảm bảo cả hai người giao dịch đều tuân thủ giao thức giao dịch, cả hai cần phải trả một khoản tiền cọc. \n\nSố tiền cọc này được giữ ở ví giao dịch cho đến khi giao dịch của bạn được hoàn thành, sau đó nó sẽ được trả lại cho bạn. \nXin lưu ý: Nếu bạn tạo một chào giá mới, ứng dụng Bisq cần phải chạy để người giao dịch khác có thể nhận chào giá đó. Để giữ cho chào giá của bạn online, để Bisq chạy và đảm bảo là máy tính của bạn cũng online (nghĩa là đảm bảo là máy tính của bạn không chuyển qua chế độ standby, nếu màn hình chuyển qua chế độ standby thì không sao). +popup.info.securityDepositInfo=Để đảm bảo cả hai người giao dịch đều tuân thủ giao thức giao dịch, cả hai cần phải trả một khoản tiền cọc. \n\nSố tiền cọc này được giữ ở ví giao dịch cho đến khi giao dịch của bạn được hoàn thành, sau đó nó sẽ được trả lại cho bạn. \nXin lưu ý: Nếu bạn tạo một chào giá mới, ứng dụng Haveno cần phải chạy để người giao dịch khác có thể nhận chào giá đó. Để giữ cho chào giá của bạn online, để Haveno chạy và đảm bảo là máy tính của bạn cũng online (nghĩa là đảm bảo là máy tính của bạn không chuyển qua chế độ standby, nếu màn hình chuyển qua chế độ standby thì không sao). popup.info.cashDepositInfo=Chắc chắn rằng khu vực của bạn có chi nhánh ngân hàng có thể gửi tiền mặt.\nID (BIC/SWIFT) ngân hàng của bên bán là: {0}. popup.info.cashDepositInfo.confirm=Tôi xác nhận tôi đã gửi tiền -popup.info.shutDownWithOpenOffers=Bisq đang đóng, nhưng vẫn có các chào giá đang mở. \n\nNhững chào giá này sẽ không có tại mạng P2P khi Bisq đang đóng, nhưng chúng sẽ được công bố lại trên mạng P2P vào lần tiếp theo bạn khởi động Bisq.\nĐể giữ các chào giá luôn trực tuyến, vui lòng để Bisq chạy và đảm bảo là máy tính của bạn cũng đang trực tuyến(có nghĩa là đảm bảo là máy tính của bạn không chuyển về chế độ chờ...nếu màn hình về chế độ chờ thì không sao). -popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\nPlease make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. -popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.info.shutDownWithOpenOffers=Haveno đang đóng, nhưng vẫn có các chào giá đang mở. \n\nNhững chào giá này sẽ không có tại mạng P2P khi Haveno đang đóng, nhưng chúng sẽ được công bố lại trên mạng P2P vào lần tiếp theo bạn khởi động Haveno.\nĐể giữ các chào giá luôn trực tuyến, vui lòng để Haveno chạy và đảm bảo là máy tính của bạn cũng đang trực tuyến(có nghĩa là đảm bảo là máy tính của bạn không chuyển về chế độ chờ...nếu màn hình về chế độ chờ thì không sao). +popup.info.qubesOSSetupInfo=It appears you are running Haveno on Qubes OS. \n\nPlease make sure your Haveno qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Haveno_on_Qubes]. +popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Haveno version. popup.privateNotification.headline=Thông báo riêng tư quan trọng! popup.securityRecommendation.headline=Khuyến cáo an ninh quan trọng popup.securityRecommendation.msg=Chúng tôi muốn nhắc nhở bạn sử dụng bảo vệ bằng mật khẩu cho ví của bạn nếu bạn vẫn chưa sử dụng.\n\nChúng tôi cũng khuyên bạn nên viết Seed words ví của bạn ra giấy. Các Seed words này như là mật khẩu chủ để khôi phục ví Bitcoin của bạn.\nBạn có thể xem thông tin ở mục \"Wallet Seed\".\n\nNgoài ra bạn nên sao lưu dự phòng folder dữ liệu ứng dụng đầy đủ ở mục \"Backup\". -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=Đang tắt ứng dụng popup.shutDownInProgress.msg=Tắt ứng dụng sẽ mất vài giây.\nVui lòng không gián đoạn quá trình này. @@ -1694,7 +1694,7 @@ notification.walletUpdate.headline=Cập nhật ví giao dịch notification.walletUpdate.msg=Ví giao dịch của bạn không được nạp đủ tiền.\nSố tiền: {0} notification.takeOffer.walletUpdate.msg=Ví giao dịch của bạn đã được nạp đủ tiền từ lần nhận báo giá trước.\nSố tiền: {0} notification.tradeCompleted.headline=giao dịch đã hoàn thành -notification.tradeCompleted.msg=Bạn có thể rút tiền từ ví Bitcoin ngoài của bạn hoặc chuyển vào ví Bisq. +notification.tradeCompleted.msg=Bạn có thể rút tiền từ ví Bitcoin ngoài của bạn hoặc chuyển vào ví Haveno. #################################################################### @@ -1703,9 +1703,9 @@ notification.tradeCompleted.msg=Bạn có thể rút tiền từ ví Bitcoin ngo systemTray.show=Hiển thị cửa sổ ứng dung systemTray.hide=Ẩn cửa sổ ứng dụng -systemTray.info=Thông tin về Bisq +systemTray.info=Thông tin về Haveno systemTray.exit=Thoát -systemTray.tooltip=Bisq: A decentralized bitcoin exchange network +systemTray.tooltip=Haveno: A decentralized bitcoin exchange network #################################################################### @@ -1847,7 +1847,7 @@ password.deriveKey=Lấy khóa từ mật khẩu password.walletDecrypted=Ví đã giải mã thành công và bảo vệ bằng mật khẩu bị gỡ bỏ. password.wrongPw=Bạn nhập sai mật khẩu.\n\nVui lòng nhập lại mật khẩu, kiểm tra lỗi do gõ phí hoặc lỗi chính tả cẩn thận. password.walletEncrypted=Ví đã được mã hóa thành công và bảo vệ bằng mật khẩu được kích hoạt. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/haveno]). password.passwordsDoNotMatch=2 mật khẩu bạn nhập không khớp. password.forgotPassword=Quên mật khẩu? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\nIt is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! @@ -1865,7 +1865,7 @@ seed.warn.walletNotEmpty.msg=Your Bitcoin wallet is not empty.\n\nYou must empty seed.warn.walletNotEmpty.restore=Tôi muốn khôi phục seed.warn.walletNotEmpty.emptyWallet=Tôi sẽ làm trống ví trước seed.warn.notEncryptedAnymore=Ví của bạn đã được mã hóa.\n\nSau khi khôi phục, ví sẽ không còn được mã hóa và bạn phải cài đặt mật khẩu mới.\n\nBạn có muốn tiếp tục? -seed.warn.walletDateEmpty=As you have not specified a wallet date, bisq will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in bisq on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? +seed.warn.walletDateEmpty=As you have not specified a wallet date, haveno will have to scan the blockchain from 2013.10.09 (the BIP39 epoch date).\n\nBIP39 wallets were first introduced in haveno on 2017.06.28 (release v0.5). So you could save time by using that date.\n\nIdeally you should specify the date your wallet seed was created.\n\n\nAre you sure you want to go ahead without specifying a wallet date? seed.restore.success=Ví khôi phục thành công với từ khởi tạo mới.\n\nBạn cần phải tắt và khởi động lại ứng dụng. seed.restore.error=Có lỗi xảy ra khi khôi phục ví với Seed words.{0} seed.restore.openOffers.warn=You have open offers which will be removed if you restore from seed words.\nAre you sure that you want to continue? @@ -1951,17 +1951,17 @@ payment.accountType=Loại tài khoản payment.checking=Đang kiểm tra payment.savings=Tiết kiệm payment.personalId=ID cá nhân -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. -payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Bisq to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Haveno account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Haveno. +payment.fasterPayments.newRequirements.info=Some banks have started verifying the receiver''s full name for Faster Payments transfers. Your current Faster Payments account does not specify a full name.\n\nPlease consider recreating your Faster Payments account in Haveno to provide future {0} buyers with a full name.\n\nWhen you recreate the account, make sure to copy the precise sort code, account number and account age verification salt values from your old account to your new account. This will ensure your existing account''s age and signing status are preserved. payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=Khi sử dụng HalCash người mua BTC cần phải gửi cho người bán BTC mã HalCash bằng tin nhắn điện thoại.\n\nVui lòng đảm bảo là lượng tiền này không vượt quá số lượng tối đa mà ngân hàng của bạn cho phép gửi khi dùng HalCash. Số lượng rút tối thiểu là 10 EUR và tối đa là 600 EUR. Nếu rút nhiều lần thì giới hạn sẽ là 3000 EUR/ người nhận/ ngày và 6000 EUR/người nhận/tháng. Vui lòng kiểm tra chéo những giới hạn này với ngân hàng của bạn để chắc chắn là họ cũng dùng những giới hạn như ghi ở đây.\n\nSố tiền rút phải là bội số của 10 EUR vì bạn không thể rút các mệnh giá khác từ ATM. Giao diện người dùng ở phần 'tạo chào giá' và 'chấp nhận chào giá' sẽ điều chỉnh lượng btc sao cho lượng EUR tương ứng sẽ chính xác. Bạn không thể dùng giá thị trường vì lượng EUR có thể sẽ thay đổi khi giá thay đổi.\n\nTrường hợp tranh chấp, người mua BTC cần phải cung cấp bằng chứng chứng minh mình đã gửi EUR. # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Bisq sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk. To mitigate this risk, Haveno sets per-trade limits based on the estimated level of chargeback risk for the payment method used.\n\nFor this payment method, your per-trade limit for buying and selling is {2}.\n\nThis limit only applies to the size of a single trade—you can place as many trades as you like.\n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. +payment.limits.info.withSigning=To limit chargeback risk, Haveno sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing. You can sell {2} in a single trade immediately.\n\nThese limits only apply to the size of a single trade—you can place as many trades as you like. \n\nSee more details on the wiki [HYPERLINK:https://bisq.wiki/Account_limits]. payment.cashDeposit.info=Vui lòng xác nhận rằng ngân hàng của bạn cho phép nạp tiền mặt vào tài khoản của người khác. Chẳng hạn, Ngân Hàng Mỹ và Wells Fargo không còn cho phép nạp tiền như vậy nữa. @@ -1973,9 +1973,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno. -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=thông tin liên hệ payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1998,7 +1998,7 @@ payment.japan.recipient=Tên payment.australia.payid=PayID payment.payid=PayID linked to financial institution. Like email address or mobile phone. payment.payid.info=A PayID like a phone number, email address or an Australian Business Number (ABN), that you can securely link to your bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index f62af77b..61dfdd0a 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -103,14 +103,14 @@ shared.faq=访问 FAQ 页面 shared.yesCancel=是的，取消 shared.nextStep=下一步 shared.selectTradingAccount=选择交易账户 -shared.fundFromSavingsWalletButton=从 Bisq 钱包资金划转 +shared.fundFromSavingsWalletButton=从 Haveno 钱包资金划转 shared.fundFromExternalWalletButton=从您的外部钱包充值 shared.openDefaultWalletFailed=打开默认的比特币钱包应用程序失败了。您确定您安装了吗？ shared.belowInPercent=低于市场价格 % shared.aboveInPercent=高于市场价格 % shared.enterPercentageValue=输入 % 值 shared.OR=或者 -shared.notEnoughFunds=您的 Bisq 钱包中没有足够的资金去支付这一交易 需要{0} 您可用余额为 {1}。\n\n请从外部比特币钱包注入资金或在“资金/存款”充值到您的 Bisq 钱包。 +shared.notEnoughFunds=您的 Haveno 钱包中没有足够的资金去支付这一交易 需要{0} 您可用余额为 {1}。\n\n请从外部比特币钱包注入资金或在“资金/存款”充值到您的 Haveno 钱包。 shared.waitingForFunds=等待资金充值... shared.TheBTCBuyer=BTC 买家 shared.You=您 @@ -125,7 +125,7 @@ shared.notUsedYet=尚未使用 shared.date=日期 shared.sendFundsDetailsWithFee=发送：{0}\n来自：{1}\n接收地址：{2}\n要求的最低交易费：{3}（{4} 聪/byte）\n交易大小：{5} Kb\n\n收款方将收到：{6}\n\n您确定您想要提现吗？ # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq 检测到，该交易将产生一个低于最低零头阈值的输出（不被比特币共识规则所允许）。相反，这些零头（{0}satoshi{1}）将被添加到挖矿手续费中。 +shared.sendFundsDetailsDust=Haveno 检测到，该交易将产生一个低于最低零头阈值的输出（不被比特币共识规则所允许）。相反，这些零头（{0}satoshi{1}）将被添加到挖矿手续费中。 shared.copyToClipboard=复制到剪贴板 shared.language=语言 shared.country=国家或地区 @@ -235,8 +235,8 @@ mainView.menu.settings=设置 mainView.menu.account=账户 mainView.marketPriceWithProvider.label=交易所价格提供商：{0} -mainView.marketPrice.bisqInternalPrice=最新 Bisq 交易的价格 -mainView.marketPrice.tooltip.bisqInternalPrice=外部交易所供应商没有可用的市场价格。\n显示的价格是该货币的最新 Bisq 交易价格。 +mainView.marketPrice.havenoInternalPrice=最新 Haveno 交易的价格 +mainView.marketPrice.tooltip.havenoInternalPrice=外部交易所供应商没有可用的市场价格。\n显示的价格是该货币的最新 Haveno 交易价格。 mainView.marketPrice.tooltip=交易所价格提供者 {0}{1}\n最后更新：{2}\n提供者节点 URL：{3} mainView.balance.available=可用余额 mainView.balance.reserved=保证金 @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=正在通过{0}同步区块：{1}/{2} mainView.footer.btcInfo.synchronizedWith=已通过{0}同步至区块{1} mainView.footer.btcInfo.connectingTo=连接至 mainView.footer.btcInfo.connectionFailed=连接失败： -mainView.footer.p2pInfo=比特币网络节点：{0} / Bisq 网络节点：{1} +mainView.footer.p2pInfo=比特币网络节点：{0} / Haveno 网络节点：{1} mainView.bootstrapState.connectionToTorNetwork=(1/4) 连接至 Tor 网络... mainView.bootstrapState.torNodeCreated=(2/4) Tor 节点已创建 @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) 初始数据已接收 mainView.bootstrapWarning.noSeedNodesAvailable=没有可用的种子节点 mainView.bootstrapWarning.noNodesAvailable=没有可用的种子节点和节点 -mainView.bootstrapWarning.bootstrappingToP2PFailed=启动 Bisq 网络失败 +mainView.bootstrapWarning.bootstrappingToP2PFailed=启动 Haveno 网络失败 mainView.p2pNetworkWarnMsg.noNodesAvailable=没有可用种子节点或永久节点可请求数据。\n请检查您的互联网连接或尝试重启应用程序。 -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=连接至 Bisq 网络失败（错误报告：{0}）。\n请检查您的互联网连接或尝试重启应用程序。 +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=连接至 Haveno 网络失败（错误报告：{0}）。\n请检查您的互联网连接或尝试重启应用程序。 mainView.walletServiceErrorMsg.timeout=比特币网络连接超时。 mainView.walletServiceErrorMsg.connectionError=错误：{0} 比特币网络连接失败。 @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=错误：{0} 比特币网络连 mainView.walletServiceErrorMsg.rejectedTxException=交易被网络拒绝。\n\n{0} mainView.networkWarning.allConnectionsLost=您失去了所有与 {0} 网络节点的连接。\n您失去了互联网连接或您的计算机处于待机状态。 -mainView.networkWarning.localhostBitcoinLost=您丢失了与本地主机比特币节点的连接。\n请重启 Bisq 应用程序连接到其他比特币节点或重新启动主机比特币节点。 +mainView.networkWarning.localhostBitcoinLost=您丢失了与本地主机比特币节点的连接。\n请重启 Haveno 应用程序连接到其他比特币节点或重新启动主机比特币节点。 mainView.version.update=（有更新可用） @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=基于以下标准的安 offerbook.warning.wrongTradeProtocol=该报价要求的软件版本与您现在运行的版本不一致。\n\n请检查您是否运行最新版本，或者是该报价用户在使用一个旧的版本。\n用户不能与不兼容的交易协议版本进行交易。 offerbook.warning.userIgnored=您已添加该用户的匿名地址在您的忽略列表里。 -offerbook.warning.offerBlocked=该报价被 Bisq 开发人员限制。\n接受该报价时，可能有一个未处理的漏洞导致了问题。 -offerbook.warning.currencyBanned=该报价中使用的货币被 Bisq 开发人员阻止。\n请访问 Bisq 论坛了解更多信息。 -offerbook.warning.paymentMethodBanned=该报价中使用的付款方式被 Bisq 开发人员阻止。\n请访问 Bisq 论坛了解更多信息。 -offerbook.warning.nodeBlocked=该交易者的匿名地址被 Bisq 开发人员限制。\n当获取来自该交易者的报价，可能有一个未处理的漏洞导致了问题。 -offerbook.warning.requireUpdateToNewVersion=您的 Bisq 版本不再兼容交易。\n请通过 https://bisq.network/downloads 更新到最新的 Bisq 版本。 +offerbook.warning.offerBlocked=该报价被 Haveno 开发人员限制。\n接受该报价时，可能有一个未处理的漏洞导致了问题。 +offerbook.warning.currencyBanned=该报价中使用的货币被 Haveno 开发人员阻止。\n请访问 Haveno 论坛了解更多信息。 +offerbook.warning.paymentMethodBanned=该报价中使用的付款方式被 Haveno 开发人员阻止。\n请访问 Haveno 论坛了解更多信息。 +offerbook.warning.nodeBlocked=该交易者的匿名地址被 Haveno 开发人员限制。\n当获取来自该交易者的报价，可能有一个未处理的漏洞导致了问题。 +offerbook.warning.requireUpdateToNewVersion=您的 Haveno 版本不再兼容交易。\n请通过 https://bisq.network/downloads 更新到最新的 Haveno 版本。 offerbook.warning.offerWasAlreadyUsedInTrade=您不能吃单因为您已经完成了该操作。可能是你之前的吃单尝试导致了交易失败。 offerbook.info.sellAtMarketPrice=您会以市场价格进行出售（每分钟更新） @@ -423,7 +423,7 @@ createOffer.fundsBox.title=为您的报价充值 createOffer.fundsBox.offerFee=挂单费 createOffer.fundsBox.networkFee=矿工手续费 createOffer.fundsBox.placeOfferSpinnerInfo=正在发布报价中... -createOffer.fundsBox.paymentLabel=Bisq 交易 ID {0} +createOffer.fundsBox.paymentLabel=Haveno 交易 ID {0} createOffer.fundsBox.fundsStructure=（{0} 保证金，{1} 交易费，{2} 采矿费） createOffer.success.headline=你的报价已经发布 createOffer.success.info=你可以在“业务/未完成报价”页面内管理您的未完成报价。 @@ -447,12 +447,12 @@ createOffer.placeOfferButton=复审：报价挂单 {0} 比特币 createOffer.createOfferFundWalletInfo.headline=为您的报价充值 # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- 交易数量：{0}\n -createOffer.createOfferFundWalletInfo.msg=这个报价您需要 {0} 作为保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n- 矿工手续费：{4}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Bisq 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。 +createOffer.createOfferFundWalletInfo.msg=这个报价您需要 {0} 作为保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n- 矿工手续费：{4}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Haveno 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=提交报价发生错误：\n\n{0}\n\n没有资金从您钱包中扣除。\n请检查您的互联网连接或尝试重启应用程序。 createOffer.setAmountPrice=设置数量和价格 -createOffer.warnCancelOffer=您已经为该报价充值了。\n如果您想立即取消，您的资金将划转到您的本地 Bisq 钱包并在“资金/提现”界面可以提现。\n您确定要取消吗？ +createOffer.warnCancelOffer=您已经为该报价充值了。\n如果您想立即取消，您的资金将划转到您的本地 Haveno 钱包并在“资金/提现”界面可以提现。\n您确定要取消吗？ createOffer.timeoutAtPublishing=发布报价时产生了一个错误。 createOffer.errorInfo=\n\n挂单费已经支付，在最坏的情况下，你会失去了这笔费用。 我们很抱歉，但请记住，这是一个很小的数量。\n请尝试重新启动应用程序并检查您的网络连接，看看是否可以解决问题。 createOffer.tooLowSecDeposit.warning=您设置的保证金低于推荐默认值 {0}。\n您确定要使用较低的保证金吗？ @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=卖出数量 takeOffer.fundsBox.offerFee=挂单费 takeOffer.fundsBox.networkFee=总共挖矿手续费 takeOffer.fundsBox.takeOfferSpinnerInfo=正在下单... -takeOffer.fundsBox.paymentLabel=Bisq 交易 ID {0} +takeOffer.fundsBox.paymentLabel=Haveno 交易 ID {0} takeOffer.fundsBox.fundsStructure=（{0} 保证金，{1} 交易费，{2} 采矿费） takeOffer.success.headline=你已成功下单一个报价。 takeOffer.success.info=你可以在“业务/未完成交易”页面内查看您的未完成交易。 @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=您不能对这笔报价下单，因为它使用 takeOffer.takeOfferFundWalletInfo.headline=为交易充值 # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- 交易数量：{0}\n -takeOffer.takeOfferFundWalletInfo.msg=这个报价您需要付出 {0} 保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n- 矿工手续费：{4}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Bisq 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。 +takeOffer.takeOfferFundWalletInfo.msg=这个报价您需要付出 {0} 保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n- 矿工手续费：{4}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Haveno 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。 takeOffer.alreadyPaidInFunds=如果你已经支付，你可以在“资金/提现”提现它。 takeOffer.paymentInfo=付款信息 takeOffer.setAmountPrice=设置数量 -takeOffer.alreadyFunded.askCancel=您已经为该报价充值了。\n如果您想立即取消，您的资金将划转到您的本地 Bisq 钱包并在“资金/提现”界面可以提现。\n您确定要取消吗？ +takeOffer.alreadyFunded.askCancel=您已经为该报价充值了。\n如果您想立即取消，您的资金将划转到您的本地 Haveno 钱包并在“资金/提现”界面可以提现。\n您确定要取消吗？ takeOffer.failed.offerNotAvailable=请求失败，由于报价不再可用。 也许有交易者在此期间已经下单。 takeOffer.failed.offerTaken=您不能对该报价下单，因为该报价已经被其他交易者下单。 takeOffer.failed.offerRemoved=您不能对该报价下单，因为该报价已经在此期间被删除。 @@ -536,7 +536,7 @@ editOffer.confirmEdit=确认：编辑报价 editOffer.publishOffer=发布您的报价。 editOffer.failed=报价编辑失败：\n{0} editOffer.success=您的报价已成功编辑。 -editOffer.invalidDeposit=买方保证金不符合 Bisq DAO 规定，不能再次编辑。 +editOffer.invalidDeposit=买方保证金不符合 Haveno DAO 规定，不能再次编辑。 #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=保证金交易仍未得到确认。请 # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=重要要求：\n完成支付 # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=请用“美国邮政汇票”发送 {0} 给 BTC 卖家。\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=发送 MTCN 和收 portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=请通过电邮发送 MTCN（追踪号码）和照片给 BTC 卖家。\n收据必须清楚地向卖家写明您的全名、城市、国家或地区、数量。卖方的电子邮件是：{0}。\n\n您把 MTCN 和合同发给卖方了吗？ portfolio.pending.step2_buyer.halCashInfo.headline=请发送 HalCash 代码 portfolio.pending.step2_buyer.halCashInfo.msg=您需要向 BTC 卖家发送带有 HalCash 代码和交易 ID（{0}）的文本消息。\n\n卖方的手机号码是 {1} 。\n\n您是否已经将代码发送至卖家? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=有些银行可能会要求接收方的姓名。在较旧的 Bisq 客户端创建的快速支付帐户没有提供收款人的姓名，所以请使用交易聊天来获得收款人姓名（如果需要）。 +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=有些银行可能会要求接收方的姓名。在较旧的 Haveno 客户端创建的快速支付帐户没有提供收款人的姓名，所以请使用交易聊天来获得收款人姓名（如果需要）。 portfolio.pending.step2_buyer.confirmStart.headline=确定您已经付款 portfolio.pending.step2_buyer.confirmStart.msg=您是否向您的交易伙伴发起 {0} 付款？ portfolio.pending.step2_buyer.confirmStart.yes=是的，我已经开始付款 portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=你没有提供任何付款证明 -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=您还没有输入交易 ID 以及交易密钥\n\n如果不提供此数据您的交易伙伴无法在收到 XMR 后使用自动确认功能以快速释放 BTC。\n另外，Bisq 要求 XMR 发送者在发生纠纷的时候能够向调解员和仲裁员提供这些信息。\n更多细节在 Bisq Wiki：https://bisq.wiki/Trading_Monero#Auto-confirming_trades +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=您还没有输入交易 ID 以及交易密钥\n\n如果不提供此数据您的交易伙伴无法在收到 XMR 后使用自动确认功能以快速释放 BTC。\n另外，Haveno 要求 XMR 发送者在发生纠纷的时候能够向调解员和仲裁员提供这些信息。\n更多细节在 Haveno Wiki：https://bisq.wiki/Trading_Monero#Auto-confirming_trades portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=输入并不是一个 32 字节的哈希值 portfolio.pending.step2_buyer.confirmStart.warningButton=忽略并继续 portfolio.pending.step2_seller.waitPayment.headline=等待付款 @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=BTC 买家仍然没有完成 {0} 付款。\n portfolio.pending.step2_seller.openForDispute=BTC 买家尚未开始付款！\n允许的最长交易期限已经过去了。你可以继续等待给予交易双方更多时间，或联系仲裁员以争取解决纠纷。 tradeChat.chatWindowTitle=使用 ID “{0}” 进行交易的聊天窗口 tradeChat.openChat=打开聊天窗口 -tradeChat.rules=您可以与您的伙伴沟通，以解决该交易的潜在问题。\n在聊天中不强制回复。\n如果交易员违反了下面的任何规则，打开纠纷并向调解员或仲裁员报告。\n聊天规则：\n\n\t●不要发送任何链接（有恶意软件的风险）。您可以发送交易 ID 和区块资源管理器的名称。\n\t●不要发送还原密钥、私钥、密码或其他敏感信息！\n\t●不鼓励 Bisq 以外的交易（无安全保障）。\n\t●不要参与任何形式的危害社会安全的计划。\n\t●如果对方没有回应，也不愿意通过聊天进行沟通，那就尊重对方的决定。\n\t●将谈话范围限制在行业内。这个聊天不是一个社交软件替代品或troll-box。\n\t●保持友好和尊重的交谈。 +tradeChat.rules=您可以与您的伙伴沟通，以解决该交易的潜在问题。\n在聊天中不强制回复。\n如果交易员违反了下面的任何规则，打开纠纷并向调解员或仲裁员报告。\n聊天规则：\n\n\t●不要发送任何链接（有恶意软件的风险）。您可以发送交易 ID 和区块资源管理器的名称。\n\t●不要发送还原密钥、私钥、密码或其他敏感信息！\n\t●不鼓励 Haveno 以外的交易（无安全保障）。\n\t●不要参与任何形式的危害社会安全的计划。\n\t●如果对方没有回应，也不愿意通过聊天进行沟通，那就尊重对方的决定。\n\t●将谈话范围限制在行业内。这个聊天不是一个社交软件替代品或troll-box。\n\t●保持友好和尊重的交谈。 # suppress inspection "UnusedProperty" message.state.UNDEFINED=未定义 @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=退还保证金 portfolio.pending.step5_buyer.withdrawBTC=提现您的比特币 portfolio.pending.step5_buyer.amount=提现数量 portfolio.pending.step5_buyer.withdrawToAddress=提现地址 -portfolio.pending.step5_buyer.moveToBisqWallet=在 Bisq 钱包中保留资金 +portfolio.pending.step5_buyer.moveToHavenoWallet=在 Haveno 钱包中保留资金 portfolio.pending.step5_buyer.withdrawExternal=提现到外部钱包 portfolio.pending.step5_buyer.alreadyWithdrawn=您的资金已经提现。\n请查看交易历史记录。 portfolio.pending.step5_buyer.confirmWithdrawal=确定提现请求 @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=您已经收到 tradeFeedbackWindow.title=恭喜您完成交易 tradeFeedbackWindow.msg.part1=我们很想听听您的体验如何。这将帮助我们改进软件，优化体验不好的地方。如欲提供意见，请填写这份简短的问卷（无需注册），网址： -tradeFeedbackWindow.msg.part2=如果您有任何疑问或遇到任何问题，请通过 Bisq 论坛与其他用户和贡献者联系： -tradeFeedbackWindow.msg.part3=感谢使用 Bisq +tradeFeedbackWindow.msg.part2=如果您有任何疑问或遇到任何问题，请通过 Haveno 论坛与其他用户和贡献者联系： +tradeFeedbackWindow.msg.part3=感谢使用 Haveno portfolio.pending.role=我的角色 portfolio.pending.tradeInformation=交易信息 @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=在第一次区块链确认之后，交易周 portfolio.pending.tradePeriodWarning=如果超过了这个周期，双方均可以提出纠纷。 portfolio.pending.tradeNotCompleted=交易不会及时完成（直到 {0} ） portfolio.pending.tradeProcess=交易流程 -portfolio.pending.openAgainDispute.msg=如果您不确定发送给调解员或仲裁员的消息是否已送达（例如，如果您在1天后没有收到回复），请放心使用 Cmd/Ctrl+o 再次打开纠纷。你也可以在 Bisq 论坛上寻求额外的帮助，网址是 https://bisq.community。 +portfolio.pending.openAgainDispute.msg=如果您不确定发送给调解员或仲裁员的消息是否已送达（例如，如果您在1天后没有收到回复），请放心使用 Cmd/Ctrl+o 再次打开纠纷。你也可以在 Haveno 论坛上寻求额外的帮助，网址是 https://haveno.community。 portfolio.pending.openAgainDispute.button=再次出现纠纷 portfolio.pending.openSupportTicket.headline=创建帮助话题 portfolio.pending.openSupportTicket.msg=请仅在紧急情况下使用此功能，如果您没有看到“提交支持”或“提交纠纷”按钮。\n\n当您发出工单时，交易将被中断并由调解员或仲裁员进行处理。 portfolio.pending.timeLockNotOver=你必须等到≈{0}（还需等待{1}个区块）才能提交纠纷。 -portfolio.pending.error.depositTxNull=保证金交易无效。没有有效的保证金交易，你使用创建纠纷。请到“设置/网络信息”进行 SPV 重新同步。\n \n如需更多帮助，请联系 Bisq Keybase 团队的 Support 频道。 +portfolio.pending.error.depositTxNull=保证金交易无效。没有有效的保证金交易，你使用创建纠纷。请到“设置/网络信息”进行 SPV 重新同步。\n \n如需更多帮助，请联系 Haveno Keybase 团队的 Support 频道。 portfolio.pending.mediationResult.error.depositTxNull=保证金交易为空。你可以移动该交易至失败的交易。 portfolio.pending.mediationResult.error.delayedPayoutTxNull=延迟支付交易为空。你可以移动该交易至失败的交易。 -portfolio.pending.error.depositTxNotConfirmed=保证金交易未确认。未经确认的存款交易不能发起纠纷或仲裁请求。请耐心等待，直到它被确认或进入“设置/网络信息”进行 SPV 重新同步。\n\n如需更多帮助，请联系 Bisq Keybase 团队的 Support 频道。 +portfolio.pending.error.depositTxNotConfirmed=保证金交易未确认。未经确认的存款交易不能发起纠纷或仲裁请求。请耐心等待，直到它被确认或进入“设置/网络信息”进行 SPV 重新同步。\n\n如需更多帮助，请联系 Haveno Keybase 团队的 Support 频道。 portfolio.pending.support.headline.getHelp=需要帮助？ -portfolio.pending.support.text.getHelp=如果您有任何问题，您可以尝试在交易聊天中联系交易伙伴，或在 https://bisq.community 询问 Bisq 社区。如果您的问题仍然没有解决，您可以向调解员取得更多的帮助。 +portfolio.pending.support.text.getHelp=如果您有任何问题，您可以尝试在交易聊天中联系交易伙伴，或在 https://haveno.community 询问 Haveno 社区。如果您的问题仍然没有解决，您可以向调解员取得更多的帮助。 portfolio.pending.support.button.getHelp=开启交易聊天 portfolio.pending.support.headline.halfPeriodOver=确认付款 portfolio.pending.support.headline.periodOver=交易期结束 @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=挂单费交易未找到 portfolio.pending.failedTrade.missingDepositTx=这个保证金交易（2 对 2 多重签名交易）缺失\n\n没有该 tx，交易不能完成。没有资金被锁定但是您的交易手续费仍然已支出。您可以发起一个请求去赔偿改交易手续费在这里：https://github.com/bisq-network/support/issues\n\n请随意的将该交易移至失败交易 portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=延迟支付交易缺失，但是资金仍然被锁定在保证金交易中。\n\n请不要给比特币卖家发送法币或数字货币，因为没有延迟交易 tx，不能开启仲裁。使用 Cmd/Ctrl+o开启调解协助。调解员应该建议交易双方分别退回全部的保证金（卖方支付的交易金额也会全数返还）。这样的话不会有任何的安全问题只会损失交易手续费。\n\n你可以在这里为失败的交易提出赔偿要求：https://github.com/bisq-network/support/issues portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=延迟支付交易确实但是资金仍然被锁定在保证金交易中。\n\n如果卖家仍然缺失延迟支付交易，他会接到请勿付款的指示并开启一个调节帮助。你也应该使用 Cmd/Ctrl+O 去打开一个调节协助\n\n如果买家还没有发送付款，调解员应该会建议交易双方分别退回全部的保证金（卖方支付的交易金额也会全数返还）。否则交易额应该判给买方。\n\n你可以在这里为失败的交易提出赔偿要求：https://github.com/bisq-network/support/issues -portfolio.pending.failedTrade.errorMsgSet=在处理交易协议是发生了一个错误\n\n错误：{0}\n\n这应该不是致命错误，您可以正常的完成交易。如果你仍担忧，打开一个调解协助并从 Bisq 调解员处得到建议。\n\n如果这个错误是致命的那么这个交易就无法完成，你可能会损失交易费。可以在这里为失败的交易提出赔偿要求：https://github.com/bisq-network/support/issues +portfolio.pending.failedTrade.errorMsgSet=在处理交易协议是发生了一个错误\n\n错误：{0}\n\n这应该不是致命错误，您可以正常的完成交易。如果你仍担忧，打开一个调解协助并从 Haveno 调解员处得到建议。\n\n如果这个错误是致命的那么这个交易就无法完成，你可能会损失交易费。可以在这里为失败的交易提出赔偿要求：https://github.com/bisq-network/support/issues portfolio.pending.failedTrade.missingContract=没有设置交易合同。\n\n这个交易无法完成，你可能会损失交易手续费。可以在这里为失败的交易提出赔偿要求：https://github.com/bisq-network/support/issues portfolio.pending.failedTrade.info.popup=交易协议出现了问题。\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=交易协议出现了严重问题。\n\n{0}\n\n您确定想要将该交易移至失败的交易吗？\n\n您不能在失败的交易中打开一个调解或仲裁，但是你随时可以将失败的交易重新移至未完成交易。 @@ -828,7 +828,7 @@ funds.tab.transactions=交易记录 funds.deposit.unused=尚未使用 funds.deposit.usedInTx=用在 {0} 交易 -funds.deposit.fundHavenoWallet=充值 Bisq 钱包 +funds.deposit.fundHavenoWallet=充值 Haveno 钱包 funds.deposit.noAddresses=尚未生成存款地址 funds.deposit.fundWallet=充值您的钱包 funds.deposit.withdrawFromWallet=从钱包转出资金 @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=从钱包提现 funds.tx.memo=备注 funds.tx.noTxAvailable=没有可用交易 funds.tx.revert=还原 -funds.tx.txSent=交易成功发送到本地 Bisq 钱包中的新地址。 +funds.tx.txSent=交易成功发送到本地 Haveno 钱包中的新地址。 funds.tx.direction.self=内部钱包交易 funds.tx.dustAttackTx=接受零头 -funds.tx.dustAttackTx.popup=这笔交易是发送一个非常小的比特币金额到您的钱包，可能是区块链分析公司尝试监控您的交易。\n\n如果您在交易中使用该交易输出，他们将了解到您很可能也是其他地址的所有者（资金归集）。\n\n为了保护您的隐私，Bisq 钱包忽略了这种零头的消费和余额显示。可以在设置中将输出视为零头时设置阈值量。 +funds.tx.dustAttackTx.popup=这笔交易是发送一个非常小的比特币金额到您的钱包，可能是区块链分析公司尝试监控您的交易。\n\n如果您在交易中使用该交易输出，他们将了解到您很可能也是其他地址的所有者（资金归集）。\n\n为了保护您的隐私，Haveno 钱包忽略了这种零头的消费和余额显示。可以在设置中将输出视为零头时设置阈值量。 #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=发送消息... support.receiverNotOnline=收件人未在线。消息被保存到他们的邮箱。 support.sendMessageError=发送消息失败。错误：{0} support.receiverNotKnown=Receiver not known -support.wrongVersion=纠纷中的订单创建于一个旧版本的 Bisq。\n您不能在当前版本关闭这个纠纷。\n\n请您使用旧版本/协议版本： {0} +support.wrongVersion=纠纷中的订单创建于一个旧版本的 Haveno。\n您不能在当前版本关闭这个纠纷。\n\n请您使用旧版本/协议版本： {0} support.openFile=打开附件文件（文件最大大小：{0} kb） support.attachmentTooLarge=您的附件的总大小为 {0} kb，并超过最大值。 允许消息大小为 {1} kB。 support.maxSize=文件允许的最大大小 {0} kB。 @@ -953,15 +953,15 @@ support.sellerMaker=BTC 卖家/挂单者 support.buyerTaker=BTC 买家/买单者 support.sellerTaker=BTC 卖家/买单者 -support.backgroundInfo=Bisq 不是一家公司，所以它处理纠纷的方式不同。\n\n交易双方可以在应用程序中通过未完成交易页面上的安全聊天进行通信，以尝试自行解决争端。如果这还不够，调解员可以介入帮助。调解员将对情况进行评估，并对交易资金的支出提出建议。如果两个交易者都接受这个建议，那么支付交易就完成了，交易也结束了。如果一方或双方不同意调解员的建议，他们可以要求仲裁。仲裁员将重新评估情况，如果有必要，将亲自向交易员付款，并要求 Bisq DAO 对这笔付款进行补偿。 -support.initialInfo=请在下面的文本框中输入您的问题描述。添加尽可能多的信息，以加快解决纠纷的时间。\n\n以下是你应提供的资料核对表：\n\t●如果您是 BTC 买家：您是否使用法定货币或其他加密货币转账？如果是，您是否点击了应用程序中的“支付开始”按钮？\n\t●如果您是 BTC 卖家：您是否收到法定货币或其他加密货币的付款了？如果是，你是否点击了应用程序中的“已收到付款”按钮？\n\t●您使用的是哪个版本的 Bisq？\n\t●您使用的是哪种操作系统？\n\t●如果遇到操作执行失败的问题，请考虑切换到新的数据目录。\n\t有时数据目录会损坏，并导致奇怪的错误。\n详见：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n请熟悉纠纷处理的基本规则：\n\t●您需要在2天内答复 {0} 的请求。\n\t●调解员会在2天之内答复，仲裁员会在5天之内答复。\n\t●纠纷的最长期限为14天。\n\t●你需要与仲裁员合作，提供他们为你的案件所要求的信息。\n\t●当您第一次启动应用程序时，您接受了用户协议中争议文档中列出的规则。\n\n您可以通过 {2} 了解有关纠纷处理的更多信息 +support.backgroundInfo=Haveno 不是一家公司，所以它处理纠纷的方式不同。\n\n交易双方可以在应用程序中通过未完成交易页面上的安全聊天进行通信，以尝试自行解决争端。如果这还不够，调解员可以介入帮助。调解员将对情况进行评估，并对交易资金的支出提出建议。如果两个交易者都接受这个建议，那么支付交易就完成了，交易也结束了。如果一方或双方不同意调解员的建议，他们可以要求仲裁。仲裁员将重新评估情况，如果有必要，将亲自向交易员付款，并要求 Haveno DAO 对这笔付款进行补偿。 +support.initialInfo=请在下面的文本框中输入您的问题描述。添加尽可能多的信息，以加快解决纠纷的时间。\n\n以下是你应提供的资料核对表：\n\t●如果您是 BTC 买家：您是否使用法定货币或其他加密货币转账？如果是，您是否点击了应用程序中的“支付开始”按钮？\n\t●如果您是 BTC 卖家：您是否收到法定货币或其他加密货币的付款了？如果是，你是否点击了应用程序中的“已收到付款”按钮？\n\t●您使用的是哪个版本的 Haveno？\n\t●您使用的是哪种操作系统？\n\t●如果遇到操作执行失败的问题，请考虑切换到新的数据目录。\n\t有时数据目录会损坏，并导致奇怪的错误。\n详见：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n请熟悉纠纷处理的基本规则：\n\t●您需要在2天内答复 {0} 的请求。\n\t●调解员会在2天之内答复，仲裁员会在5天之内答复。\n\t●纠纷的最长期限为14天。\n\t●你需要与仲裁员合作，提供他们为你的案件所要求的信息。\n\t●当您第一次启动应用程序时，您接受了用户协议中争议文档中列出的规则。\n\n您可以通过 {2} 了解有关纠纷处理的更多信息 support.systemMsg=系统消息：{0} -support.youOpenedTicket=您创建了帮助请求。\n\n{0}\n\nBisq 版本：{1} -support.youOpenedDispute=您创建了一个纠纷请求。\n\n{0}\n\nBisq 版本：{1} -support.youOpenedDisputeForMediation=您创建了一个调解请求。\n\n{0}\n\nBisq 版本：{1} -support.peerOpenedTicket=对方因技术问题请求获取帮助。\n\n{0}\n\nBisq 版本：{1} -support.peerOpenedDispute=对方创建了一个纠纷请求。\n\n{0}\n\nBisq 版本：{1} -support.peerOpenedDisputeForMediation=对方创建了一个调解请求。\n\n{0}\n\nBisq 版本：{1} +support.youOpenedTicket=您创建了帮助请求。\n\n{0}\n\nHaveno 版本：{1} +support.youOpenedDispute=您创建了一个纠纷请求。\n\n{0}\n\nHaveno 版本：{1} +support.youOpenedDisputeForMediation=您创建了一个调解请求。\n\n{0}\n\nHaveno 版本：{1} +support.peerOpenedTicket=对方因技术问题请求获取帮助。\n\n{0}\n\nHaveno 版本：{1} +support.peerOpenedDispute=对方创建了一个纠纷请求。\n\n{0}\n\nHaveno 版本：{1} +support.peerOpenedDisputeForMediation=对方创建了一个调解请求。\n\n{0}\n\nHaveno 版本：{1} support.mediatorsDisputeSummary=系统消息：\n调解纠纷总结：\n{0} support.mediatorsAddress=仲裁员的节点地址：{0} support.warning.disputesWithInvalidDonationAddress=延迟支付交易已经被用于一个不可用接受者地址。它与有效捐赠地址的任何 DAO 中参数值均不匹配。\n\n这可能是一个骗局。请将该事件通知开发者，在问题解决之前不要关闭该案件！\n\n纠纷所用的地址：{0}\n\n所有 DAO 参数中捐赠地址：{1}\n\n交易：{2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=交易 URL settings.preferences.editCustomExplorer.addressUrl=地址 URL settings.net.btcHeader=比特币网络 -settings.net.p2pHeader=Bisq 网络 +settings.net.p2pHeader=Haveno 网络 settings.net.onionAddressLabel=我的匿名地址 settings.net.btcNodesLabel=使用自定义比特币主节点 settings.net.bitcoinPeersLabel=已连接节点 @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=需要连接比特币核心 settings.net.useProvidedNodesRadio=使用公共比特币核心节点 settings.net.usePublicNodesRadio=使用公共比特币网络 settings.net.useCustomNodesRadio=使用自定义比特币主节点 -settings.net.warn.usePublicNodes=如果你使用公共比特币网络，你就会面临严重的隐私问题，这是由损坏的 bloom filter 设计和实现造成的，它适用于像 BitcoinJ 这样的 SPV 钱包（在 Bisq 中使用）。您所连接的任何完整节点都可以发现您的所有钱包地址都属于一个实体。\n\n详情请浏览： https://bisq.network/blog/privacy-in-bitsquare 。\n\n您确定要使用公共节点吗？ +settings.net.warn.usePublicNodes=如果你使用公共比特币网络，你就会面临严重的隐私问题，这是由损坏的 bloom filter 设计和实现造成的，它适用于像 BitcoinJ 这样的 SPV 钱包（在 Haveno 中使用）。您所连接的任何完整节点都可以发现您的所有钱包地址都属于一个实体。\n\n详情请浏览： https://bisq.network/blog/privacy-in-bitsquare 。\n\n您确定要使用公共节点吗？ settings.net.warn.usePublicNodes.useProvided=不，使用给定的节点 settings.net.warn.usePublicNodes.usePublic=使用公共网络 settings.net.warn.useCustomNodes.B2XWarning=请确保您的比特币节点是一个可信的比特币核心节点！\n\n连接到不遵循比特币核心共识规则的节点可能会损坏您的钱包，并在交易过程中造成问题。\n\n连接到违反共识规则的节点的用户应对任何由此造成的损害负责。任何由此产生的纠纷都将有利于另一方。对于忽略此警告和保护机制的用户，不提供任何技术支持！ -settings.net.warn.invalidBtcConfig=由于您的配置无效，无法连接至比特币网络。\n\n您的配置已经被重置为默认比特币节点。你需要重启 Bisq。 -settings.net.localhostBtcNodeInfo=背景信息：Bisq 在启动时会在本地查找比特币节点。如果有，Bisq 将只通过它与比特币网络进行通信。 +settings.net.warn.invalidBtcConfig=由于您的配置无效，无法连接至比特币网络。\n\n您的配置已经被重置为默认比特币节点。你需要重启 Haveno。 +settings.net.localhostBtcNodeInfo=背景信息：Haveno 在启动时会在本地查找比特币节点。如果有，Haveno 将只通过它与比特币网络进行通信。 settings.net.p2PPeersLabel=已连接节点 settings.net.onionAddressColumn=匿名地址 settings.net.creationDateColumn=已建立连接 @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=您确定要进行 SPV 重新同步？如果您继 settings.net.reSyncSPVAfterRestart=SPV 链文件已被删除。请耐心等待，与网络重新同步可能需要一段时间。 settings.net.reSyncSPVAfterRestartCompleted=重新同步刚刚完成，请重启应用程序。 settings.net.reSyncSPVFailed=无法删除 SPV 链文件。\n错误：{0} -setting.about.aboutBisq=关于 Bisq -setting.about.about=Bisq 是一款开源软件，它通过分散的对等网络促进了比特币与各国货币（以及其他加密货币）的交易，严格保护了用户隐私的方式。请到我们项目的网站阅读更多关于 Bisq 的信息。 -setting.about.web=Bisq 网站 +setting.about.aboutHaveno=关于 Haveno +setting.about.about=Haveno 是一款开源软件，它通过分散的对等网络促进了比特币与各国货币（以及其他加密货币）的交易，严格保护了用户隐私的方式。请到我们项目的网站阅读更多关于 Haveno 的信息。 +setting.about.web=Haveno 网站 setting.about.code=源代码 setting.about.agpl=AGPL 协议 -setting.about.support=支持 Bisq -setting.about.def=Bisq 不是一个公司，而是一个社区项目，开放参与。如果您想参与或支持 Bisq，请点击下面连接。 +setting.about.support=支持 Haveno +setting.about.def=Haveno 不是一个公司，而是一个社区项目，开放参与。如果您想参与或支持 Haveno，请点击下面连接。 setting.about.contribute=贡献 setting.about.providers=数据提供商 -setting.about.apisWithFee=Bisq 使用 Bisq 价格指数来表示法币与虚拟货币的市场价格，并使用 Bisq 内存池节点来估算采矿费。 -setting.about.apis=Bisq 使用 Bisq 价格指数来表示法币与数字货币的市场价格。 +setting.about.apisWithFee=Haveno 使用 Haveno 价格指数来表示法币与虚拟货币的市场价格，并使用 Haveno 内存池节点来估算采矿费。 +setting.about.apis=Haveno 使用 Haveno 价格指数来表示法币与数字货币的市场价格。 setting.about.pricesProvided=交易所价格提供商 setting.about.feeEstimation.label=矿工手续费估算提供商 setting.about.versionDetails=版本详情 @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=“Ctrl + {0}”或“alt + {0}”或“c setting.about.shortcuts.menuNav=主页面 setting.about.shortcuts.menuNav.value=使用“Ctrl”或“Alt”或“cmd” + 数字键“1-9”来切换不同的主页面 -setting.about.shortcuts.close=关闭 Bisq +setting.about.shortcuts.close=关闭 Haveno setting.about.shortcuts.close.value=“Ctrl + {0}”或“cmd + {0}”或“Ctrl + {1}”或“cmd + {1}” setting.about.shortcuts.closePopup=关闭弹窗以及对话框 @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=发送私人通知到对等点 setting.about.shortcuts.sendPrivateNotification.value=点击交易伙伴头像并按下：{0} 以显示更多信息 setting.info.headline=新 XMR 自动确认功能 -setting.info.msg=当你完成 BTC/XMR 交易时，您可以使用自动确认功能来验证是否向您的钱包中发送了正确数量的 XMR，以便 Bisq 可以自动将交易标记为完成，从而使每个人都可以更快地进行交易。\n\n自动确认使用 XMR 发送方提供的交易密钥在至少 2 个 XMR 区块浏览器节点上检查 XMR 交易。在默认情况下，Bisq 使用由 Bisq 贡献者运行的区块浏览器节点，但是我们建议运行您自己的 XMR 区块浏览器节点以最大程度地保护隐私和安全。\n\n您还可以在``设置''中将每笔交易的最大 BTC 数量设置为自动确认以及所需确认的数量。\n\n在 Bisq Wiki 上查看更多详细信息（包括如何设置自己的区块浏览器节点）：https://bisq.wiki/Trading_Monero#Auto-confirming_trades +setting.info.msg=当你完成 BTC/XMR 交易时，您可以使用自动确认功能来验证是否向您的钱包中发送了正确数量的 XMR，以便 Haveno 可以自动将交易标记为完成，从而使每个人都可以更快地进行交易。\n\n自动确认使用 XMR 发送方提供的交易密钥在至少 2 个 XMR 区块浏览器节点上检查 XMR 交易。在默认情况下，Haveno 使用由 Haveno 贡献者运行的区块浏览器节点，但是我们建议运行您自己的 XMR 区块浏览器节点以最大程度地保护隐私和安全。\n\n您还可以在``设置''中将每笔交易的最大 BTC 数量设置为自动确认以及所需确认的数量。\n\n在 Haveno Wiki 上查看更多详细信息（包括如何设置自己的区块浏览器节点）：https://bisq.wiki/Trading_Monero#Auto-confirming_trades #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=当你完成 BTC/XMR 交易时，您可以使用自动确认功 account.tab.mediatorRegistration=调解员注册 account.tab.refundAgentRegistration=退款助理注册 account.tab.signing=验证中 -account.info.headline=欢迎来到 Bisq 账户 -account.info.msg=在这里你可以设置交易账户的法定货币及数字货币，选择仲裁员和备份你的钱包及账户数据。\n\n当你开始运行 Bisq 就已经创建了一个空的比特币钱包。\n\n我们建议你在充值之前写下你比特币钱包的还原密钥（在左边的列表）和考虑添加密码。在“资金”选项中管理比特币存入和提现。\n\n隐私 & 安全：\nBisq 是一个去中心化的交易所 – 意味着您的所有数据都保存在您的电脑上，没有服务器，我们无法访问您的个人信息，您的资金，甚至您的 IP 地址。如银行账号、数字货币、比特币地址等数据只分享给与您交易的人，以实现您发起的交易（如果有争议，仲裁员将会看到您的交易数据）。 +account.info.headline=欢迎来到 Haveno 账户 +account.info.msg=在这里你可以设置交易账户的法定货币及数字货币，选择仲裁员和备份你的钱包及账户数据。\n\n当你开始运行 Haveno 就已经创建了一个空的比特币钱包。\n\n我们建议你在充值之前写下你比特币钱包的还原密钥（在左边的列表）和考虑添加密码。在“资金”选项中管理比特币存入和提现。\n\n隐私 & 安全：\nHaveno 是一个去中心化的交易所 – 意味着您的所有数据都保存在您的电脑上，没有服务器，我们无法访问您的个人信息，您的资金，甚至您的 IP 地址。如银行账号、数字货币、比特币地址等数据只分享给与您交易的人，以实现您发起的交易（如果有争议，仲裁员将会看到您的交易数据）。 account.menu.paymentAccount=法定货币账户 account.menu.altCoinsAccountView=数字货币账户 @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=这里包括内部钱包余额包括未确 account.menu.walletInfo.xpub.headLine=监控密钥（xpub keys） account.menu.walletInfo.walletSelector={0} {1} 钱包 account.menu.walletInfo.path.headLine=HD 密钥链路径 -account.menu.walletInfo.path.info=如果您导入其他钱包（例如 Electrum）的种子词，你需要去确认路径。这个操作只能用于你失去 Bisq 钱包和数据目录的控制的紧急情况。\n请记住使用非 Bisq 钱包的资金可能会打乱 Bisq 内部与之相连的钱包数据结构，这可能导致交易失败。\n\n请不要将 BSQ 发送至非 Bisq 钱包，因为这可能让您的 BSQ 交易记录失效以及损失 BSQ. +account.menu.walletInfo.path.info=如果您导入其他钱包（例如 Electrum）的种子词，你需要去确认路径。这个操作只能用于你失去 Haveno 钱包和数据目录的控制的紧急情况。\n请记住使用非 Haveno 钱包的资金可能会打乱 Haveno 内部与之相连的钱包数据结构，这可能导致交易失败。\n\n请不要将 BSQ 发送至非 Haveno 钱包，因为这可能让您的 BSQ 交易记录失效以及损失 BSQ. account.menu.walletInfo.openDetails=显示原始钱包详情与私钥 @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} 注册 account.arbitratorRegistration.revoke=撤销 account.arbitratorRegistration.info.msg=请注意，撤销后需要保留15天，因为可能有交易正在以你作为 {0}。最大允许的交易期限为8天，纠纷过程最多可能需要7天。 account.arbitratorRegistration.warn.min1Language=您需要设置至少1种语言。\n我们已经为您添加了默认语言。 -account.arbitratorRegistration.removedSuccess=您已从 Bisq 网络成功删除仲裁员注册信息。 +account.arbitratorRegistration.removedSuccess=您已从 Haveno 网络成功删除仲裁员注册信息。 account.arbitratorRegistration.removedFailed=无法删除仲裁员。{0} -account.arbitratorRegistration.registerSuccess=您已从 Bisq 网络成功注册您的仲裁员。 +account.arbitratorRegistration.registerSuccess=您已从 Haveno 网络成功注册您的仲裁员。 account.arbitratorRegistration.registerFailed=无法注册仲裁员。{0} account.altcoin.yourAltcoinAccounts=您的数字货币账户 account.altcoin.popup.wallet.msg=请确保您按照 {1} 网页上所述使用 {0} 钱包的要求。\n使用集中式交易所的钱包，您无法控制密钥或使用不兼容的钱包软件，可能会导致交易资金的流失！\n调解员或仲裁员不是 {2} 专家，在这种情况下不能帮助。 account.altcoin.popup.wallet.confirm=我了解并确定我知道我需要哪种钱包。 # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=在 Bisq 上交易 UPX 需要您了解并满足以下要求：\n\n要发送 UPX ，您需要使用官方的 UPXmA GUI 钱包或启用 store-tx-info 标志的 UPXmA CLI 钱包（在新版本中是默认的）。请确保您可以访问Tx密钥，因为在纠纷状态时需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高级>证明/检查页面。\n\n在普通的区块链浏览器中，这种交易是不可验证的。\n\n如有纠纷，你须向仲裁员提供下列资料：\n \n- Tx私钥\n- 交易哈希\n- 接收者的公开地址\n\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。如果发生纠纷，UPX 发送方负责向仲裁员提供 UPX 转账的验证。\n\n不需要支付 ID，只需要普通的公共地址。\n \n如果您对该流程不确定，请访问 UPXmA Discord 频道（https://discord.gg/vhdNSrV）或 Telegram 交流群（https://t.me/uplexaOfficial）了解更多信息。\n\n +account.altcoin.popup.upx.msg=在 Haveno 上交易 UPX 需要您了解并满足以下要求：\n\n要发送 UPX ，您需要使用官方的 UPXmA GUI 钱包或启用 store-tx-info 标志的 UPXmA CLI 钱包（在新版本中是默认的）。请确保您可以访问Tx密钥，因为在纠纷状态时需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高级>证明/检查页面。\n\n在普通的区块链浏览器中，这种交易是不可验证的。\n\n如有纠纷，你须向仲裁员提供下列资料：\n \n- Tx私钥\n- 交易哈希\n- 接收者的公开地址\n\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。如果发生纠纷，UPX 发送方负责向仲裁员提供 UPX 转账的验证。\n\n不需要支付 ID，只需要普通的公共地址。\n \n如果您对该流程不确定，请访问 UPXmA Discord 频道（https://discord.gg/vhdNSrV）或 Telegram 交流群（https://t.me/uplexaOfficial）了解更多信息。\n\n # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=在 Bisq 上交易 ARQ 需要您了解并满足以下要求：\n\n要发送 ARQ ，您需要使用官方的 ArQmA GUI 钱包或启用 store-tx-info 标志的 ArQmA CLI 钱包（在新版本中是默认的）。请确保您可以访问Tx密钥，因为在纠纷状态时需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高级>证明/检查页面。\n\n在普通的区块链浏览器中，这种交易是不可验证的。\n\n如有纠纷，你须向调解员或仲裁员提供下列资料：\n\n- Tx私钥\n- 交易哈希\n- 接收者的公开地址\n\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。如果发生纠纷，ARQ 发送方负责向调解员或仲裁员提供 ARQ 转账的验证。\n\n不需要交易 ID，只需要普通的公共地址。\n\n如果您对该流程不确定，请访问 ArQmA Discord 频道（https://discord.gg/s9BQpJT）或 ArQmA 论坛（https://labs.arqma.com）了解更多信息。 +account.altcoin.popup.arq.msg=在 Haveno 上交易 ARQ 需要您了解并满足以下要求：\n\n要发送 ARQ ，您需要使用官方的 ArQmA GUI 钱包或启用 store-tx-info 标志的 ArQmA CLI 钱包（在新版本中是默认的）。请确保您可以访问Tx密钥，因为在纠纷状态时需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高级>证明/检查页面。\n\n在普通的区块链浏览器中，这种交易是不可验证的。\n\n如有纠纷，你须向调解员或仲裁员提供下列资料：\n\n- Tx私钥\n- 交易哈希\n- 接收者的公开地址\n\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。如果发生纠纷，ARQ 发送方负责向调解员或仲裁员提供 ARQ 转账的验证。\n\n不需要交易 ID，只需要普通的公共地址。\n\n如果您对该流程不确定，请访问 ArQmA Discord 频道（https://discord.gg/s9BQpJT）或 ArQmA 论坛（https://labs.arqma.com）了解更多信息。 # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=在 Bisq 上交易 XMR 需要你理解并满足以下要求。\n\n如果您出售 XMR，当您在纠纷中您必须要提供下列信息给调解员或仲裁员：\n- 交易密钥（Tx 公钥，Tx密钥，Tx私钥）\n- 交易 ID（Tx ID 或 Tx 哈希）\n- 交易目标地址（接收者地址）\n\n在 wiki 中查看更多关于 Monero 钱包的信息：\nhttps://bisq.wiki/Trading_Monero#Proving_payments\n\n如未能提供要求的交易数据将在纠纷中直接判负\n\n还要注意，Bisq 现在提供了自动确认 XMR 交易的功能，以使交易更快，但是您需要在设置中启用它。\n\n有关自动确认功能的更多信息，请参见 Wiki：\nhttps://bisq.wiki/Trading_Monero#Auto-confirming_trades +account.altcoin.popup.xmr.msg=在 Haveno 上交易 XMR 需要你理解并满足以下要求。\n\n如果您出售 XMR，当您在纠纷中您必须要提供下列信息给调解员或仲裁员：\n- 交易密钥（Tx 公钥，Tx密钥，Tx私钥）\n- 交易 ID（Tx ID 或 Tx 哈希）\n- 交易目标地址（接收者地址）\n\n在 wiki 中查看更多关于 Monero 钱包的信息：\nhttps://bisq.wiki/Trading_Monero#Proving_payments\n\n如未能提供要求的交易数据将在纠纷中直接判负\n\n还要注意，Haveno 现在提供了自动确认 XMR 交易的功能，以使交易更快，但是您需要在设置中启用它。\n\n有关自动确认功能的更多信息，请参见 Wiki：\nhttps://bisq.wiki/Trading_Monero#Auto-confirming_trades # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=区块链浏览器在 Bisq 上交易 XMR 需要您了解并满足以下要求：\n\n发送MSR时，您需要使用官方的 Masari GUI 钱包、启用store-tx-info标记的Masari CLI钱包(默认启用)或Masari 网页钱包(https://wallet.getmasari.org)。请确保您可以访问的 tx 密钥，因为如果发生纠纷这是需要的。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高级>证明/检查页面。\n\nMasari 网页钱包（前往 帐户->交易历史和查看您发送的交易细节）\n\n验证可以在钱包中完成。\nmonero-wallet-cli：使用命令（check_tx_key）。\nmonero-wallet-gui：在高级>证明/检查页面\n验证可以在区块浏览器中完成\n打开区块浏览器（https://explorer.getmasari.org），使用搜索栏查找您的事务哈希。\n一旦找到交易，滚动到底部的“证明发送”区域，并填写所需的详细信息。\n如有纠纷，你须向调解员或仲裁员提供下列资料：\n- Tx私钥\n- 交易哈希\n- 接收者的公开地址\n\n不需要交易 ID，只需要正常的公共地址。\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。如果发生纠纷，XMR 发送方负责向调解员或仲裁员提供 XMR 转账的验证。\n\n如果您对该流程不确定，请访问官方的 Masari Discord（https://discord.gg/sMCwMqs）上寻求帮助。 +account.altcoin.popup.msr.msg=区块链浏览器在 Haveno 上交易 XMR 需要您了解并满足以下要求：\n\n发送MSR时，您需要使用官方的 Masari GUI 钱包、启用store-tx-info标记的Masari CLI钱包(默认启用)或Masari 网页钱包(https://wallet.getmasari.org)。请确保您可以访问的 tx 密钥，因为如果发生纠纷这是需要的。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高级>证明/检查页面。\n\nMasari 网页钱包（前往 帐户->交易历史和查看您发送的交易细节）\n\n验证可以在钱包中完成。\nmonero-wallet-cli：使用命令（check_tx_key）。\nmonero-wallet-gui：在高级>证明/检查页面\n验证可以在区块浏览器中完成\n打开区块浏览器（https://explorer.getmasari.org），使用搜索栏查找您的事务哈希。\n一旦找到交易，滚动到底部的“证明发送”区域，并填写所需的详细信息。\n如有纠纷，你须向调解员或仲裁员提供下列资料：\n- Tx私钥\n- 交易哈希\n- 接收者的公开地址\n\n不需要交易 ID，只需要正常的公共地址。\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。如果发生纠纷，XMR 发送方负责向调解员或仲裁员提供 XMR 转账的验证。\n\n如果您对该流程不确定，请访问官方的 Masari Discord（https://discord.gg/sMCwMqs）上寻求帮助。 # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=在 Bisq 上交易 BLUR 需要你了解并满足以下要求：\n\n要发送匿名信息你必须使用匿名网络 CLI 或 GUI 钱包。\n如果您正在使用 CLI 钱包，在传输发送后将显示交易哈希（tx ID）。您必须保存此信息。在发送传输之后，您必须立即使用“get_tx_key”命令来检索交易私钥。如果未能执行此步骤，以后可能无法检索密钥。\n\n如果您使用 Blur Network GUI 钱包，可以在“历史”选项卡中方便地找到交易私钥和交易 ID。发送后立即定位感兴趣的交易。单击包含交易的框的右下角的“?”符号。您必须保存此信息。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息：1.)交易ID，2.)交易私钥，3.)收件人地址。调解或仲裁程序将使用 BLUR 事务查看器（https://blur.cash/#tx-viewer）验证 BLUR 转账。\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有争议的情况下，匿名发送方承担100%的责任来向调解员或仲裁员核实交易。\n\n如果你不了解这些要求，不要在 Bisq 上交易。首先，在 Blur Network Discord 中寻求帮助（https://discord.gg/dMWaqVW）。 +account.altcoin.popup.blur.msg=在 Haveno 上交易 BLUR 需要你了解并满足以下要求：\n\n要发送匿名信息你必须使用匿名网络 CLI 或 GUI 钱包。\n如果您正在使用 CLI 钱包，在传输发送后将显示交易哈希（tx ID）。您必须保存此信息。在发送传输之后，您必须立即使用“get_tx_key”命令来检索交易私钥。如果未能执行此步骤，以后可能无法检索密钥。\n\n如果您使用 Blur Network GUI 钱包，可以在“历史”选项卡中方便地找到交易私钥和交易 ID。发送后立即定位感兴趣的交易。单击包含交易的框的右下角的“?”符号。您必须保存此信息。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息：1.)交易ID，2.)交易私钥，3.)收件人地址。调解或仲裁程序将使用 BLUR 事务查看器（https://blur.cash/#tx-viewer）验证 BLUR 转账。\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有争议的情况下，匿名发送方承担100%的责任来向调解员或仲裁员核实交易。\n\n如果你不了解这些要求，不要在 Haveno 上交易。首先，在 Blur Network Discord 中寻求帮助（https://discord.gg/dMWaqVW）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=在 Bisq 上交易 Solo 需要您了解并满足以下要求:\n\n要发送 Solo，您必须使用 Solo CLI 网络钱包版本 5.1.3 或更高。\n\n如果您使用的是CLI钱包，则在发送交易之后，将显示交易ID。您必须保存此信息。在发送交易之后，您必须立即使用'get_tx_key'命令来检索交易密钥。如果未能执行此步骤，则以后可能无法检索密钥。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息：1)交易 ID,、2)交易密钥，3)收件人的地址。调解员或仲裁员将使用 Solo 区块资源管理器（https://explorer.Solo.org）搜索交易然后使用“发送证明”功能（https://explorer.minesolo.com/）\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有发生争议的情况下，在向调解员或仲裁员核实交易时，QWC 的发送方承担 100% 的责任。\n\n如果你不理解这些要求，不要在 Bisq 上交易。首先，在 Solo Discord 中寻求帮助（https://discord.minesolo.com/）。\n\n +account.altcoin.popup.solo.msg=在 Haveno 上交易 Solo 需要您了解并满足以下要求:\n\n要发送 Solo，您必须使用 Solo CLI 网络钱包版本 5.1.3 或更高。\n\n如果您使用的是CLI钱包，则在发送交易之后，将显示交易ID。您必须保存此信息。在发送交易之后，您必须立即使用'get_tx_key'命令来检索交易密钥。如果未能执行此步骤，则以后可能无法检索密钥。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息：1)交易 ID,、2)交易密钥，3)收件人的地址。调解员或仲裁员将使用 Solo 区块资源管理器（https://explorer.Solo.org）搜索交易然后使用“发送证明”功能（https://explorer.minesolo.com/）\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有发生争议的情况下，在向调解员或仲裁员核实交易时，QWC 的发送方承担 100% 的责任。\n\n如果你不理解这些要求，不要在 Haveno 上交易。首先，在 Solo Discord 中寻求帮助（https://discord.minesolo.com/）。\n\n # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=在 Bisq 上交易 CASH2 需要您了解并满足以下要求：\n\n要发送 CASH2，您必须使用 CASH2 钱包版本 3 或更高。\n\n在发送交易之后，将显示交易ID。您必须保存此信息。在发送交易之后，必须立即在 simplewallet 中使用命令“getTxKey”来检索交易密钥。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息：1)交易 ID，2)交易密钥，3)收件人的 CASH2 地址。调解员或仲裁员将使用 CASH2 区块资源管理器（https://blocks.cash2.org）验证 CASH2 转账。\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有发生争议的情况下，在向调解员或仲裁员核实交易时，CASH2 的发送方承担 100% 的责任。\n\n如果你不理解这些要求，不要在 Bisq 上交易。首先，在 Cash2 Discord 中寻求帮助（https://discord.gg/FGfXAYN）。 +account.altcoin.popup.cash2.msg=在 Haveno 上交易 CASH2 需要您了解并满足以下要求：\n\n要发送 CASH2，您必须使用 CASH2 钱包版本 3 或更高。\n\n在发送交易之后，将显示交易ID。您必须保存此信息。在发送交易之后，必须立即在 simplewallet 中使用命令“getTxKey”来检索交易密钥。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息：1)交易 ID，2)交易密钥，3)收件人的 CASH2 地址。调解员或仲裁员将使用 CASH2 区块资源管理器（https://blocks.cash2.org）验证 CASH2 转账。\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有发生争议的情况下，在向调解员或仲裁员核实交易时，CASH2 的发送方承担 100% 的责任。\n\n如果你不理解这些要求，不要在 Haveno 上交易。首先，在 Cash2 Discord 中寻求帮助（https://discord.gg/FGfXAYN）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=在 Bisq 上交易 Qwertycoin 需要您了解并满足以下要求:\n\n要发送 Qwertycoin，您必须使用 Qwertycoin 钱包版本 5.1.3 或更高。\n\n在发送交易之后，将显示交易ID。您必须保存此信息。在发送交易之后，必须立即在 simplewallet 中使用命令“get_Tx_Key”来检索交易密钥。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息:：1)交易 ID,、2)交易密钥，3)收件人的 QWC 地址。调解员或仲裁员将使用 QWC 区块资源管理器（https://explorer.qwertycoin.org）验证 QWC 转账。\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有发生争议的情况下，在向调解员或仲裁员核实交易时，QWC 的发送方承担 100% 的责任。\n\n如果你不理解这些要求，不要在 Bisq 上交易。首先，在 QWC Discord 中寻求帮助（https://discord.gg/rUkfnpC）。 +account.altcoin.popup.qwertycoin.msg=在 Haveno 上交易 Qwertycoin 需要您了解并满足以下要求:\n\n要发送 Qwertycoin，您必须使用 Qwertycoin 钱包版本 5.1.3 或更高。\n\n在发送交易之后，将显示交易ID。您必须保存此信息。在发送交易之后，必须立即在 simplewallet 中使用命令“get_Tx_Key”来检索交易密钥。\n\n如果仲裁是必要的，您必须向调解员或仲裁员提供以下信息:：1)交易 ID,、2)交易密钥，3)收件人的 QWC 地址。调解员或仲裁员将使用 QWC 区块资源管理器（https://explorer.qwertycoin.org）验证 QWC 转账。\n\n未能向调解员或仲裁员提供必要的信息将导致败诉。在所有发生争议的情况下，在向调解员或仲裁员核实交易时，QWC 的发送方承担 100% 的责任。\n\n如果你不理解这些要求，不要在 Haveno 上交易。首先，在 QWC Discord 中寻求帮助（https://discord.gg/rUkfnpC）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=在 Bisq 上交易 Dragonglass 需要您了解并满足以下要求：\n\n由于 Dragonglass 提供了隐私保护，所以交易不能在公共区块链上验证。如果需要，您可以通过使用您的 TXN-Private-Key 来证明您的付款。\nTXN-Private 密匙是自动生成的一次性密匙，用于只能从 DRGL 钱包中访问的每个交易。\n要么通过 DRGL-wallet GUI（内部交易细节对话框），要么通过 Dragonglass CLI simplewallet（使用命令“get_tx_key”）。\n\n两者都需要 DRGL 版本的“Oathkeeper”或更高版本。\n\n如有争议，你必须向调解员或仲裁员提供下列资料：\n\n- txn-Privite-ket\n- 交易哈希 \n- 接收者的公开地址\n\n付款验证可以使用上面的数据作为输入（http://drgl.info/#check_txn）。\n\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。Dragonglass 发送方负责在发生争议时向调解员或仲裁员提供 DRGL 转账的验证。不需要使用付款 ID。\n\n如果您对这个过程的任何部分都不确定，请访问（http://discord.drgl.info）上的 Dragonglass 寻求帮助。 +account.altcoin.popup.drgl.msg=在 Haveno 上交易 Dragonglass 需要您了解并满足以下要求：\n\n由于 Dragonglass 提供了隐私保护，所以交易不能在公共区块链上验证。如果需要，您可以通过使用您的 TXN-Private-Key 来证明您的付款。\nTXN-Private 密匙是自动生成的一次性密匙，用于只能从 DRGL 钱包中访问的每个交易。\n要么通过 DRGL-wallet GUI（内部交易细节对话框），要么通过 Dragonglass CLI simplewallet（使用命令“get_tx_key”）。\n\n两者都需要 DRGL 版本的“Oathkeeper”或更高版本。\n\n如有争议，你必须向调解员或仲裁员提供下列资料：\n\n- txn-Privite-ket\n- 交易哈希 \n- 接收者的公开地址\n\n付款验证可以使用上面的数据作为输入（http://drgl.info/#check_txn）。\n\n如未能提供上述资料，或使用不兼容的钱包，将会导致纠纷败诉。Dragonglass 发送方负责在发生争议时向调解员或仲裁员提供 DRGL 转账的验证。不需要使用付款 ID。\n\n如果您对这个过程的任何部分都不确定，请访问（http://discord.drgl.info）上的 Dragonglass 寻求帮助。 # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=当使用 Zcash 时，您只能使用透明地址（以 t 开头），而不能使用 z 地址（私有），因为调解员或仲裁员无法使用 z 地址验证交易。 # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=在使用 Zcoin 时，您只能使用透明的（可跟踪的）地址，而不能使用不可跟踪的地址，因为调解员或仲裁员无法在区块资源管理器中使用不可跟踪的地址验证交易。 # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN 需要发送方和接收方之间的交互过程来创建交易。请确保遵循 GRIN 项目网页中的说明，以可靠地发送和接收 GRIN（接收方需要在线，或至少在一定时间内在线）。\n \nBisq 只支持 Grinbox（Wallet713）钱包 URL 格式。\n\nGRIN 发送者需要提供他们已成功发送 GRIN 的证明。如果钱包不能提供证明，一个潜在的纠纷将被解决，有利于露齿微笑的接受者。请确保您使用了最新的支持交易证明的 Grinbox 软件，并且您了解传输和接收 GRIN 的过程以及如何创建证明。\n请参阅 https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only，以获得关于 Grinbox 证明工具的更多信息。\n +account.altcoin.popup.grin.msg=GRIN 需要发送方和接收方之间的交互过程来创建交易。请确保遵循 GRIN 项目网页中的说明，以可靠地发送和接收 GRIN（接收方需要在线，或至少在一定时间内在线）。\n \nHaveno 只支持 Grinbox（Wallet713）钱包 URL 格式。\n\nGRIN 发送者需要提供他们已成功发送 GRIN 的证明。如果钱包不能提供证明，一个潜在的纠纷将被解决，有利于露齿微笑的接受者。请确保您使用了最新的支持交易证明的 Grinbox 软件，并且您了解传输和接收 GRIN 的过程以及如何创建证明。\n请参阅 https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only，以获得关于 Grinbox 证明工具的更多信息。\n # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM 需要发送方和接收方之间的交互过程来创建交易。\n\n\n确保遵循 BEAM 项目网页的指示可靠地发送和接收 BEAM（接收方需要在线，或者至少在一定的时间范围内在线）。\n\nBEAM 发送者需要提供他们成功发送 BEAM 的证明。一定要使用钱包软件，可以产生这样的证明。如果钱包不能提供证据，一个潜在的纠纷将得到解决，有利于 BEAM 接收者。 # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=在 Bisq 上交易 ParsiCoin 需要您了解并满足以下要求：\n\n要发送 PARS ，您必须使用官方 ParsiCoin Wallet 版本 3.0.0 或更高。\n\n您可以在 GUI 钱包（ParsiPay）的交易部分检查您的交易哈希和交易键，您需要右键单击“交易”，然后单击“显示详情”。\n\n如果仲裁是 100% 必要的，您必须向调解员或仲裁员提供以下内容：1)交易哈希，2)交易密钥，以及3)接收方的 PARS 地址。调解员或仲裁员将使用 ParsiCoin 区块链浏览器 （http://explorer.parsicoin.net/#check_payment）验证 PARS 传输。\n\n如果你不了解这些要求，不要在 Bisq 上交易。首先，在 ParsiCoin Discord 寻求帮助（https://discord.gg/c7qmFNh）。 +account.altcoin.popup.pars.msg=在 Haveno 上交易 ParsiCoin 需要您了解并满足以下要求：\n\n要发送 PARS ，您必须使用官方 ParsiCoin Wallet 版本 3.0.0 或更高。\n\n您可以在 GUI 钱包（ParsiPay）的交易部分检查您的交易哈希和交易键，您需要右键单击“交易”，然后单击“显示详情”。\n\n如果仲裁是 100% 必要的，您必须向调解员或仲裁员提供以下内容：1)交易哈希，2)交易密钥，以及3)接收方的 PARS 地址。调解员或仲裁员将使用 ParsiCoin 区块链浏览器 （http://explorer.parsicoin.net/#check_payment）验证 PARS 传输。\n\n如果你不了解这些要求，不要在 Haveno 上交易。首先，在 ParsiCoin Discord 寻求帮助（https://discord.gg/c7qmFNh）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=要交易烧毁的货币，你需要知道以下几点：\n\n烧毁的货币是不能花的。要在 Bisq 上交易它们，输出脚本需要采用以下形式：OP_RETURN OP_PUSHDATA，后跟相关的数据字节，这些字节经过十六进制编码后构成地址。例如，地址为666f6f（在UTF-8中的"foo"）的烧毁的货币将有以下脚本：\n\nOP_RETURN OP_PUSHDATA 666f6f\n\n要创建烧毁的货币，您可以使用“烧毁”RPC命令，它在一些钱包可用。\n\n对于可能的情况，可以查看 https://ibo.laboratorium.ee\n\n因为烧毁的货币是不能用的，所以不能重新出售。“出售”烧毁的货币意味着焚烧初始的货币（与目的地地址相关联的数据）。\n\n如果发生争议，BLK 卖方需要提供交易哈希。 +account.altcoin.popup.blk-burnt.msg=要交易烧毁的货币，你需要知道以下几点：\n\n烧毁的货币是不能花的。要在 Haveno 上交易它们，输出脚本需要采用以下形式：OP_RETURN OP_PUSHDATA，后跟相关的数据字节，这些字节经过十六进制编码后构成地址。例如，地址为666f6f（在UTF-8中的"foo"）的烧毁的货币将有以下脚本：\n\nOP_RETURN OP_PUSHDATA 666f6f\n\n要创建烧毁的货币，您可以使用“烧毁”RPC命令，它在一些钱包可用。\n\n对于可能的情况，可以查看 https://ibo.laboratorium.ee\n\n因为烧毁的货币是不能用的，所以不能重新出售。“出售”烧毁的货币意味着焚烧初始的货币（与目的地地址相关联的数据）。\n\n如果发生争议，BLK 卖方需要提供交易哈希。 # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=在 Bisq 上交易 L-BTC 你必须理解下述条款：\n\n当你在 Bisq 上接受 L-BTC 交易时，你不能使用手机 Blockstream Green Wallet 或者是一个托管/交易钱包。你必须只接收 L-BTC 到 Liquid Elements Core 钱包，或另一个 L-BTC 钱包且允许你获得匿名的 L-BTC 地址以及密钥。\n\n在需要进行调解的情况下，或者如果发生了交易纠纷，您必须将接收 L-BTC地址的安全密钥披露给 Bisq 调解员或退款代理，以便他们能够在他们自己的 Elements Core 全节点上验证您的匿名交易的细节。\n\n如果你不了解或了解这些要求，不要在 Bisq 上交易 L-BTC。 +account.altcoin.popup.liquidbitcoin.msg=在 Haveno 上交易 L-BTC 你必须理解下述条款：\n\n当你在 Haveno 上接受 L-BTC 交易时，你不能使用手机 Blockstream Green Wallet 或者是一个托管/交易钱包。你必须只接收 L-BTC 到 Liquid Elements Core 钱包，或另一个 L-BTC 钱包且允许你获得匿名的 L-BTC 地址以及密钥。\n\n在需要进行调解的情况下，或者如果发生了交易纠纷，您必须将接收 L-BTC地址的安全密钥披露给 Haveno 调解员或退款代理，以便他们能够在他们自己的 Elements Core 全节点上验证您的匿名交易的细节。\n\n如果你不了解或了解这些要求，不要在 Haveno 上交易 L-BTC。 account.fiat.yourFiatAccounts=您的法定货币账户 @@ -1235,12 +1235,12 @@ account.password.info=使用密码保护，您需要在将比特币从钱包中 account.seed.backup.title=备份您的钱包还原密钥 account.seed.info=请写下钱包还原密钥和时间！\n您可以通过还原密钥和时间在任何时候恢复您的钱包。\n还原密钥用于 BTC 和 BSQ 钱包。\n\n您应该在一张纸上写下还原密钥并且不要保存它们在您的电脑上。\n请注意还原密钥并不能代替备份。\n您需要备份完整的应用程序目录在”账户/备份“界面去恢复有效的应用程序状态和数据。 -account.seed.backup.warning=请注意种子词不能替代备份。您需要为整个应用目录（在“账户/备份”选项卡中）以恢复应用状态以及数据。\n导入种子词仅在紧急情况时才推荐使用。 如果没有正确备份数据库文件和密钥，该应用程序将无法运行！\n\n在 Bisq wiki 中查看更多信息： https://bisq.wiki/Backing_up_application_data +account.seed.backup.warning=请注意种子词不能替代备份。您需要为整个应用目录（在“账户/备份”选项卡中）以恢复应用状态以及数据。\n导入种子词仅在紧急情况时才推荐使用。 如果没有正确备份数据库文件和密钥，该应用程序将无法运行！\n\n在 Haveno wiki 中查看更多信息： https://bisq.wiki/Backing_up_application_data account.seed.warn.noPw.msg=您还没有设置一个可以保护还原密钥显示的钱包密码。\n\n要显示还原密钥吗？ account.seed.warn.noPw.yes=是的，不要再问我 account.seed.enterPw=输入密码查看还原密钥 account.seed.restore.info=请在应用还原密钥还原之前进行备份。请注意，钱包还原仅用于紧急情况，可能会导致内部钱包数据库出现问题。\n这不是应用备份的方法！请使用应用程序数据目录中的备份来恢复以前的应用程序状态。\n恢复后，应用程序将自动关闭。重新启动应用程序后，它将重新与比特币网络同步。这可能需要一段时间，并且会消耗大量CPU，特别是在钱包较旧且有很多交易的情况下。请避免中断该进程，否则可能需要再次删除 SPV 链文件或重复还原过程。 -account.seed.restore.ok=好的，立即执行回复并且关闭 Bisq +account.seed.restore.ok=好的，立即执行回复并且关闭 Haveno #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=提醒条件：当 BTC 价格低于 account.notifications.priceAlert.setButton=设置价格提醒 account.notifications.priceAlert.removeButton=取消价格提醒 account.notifications.trade.message.title=交易状态已变更 -account.notifications.trade.message.msg.conf=ID 为 {0} 的交易的存款交易已被确认。请打开您的 Bisq 应用程序并开始付款。 +account.notifications.trade.message.msg.conf=ID 为 {0} 的交易的存款交易已被确认。请打开您的 Haveno 应用程序并开始付款。 account.notifications.trade.message.msg.started=BTC 买家已经开始支付 ID 为 {0} 的交易。 account.notifications.trade.message.msg.completed=ID 为 {0} 的交易已完成。 account.notifications.offer.message.title=您的报价已被接受 @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=报价类型 account.notifications.marketAlert.message.title=报价提醒 account.notifications.marketAlert.message.msg.below=低于 account.notifications.marketAlert.message.msg.above=高于 -account.notifications.marketAlert.message.msg=价格为 {2}（{3} {4}市场价）和支付方式为 {5} 的报价 {0} {1} 已发布到 Bisq 报价列表。\n报价ID： {6}。 +account.notifications.marketAlert.message.msg=价格为 {2}（{3} {4}市场价）和支付方式为 {5} 的报价 {0} {1} 已发布到 Haveno 报价列表。\n报价ID： {6}。 account.notifications.priceAlert.message.title=价格提醒 {0} account.notifications.priceAlert.message.msg=您的价格提醒已被触发。当前 {0} 的价格为 {1} {2} -account.notifications.noWebCamFound.warning=未找到网络摄像头。\n\n请使用电子邮件选项将代码和加密密钥从您的手机发送到 Bisq 应用程序。 +account.notifications.noWebCamFound.warning=未找到网络摄像头。\n\n请使用电子邮件选项将代码和加密密钥从您的手机发送到 Haveno 应用程序。 account.notifications.priceAlert.warning.highPriceTooLow=较高的价格必须大于较低的价格。 account.notifications.priceAlert.warning.lowerPriceTooHigh=较低的价格必须低于较高的价格。 @@ -1327,11 +1327,11 @@ displayUpdateDownloadWindow.status.verifying=验证验证中... displayUpdateDownloadWindow.button.label=下载安装程序并验证验证 displayUpdateDownloadWindow.button.downloadLater=稍后下载 displayUpdateDownloadWindow.button.ignoreDownload=忽略这个版本 -displayUpdateDownloadWindow.headline=Bisq 有新的更新！ +displayUpdateDownloadWindow.headline=Haveno 有新的更新！ displayUpdateDownloadWindow.download.failed.headline=下载失败 -displayUpdateDownloadWindow.download.failed=下载失败。\n请到 https://bisq.io/downloads 下载并验证。 +displayUpdateDownloadWindow.download.failed=下载失败。\n请到 https://haveno.io/downloads 下载并验证。 displayUpdateDownloadWindow.installer.failed=无法确定正确的安装程序。请通过 https://bisq.network/downloads 手动下载和验证。 -displayUpdateDownloadWindow.verify.failed=验证失败。\n请到 https://bisq.io/downloads 手动下载和验证。 +displayUpdateDownloadWindow.verify.failed=验证失败。\n请到 https://haveno.io/downloads 手动下载和验证。 displayUpdateDownloadWindow.success=新版本成功下载并验证验证 。\n\n请打开下载目录，关闭应用程序并安装最新版本。 displayUpdateDownloadWindow.download.openDir=打开下载目录 @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=未支付关闭 disputeSummaryWindow.close.noPayout.text=你想要在未作支付的情况下关闭吗？ emptyWalletWindow.headline={0} 钱包急救工具 -emptyWalletWindow.info=请在紧急情况下使用，如果您无法从 UI 中访问您的资金。\n\n请注意，使用此工具时，所有未结报价将自动关闭。\n\n在使用此工具之前，请备份您的数据目录。您可以在“帐户/备份”中执行此操作。\n\n请报告我们您的问题，并在 Github 或 Bisq 论坛上提交错误报告，以便我们可以调查导致问题的原因。 +emptyWalletWindow.info=请在紧急情况下使用，如果您无法从 UI 中访问您的资金。\n\n请注意，使用此工具时，所有未结报价将自动关闭。\n\n在使用此工具之前，请备份您的数据目录。您可以在“帐户/备份”中执行此操作。\n\n请报告我们您的问题，并在 Github 或 Haveno 论坛上提交错误报告，以便我们可以调查导致问题的原因。 emptyWalletWindow.balance=您的可用钱包余额 emptyWalletWindow.address=输入您的目标地址 @@ -1454,7 +1454,7 @@ offerDetailsWindow.creationDate=创建时间 offerDetailsWindow.makersOnion=卖家的匿名地址 qRCodeWindow.headline=二维码 -qRCodeWindow.msg=请使用二维码从外部钱包充值至 Bisq 钱包 +qRCodeWindow.msg=请使用二维码从外部钱包充值至 Haveno 钱包 qRCodeWindow.request=付款请求：\n{0} selectDepositTxWindow.headline=选择纠纷的存款交易 @@ -1564,7 +1564,7 @@ popup.headline.error=错误 popup.doNotShowAgain=不要再显示 popup.reportError.log=打开日志文件 popup.reportError.gitHub=报告至 Github issue tracker -popup.reportError={0}\n\n为了帮助我们改进软件，请在 https://github.com/bisq-network/bisq/issues 上打开一个新问题来报告这个 bug 。\n\n当您单击下面任意一个按钮时，上面的错误消息将被复制到剪贴板。\n\n如果您通过按下“打开日志文件”，保存一份副本，并将其附加到 bug 报告中，如果包含 bisq.log 文件，那么调试就会变得更容易。 +popup.reportError={0}\n\n为了帮助我们改进软件，请在 https://github.com/bisq-network/bisq/issues 上打开一个新问题来报告这个 bug 。\n\n当您单击下面任意一个按钮时，上面的错误消息将被复制到剪贴板。\n\n如果您通过按下“打开日志文件”，保存一份副本，并将其附加到 bug 报告中，如果包含 haveno.log 文件，那么调试就会变得更容易。 popup.error.tryRestart=请尝试重启您的应用程序或者检查您的网络连接。 popup.error.takeOfferRequestFailed=当有人试图接受你的报价时发生了一个错误：\n{0} @@ -1575,10 +1575,10 @@ error.closedTradeWithUnconfirmedDepositTx=交易 ID 为 {0} 的已关闭交易 error.closedTradeWithNoDepositTx=交易 ID 为 {0} 的保证金交易已被确认。\n\n请重新启动应用程序来清理已关闭的交易列表。 popup.warning.walletNotInitialized=钱包至今未初始化 -popup.warning.osxKeyLoggerWarning=由于 MacOS 10.14 及更高版本中的安全措施更加严格，因此启动 Java 应用程序（Bisq 使用Java）会在 MacOS 中引发弹出警告（``Bisq 希望从任何应用程序接收击键''）.\n\n为了避免该问题，请打开“ MacOS 设置”，然后转到“安全和隐私”->“隐私”->“输入监视”，然后从右侧列表中删除“ Bisq”。\n\n一旦解决了技术限制（所需的 Java 版本的 Java 打包程序尚未交付），Bisq将升级到新的 Java 版本，以避免该问题。 -popup.warning.wrongVersion=您这台电脑上可能有错误的 Bisq 版本。\n您的电脑的架构是：{0}\n您安装的 Bisq 二进制文件是：{1}\n请关闭并重新安装正确的版本（{2}）。 -popup.warning.incompatibleDB=我们检测到不兼容的数据库文件！\n\n那些数据库文件与我们当前的代码库不兼容：\n{0}\n\n我们对损坏的文件进行了备份，并将默认值应用于新的数据库版本。\n\n备份位于：\n{1}/db/backup_of_corrupted_data。\n\n请检查您是否安装了最新版本的 Bisq\n您可以下载：\nhttps://bisq.network/downloads\n\n请重新启动应用程序。 -popup.warning.startupFailed.twoInstances=Bisq 已经在运行。 您不能运行两个 Bisq 实例。 +popup.warning.osxKeyLoggerWarning=由于 MacOS 10.14 及更高版本中的安全措施更加严格，因此启动 Java 应用程序（Haveno 使用Java）会在 MacOS 中引发弹出警告（``Haveno 希望从任何应用程序接收击键''）.\n\n为了避免该问题，请打开“ MacOS 设置”，然后转到“安全和隐私”->“隐私”->“输入监视”，然后从右侧列表中删除“ Haveno”。\n\n一旦解决了技术限制（所需的 Java 版本的 Java 打包程序尚未交付），Haveno将升级到新的 Java 版本，以避免该问题。 +popup.warning.wrongVersion=您这台电脑上可能有错误的 Haveno 版本。\n您的电脑的架构是：{0}\n您安装的 Haveno 二进制文件是：{1}\n请关闭并重新安装正确的版本（{2}）。 +popup.warning.incompatibleDB=我们检测到不兼容的数据库文件！\n\n那些数据库文件与我们当前的代码库不兼容：\n{0}\n\n我们对损坏的文件进行了备份，并将默认值应用于新的数据库版本。\n\n备份位于：\n{1}/db/backup_of_corrupted_data。\n\n请检查您是否安装了最新版本的 Haveno\n您可以下载：\nhttps://bisq.network/downloads\n\n请重新启动应用程序。 +popup.warning.startupFailed.twoInstances=Haveno 已经在运行。 您不能运行两个 Haveno 实例。 popup.warning.tradePeriod.halfReached=您与 ID {0} 的交易已达到最长交易期的一半，且仍未完成。\n\n交易期结束于 {1}\n\n请查看“业务/未完成交易”的交易状态，以获取更多信息。 popup.warning.tradePeriod.ended=您与 ID {0} 的已达到最长交易期，且未完成。\n\n交易期结束于 {1}\n\n请查看“业务/未完成交易”的交易状态，以从调解员获取更多信息。 popup.warning.noTradingAccountSetup.headline=您还没有设置交易账户 @@ -1588,7 +1588,7 @@ popup.warning.noMediatorsAvailable=没有调解员可用。 popup.warning.notFullyConnected=您需要等到您完全连接到网络\n在启动时可能需要2分钟。 popup.warning.notSufficientConnectionsToBtcNetwork=你需要等待至少有{0}个与比特币网络的连接点。 popup.warning.downloadNotComplete=您需要等待，直到丢失的比特币区块被下载完毕。 -popup.warning.chainNotSynced=Bisq 钱包区块链高度没有正确地同步。如果最近才打开应用，请等待一个新发布的比特币区块。\n\n你可以检查区块链高度在设置/网络信息。如果经过了一个区块但问题还是没有解决，你应该及时的完成 SPV 链重新同步。https://bisq.wiki/Resyncing_SPV_file +popup.warning.chainNotSynced=Haveno 钱包区块链高度没有正确地同步。如果最近才打开应用，请等待一个新发布的比特币区块。\n\n你可以检查区块链高度在设置/网络信息。如果经过了一个区块但问题还是没有解决，你应该及时的完成 SPV 链重新同步。https://bisq.wiki/Resyncing_SPV_file popup.warning.removeOffer=您确定要移除该报价吗？\n如果您删除该报价，{0} 的挂单费将会丢失。 popup.warning.tooLargePercentageValue=您不能设置100％或更大的百分比。 popup.warning.examplePercentageValue=请输入百分比数字，如 5.4％ 是“5.4” @@ -1608,32 +1608,32 @@ popup.warning.nodeBanned=其中一个 {0} 节点已被禁用 # suppress inspection "UnusedProperty" popup.warning.priceRelay=价格传递 popup.warning.seed=种子 -popup.warning.mandatoryUpdate.trading=请更新到最新的 Bisq 版本。强制更新禁止了旧版本进行交易。更多信息请访问 Bisq 论坛。 -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=请更新到最新的 Haveno 版本。强制更新禁止了旧版本进行交易。更多信息请访问 Haveno 论坛。 +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=这笔交易是无法实现，因为 {0} 的挖矿手续费用会超过 {1} 的转账金额。请等到挖矿手续费再次降低或您积累了更多的 BTC 来转账。 -popup.warning.openOffer.makerFeeTxRejected=交易 ID 为 {0} 的挂单费交易被比特币网络拒绝。\n交易 ID = {1}\n交易已被移至失败交易。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Bisq Keybase 团队的 Support 频道 +popup.warning.openOffer.makerFeeTxRejected=交易 ID 为 {0} 的挂单费交易被比特币网络拒绝。\n交易 ID = {1}\n交易已被移至失败交易。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Haveno Keybase 团队的 Support 频道 popup.warning.trade.txRejected.tradeFee=交易手续费 popup.warning.trade.txRejected.deposit=押金 -popup.warning.trade.txRejected=使用 ID {1} 进行交易的 {0} 交易被比特币网络拒绝。\n交易 ID = {2}\n交易已被移至失败交易。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Bisq Keybase 团队的 Support 频道 +popup.warning.trade.txRejected=使用 ID {1} 进行交易的 {0} 交易被比特币网络拒绝。\n交易 ID = {2}\n交易已被移至失败交易。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Haveno Keybase 团队的 Support 频道 -popup.warning.openOfferWithInvalidMakerFeeTx=交易 ID 为 {0} 的挂单费交易无效。\n交易 ID = {1}。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Bisq Keybase 团队的 Support 频道 +popup.warning.openOfferWithInvalidMakerFeeTx=交易 ID 为 {0} 的挂单费交易无效。\n交易 ID = {1}。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Haveno Keybase 团队的 Support 频道 -popup.info.securityDepositInfo=为了确保双方都遵守交易协议，双方都需要支付保证金。\n\n这笔存款一直保存在您的交易钱包里，直到您的交易成功完成，然后再退还给您。\n\n请注意：如果您正在创建一个新的报价，Bisq 需要运行另一个交易员接受它。为了让您的报价在线，保持 Bisq 运行，并确保这台计算机也在线（即，确保它没有切换到待机模式…显示器可以待机）。 +popup.info.securityDepositInfo=为了确保双方都遵守交易协议，双方都需要支付保证金。\n\n这笔存款一直保存在您的交易钱包里，直到您的交易成功完成，然后再退还给您。\n\n请注意：如果您正在创建一个新的报价，Haveno 需要运行另一个交易员接受它。为了让您的报价在线，保持 Haveno 运行，并确保这台计算机也在线（即，确保它没有切换到待机模式…显示器可以待机）。 popup.info.cashDepositInfo=请确保您在您的地区有一个银行分行，以便能够进行现金存款。\n卖方银行的银行 ID（BIC/SWIFT）为：{0}。 popup.info.cashDepositInfo.confirm=我确认我可以支付保证金 -popup.info.shutDownWithOpenOffers=Bisq 正在被关闭，但仍有公开的报价。\n\n当 Bisq 关闭时，这些提供将不能在 P2P 网络上使用，但是它们将在您下次启动 Bisq 时重新发布到 P2P 网络上。\n\n为了让您的报价在线，保持 Bisq 运行，并确保这台计算机也在线（即，确保它不会进入待机模式…显示器待机不是问题）。 -popup.info.qubesOSSetupInfo=你似乎好像在 Qubes OS 上运行 Bisq。\n\n请确保您的 Bisq qube 是参考设置指南的说明设置的 https://bisq.wiki/Running_Bisq_on_Qubes -popup.warn.downGradePrevention=不支持从 {0} 版本降级到 {1} 版本。请使用最新的 Bisq 版本。 +popup.info.shutDownWithOpenOffers=Haveno 正在被关闭，但仍有公开的报价。\n\n当 Haveno 关闭时，这些提供将不能在 P2P 网络上使用，但是它们将在您下次启动 Haveno 时重新发布到 P2P 网络上。\n\n为了让您的报价在线，保持 Haveno 运行，并确保这台计算机也在线（即，确保它不会进入待机模式…显示器待机不是问题）。 +popup.info.qubesOSSetupInfo=你似乎好像在 Qubes OS 上运行 Haveno。\n\n请确保您的 Haveno qube 是参考设置指南的说明设置的 https://bisq.wiki/Running_Haveno_on_Qubes +popup.warn.downGradePrevention=不支持从 {0} 版本降级到 {1} 版本。请使用最新的 Haveno 版本。 popup.privateNotification.headline=重要私人通知！ popup.securityRecommendation.headline=重要安全建议 popup.securityRecommendation.msg=如果您还没有启用，我们想提醒您考虑为您的钱包使用密码保护。\n\n强烈建议你写下钱包还原密钥。 那些还原密钥就是恢复你的比特币钱包的主密码。\n在“钱包密钥”部分，您可以找到更多信息\n\n此外，您应该在“备份”界面备份完整的应用程序数据文件夹。 -popup.bitcoinLocalhostNode.msg=Bisq 侦测到一个比特币核心节点在本机（本地）运行\n\n请确保：\n- 这个节点已经在运行 Bisq 之前已全部同步\n- 修饰已被禁用 （'prune=0' 在 bitcoin.conf 文件中)\n- Bloom 过滤器已经启用（'peerbloomfilters=1' 在 bitcoin.conf 文件中） +popup.bitcoinLocalhostNode.msg=Haveno 侦测到一个比特币核心节点在本机（本地）运行\n\n请确保：\n- 这个节点已经在运行 Haveno 之前已全部同步\n- 修饰已被禁用 （'prune=0' 在 bitcoin.conf 文件中)\n- Bloom 过滤器已经启用（'peerbloomfilters=1' 在 bitcoin.conf 文件中） popup.shutDownInProgress.headline=正在关闭 popup.shutDownInProgress.msg=关闭应用可能会花一点时间。\n请不要打断关闭过程。 @@ -1696,7 +1696,7 @@ notification.walletUpdate.headline=交易钱包更新 notification.walletUpdate.msg=您的交易钱包充值成功。\n金额：{0} notification.takeOffer.walletUpdate.msg=您的交易钱包已经从早期的下单尝试中得到足够的资金支持。\n金额：{0} notification.tradeCompleted.headline=交易完成 -notification.tradeCompleted.msg=您现在可以提现您的资金到您的外部比特币钱包或者划转它到 Bisq 钱包。 +notification.tradeCompleted.msg=您现在可以提现您的资金到您的外部比特币钱包或者划转它到 Haveno 钱包。 #################################################################### @@ -1705,9 +1705,9 @@ notification.tradeCompleted.msg=您现在可以提现您的资金到您的外部 systemTray.show=显示应用程序窗口 systemTray.hide=隐藏应用程序窗口 -systemTray.info=关于 Bisq 信息 +systemTray.info=关于 Haveno 信息 systemTray.exit=退出 -systemTray.tooltip=Bisq：去中心化比特币交易网络 +systemTray.tooltip=Haveno：去中心化比特币交易网络 #################################################################### @@ -1849,7 +1849,7 @@ password.deriveKey=从密码中提取密钥 password.walletDecrypted=钱包成功解密并移除密码保护 password.wrongPw=你输入了错误的密码。\n\n请再次尝试输入密码，仔细检查拼写错误。 password.walletEncrypted=钱包成功加密并开启密码保护。 -password.walletEncryptionFailed=无法设置钱包密码。您可能导入了与钱包数据库不匹配的还原密钥。请在 Keybase 上联系开发者（https://keybase.io/team/bisq]） +password.walletEncryptionFailed=无法设置钱包密码。您可能导入了与钱包数据库不匹配的还原密钥。请在 Keybase 上联系开发者（https://keybase.io/team/haveno]） password.passwordsDoNotMatch=这2个密码您输入的不相同 password.forgotPassword=忘记密码？ password.backupReminder=请注意，设置钱包密码时，所有未加密的钱包的自动创建的备份将被删除。\n\n强烈建议您备份应用程序的目录，并在设置密码之前记下您的还原密钥！ @@ -1867,7 +1867,7 @@ seed.warn.walletNotEmpty.msg=你的比特币钱包不是空的。\n\n在尝试 seed.warn.walletNotEmpty.restore=无论如何我要恢复 seed.warn.walletNotEmpty.emptyWallet=我先清空我的钱包 seed.warn.notEncryptedAnymore=你的钱包被加密了。\n\n恢复后，钱包将不再加密，您必须设置新的密码。\n\n你要继续吗？ -seed.warn.walletDateEmpty=由于您尚未指定钱包日期，因此 Bisq 将必须扫描 2013.10.09（BIP39创始日期）之后的区块链。\n\nBIP39 钱包于 Bisq 于 2017.06.28 首次发布（版本 v0.5）。因此，您可以使用该日期来节省时间。\n\n理想情况下，您应指定创建钱包种子的日期。\n\n\n您确定要继续而不指定钱包日期吗？ +seed.warn.walletDateEmpty=由于您尚未指定钱包日期，因此 Haveno 将必须扫描 2013.10.09（BIP39创始日期）之后的区块链。\n\nBIP39 钱包于 Haveno 于 2017.06.28 首次发布（版本 v0.5）。因此，您可以使用该日期来节省时间。\n\n理想情况下，您应指定创建钱包种子的日期。\n\n\n您确定要继续而不指定钱包日期吗？ seed.restore.success=新的还原密钥成功地恢复了钱包。\n\n您需要关闭并重新启动应用程序。 seed.restore.error=使用还原密钥恢复钱包时出现错误。{0} seed.restore.openOffers.warn=您有公开报价，如果您从种子词恢复，则这些报价将被删除。\n您确定要继续吗？ @@ -1953,17 +1953,17 @@ payment.accountType=账户类型 payment.checking=检查 payment.savings=保存 payment.personalId=个人 ID -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle是一项转账服务，转账到其他银行做的很好。\n\n1.检查此页面以查看您的银行是否（以及如何）与 Zelle 合作：\nhttps://www.zellepay.com/get-started\n\n2.特别注意您的转账限额-汇款限额因银行而异，银行通常分别指定每日，每周和每月的限额。\n\n3.如果您的银行不能使用 Zelle，您仍然可以通过 Zelle 移动应用程序使用它，但是您的转账限额会低得多。\n\n4.您的 Bisq 帐户上指定的名称必须与 Zelle/银行帐户上的名称匹配。 \n\n如果您无法按照贸易合同中的规定完成 Zelle 交易，则可能会损失部分（或全部）保证金。\n\n由于 Zelle 的拒付风险较高，因此建议卖家通过电子邮件或 SMS 与未签名的买家联系，以确认买家确实拥有 Bisq 中指定的 Zelle 帐户。 -payment.fasterPayments.newRequirements.info=有些银行已经开始核实快捷支付收款人的全名。您当前的快捷支付帐户没有填写全名。\n\n请考虑在 Bisq 中重新创建您的快捷支付帐户，为将来的 {0} 买家提供一个完整的姓名。\n\n重新创建帐户时，请确保将银行区号、帐户编号和帐龄验证盐值从旧帐户复制到新帐户。这将确保您现有的帐龄和签名状态得到保留。 +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle是一项转账服务，转账到其他银行做的很好。\n\n1.检查此页面以查看您的银行是否（以及如何）与 Zelle 合作：\nhttps://www.zellepay.com/get-started\n\n2.特别注意您的转账限额-汇款限额因银行而异，银行通常分别指定每日，每周和每月的限额。\n\n3.如果您的银行不能使用 Zelle，您仍然可以通过 Zelle 移动应用程序使用它，但是您的转账限额会低得多。\n\n4.您的 Haveno 帐户上指定的名称必须与 Zelle/银行帐户上的名称匹配。 \n\n如果您无法按照贸易合同中的规定完成 Zelle 交易，则可能会损失部分（或全部）保证金。\n\n由于 Zelle 的拒付风险较高，因此建议卖家通过电子邮件或 SMS 与未签名的买家联系，以确认买家确实拥有 Haveno 中指定的 Zelle 帐户。 +payment.fasterPayments.newRequirements.info=有些银行已经开始核实快捷支付收款人的全名。您当前的快捷支付帐户没有填写全名。\n\n请考虑在 Haveno 中重新创建您的快捷支付帐户，为将来的 {0} 买家提供一个完整的姓名。\n\n重新创建帐户时，请确保将银行区号、帐户编号和帐龄验证盐值从旧帐户复制到新帐户。这将确保您现有的帐龄和签名状态得到保留。 payment.moneyGram.info=使用 MoneyGram 时，BTC 买方必须将授权号码和收据的照片通过电子邮件发送给 BTC 卖方。收据必须清楚地显示卖方的全名、国家或地区、州和金额。买方将在交易过程中显示卖方的电子邮件。 payment.westernUnion.info=使用 Western Union 时，BTC 买方必须通过电子邮件将 MTCN（运单号）和收据照片发送给 BTC 卖方。收据上必须清楚地显示卖方的全名、城市、国家或地区和金额。买方将在交易过程中显示卖方的电子邮件。 payment.halCash.info=使用 HalCash 时，BTC 买方需要通过手机短信向 BTC 卖方发送 HalCash 代码。\n\n请确保不要超过银行允许您用半现金汇款的最高金额。每次取款的最低金额是 10 欧元，最高金额是 10 欧元。金额是 600 欧元。对于重复取款，每天每个接收者 3000 欧元，每月每个接收者 6000 欧元。请与您的银行核对这些限额，以确保它们使用与此处所述相同的限额。\n\n提现金额必须是 10 欧元的倍数，因为您不能从 ATM 机提取其他金额。 创建报价和下单屏幕中的 UI 将调整 BTC 金额，使 EUR 金额正确。你不能使用基于市场的价格，因为欧元的数量会随着价格的变化而变化。\n # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=请注意，所有银行转账都有一定的退款风险。为了降低这一风险，Bisq 基于使用的付款方式的退款风险。\n\n对于付款方式，您的每笔交易的出售和购买的限额为{2}\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Bisq Wiki 查看更多信息[HYPERLINK:https://bisq.wiki/Account_limits]。 +payment.limits.info=请注意，所有银行转账都有一定的退款风险。为了降低这一风险，Haveno 基于使用的付款方式的退款风险。\n\n对于付款方式，您的每笔交易的出售和购买的限额为{2}\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Haveno Wiki 查看更多信息[HYPERLINK:https://bisq.wiki/Account_limits]。 # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=为了降低这一风险，Bisq 基于两个因素对该付款方式每笔交易设置了限制：\n\n1. 使用的付款方法的预估退款风险水平\n2. 您的付款方式的账龄\n\n这个付款账户还没有被验证，所以他每个交易最多购买{0}。在验证之后，购买限制会以以下规则逐渐增加：\n\n●签署前，以及签署后30天内，您的每笔最大交易将限制为{0}\n●签署后30天，每笔最大交易将限制为{1}\n●签署后60天，每笔最大交易将限制为{2}\n\n出售限制不会被账户验证状态限制，你可以理科进行单笔为{2}的交易\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Bisq Wiki 上查看更多：\nhttps://bisq.wiki/Account_limits +payment.limits.info.withSigning=为了降低这一风险，Haveno 基于两个因素对该付款方式每笔交易设置了限制：\n\n1. 使用的付款方法的预估退款风险水平\n2. 您的付款方式的账龄\n\n这个付款账户还没有被验证，所以他每个交易最多购买{0}。在验证之后，购买限制会以以下规则逐渐增加：\n\n●签署前，以及签署后30天内，您的每笔最大交易将限制为{0}\n●签署后30天，每笔最大交易将限制为{1}\n●签署后60天，每笔最大交易将限制为{2}\n\n出售限制不会被账户验证状态限制，你可以理科进行单笔为{2}的交易\n\n限制只应用在单笔交易，你可以尽可能多的进行交易。\n\n在 Haveno Wiki 上查看更多：\nhttps://bisq.wiki/Account_limits payment.cashDeposit.info=请确认您的银行允许您将现金存款汇入他人账户。例如，美国银行和富国银行不再允许此类存款。 @@ -1975,9 +1975,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=在 Bisq 上交易 US Postal Money Orders （USPMO）您必须理解下述条款：\n\n- BTC 买方必须在发送方和收款人字段中都写上 BTC 卖方的名称，并在发送之前对 USPMO 和信封进行高分辨率照片拍照，并带有跟踪证明。\n- BTC 买方必须将 USPMO 连同交货确认书一起发送给 BTC 卖方。\n\n如果需要调解，或有交易纠纷，您将需要将照片连同 USPMO 编号，邮局编号和交易金额一起发送给 Bisq 调解员或退款代理，以便他们进行验证美国邮局网站上的详细信息。\n\n如未能提供要求的交易数据将在纠纷中直接判负\n\n在所有争议案件中，USPMO 发送方在向调解人或仲裁员提供证据/证明时承担 100％ 的责任。\n\n如果您不理解这些要求，请不要在 Bisq 上使用 USPMO 进行交易。 +payment.usPostalMoneyOrder.info=在 Haveno 上交易 US Postal Money Orders （USPMO）您必须理解下述条款：\n\n- BTC 买方必须在发送方和收款人字段中都写上 BTC 卖方的名称，并在发送之前对 USPMO 和信封进行高分辨率照片拍照，并带有跟踪证明。\n- BTC 买方必须将 USPMO 连同交货确认书一起发送给 BTC 卖方。\n\n如果需要调解，或有交易纠纷，您将需要将照片连同 USPMO 编号，邮局编号和交易金额一起发送给 Haveno 调解员或退款代理，以便他们进行验证美国邮局网站上的详细信息。\n\n如未能提供要求的交易数据将在纠纷中直接判负\n\n在所有争议案件中，USPMO 发送方在向调解人或仲裁员提供证据/证明时承担 100％ 的责任。\n\n如果您不理解这些要求，请不要在 Haveno 上使用 USPMO 进行交易。 -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=联系方式 payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -2000,7 +2000,7 @@ payment.japan.recipient=名称 payment.australia.payid=PayID payment.payid=PayID 需链接至金融机构。例如电子邮件地址或手机。 payment.payid.info=PayID，如电话号码、电子邮件地址或澳大利亚商业号码（ABN），您可以安全地连接到您的银行、信用合作社或建立社会帐户。你需要在你的澳大利亚金融机构创建一个 PayID。发送和接收金融机构都必须支持 PayID。更多信息请查看[HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index ab30b0a4..62ff1338 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -103,14 +103,14 @@ shared.faq=訪問 FAQ 頁面 shared.yesCancel=是的，取消 shared.nextStep=下一步 shared.selectTradingAccount=選擇交易賬户 -shared.fundFromSavingsWalletButton=從 Bisq 錢包資金劃轉 +shared.fundFromSavingsWalletButton=從 Haveno 錢包資金劃轉 shared.fundFromExternalWalletButton=從您的外部錢包充值 shared.openDefaultWalletFailed=打開默認的比特幣錢包應用程序失敗了。您確定您安裝了嗎？ shared.belowInPercent=低於市場價格 % shared.aboveInPercent=高於市場價格 % shared.enterPercentageValue=輸入 % 值 shared.OR=或者 -shared.notEnoughFunds=您的 Bisq 錢包中沒有足夠的資金去支付這一交易 需要{0} 您可用餘額為 {1}。\n\n請從外部比特幣錢包注入資金或在“資金/存款”充值到您的 Bisq 錢包。 +shared.notEnoughFunds=您的 Haveno 錢包中沒有足夠的資金去支付這一交易 需要{0} 您可用餘額為 {1}。\n\n請從外部比特幣錢包注入資金或在“資金/存款”充值到您的 Haveno 錢包。 shared.waitingForFunds=等待資金充值... shared.TheBTCBuyer=BTC 買家 shared.You=您 @@ -125,7 +125,7 @@ shared.notUsedYet=尚未使用 shared.date=日期 shared.sendFundsDetailsWithFee=發送：{0}\n來自：{1}\n接收地址：{2}\n要求的最低交易費：{3}（{4} 聰/byte）\n交易大小：{5} Kb\n\n收款方將收到：{6}\n\n您確定您想要提現嗎？ # suppress inspection "TrailingSpacesInProperty" -shared.sendFundsDetailsDust=Bisq 檢測到，該交易將產生一個低於最低零頭閾值的輸出（不被比特幣共識規則所允許）。相反，這些零頭（{0}satoshi{1}）將被添加到挖礦手續費中。 +shared.sendFundsDetailsDust=Haveno 檢測到，該交易將產生一個低於最低零頭閾值的輸出（不被比特幣共識規則所允許）。相反，這些零頭（{0}satoshi{1}）將被添加到挖礦手續費中。 shared.copyToClipboard=複製到剪貼板 shared.language=語言 shared.country=國家或地區 @@ -235,8 +235,8 @@ mainView.menu.settings=設置 mainView.menu.account=賬户 mainView.marketPriceWithProvider.label=交易所價格提供商：{0} -mainView.marketPrice.bisqInternalPrice=最新 Bisq 交易的價格 -mainView.marketPrice.tooltip.bisqInternalPrice=外部交易所供應商沒有可用的市場價格。\n顯示的價格是該貨幣的最新 Bisq 交易價格。 +mainView.marketPrice.havenoInternalPrice=最新 Haveno 交易的價格 +mainView.marketPrice.tooltip.havenoInternalPrice=外部交易所供應商沒有可用的市場價格。\n顯示的價格是該貨幣的最新 Haveno 交易價格。 mainView.marketPrice.tooltip=交易所價格提供者 {0}{1}\n最後更新：{2}\n提供者節點 URL：{3} mainView.balance.available=可用餘額 mainView.balance.reserved=保證金 @@ -253,7 +253,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=連接至 mainView.footer.btcInfo.connectionFailed=連接失敗： -mainView.footer.p2pInfo=比特幣網絡節點：{0} / Bisq 網絡節點：{1} +mainView.footer.p2pInfo=比特幣網絡節點：{0} / Haveno 網絡節點：{1} mainView.bootstrapState.connectionToTorNetwork=(1/4) 連接至 Tor 網絡... mainView.bootstrapState.torNodeCreated=(2/4) Tor 節點已創建 @@ -262,10 +262,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) 初始數據已接收 mainView.bootstrapWarning.noSeedNodesAvailable=沒有可用的種子節點 mainView.bootstrapWarning.noNodesAvailable=沒有可用的種子節點和節點 -mainView.bootstrapWarning.bootstrappingToP2PFailed=啟動 Bisq 網絡失敗 +mainView.bootstrapWarning.bootstrappingToP2PFailed=啟動 Haveno 網絡失敗 mainView.p2pNetworkWarnMsg.noNodesAvailable=沒有可用種子節點或永久節點可請求數據。\n請檢查您的互聯網連接或嘗試重啟應用程序。 -mainView.p2pNetworkWarnMsg.connectionToP2PFailed=連接至 Bisq 網絡失敗（錯誤報吿：{0}）。\n請檢查您的互聯網連接或嘗試重啟應用程序。 +mainView.p2pNetworkWarnMsg.connectionToP2PFailed=連接至 Haveno 網絡失敗（錯誤報吿：{0}）。\n請檢查您的互聯網連接或嘗試重啟應用程序。 mainView.walletServiceErrorMsg.timeout=比特幣網絡連接超時。 mainView.walletServiceErrorMsg.connectionError=錯誤：{0} 比特幣網絡連接失敗。 @@ -273,7 +273,7 @@ mainView.walletServiceErrorMsg.connectionError=錯誤：{0} 比特幣網絡連 mainView.walletServiceErrorMsg.rejectedTxException=交易被網絡拒絕。\n\n{0} mainView.networkWarning.allConnectionsLost=您失去了所有與 {0} 網絡節點的連接。\n您失去了互聯網連接或您的計算機處於待機狀態。 -mainView.networkWarning.localhostBitcoinLost=您丟失了與本地主機比特幣節點的連接。\n請重啟 Bisq 應用程序連接到其他比特幣節點或重新啟動主機比特幣節點。 +mainView.networkWarning.localhostBitcoinLost=您丟失了與本地主機比特幣節點的連接。\n請重啟 Haveno 應用程序連接到其他比特幣節點或重新啟動主機比特幣節點。 mainView.version.update=（有更新可用） @@ -389,11 +389,11 @@ popup.warning.tradeLimitDueAccountAgeRestriction.buyer=基於以下標準的安 offerbook.warning.wrongTradeProtocol=該報價要求的軟件版本與您現在運行的版本不一致。\n\n請檢查您是否運行最新版本，或者是該報價用户在使用一箇舊的版本。\n用户不能與不兼容的交易協議版本進行交易。 offerbook.warning.userIgnored=您已添加該用户的匿名地址在您的忽略列表裏。 -offerbook.warning.offerBlocked=該報價被 Bisq 開發人員限制。\n接受該報價時，可能有一個未處理的漏洞導致了問題。 -offerbook.warning.currencyBanned=該報價中使用的貨幣被 Bisq 開發人員阻止。\n請訪問 Bisq 論壇瞭解更多信息。 -offerbook.warning.paymentMethodBanned=該報價中使用的付款方式被 Bisq 開發人員阻止。\n請訪問 Bisq 論壇瞭解更多信息。 -offerbook.warning.nodeBlocked=該交易者的匿名地址被 Bisq 開發人員限制。\n當獲取來自該交易者的報價，可能有一個未處理的漏洞導致了問題。 -offerbook.warning.requireUpdateToNewVersion=您的 Bisq 版本不再兼容交易。\n請通過 https://bisq.network/downloads 更新到最新的 Bisq 版本。 +offerbook.warning.offerBlocked=該報價被 Haveno 開發人員限制。\n接受該報價時，可能有一個未處理的漏洞導致了問題。 +offerbook.warning.currencyBanned=該報價中使用的貨幣被 Haveno 開發人員阻止。\n請訪問 Haveno 論壇瞭解更多信息。 +offerbook.warning.paymentMethodBanned=該報價中使用的付款方式被 Haveno 開發人員阻止。\n請訪問 Haveno 論壇瞭解更多信息。 +offerbook.warning.nodeBlocked=該交易者的匿名地址被 Haveno 開發人員限制。\n當獲取來自該交易者的報價，可能有一個未處理的漏洞導致了問題。 +offerbook.warning.requireUpdateToNewVersion=您的 Haveno 版本不再兼容交易。\n請通過 https://bisq.network/downloads 更新到最新的 Haveno 版本。 offerbook.warning.offerWasAlreadyUsedInTrade=您不能吃單因為您已經完成了該操作。可能是你之前的吃單嘗試導致了交易失敗。 offerbook.info.sellAtMarketPrice=您會以市場價格進行出售（每分鐘更新） @@ -423,7 +423,7 @@ createOffer.fundsBox.title=為您的報價充值 createOffer.fundsBox.offerFee=掛單費 createOffer.fundsBox.networkFee=礦工手續費 createOffer.fundsBox.placeOfferSpinnerInfo=正在發佈報價中... -createOffer.fundsBox.paymentLabel=Bisq 交易 ID {0} +createOffer.fundsBox.paymentLabel=Haveno 交易 ID {0} createOffer.fundsBox.fundsStructure=（{0} 保證金，{1} 交易費，{2} 採礦費） createOffer.success.headline=你的報價已經發布 createOffer.success.info=你可以在“業務/未完成報價”頁面內管理您的未完成報價。 @@ -447,12 +447,12 @@ createOffer.placeOfferButton=複審：報價掛單 {0} 比特幣 createOffer.createOfferFundWalletInfo.headline=為您的報價充值 # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- 交易數量：{0}\n -createOffer.createOfferFundWalletInfo.msg=這個報價您需要 {0} 作為保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n- 礦工手續費：{4}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Bisq 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。 +createOffer.createOfferFundWalletInfo.msg=這個報價您需要 {0} 作為保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n- 礦工手續費：{4}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Haveno 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!) createOffer.amountPriceBox.error.message=提交報價發生錯誤：\n\n{0}\n\n沒有資金從您錢包中扣除。\n請檢查您的互聯網連接或嘗試重啟應用程序。 createOffer.setAmountPrice=設置數量和價格 -createOffer.warnCancelOffer=您已經為該報價充值了。\n如果您想立即取消，您的資金將劃轉到您的本地 Bisq 錢包並在“資金/提現”界面可以提現。\n您確定要取消嗎？ +createOffer.warnCancelOffer=您已經為該報價充值了。\n如果您想立即取消，您的資金將劃轉到您的本地 Haveno 錢包並在“資金/提現”界面可以提現。\n您確定要取消嗎？ createOffer.timeoutAtPublishing=發佈報價時產生了一個錯誤。 createOffer.errorInfo=\n\n掛單費已經支付，在最壞的情況下，你會失去了這筆費用。 我們很抱歉，但請記住，這是一個很小的數量。\n請嘗試重新啟動應用程序並檢查您的網絡連接，看看是否可以解決問題。 createOffer.tooLowSecDeposit.warning=您設置的保證金低於推薦默認值 {0}。\n您確定要使用較低的保證金嗎？ @@ -491,7 +491,7 @@ takeOffer.fundsBox.tradeAmount=賣出數量 takeOffer.fundsBox.offerFee=掛單費 takeOffer.fundsBox.networkFee=總共挖礦手續費 takeOffer.fundsBox.takeOfferSpinnerInfo=正在下單... -takeOffer.fundsBox.paymentLabel=Bisq 交易 ID {0} +takeOffer.fundsBox.paymentLabel=Haveno 交易 ID {0} takeOffer.fundsBox.fundsStructure=（{0} 保證金，{1} 交易費，{2} 採礦費） takeOffer.success.headline=你已成功下單一個報價。 takeOffer.success.info=你可以在“業務/未完成交易”頁面內查看您的未完成交易。 @@ -503,11 +503,11 @@ takeOffer.noPriceFeedAvailable=您不能對這筆報價下單，因為它使用 takeOffer.takeOfferFundWalletInfo.headline=為交易充值 # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- 交易數量：{0}\n -takeOffer.takeOfferFundWalletInfo.msg=這個報價您需要付出 {0} 保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n- 礦工手續費：{4}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Bisq 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。 +takeOffer.takeOfferFundWalletInfo.msg=這個報價您需要付出 {0} 保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n- 礦工手續費：{4}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Haveno 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。 takeOffer.alreadyPaidInFunds=如果你已經支付，你可以在“資金/提現”提現它。 takeOffer.paymentInfo=付款信息 takeOffer.setAmountPrice=設置數量 -takeOffer.alreadyFunded.askCancel=您已經為該報價充值了。\n如果您想立即取消，您的資金將劃轉到您的本地 Bisq 錢包並在“資金/提現”界面可以提現。\n您確定要取消嗎？ +takeOffer.alreadyFunded.askCancel=您已經為該報價充值了。\n如果您想立即取消，您的資金將劃轉到您的本地 Haveno 錢包並在“資金/提現”界面可以提現。\n您確定要取消嗎？ takeOffer.failed.offerNotAvailable=請求失敗，由於報價不再可用。 也許有交易者在此期間已經下單。 takeOffer.failed.offerTaken=您不能對該報價下單，因為該報價已經被其他交易者下單。 takeOffer.failed.offerRemoved=您不能對該報價下單，因為該報價已經在此期間被刪除。 @@ -536,7 +536,7 @@ editOffer.confirmEdit=確認：編輯報價 editOffer.publishOffer=發佈您的報價。 editOffer.failed=報價編輯失敗：\n{0} editOffer.success=您的報價已成功編輯。 -editOffer.invalidDeposit=買方保證金不符合 Bisq DAO 規定，不能再次編輯。 +editOffer.invalidDeposit=買方保證金不符合 Haveno DAO 規定，不能再次編輯。 #################################################################### # Portfolio @@ -596,7 +596,7 @@ portfolio.pending.step1.openForDispute=保證金交易仍未得到確認。請 # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n -portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. +portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Haveno'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both. # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees. # suppress inspection "TrailingSpacesInProperty" @@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=重要要求：\n完成支付 # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.postal=請用“美國郵政匯票”發送 {0} 給 BTC 賣家。\n\n # suppress inspection "TrailingSpacesInProperty" -portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n +portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n # suppress inspection "TrailingSpacesInProperty" portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n # suppress inspection "TrailingSpacesInProperty" @@ -635,12 +635,12 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=發送 MTCN 和收 portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=請通過電郵發送 MTCN（追蹤號碼）和照片給 BTC 賣家。\n收據必須清楚地向賣家寫明您的全名、城市、國家或地區、數量。賣方的電子郵件是：{0}。\n\n您把 MTCN 和合同發給賣方了嗎？ portfolio.pending.step2_buyer.halCashInfo.headline=請發送 HalCash 代碼 portfolio.pending.step2_buyer.halCashInfo.msg=您需要向 BTC 賣家發送帶有 HalCash 代碼和交易 ID（{0}）的文本消息。\n\n賣方的手機號碼是 {1} 。\n\n您是否已經將代碼發送至賣家? -portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=有些銀行可能會要求接收方的姓名。在較舊的 Bisq 客户端創建的快速支付帳户沒有提供收款人的姓名，所以請使用交易聊天來獲得收款人姓名（如果需要）。 +portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=有些銀行可能會要求接收方的姓名。在較舊的 Haveno 客户端創建的快速支付帳户沒有提供收款人的姓名，所以請使用交易聊天來獲得收款人姓名（如果需要）。 portfolio.pending.step2_buyer.confirmStart.headline=確定您已經付款 portfolio.pending.step2_buyer.confirmStart.msg=您是否向您的交易夥伴發起 {0} 付款？ portfolio.pending.step2_buyer.confirmStart.yes=是的，我已經開始付款 portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=你沒有提供任何付款證明 -portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=您還沒有輸入交易 ID 以及交易密鑰\n\n如果不提供此數據您的交易夥伴無法在收到 XMR 後使用自動確認功能以快速釋放 BTC。\n另外，Bisq 要求 XMR 發送者在發生糾紛的時候能夠向調解員和仲裁員提供這些信息。\n更多細節在 Bisq Wiki：https://bisq.wiki/Trading_Monero#Auto-confirming_trades +portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=您還沒有輸入交易 ID 以及交易密鑰\n\n如果不提供此數據您的交易夥伴無法在收到 XMR 後使用自動確認功能以快速釋放 BTC。\n另外，Haveno 要求 XMR 發送者在發生糾紛的時候能夠向調解員和仲裁員提供這些信息。\n更多細節在 Haveno Wiki：https://bisq.wiki/Trading_Monero#Auto-confirming_trades portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=輸入並不是一個 32 字節的哈希值 portfolio.pending.step2_buyer.confirmStart.warningButton=忽略並繼續 portfolio.pending.step2_seller.waitPayment.headline=等待付款 @@ -650,7 +650,7 @@ portfolio.pending.step2_seller.warn=BTC 買家仍然沒有完成 {0} 付款。\n portfolio.pending.step2_seller.openForDispute=BTC 買家尚未開始付款！\n允許的最長交易期限已經過去了。你可以繼續等待給予交易雙方更多時間，或聯繫仲裁員以爭取解決糾紛。 tradeChat.chatWindowTitle=使用 ID “{0}” 進行交易的聊天窗口 tradeChat.openChat=打開聊天窗口 -tradeChat.rules=您可以與您的夥伴溝通，以解決該交易的潛在問題。\n在聊天中不強制回覆。\n如果交易員違反了下面的任何規則，打開糾紛並向調解員或仲裁員報吿。\n聊天規則：\n\n\t●不要發送任何鏈接（有惡意軟件的風險）。您可以發送交易 ID 和區塊資源管理器的名稱。\n\t●不要發送還原密鑰、私鑰、密碼或其他敏感信息！\n\t●不鼓勵 Bisq 以外的交易（無安全保障）。\n\t●不要參與任何形式的危害社會安全的計劃。\n\t●如果對方沒有迴應，也不願意通過聊天進行溝通，那就尊重對方的決定。\n\t●將談話範圍限制在行業內。這個聊天不是一個社交軟件替代品或troll-box。\n\t●保持友好和尊重的交談。 +tradeChat.rules=您可以與您的夥伴溝通，以解決該交易的潛在問題。\n在聊天中不強制回覆。\n如果交易員違反了下面的任何規則，打開糾紛並向調解員或仲裁員報吿。\n聊天規則：\n\n\t●不要發送任何鏈接（有惡意軟件的風險）。您可以發送交易 ID 和區塊資源管理器的名稱。\n\t●不要發送還原密鑰、私鑰、密碼或其他敏感信息！\n\t●不鼓勵 Haveno 以外的交易（無安全保障）。\n\t●不要參與任何形式的危害社會安全的計劃。\n\t●如果對方沒有迴應，也不願意通過聊天進行溝通，那就尊重對方的決定。\n\t●將談話範圍限制在行業內。這個聊天不是一個社交軟件替代品或troll-box。\n\t●保持友好和尊重的交談。 # suppress inspection "UnusedProperty" message.state.UNDEFINED=未定義 @@ -725,7 +725,7 @@ portfolio.pending.step5_buyer.refunded=退還保證金 portfolio.pending.step5_buyer.withdrawBTC=提現您的比特幣 portfolio.pending.step5_buyer.amount=提現數量 portfolio.pending.step5_buyer.withdrawToAddress=提現地址 -portfolio.pending.step5_buyer.moveToBisqWallet=在 Bisq 錢包中保留資金 +portfolio.pending.step5_buyer.moveToHavenoWallet=在 Haveno 錢包中保留資金 portfolio.pending.step5_buyer.withdrawExternal=提現到外部錢包 portfolio.pending.step5_buyer.alreadyWithdrawn=您的資金已經提現。\n請查看交易歷史記錄。 portfolio.pending.step5_buyer.confirmWithdrawal=確定提現請求 @@ -740,8 +740,8 @@ portfolio.pending.step5_seller.received=您已經收到 tradeFeedbackWindow.title=恭喜您完成交易 tradeFeedbackWindow.msg.part1=我們很想聽聽您的體驗如何。這將幫助我們改進軟件，優化體驗不好的地方。如欲提供意見，請填寫這份簡短的問卷（無需註冊），網址： -tradeFeedbackWindow.msg.part2=如果您有任何疑問或遇到任何問題，請通過 Bisq 論壇與其他用户和貢獻者聯繫： -tradeFeedbackWindow.msg.part3=感謝使用 Bisq +tradeFeedbackWindow.msg.part2=如果您有任何疑問或遇到任何問題，請通過 Haveno 論壇與其他用户和貢獻者聯繫： +tradeFeedbackWindow.msg.part3=感謝使用 Haveno portfolio.pending.role=我的角色 portfolio.pending.tradeInformation=交易信息 @@ -751,19 +751,19 @@ portfolio.pending.tradePeriodInfo=在第一次區塊鏈確認之後，交易週 portfolio.pending.tradePeriodWarning=如果超過了這個週期，雙方均可以提出糾紛。 portfolio.pending.tradeNotCompleted=交易不會及時完成（直到 {0} ） portfolio.pending.tradeProcess=交易流程 -portfolio.pending.openAgainDispute.msg=如果您不確定發送給調解員或仲裁員的消息是否已送達（例如，如果您在1天后沒有收到回覆），請放心使用 Cmd/Ctrl+o 再次打開糾紛。你也可以在 Bisq 論壇上尋求額外的幫助，網址是 https://bisq.community。 +portfolio.pending.openAgainDispute.msg=如果您不確定發送給調解員或仲裁員的消息是否已送達（例如，如果您在1天后沒有收到回覆），請放心使用 Cmd/Ctrl+o 再次打開糾紛。你也可以在 Haveno 論壇上尋求額外的幫助，網址是 https://haveno.community。 portfolio.pending.openAgainDispute.button=再次出現糾紛 portfolio.pending.openSupportTicket.headline=創建幫助話題 portfolio.pending.openSupportTicket.msg=請僅在緊急情況下使用此功能，如果您沒有看到“提交支持”或“提交糾紛”按鈕。\n\n當您發出工單時，交易將被中斷並由調解員或仲裁員進行處理。 portfolio.pending.timeLockNotOver=你必須等到≈{0}（還需等待{1}個區塊）才能提交糾紛。 -portfolio.pending.error.depositTxNull=保證金交易無效。沒有有效的保證金交易，你使用創建糾紛。請到“設置/網絡信息”進行 SPV 重新同步。\n \n如需更多幫助，請聯繫 Bisq Keybase 團隊的 Support 頻道。 +portfolio.pending.error.depositTxNull=保證金交易無效。沒有有效的保證金交易，你使用創建糾紛。請到“設置/網絡信息”進行 SPV 重新同步。\n \n如需更多幫助，請聯繫 Haveno Keybase 團隊的 Support 頻道。 portfolio.pending.mediationResult.error.depositTxNull=保證金交易為空。你可以移動該交易至失敗的交易。 portfolio.pending.mediationResult.error.delayedPayoutTxNull=延遲支付交易為空。你可以移動該交易至失敗的交易。 -portfolio.pending.error.depositTxNotConfirmed=保證金交易未確認。未經確認的存款交易不能發起糾紛或仲裁請求。請耐心等待，直到它被確認或進入“設置/網絡信息”進行 SPV 重新同步。\n\n如需更多幫助，請聯繫 Bisq Keybase 團隊的 Support 頻道。 +portfolio.pending.error.depositTxNotConfirmed=保證金交易未確認。未經確認的存款交易不能發起糾紛或仲裁請求。請耐心等待，直到它被確認或進入“設置/網絡信息”進行 SPV 重新同步。\n\n如需更多幫助，請聯繫 Haveno Keybase 團隊的 Support 頻道。 portfolio.pending.support.headline.getHelp=需要幫助？ -portfolio.pending.support.text.getHelp=如果您有任何問題，您可以嘗試在交易聊天中聯繫交易夥伴，或在 https://bisq.community 詢問 Bisq 社區。如果您的問題仍然沒有解決，您可以向調解員取得更多的幫助。 +portfolio.pending.support.text.getHelp=如果您有任何問題，您可以嘗試在交易聊天中聯繫交易夥伴，或在 https://haveno.community 詢問 Haveno 社區。如果您的問題仍然沒有解決，您可以向調解員取得更多的幫助。 portfolio.pending.support.button.getHelp=開啟交易聊天 portfolio.pending.support.headline.halfPeriodOver=確認付款 portfolio.pending.support.headline.periodOver=交易期結束 @@ -795,7 +795,7 @@ portfolio.pending.failedTrade.maker.missingTakerFeeTx=掛單費交易未找到 portfolio.pending.failedTrade.missingDepositTx=這個保證金交易（2 對 2 多重簽名交易）缺失\n\n沒有該 tx，交易不能完成。沒有資金被鎖定但是您的交易手續費仍然已支出。您可以發起一個請求去賠償改交易手續費在這裏：https://github.com/bisq-network/support/issues\n\n請隨意的將該交易移至失敗交易 portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=延遲支付交易缺失，但是資金仍然被鎖定在保證金交易中。\n\n請不要給比特幣賣家發送法幣或數字貨幣，因為沒有延遲交易 tx，不能開啟仲裁。使用 Cmd/Ctrl+o開啟調解協助。調解員應該建議交易雙方分別退回全部的保證金（賣方支付的交易金額也會全數返還）。這樣的話不會有任何的安全問題只會損失交易手續費。\n\n你可以在這裏為失敗的交易提出賠償要求：https://github.com/bisq-network/support/issues portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=延遲支付交易確實但是資金仍然被鎖定在保證金交易中。\n\n如果賣家仍然缺失延遲支付交易，他會接到請勿付款的指示並開啟一個調節幫助。你也應該使用 Cmd/Ctrl+O 去打開一個調節協助\n\n如果買家還沒有發送付款，調解員應該會建議交易雙方分別退回全部的保證金（賣方支付的交易金額也會全數返還）。否則交易額應該判給買方。\n\n你可以在這裏為失敗的交易提出賠償要求：https://github.com/bisq-network/support/issues -portfolio.pending.failedTrade.errorMsgSet=在處理交易協議是發生了一個錯誤\n\n錯誤：{0}\n\n這應該不是致命錯誤，您可以正常的完成交易。如果你仍擔憂，打開一個調解協助並從 Bisq 調解員處得到建議。\n\n如果這個錯誤是致命的那麼這個交易就無法完成，你可能會損失交易費。可以在這裏為失敗的交易提出賠償要求：https://github.com/bisq-network/support/issues +portfolio.pending.failedTrade.errorMsgSet=在處理交易協議是發生了一個錯誤\n\n錯誤：{0}\n\n這應該不是致命錯誤，您可以正常的完成交易。如果你仍擔憂，打開一個調解協助並從 Haveno 調解員處得到建議。\n\n如果這個錯誤是致命的那麼這個交易就無法完成，你可能會損失交易費。可以在這裏為失敗的交易提出賠償要求：https://github.com/bisq-network/support/issues portfolio.pending.failedTrade.missingContract=沒有設置交易合同。\n\n這個交易無法完成，你可能會損失交易手續費。可以在這裏為失敗的交易提出賠償要求：https://github.com/bisq-network/support/issues portfolio.pending.failedTrade.info.popup=交易協議出現了問題。\n\n{0} portfolio.pending.failedTrade.txChainInvalid.moveToFailed=交易協議出現了嚴重問題。\n\n{0}\n\n您確定想要將該交易移至失敗的交易嗎？\n\n您不能在失敗的交易中打開一個調解或仲裁，但是你隨時可以將失敗的交易重新移至未完成交易。 @@ -828,7 +828,7 @@ funds.tab.transactions=交易記錄 funds.deposit.unused=尚未使用 funds.deposit.usedInTx=用在 {0} 交易 -funds.deposit.fundHavenoWallet=充值 Bisq 錢包 +funds.deposit.fundHavenoWallet=充值 Haveno 錢包 funds.deposit.noAddresses=尚未生成存款地址 funds.deposit.fundWallet=充值您的錢包 funds.deposit.withdrawFromWallet=從錢包轉出資金 @@ -886,10 +886,10 @@ funds.tx.withdrawnFromWallet=從錢包提現 funds.tx.memo=備註 funds.tx.noTxAvailable=沒有可用交易 funds.tx.revert=還原 -funds.tx.txSent=交易成功發送到本地 Bisq 錢包中的新地址。 +funds.tx.txSent=交易成功發送到本地 Haveno 錢包中的新地址。 funds.tx.direction.self=內部錢包交易 funds.tx.dustAttackTx=接受零頭 -funds.tx.dustAttackTx.popup=這筆交易是發送一個非常小的比特幣金額到您的錢包，可能是區塊鏈分析公司嘗試監控您的交易。\n\n如果您在交易中使用該交易輸出，他們將瞭解到您很可能也是其他地址的所有者（資金歸集）。\n\n為了保護您的隱私，Bisq 錢包忽略了這種零頭的消費和餘額顯示。可以在設置中將輸出視為零頭時設置閾值量。 +funds.tx.dustAttackTx.popup=這筆交易是發送一個非常小的比特幣金額到您的錢包，可能是區塊鏈分析公司嘗試監控您的交易。\n\n如果您在交易中使用該交易輸出，他們將瞭解到您很可能也是其他地址的所有者（資金歸集）。\n\n為了保護您的隱私，Haveno 錢包忽略了這種零頭的消費和餘額顯示。可以在設置中將輸出視為零頭時設置閾值量。 #################################################################### # Support @@ -922,7 +922,7 @@ support.sendingMessage=發送消息... support.receiverNotOnline=收件人未在線。消息被保存到他們的郵箱。 support.sendMessageError=發送消息失敗。錯誤：{0} support.receiverNotKnown=Receiver not known -support.wrongVersion=糾紛中的訂單創建於一箇舊版本的 Bisq。\n您不能在當前版本關閉這個糾紛。\n\n請您使用舊版本/協議版本： {0} +support.wrongVersion=糾紛中的訂單創建於一箇舊版本的 Haveno。\n您不能在當前版本關閉這個糾紛。\n\n請您使用舊版本/協議版本： {0} support.openFile=打開附件文件（文件最大大小：{0} kb） support.attachmentTooLarge=您的附件的總大小為 {0} kb，並超過最大值。 允許消息大小為 {1} kB。 support.maxSize=文件允許的最大大小 {0} kB。 @@ -953,15 +953,15 @@ support.sellerMaker=BTC 賣家/掛單者 support.buyerTaker=BTC 買家/買單者 support.sellerTaker=BTC 賣家/買單者 -support.backgroundInfo=Bisq 不是一家公司，所以它處理糾紛的方式不同。\n\n交易雙方可以在應用程序中通過未完成交易頁面上的安全聊天進行通信，以嘗試自行解決爭端。如果這還不夠，調解員可以介入幫助。調解員將對情況進行評估，並對交易資金的支出提出建議。如果兩個交易者都接受這個建議，那麼支付交易就完成了，交易也結束了。如果一方或雙方不同意調解員的建議，他們可以要求仲裁。仲裁員將重新評估情況，如果有必要，將親自向交易員付款，並要求 Bisq DAO 對這筆付款進行補償。 -support.initialInfo=請在下面的文本框中輸入您的問題描述。添加儘可能多的信息，以加快解決糾紛的時間。\n\n以下是你應提供的資料核對表：\n\t●如果您是 BTC 買家：您是否使用法定貨幣或其他加密貨幣轉賬？如果是，您是否點擊了應用程序中的“支付開始”按鈕？\n\t●如果您是 BTC 賣家：您是否收到法定貨幣或其他加密貨幣的付款了？如果是，你是否點擊了應用程序中的“已收到付款”按鈕？\n\t●您使用的是哪個版本的 Bisq？\n\t●您使用的是哪種操作系統？\n\t●如果遇到操作執行失敗的問題，請考慮切換到新的數據目錄。\n\t有時數據目錄會損壞，並導致奇怪的錯誤。\n詳見：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n請熟悉糾紛處理的基本規則：\n\t●您需要在2天內答覆 {0} 的請求。\n\t●調解員會在2天之內答覆，仲裁員會在5天之內答覆。\n\t●糾紛的最長期限為14天。\n\t●你需要與仲裁員合作，提供他們為你的案件所要求的信息。\n\t●當您第一次啟動應用程序時，您接受了用户協議中爭議文檔中列出的規則。\n\n您可以通過 {2} 瞭解有關糾紛處理的更多信息 +support.backgroundInfo=Haveno 不是一家公司，所以它處理糾紛的方式不同。\n\n交易雙方可以在應用程序中通過未完成交易頁面上的安全聊天進行通信，以嘗試自行解決爭端。如果這還不夠，調解員可以介入幫助。調解員將對情況進行評估，並對交易資金的支出提出建議。如果兩個交易者都接受這個建議，那麼支付交易就完成了，交易也結束了。如果一方或雙方不同意調解員的建議，他們可以要求仲裁。仲裁員將重新評估情況，如果有必要，將親自向交易員付款，並要求 Haveno DAO 對這筆付款進行補償。 +support.initialInfo=請在下面的文本框中輸入您的問題描述。添加儘可能多的信息，以加快解決糾紛的時間。\n\n以下是你應提供的資料核對表：\n\t●如果您是 BTC 買家：您是否使用法定貨幣或其他加密貨幣轉賬？如果是，您是否點擊了應用程序中的“支付開始”按鈕？\n\t●如果您是 BTC 賣家：您是否收到法定貨幣或其他加密貨幣的付款了？如果是，你是否點擊了應用程序中的“已收到付款”按鈕？\n\t●您使用的是哪個版本的 Haveno？\n\t●您使用的是哪種操作系統？\n\t●如果遇到操作執行失敗的問題，請考慮切換到新的數據目錄。\n\t有時數據目錄會損壞，並導致奇怪的錯誤。\n詳見：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n請熟悉糾紛處理的基本規則：\n\t●您需要在2天內答覆 {0} 的請求。\n\t●調解員會在2天之內答覆，仲裁員會在5天之內答覆。\n\t●糾紛的最長期限為14天。\n\t●你需要與仲裁員合作，提供他們為你的案件所要求的信息。\n\t●當您第一次啟動應用程序時，您接受了用户協議中爭議文檔中列出的規則。\n\n您可以通過 {2} 瞭解有關糾紛處理的更多信息 support.systemMsg=系統消息：{0} -support.youOpenedTicket=您創建了幫助請求。\n\n{0}\n\nBisq 版本：{1} -support.youOpenedDispute=您創建了一個糾紛請求。\n\n{0}\n\nBisq 版本：{1} -support.youOpenedDisputeForMediation=您創建了一個調解請求。\n\n{0}\n\nBisq 版本：{1} -support.peerOpenedTicket=對方因技術問題請求獲取幫助。\n\n{0}\n\nBisq 版本：{1} -support.peerOpenedDispute=對方創建了一個糾紛請求。\n\n{0}\n\nBisq 版本：{1} -support.peerOpenedDisputeForMediation=對方創建了一個調解請求。\n\n{0}\n\nBisq 版本：{1} +support.youOpenedTicket=您創建了幫助請求。\n\n{0}\n\nHaveno 版本：{1} +support.youOpenedDispute=您創建了一個糾紛請求。\n\n{0}\n\nHaveno 版本：{1} +support.youOpenedDisputeForMediation=您創建了一個調解請求。\n\n{0}\n\nHaveno 版本：{1} +support.peerOpenedTicket=對方因技術問題請求獲取幫助。\n\n{0}\n\nHaveno 版本：{1} +support.peerOpenedDispute=對方創建了一個糾紛請求。\n\n{0}\n\nHaveno 版本：{1} +support.peerOpenedDisputeForMediation=對方創建了一個調解請求。\n\n{0}\n\nHaveno 版本：{1} support.mediatorsDisputeSummary=系統消息：\n調解糾紛總結：\n{0} support.mediatorsAddress=仲裁員的節點地址：{0} support.warning.disputesWithInvalidDonationAddress=延遲支付交易已經被用於一個不可用接受者地址。它與有效捐贈地址的任何 DAO 中參數值均不匹配。\n\n這可能是一個騙局。請將該事件通知開發者，在問題解決之前不要關閉該案件！\n\n糾紛所用的地址：{0}\n\n所有 DAO 參數中捐贈地址：{1}\n\n交易：{2}{3} @@ -1022,7 +1022,7 @@ settings.preferences.editCustomExplorer.txUrl=交易 URL settings.preferences.editCustomExplorer.addressUrl=地址 URL settings.net.btcHeader=比特幣網絡 -settings.net.p2pHeader=Bisq 網絡 +settings.net.p2pHeader=Haveno 網絡 settings.net.onionAddressLabel=我的匿名地址 settings.net.btcNodesLabel=使用自定義比特幣主節點 settings.net.bitcoinPeersLabel=已連接節點 @@ -1031,12 +1031,12 @@ settings.net.bitcoinNodesLabel=需要連接比特幣核心 settings.net.useProvidedNodesRadio=使用公共比特幣核心節點 settings.net.usePublicNodesRadio=使用公共比特幣網絡 settings.net.useCustomNodesRadio=使用自定義比特幣主節點 -settings.net.warn.usePublicNodes=如果你使用公共比特幣網絡，你就會面臨嚴重的隱私問題，這是由損壞的 bloom filter 設計和實現造成的，它適用於像 BitcoinJ 這樣的 SPV 錢包（在 Bisq 中使用）。您所連接的任何完整節點都可以發現您的所有錢包地址都屬於一個實體。\n\n詳情請瀏覽： https://bisq.network/blog/privacy-in-bitsquare 。\n\n您確定要使用公共節點嗎？ +settings.net.warn.usePublicNodes=如果你使用公共比特幣網絡，你就會面臨嚴重的隱私問題，這是由損壞的 bloom filter 設計和實現造成的，它適用於像 BitcoinJ 這樣的 SPV 錢包（在 Haveno 中使用）。您所連接的任何完整節點都可以發現您的所有錢包地址都屬於一個實體。\n\n詳情請瀏覽： https://bisq.network/blog/privacy-in-bitsquare 。\n\n您確定要使用公共節點嗎？ settings.net.warn.usePublicNodes.useProvided=不，使用給定的節點 settings.net.warn.usePublicNodes.usePublic=使用公共網絡 settings.net.warn.useCustomNodes.B2XWarning=請確保您的比特幣節點是一個可信的比特幣核心節點！\n\n連接到不遵循比特幣核心共識規則的節點可能會損壞您的錢包，並在交易過程中造成問題。\n\n連接到違反共識規則的節點的用户應對任何由此造成的損害負責。任何由此產生的糾紛都將有利於另一方。對於忽略此警吿和保護機制的用户，不提供任何技術支持！ -settings.net.warn.invalidBtcConfig=由於您的配置無效，無法連接至比特幣網絡。\n\n您的配置已經被重置為默認比特幣節點。你需要重啟 Bisq。 -settings.net.localhostBtcNodeInfo=背景信息：Bisq 在啟動時會在本地查找比特幣節點。如果有，Bisq 將只通過它與比特幣網絡進行通信。 +settings.net.warn.invalidBtcConfig=由於您的配置無效，無法連接至比特幣網絡。\n\n您的配置已經被重置為默認比特幣節點。你需要重啟 Haveno。 +settings.net.localhostBtcNodeInfo=背景信息：Haveno 在啟動時會在本地查找比特幣節點。如果有，Haveno 將只通過它與比特幣網絡進行通信。 settings.net.p2PPeersLabel=已連接節點 settings.net.onionAddressColumn=匿名地址 settings.net.creationDateColumn=已建立連接 @@ -1072,17 +1072,17 @@ settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync? If you settings.net.reSyncSPVAfterRestart=SPV 鏈文件已被刪除。請耐心等待，與網絡重新同步可能需要一段時間。 settings.net.reSyncSPVAfterRestartCompleted=重新同步剛剛完成，請重啟應用程序。 settings.net.reSyncSPVFailed=無法刪除 SPV 鏈文件。\n錯誤：{0} -setting.about.aboutBisq=關於 Bisq -setting.about.about=Bisq 是一款開源軟件，它通過分散的對等網絡促進了比特幣與各國貨幣（以及其他加密貨幣）的交易，嚴格保護了用户隱私的方式。請到我們項目的網站閲讀更多關於 Bisq 的信息。 -setting.about.web=Bisq 網站 +setting.about.aboutHaveno=關於 Haveno +setting.about.about=Haveno 是一款開源軟件，它通過分散的對等網絡促進了比特幣與各國貨幣（以及其他加密貨幣）的交易，嚴格保護了用户隱私的方式。請到我們項目的網站閲讀更多關於 Haveno 的信息。 +setting.about.web=Haveno 網站 setting.about.code=源代碼 setting.about.agpl=AGPL 協議 -setting.about.support=支持 Bisq -setting.about.def=Bisq 不是一個公司，而是一個社區項目，開放參與。如果您想參與或支持 Bisq，請點擊下面連接。 +setting.about.support=支持 Haveno +setting.about.def=Haveno 不是一個公司，而是一個社區項目，開放參與。如果您想參與或支持 Haveno，請點擊下面連接。 setting.about.contribute=貢獻 setting.about.providers=數據提供商 -setting.about.apisWithFee=Bisq 使用 Bisq 價格指數來表示法幣與虛擬貨幣的市場價格，並使用 Bisq 內存池節點來估算採礦費。 -setting.about.apis=Bisq 使用 Bisq 價格指數來表示法幣與數字貨幣的市場價格。 +setting.about.apisWithFee=Haveno 使用 Haveno 價格指數來表示法幣與虛擬貨幣的市場價格，並使用 Haveno 內存池節點來估算採礦費。 +setting.about.apis=Haveno 使用 Haveno 價格指數來表示法幣與數字貨幣的市場價格。 setting.about.pricesProvided=交易所價格提供商 setting.about.feeEstimation.label=礦工手續費估算提供商 setting.about.versionDetails=版本詳情 @@ -1096,7 +1096,7 @@ setting.about.shortcuts.ctrlOrAltOrCmd=“Ctrl + {0}”或“alt + {0}”或“c setting.about.shortcuts.menuNav=主頁面 setting.about.shortcuts.menuNav.value=使用“Ctrl”或“Alt”或“cmd” + 數字鍵“1-9”來切換不同的主頁面 -setting.about.shortcuts.close=關閉 Bisq +setting.about.shortcuts.close=關閉 Haveno setting.about.shortcuts.close.value=“Ctrl + {0}”或“cmd + {0}”或“Ctrl + {1}”或“cmd + {1}” setting.about.shortcuts.closePopup=關閉彈窗以及對話框 @@ -1136,7 +1136,7 @@ setting.about.shortcuts.sendPrivateNotification=發送私人通知到對等點 setting.about.shortcuts.sendPrivateNotification.value=點擊交易夥伴頭像並按下：{0} 以顯示更多信息 setting.info.headline=新 XMR 自動確認功能 -setting.info.msg=當你完成 BTC/XMR 交易時，您可以使用自動確認功能來驗證是否向您的錢包中發送了正確數量的 XMR，以便 Bisq 可以自動將交易標記為完成，從而使每個人都可以更快地進行交易。\n\n自動確認使用 XMR 發送方提供的交易密鑰在至少 2 個 XMR 區塊瀏覽器節點上檢查 XMR 交易。在默認情況下，Bisq 使用由 Bisq 貢獻者運行的區塊瀏覽器節點，但是我們建議運行您自己的 XMR 區塊瀏覽器節點以最大程度地保護隱私和安全。\n\n您還可以在``設置''中將每筆交易的最大 BTC 數量設置為自動確認以及所需確認的數量。\n\n在 Bisq Wiki 上查看更多詳細信息（包括如何設置自己的區塊瀏覽器節點）：https://bisq.wiki/Trading_Monero#Auto-confirming_trades +setting.info.msg=當你完成 BTC/XMR 交易時，您可以使用自動確認功能來驗證是否向您的錢包中發送了正確數量的 XMR，以便 Haveno 可以自動將交易標記為完成，從而使每個人都可以更快地進行交易。\n\n自動確認使用 XMR 發送方提供的交易密鑰在至少 2 個 XMR 區塊瀏覽器節點上檢查 XMR 交易。在默認情況下，Haveno 使用由 Haveno 貢獻者運行的區塊瀏覽器節點，但是我們建議運行您自己的 XMR 區塊瀏覽器節點以最大程度地保護隱私和安全。\n\n您還可以在``設置''中將每筆交易的最大 BTC 數量設置為自動確認以及所需確認的數量。\n\n在 Haveno Wiki 上查看更多詳細信息（包括如何設置自己的區塊瀏覽器節點）：https://bisq.wiki/Trading_Monero#Auto-confirming_trades #################################################################### # Account #################################################################### @@ -1144,8 +1144,8 @@ setting.info.msg=當你完成 BTC/XMR 交易時，您可以使用自動確認功 account.tab.mediatorRegistration=調解員註冊 account.tab.refundAgentRegistration=退款助理註冊 account.tab.signing=驗證中 -account.info.headline=歡迎來到 Bisq 賬户 -account.info.msg=在這裏你可以設置交易賬户的法定貨幣及數字貨幣，選擇仲裁員和備份你的錢包及賬户數據。\n\n當你開始運行 Bisq 就已經創建了一個空的比特幣錢包。\n\n我們建議你在充值之前寫下你比特幣錢包的還原密鑰（在左邊的列表）和考慮添加密碼。在“資金”選項中管理比特幣存入和提現。\n\n隱私 & 安全：\nBisq 是一個去中心化的交易所 – 意味着您的所有數據都保存在您的電腦上，沒有服務器，我們無法訪問您的個人信息，您的資金，甚至您的 IP 地址。如銀行賬號、數字貨幣、比特幣地址等數據只分享給與您交易的人，以實現您發起的交易（如果有爭議，仲裁員將會看到您的交易數據）。 +account.info.headline=歡迎來到 Haveno 賬户 +account.info.msg=在這裏你可以設置交易賬户的法定貨幣及數字貨幣，選擇仲裁員和備份你的錢包及賬户數據。\n\n當你開始運行 Haveno 就已經創建了一個空的比特幣錢包。\n\n我們建議你在充值之前寫下你比特幣錢包的還原密鑰（在左邊的列表）和考慮添加密碼。在“資金”選項中管理比特幣存入和提現。\n\n隱私 & 安全：\nHaveno 是一個去中心化的交易所 – 意味着您的所有數據都保存在您的電腦上，沒有服務器，我們無法訪問您的個人信息，您的資金，甚至您的 IP 地址。如銀行賬號、數字貨幣、比特幣地址等數據只分享給與您交易的人，以實現您發起的交易（如果有爭議，仲裁員將會看到您的交易數據）。 account.menu.paymentAccount=法定貨幣賬户 account.menu.altCoinsAccountView=數字貨幣賬户 @@ -1160,7 +1160,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Haveno wallet and data directory.\nKeep in mind that spending funds from a non-Haveno wallet can bungle the internal Haveno data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Haveno wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. account.menu.walletInfo.openDetails=Show raw wallet details and private keys @@ -1172,48 +1172,48 @@ account.arbitratorRegistration.registration={0} 註冊 account.arbitratorRegistration.revoke=撤銷 account.arbitratorRegistration.info.msg=請注意，撤銷後需要保留15天，因為可能有交易正在以你作為 {0}。最大允許的交易期限為8天，糾紛過程最多可能需要7天。 account.arbitratorRegistration.warn.min1Language=您需要設置至少1種語言。\n我們已經為您添加了默認語言。 -account.arbitratorRegistration.removedSuccess=您已從 Bisq 網絡成功刪除仲裁員註冊信息。 +account.arbitratorRegistration.removedSuccess=您已從 Haveno 網絡成功刪除仲裁員註冊信息。 account.arbitratorRegistration.removedFailed=無法刪除仲裁員。{0} -account.arbitratorRegistration.registerSuccess=您已從 Bisq 網絡成功註冊您的仲裁員。 +account.arbitratorRegistration.registerSuccess=您已從 Haveno 網絡成功註冊您的仲裁員。 account.arbitratorRegistration.registerFailed=無法註冊仲裁員。{0} account.altcoin.yourAltcoinAccounts=您的數字貨幣賬户 account.altcoin.popup.wallet.msg=請確保您按照 {1} 網頁上所述使用 {0} 錢包的要求。\n使用集中式交易所的錢包，您無法控制密鑰或使用不兼容的錢包軟件，可能會導致交易資金的流失！\n調解員或仲裁員不是 {2} 專家，在這種情況下不能幫助。 account.altcoin.popup.wallet.confirm=我瞭解並確定我知道我需要哪種錢包。 # suppress inspection "UnusedProperty" -account.altcoin.popup.upx.msg=在 Bisq 上交易 UPX 需要您瞭解並滿足以下要求：\n\n要發送 UPX ，您需要使用官方的 UPXmA GUI 錢包或啟用 store-tx-info 標誌的 UPXmA CLI 錢包（在新版本中是默認的）。請確保您可以訪問Tx密鑰，因為在糾紛狀態時需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高級>證明/檢查頁面。\n\n在普通的區塊鏈瀏覽器中，這種交易是不可驗證的。\n\n如有糾紛，你須向仲裁員提供下列資料：\n \n- Tx私鑰\n- 交易哈希\n- 接收者的公開地址\n\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。如果發生糾紛，UPX 發送方負責向仲裁員提供 UPX 轉賬的驗證。\n\n不需要支付 ID，只需要普通的公共地址。\n \n如果您對該流程不確定，請訪問 UPXmA Discord 頻道（https://discord.gg/vhdNSrV）或 Telegram 交流羣（https://t.me/uplexaOfficial）瞭解更多信息。\n\n +account.altcoin.popup.upx.msg=在 Haveno 上交易 UPX 需要您瞭解並滿足以下要求：\n\n要發送 UPX ，您需要使用官方的 UPXmA GUI 錢包或啟用 store-tx-info 標誌的 UPXmA CLI 錢包（在新版本中是默認的）。請確保您可以訪問Tx密鑰，因為在糾紛狀態時需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高級>證明/檢查頁面。\n\n在普通的區塊鏈瀏覽器中，這種交易是不可驗證的。\n\n如有糾紛，你須向仲裁員提供下列資料：\n \n- Tx私鑰\n- 交易哈希\n- 接收者的公開地址\n\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。如果發生糾紛，UPX 發送方負責向仲裁員提供 UPX 轉賬的驗證。\n\n不需要支付 ID，只需要普通的公共地址。\n \n如果您對該流程不確定，請訪問 UPXmA Discord 頻道（https://discord.gg/vhdNSrV）或 Telegram 交流羣（https://t.me/uplexaOfficial）瞭解更多信息。\n\n # suppress inspection "UnusedProperty" -account.altcoin.popup.arq.msg=在 Bisq 上交易 ARQ 需要您瞭解並滿足以下要求：\n\n要發送 ARQ ，您需要使用官方的 ArQmA GUI 錢包或啟用 store-tx-info 標誌的 ArQmA CLI 錢包（在新版本中是默認的）。請確保您可以訪問Tx密鑰，因為在糾紛狀態時需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高級>證明/檢查頁面。\n\n在普通的區塊鏈瀏覽器中，這種交易是不可驗證的。\n\n如有糾紛，你須向調解員或仲裁員提供下列資料：\n\n- Tx私鑰\n- 交易哈希\n- 接收者的公開地址\n\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。如果發生糾紛，ARQ 發送方負責向調解員或仲裁員提供 ARQ 轉賬的驗證。\n\n不需要交易 ID，只需要普通的公共地址。\n\n如果您對該流程不確定，請訪問 ArQmA Discord 頻道（https://discord.gg/s9BQpJT）或 ArQmA 論壇（https://labs.arqma.com）瞭解更多信息。 +account.altcoin.popup.arq.msg=在 Haveno 上交易 ARQ 需要您瞭解並滿足以下要求：\n\n要發送 ARQ ，您需要使用官方的 ArQmA GUI 錢包或啟用 store-tx-info 標誌的 ArQmA CLI 錢包（在新版本中是默認的）。請確保您可以訪問Tx密鑰，因為在糾紛狀態時需要。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高級>證明/檢查頁面。\n\n在普通的區塊鏈瀏覽器中，這種交易是不可驗證的。\n\n如有糾紛，你須向調解員或仲裁員提供下列資料：\n\n- Tx私鑰\n- 交易哈希\n- 接收者的公開地址\n\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。如果發生糾紛，ARQ 發送方負責向調解員或仲裁員提供 ARQ 轉賬的驗證。\n\n不需要交易 ID，只需要普通的公共地址。\n\n如果您對該流程不確定，請訪問 ArQmA Discord 頻道（https://discord.gg/s9BQpJT）或 ArQmA 論壇（https://labs.arqma.com）瞭解更多信息。 # suppress inspection "UnusedProperty" -account.altcoin.popup.xmr.msg=在 Bisq 上交易 XMR 需要你理解並滿足以下要求。\n\n如果您出售 XMR，當您在糾紛中您必須要提供下列信息給調解員或仲裁員：\n- 交易密鑰（Tx 公鑰，Tx密鑰，Tx私鑰）\n- 交易 ID（Tx ID 或 Tx 哈希）\n- 交易目標地址（接收者地址）\n\n在 wiki 中查看更多關於 Monero 錢包的信息：\nhttps://bisq.wiki/Trading_Monero#Proving_payments\n\n如未能提供要求的交易數據將在糾紛中直接判負\n\n還要注意，Bisq 現在提供了自動確認 XMR 交易的功能，以使交易更快，但是您需要在設置中啟用它。\n\n有關自動確認功能的更多信息，請參見 Wiki：\nhttps://bisq.wiki/Trading_Monero#Auto-confirming_trades +account.altcoin.popup.xmr.msg=在 Haveno 上交易 XMR 需要你理解並滿足以下要求。\n\n如果您出售 XMR，當您在糾紛中您必須要提供下列信息給調解員或仲裁員：\n- 交易密鑰（Tx 公鑰，Tx密鑰，Tx私鑰）\n- 交易 ID（Tx ID 或 Tx 哈希）\n- 交易目標地址（接收者地址）\n\n在 wiki 中查看更多關於 Monero 錢包的信息：\nhttps://bisq.wiki/Trading_Monero#Proving_payments\n\n如未能提供要求的交易數據將在糾紛中直接判負\n\n還要注意，Haveno 現在提供了自動確認 XMR 交易的功能，以使交易更快，但是您需要在設置中啟用它。\n\n有關自動確認功能的更多信息，請參見 Wiki：\nhttps://bisq.wiki/Trading_Monero#Auto-confirming_trades # suppress inspection "UnusedProperty" -account.altcoin.popup.msr.msg=區塊鏈瀏覽器在 Bisq 上交易 XMR 需要您瞭解並滿足以下要求：\n\n發送MSR時，您需要使用官方的 Masari GUI 錢包、啟用store-tx-info標記的Masari CLI錢包(默認啟用)或Masari 網頁錢包(https://wallet.getmasari.org)。請確保您可以訪問的 tx 密鑰，因為如果發生糾紛這是需要的。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高級>證明/檢查頁面。\n\nMasari 網頁錢包（前往 帳户->交易歷史和查看您發送的交易細節）\n\n驗證可以在錢包中完成。\nmonero-wallet-cli：使用命令（check_tx_key）。\nmonero-wallet-gui：在高級>證明/檢查頁面\n驗證可以在區塊瀏覽器中完成\n打開區塊瀏覽器（https://explorer.getmasari.org），使用搜索欄查找您的事務哈希。\n一旦找到交易，滾動到底部的“證明發送”區域，並填寫所需的詳細信息。\n如有糾紛，你須向調解員或仲裁員提供下列資料：\n- Tx私鑰\n- 交易哈希\n- 接收者的公開地址\n\n不需要交易 ID，只需要正常的公共地址。\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。如果發生糾紛，XMR 發送方負責向調解員或仲裁員提供 XMR 轉賬的驗證。\n\n如果您對該流程不確定，請訪問官方的 Masari Discord（https://discord.gg/sMCwMqs）上尋求幫助。 +account.altcoin.popup.msr.msg=區塊鏈瀏覽器在 Haveno 上交易 XMR 需要您瞭解並滿足以下要求：\n\n發送MSR時，您需要使用官方的 Masari GUI 錢包、啟用store-tx-info標記的Masari CLI錢包(默認啟用)或Masari 網頁錢包(https://wallet.getmasari.org)。請確保您可以訪問的 tx 密鑰，因為如果發生糾紛這是需要的。\nmonero-wallet-cli（使用get_Tx_key命令）\nmonero-wallet-gui：在高級>證明/檢查頁面。\n\nMasari 網頁錢包（前往 帳户->交易歷史和查看您發送的交易細節）\n\n驗證可以在錢包中完成。\nmonero-wallet-cli：使用命令（check_tx_key）。\nmonero-wallet-gui：在高級>證明/檢查頁面\n驗證可以在區塊瀏覽器中完成\n打開區塊瀏覽器（https://explorer.getmasari.org），使用搜索欄查找您的事務哈希。\n一旦找到交易，滾動到底部的“證明發送”區域，並填寫所需的詳細信息。\n如有糾紛，你須向調解員或仲裁員提供下列資料：\n- Tx私鑰\n- 交易哈希\n- 接收者的公開地址\n\n不需要交易 ID，只需要正常的公共地址。\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。如果發生糾紛，XMR 發送方負責向調解員或仲裁員提供 XMR 轉賬的驗證。\n\n如果您對該流程不確定，請訪問官方的 Masari Discord（https://discord.gg/sMCwMqs）上尋求幫助。 # suppress inspection "UnusedProperty" -account.altcoin.popup.blur.msg=在 Bisq 上交易 BLUR 需要你瞭解並滿足以下要求：\n\n要發送匿名信息你必須使用匿名網絡 CLI 或 GUI 錢包。\n如果您正在使用 CLI 錢包，在傳輸發送後將顯示交易哈希（tx ID）。您必須保存此信息。在發送傳輸之後，您必須立即使用“get_tx_key”命令來檢索交易私鑰。如果未能執行此步驟，以後可能無法檢索密鑰。\n\n如果您使用 Blur Network GUI 錢包，可以在“歷史”選項卡中方便地找到交易私鑰和交易 ID。發送後立即定位感興趣的交易。單擊包含交易的框的右下角的“?”符號。您必須保存此信息。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息：1.)交易ID，2.)交易私鑰，3.)收件人地址。調解或仲裁程序將使用 BLUR 事務查看器（https://blur.cash/#tx-viewer）驗證 BLUR 轉賬。\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有爭議的情況下，匿名發送方承擔100%的責任來向調解員或仲裁員核實交易。\n\n如果你不瞭解這些要求，不要在 Bisq 上交易。首先，在 Blur Network Discord 中尋求幫助（https://discord.gg/dMWaqVW）。 +account.altcoin.popup.blur.msg=在 Haveno 上交易 BLUR 需要你瞭解並滿足以下要求：\n\n要發送匿名信息你必須使用匿名網絡 CLI 或 GUI 錢包。\n如果您正在使用 CLI 錢包，在傳輸發送後將顯示交易哈希（tx ID）。您必須保存此信息。在發送傳輸之後，您必須立即使用“get_tx_key”命令來檢索交易私鑰。如果未能執行此步驟，以後可能無法檢索密鑰。\n\n如果您使用 Blur Network GUI 錢包，可以在“歷史”選項卡中方便地找到交易私鑰和交易 ID。發送後立即定位感興趣的交易。單擊包含交易的框的右下角的“?”符號。您必須保存此信息。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息：1.)交易ID，2.)交易私鑰，3.)收件人地址。調解或仲裁程序將使用 BLUR 事務查看器（https://blur.cash/#tx-viewer）驗證 BLUR 轉賬。\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有爭議的情況下，匿名發送方承擔100%的責任來向調解員或仲裁員核實交易。\n\n如果你不瞭解這些要求，不要在 Haveno 上交易。首先，在 Blur Network Discord 中尋求幫助（https://discord.gg/dMWaqVW）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.solo.msg=在 Bisq 上交易 Solo 需要您瞭解並滿足以下要求:\n\n要發送 Solo，您必須使用 Solo CLI 網絡錢包版本 5.1.3 或更高。\n\n如果您使用的是CLI錢包，則在發送交易之後，將顯示交易ID。您必須保存此信息。在發送交易之後，您必須立即使用'get_tx_key'命令來檢索交易密鑰。如果未能執行此步驟，則以後可能無法檢索密鑰。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息：1)交易 ID,、2)交易密鑰，3)收件人的地址。調解員或仲裁員將使用 Solo 區塊資源管理器（https://explorer.Solo.org）搜索交易然後使用“發送證明”功能（https://explorer.minesolo.com/）\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有發生爭議的情況下，在向調解員或仲裁員核實交易時，QWC 的發送方承擔 100% 的責任。\n\n如果你不理解這些要求，不要在 Bisq 上交易。首先，在 Solo Discord 中尋求幫助（https://discord.minesolo.com/）。\n\n +account.altcoin.popup.solo.msg=在 Haveno 上交易 Solo 需要您瞭解並滿足以下要求:\n\n要發送 Solo，您必須使用 Solo CLI 網絡錢包版本 5.1.3 或更高。\n\n如果您使用的是CLI錢包，則在發送交易之後，將顯示交易ID。您必須保存此信息。在發送交易之後，您必須立即使用'get_tx_key'命令來檢索交易密鑰。如果未能執行此步驟，則以後可能無法檢索密鑰。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息：1)交易 ID,、2)交易密鑰，3)收件人的地址。調解員或仲裁員將使用 Solo 區塊資源管理器（https://explorer.Solo.org）搜索交易然後使用“發送證明”功能（https://explorer.minesolo.com/）\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有發生爭議的情況下，在向調解員或仲裁員核實交易時，QWC 的發送方承擔 100% 的責任。\n\n如果你不理解這些要求，不要在 Haveno 上交易。首先，在 Solo Discord 中尋求幫助（https://discord.minesolo.com/）。\n\n # suppress inspection "UnusedProperty" -account.altcoin.popup.cash2.msg=在 Bisq 上交易 CASH2 需要您瞭解並滿足以下要求：\n\n要發送 CASH2，您必須使用 CASH2 錢包版本 3 或更高。\n\n在發送交易之後，將顯示交易ID。您必須保存此信息。在發送交易之後，必須立即在 simplewallet 中使用命令“getTxKey”來檢索交易密鑰。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息：1)交易 ID，2)交易密鑰，3)收件人的 CASH2 地址。調解員或仲裁員將使用 CASH2 區塊資源管理器（https://blocks.cash2.org）驗證 CASH2 轉賬。\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有發生爭議的情況下，在向調解員或仲裁員核實交易時，CASH2 的發送方承擔 100% 的責任。\n\n如果你不理解這些要求，不要在 Bisq 上交易。首先，在 Cash2 Discord 中尋求幫助（https://discord.gg/FGfXAYN）。 +account.altcoin.popup.cash2.msg=在 Haveno 上交易 CASH2 需要您瞭解並滿足以下要求：\n\n要發送 CASH2，您必須使用 CASH2 錢包版本 3 或更高。\n\n在發送交易之後，將顯示交易ID。您必須保存此信息。在發送交易之後，必須立即在 simplewallet 中使用命令“getTxKey”來檢索交易密鑰。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息：1)交易 ID，2)交易密鑰，3)收件人的 CASH2 地址。調解員或仲裁員將使用 CASH2 區塊資源管理器（https://blocks.cash2.org）驗證 CASH2 轉賬。\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有發生爭議的情況下，在向調解員或仲裁員核實交易時，CASH2 的發送方承擔 100% 的責任。\n\n如果你不理解這些要求，不要在 Haveno 上交易。首先，在 Cash2 Discord 中尋求幫助（https://discord.gg/FGfXAYN）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.qwertycoin.msg=在 Bisq 上交易 Qwertycoin 需要您瞭解並滿足以下要求:\n\n要發送 Qwertycoin，您必須使用 Qwertycoin 錢包版本 5.1.3 或更高。\n\n在發送交易之後，將顯示交易ID。您必須保存此信息。在發送交易之後，必須立即在 simplewallet 中使用命令“get_Tx_Key”來檢索交易密鑰。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息:：1)交易 ID,、2)交易密鑰，3)收件人的 QWC 地址。調解員或仲裁員將使用 QWC 區塊資源管理器（https://explorer.qwertycoin.org）驗證 QWC 轉賬。\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有發生爭議的情況下，在向調解員或仲裁員核實交易時，QWC 的發送方承擔 100% 的責任。\n\n如果你不理解這些要求，不要在 Bisq 上交易。首先，在 QWC Discord 中尋求幫助（https://discord.gg/rUkfnpC）。 +account.altcoin.popup.qwertycoin.msg=在 Haveno 上交易 Qwertycoin 需要您瞭解並滿足以下要求:\n\n要發送 Qwertycoin，您必須使用 Qwertycoin 錢包版本 5.1.3 或更高。\n\n在發送交易之後，將顯示交易ID。您必須保存此信息。在發送交易之後，必須立即在 simplewallet 中使用命令“get_Tx_Key”來檢索交易密鑰。\n\n如果仲裁是必要的，您必須向調解員或仲裁員提供以下信息:：1)交易 ID,、2)交易密鑰，3)收件人的 QWC 地址。調解員或仲裁員將使用 QWC 區塊資源管理器（https://explorer.qwertycoin.org）驗證 QWC 轉賬。\n\n未能向調解員或仲裁員提供必要的信息將導致敗訴。在所有發生爭議的情況下，在向調解員或仲裁員核實交易時，QWC 的發送方承擔 100% 的責任。\n\n如果你不理解這些要求，不要在 Haveno 上交易。首先，在 QWC Discord 中尋求幫助（https://discord.gg/rUkfnpC）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.drgl.msg=在 Bisq 上交易 Dragonglass 需要您瞭解並滿足以下要求：\n\n由於 Dragonglass 提供了隱私保護，所以交易不能在公共區塊鏈上驗證。如果需要，您可以通過使用您的 TXN-Private-Key 來證明您的付款。\nTXN-Private 密匙是自動生成的一次性密匙，用於只能從 DRGL 錢包中訪問的每個交易。\n要麼通過 DRGL-wallet GUI（內部交易細節對話框），要麼通過 Dragonglass CLI simplewallet（使用命令“get_tx_key”）。\n\n兩者都需要 DRGL 版本的“Oathkeeper”或更高版本。\n\n如有爭議，你必須向調解員或仲裁員提供下列資料：\n\n- txn-Privite-ket\n- 交易哈希 \n- 接收者的公開地址\n\n付款驗證可以使用上面的數據作為輸入（http://drgl.info/#check_txn）。\n\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。Dragonglass 發送方負責在發生爭議時向調解員或仲裁員提供 DRGL 轉賬的驗證。不需要使用付款 ID。\n\n如果您對這個過程的任何部分都不確定，請訪問（http://discord.drgl.info）上的 Dragonglass 尋求幫助。 +account.altcoin.popup.drgl.msg=在 Haveno 上交易 Dragonglass 需要您瞭解並滿足以下要求：\n\n由於 Dragonglass 提供了隱私保護，所以交易不能在公共區塊鏈上驗證。如果需要，您可以通過使用您的 TXN-Private-Key 來證明您的付款。\nTXN-Private 密匙是自動生成的一次性密匙，用於只能從 DRGL 錢包中訪問的每個交易。\n要麼通過 DRGL-wallet GUI（內部交易細節對話框），要麼通過 Dragonglass CLI simplewallet（使用命令“get_tx_key”）。\n\n兩者都需要 DRGL 版本的“Oathkeeper”或更高版本。\n\n如有爭議，你必須向調解員或仲裁員提供下列資料：\n\n- txn-Privite-ket\n- 交易哈希 \n- 接收者的公開地址\n\n付款驗證可以使用上面的數據作為輸入（http://drgl.info/#check_txn）。\n\n如未能提供上述資料，或使用不兼容的錢包，將會導致糾紛敗訴。Dragonglass 發送方負責在發生爭議時向調解員或仲裁員提供 DRGL 轉賬的驗證。不需要使用付款 ID。\n\n如果您對這個過程的任何部分都不確定，請訪問（http://discord.drgl.info）上的 Dragonglass 尋求幫助。 # suppress inspection "UnusedProperty" account.altcoin.popup.ZEC.msg=當使用 Zcash 時，您只能使用透明地址（以 t 開頭），而不能使用 z 地址（私有），因為調解員或仲裁員無法使用 z 地址驗證交易。 # suppress inspection "UnusedProperty" account.altcoin.popup.XZC.msg=在使用 Zcoin 時，您只能使用透明的（可跟蹤的）地址，而不能使用不可跟蹤的地址，因為調解員或仲裁員無法在區塊資源管理器中使用不可跟蹤的地址驗證交易。 # suppress inspection "UnusedProperty" -account.altcoin.popup.grin.msg=GRIN 需要發送方和接收方之間的交互過程來創建交易。請確保遵循 GRIN 項目網頁中的説明，以可靠地發送和接收 GRIN（接收方需要在線，或至少在一定時間內在線）。\n \nBisq 只支持 Grinbox（Wallet713）錢包 URL 格式。\n\nGRIN 發送者需要提供他們已成功發送 GRIN 的證明。如果錢包不能提供證明，一個潛在的糾紛將被解決，有利於露齒微笑的接受者。請確保您使用了最新的支持交易證明的 Grinbox 軟件，並且您瞭解傳輸和接收 GRIN 的過程以及如何創建證明。\n請參閲 https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only，以獲得關於 Grinbox 證明工具的更多信息。\n +account.altcoin.popup.grin.msg=GRIN 需要發送方和接收方之間的交互過程來創建交易。請確保遵循 GRIN 項目網頁中的説明，以可靠地發送和接收 GRIN（接收方需要在線，或至少在一定時間內在線）。\n \nHaveno 只支持 Grinbox（Wallet713）錢包 URL 格式。\n\nGRIN 發送者需要提供他們已成功發送 GRIN 的證明。如果錢包不能提供證明，一個潛在的糾紛將被解決，有利於露齒微笑的接受者。請確保您使用了最新的支持交易證明的 Grinbox 軟件，並且您瞭解傳輸和接收 GRIN 的過程以及如何創建證明。\n請參閲 https://github.com/vault713/wallet713/blob/master/docs/usage.md#transaction-proofs-grinbox-only，以獲得關於 Grinbox 證明工具的更多信息。\n # suppress inspection "UnusedProperty" account.altcoin.popup.beam.msg=BEAM 需要發送方和接收方之間的交互過程來創建交易。\n\n\n確保遵循 BEAM 項目網頁的指示可靠地發送和接收 BEAM（接收方需要在線，或者至少在一定的時間範圍內在線）。\n\nBEAM 發送者需要提供他們成功發送 BEAM 的證明。一定要使用錢包軟件，可以產生這樣的證明。如果錢包不能提供證據，一個潛在的糾紛將得到解決，有利於 BEAM 接收者。 # suppress inspection "UnusedProperty" -account.altcoin.popup.pars.msg=在 Bisq 上交易 ParsiCoin 需要您瞭解並滿足以下要求：\n\n要發送 PARS ，您必須使用官方 ParsiCoin Wallet 版本 3.0.0 或更高。\n\n您可以在 GUI 錢包（ParsiPay）的交易部分檢查您的交易哈希和交易鍵，您需要右鍵單擊“交易”，然後單擊“顯示詳情”。\n\n如果仲裁是 100% 必要的，您必須向調解員或仲裁員提供以下內容：1)交易哈希，2)交易密鑰，以及3)接收方的 PARS 地址。調解員或仲裁員將使用 ParsiCoin 區塊鏈瀏覽器 （http://explorer.parsicoin.net/#check_payment）驗證 PARS 傳輸。\n\n如果你不瞭解這些要求，不要在 Bisq 上交易。首先，在 ParsiCoin Discord 尋求幫助（https://discord.gg/c7qmFNh）。 +account.altcoin.popup.pars.msg=在 Haveno 上交易 ParsiCoin 需要您瞭解並滿足以下要求：\n\n要發送 PARS ，您必須使用官方 ParsiCoin Wallet 版本 3.0.0 或更高。\n\n您可以在 GUI 錢包（ParsiPay）的交易部分檢查您的交易哈希和交易鍵，您需要右鍵單擊“交易”，然後單擊“顯示詳情”。\n\n如果仲裁是 100% 必要的，您必須向調解員或仲裁員提供以下內容：1)交易哈希，2)交易密鑰，以及3)接收方的 PARS 地址。調解員或仲裁員將使用 ParsiCoin 區塊鏈瀏覽器 （http://explorer.parsicoin.net/#check_payment）驗證 PARS 傳輸。\n\n如果你不瞭解這些要求，不要在 Haveno 上交易。首先，在 ParsiCoin Discord 尋求幫助（https://discord.gg/c7qmFNh）。 # suppress inspection "UnusedProperty" -account.altcoin.popup.blk-burnt.msg=要交易燒燬的貨幣，你需要知道以下幾點：\n\n燒燬的貨幣是不能花的。要在 Bisq 上交易它們，輸出腳本需要採用以下形式：OP_RETURN OP_PUSHDATA，後跟相關的數據字節，這些字節經過十六進制編碼後構成地址。例如，地址為666f6f（在UTF-8中的"foo"）的燒燬的貨幣將有以下腳本：\n\nOP_RETURN OP_PUSHDATA 666f6f\n\n要創建燒燬的貨幣，您可以使用“燒燬”RPC命令，它在一些錢包可用。\n\n對於可能的情況，可以查看 https://ibo.laboratorium.ee\n\n因為燒燬的貨幣是不能用的，所以不能重新出售。“出售”燒燬的貨幣意味着焚燒初始的貨幣（與目的地地址相關聯的數據）。\n\n如果發生爭議，BLK 賣方需要提供交易哈希。 +account.altcoin.popup.blk-burnt.msg=要交易燒燬的貨幣，你需要知道以下幾點：\n\n燒燬的貨幣是不能花的。要在 Haveno 上交易它們，輸出腳本需要採用以下形式：OP_RETURN OP_PUSHDATA，後跟相關的數據字節，這些字節經過十六進制編碼後構成地址。例如，地址為666f6f（在UTF-8中的"foo"）的燒燬的貨幣將有以下腳本：\n\nOP_RETURN OP_PUSHDATA 666f6f\n\n要創建燒燬的貨幣，您可以使用“燒燬”RPC命令，它在一些錢包可用。\n\n對於可能的情況，可以查看 https://ibo.laboratorium.ee\n\n因為燒燬的貨幣是不能用的，所以不能重新出售。“出售”燒燬的貨幣意味着焚燒初始的貨幣（與目的地地址相關聯的數據）。\n\n如果發生爭議，BLK 賣方需要提供交易哈希。 # suppress inspection "UnusedProperty" -account.altcoin.popup.liquidbitcoin.msg=在 Bisq 上交易 L-BTC 你必須理解下述條款：\n\n當你在 Bisq 上接受 L-BTC 交易時，你不能使用手機 Blockstream Green Wallet 或者是一個託管/交易錢包。你必須只接收 L-BTC 到 Liquid Elements Core 錢包，或另一個 L-BTC 錢包且允許你獲得匿名的 L-BTC 地址以及密鑰。\n\n在需要進行調解的情況下，或者如果發生了交易糾紛，您必須將接收 L-BTC地址的安全密鑰披露給 Bisq 調解員或退款代理，以便他們能夠在他們自己的 Elements Core 全節點上驗證您的匿名交易的細節。\n\n如果你不瞭解或瞭解這些要求，不要在 Bisq 上交易 L-BTC。 +account.altcoin.popup.liquidbitcoin.msg=在 Haveno 上交易 L-BTC 你必須理解下述條款：\n\n當你在 Haveno 上接受 L-BTC 交易時，你不能使用手機 Blockstream Green Wallet 或者是一個託管/交易錢包。你必須只接收 L-BTC 到 Liquid Elements Core 錢包，或另一個 L-BTC 錢包且允許你獲得匿名的 L-BTC 地址以及密鑰。\n\n在需要進行調解的情況下，或者如果發生了交易糾紛，您必須將接收 L-BTC地址的安全密鑰披露給 Haveno 調解員或退款代理，以便他們能夠在他們自己的 Elements Core 全節點上驗證您的匿名交易的細節。\n\n如果你不瞭解或瞭解這些要求，不要在 Haveno 上交易 L-BTC。 account.fiat.yourFiatAccounts=您的法定貨幣賬户 @@ -1235,12 +1235,12 @@ account.password.info=使用密碼保護，您需要在將比特幣從錢包中 account.seed.backup.title=備份您的錢包還原密鑰 account.seed.info=請寫下錢包還原密鑰和時間！\n您可以通過還原密鑰和時間在任何時候恢復您的錢包。\n還原密鑰用於 BTC 和 BSQ 錢包。\n\n您應該在一張紙上寫下還原密鑰並且不要保存它們在您的電腦上。\n請注意還原密鑰並不能代替備份。\n您需要備份完整的應用程序目錄在”賬户/備份“界面去恢復有效的應用程序狀態和數據。 -account.seed.backup.warning=請注意種子詞不能替代備份。您需要為整個應用目錄（在“賬户/備份”選項卡中）以恢復應用狀態以及數據。\n導入種子詞僅在緊急情況時才推薦使用。 如果沒有正確備份數據庫文件和密鑰，該應用程序將無法運行！\n\n在 Bisq wiki 中查看更多信息： https://bisq.wiki/Backing_up_application_data +account.seed.backup.warning=請注意種子詞不能替代備份。您需要為整個應用目錄（在“賬户/備份”選項卡中）以恢復應用狀態以及數據。\n導入種子詞僅在緊急情況時才推薦使用。 如果沒有正確備份數據庫文件和密鑰，該應用程序將無法運行！\n\n在 Haveno wiki 中查看更多信息： https://bisq.wiki/Backing_up_application_data account.seed.warn.noPw.msg=您還沒有設置一個可以保護還原密鑰顯示的錢包密碼。\n\n要顯示還原密鑰嗎？ account.seed.warn.noPw.yes=是的，不要再問我 account.seed.enterPw=輸入密碼查看還原密鑰 account.seed.restore.info=請在應用還原密鑰還原之前進行備份。請注意，錢包還原僅用於緊急情況，可能會導致內部錢包數據庫出現問題。\n這不是應用備份的方法！請使用應用程序數據目錄中的備份來恢復以前的應用程序狀態。\n恢復後，應用程序將自動關閉。重新啟動應用程序後，它將重新與比特幣網絡同步。這可能需要一段時間，並且會消耗大量CPU，特別是在錢包較舊且有很多交易的情況下。請避免中斷該進程，否則可能需要再次刪除 SPV 鏈文件或重複還原過程。 -account.seed.restore.ok=好的，立即執行回覆並且關閉 Bisq +account.seed.restore.ok=好的，立即執行回覆並且關閉 Haveno #################################################################### @@ -1269,7 +1269,7 @@ account.notifications.priceAlert.low.label=提醒條件：當 BTC 價格低於 account.notifications.priceAlert.setButton=設置價格提醒 account.notifications.priceAlert.removeButton=取消價格提醒 account.notifications.trade.message.title=交易狀態已變更 -account.notifications.trade.message.msg.conf=ID 為 {0} 的交易的存款交易已被確認。請打開您的 Bisq 應用程序並開始付款。 +account.notifications.trade.message.msg.conf=ID 為 {0} 的交易的存款交易已被確認。請打開您的 Haveno 應用程序並開始付款。 account.notifications.trade.message.msg.started=BTC 買家已經開始支付 ID 為 {0} 的交易。 account.notifications.trade.message.msg.completed=ID 為 {0} 的交易已完成。 account.notifications.offer.message.title=您的報價已被接受 @@ -1294,10 +1294,10 @@ account.notifications.marketAlert.manageAlerts.header.offerType=報價類型 account.notifications.marketAlert.message.title=報價提醒 account.notifications.marketAlert.message.msg.below=低於 account.notifications.marketAlert.message.msg.above=高於 -account.notifications.marketAlert.message.msg=價格為 {2}（{3} {4}市場價）和支付方式為 {5} 的報價 {0} {1} 已發佈到 Bisq 報價列表。\n報價ID： {6}。 +account.notifications.marketAlert.message.msg=價格為 {2}（{3} {4}市場價）和支付方式為 {5} 的報價 {0} {1} 已發佈到 Haveno 報價列表。\n報價ID： {6}。 account.notifications.priceAlert.message.title=價格提醒 {0} account.notifications.priceAlert.message.msg=您的價格提醒已被觸發。當前 {0} 的價格為 {1} {2} -account.notifications.noWebCamFound.warning=未找到網絡攝像頭。\n\n請使用電子郵件選項將代碼和加密密鑰從您的手機發送到 Bisq 應用程序。 +account.notifications.noWebCamFound.warning=未找到網絡攝像頭。\n\n請使用電子郵件選項將代碼和加密密鑰從您的手機發送到 Haveno 應用程序。 account.notifications.priceAlert.warning.highPriceTooLow=較高的價格必須大於較低的價格。 account.notifications.priceAlert.warning.lowerPriceTooHigh=較低的價格必須低於較高的價格。 @@ -1327,11 +1327,11 @@ displayUpdateDownloadWindow.status.verifying=驗證驗證中... displayUpdateDownloadWindow.button.label=下載安裝程序並驗證驗證 displayUpdateDownloadWindow.button.downloadLater=稍後下載 displayUpdateDownloadWindow.button.ignoreDownload=忽略這個版本 -displayUpdateDownloadWindow.headline=Bisq 有新的更新！ +displayUpdateDownloadWindow.headline=Haveno 有新的更新！ displayUpdateDownloadWindow.download.failed.headline=下載失敗 -displayUpdateDownloadWindow.download.failed=下載失敗。\n請到 https://bisq.io/downloads 下載並驗證。 +displayUpdateDownloadWindow.download.failed=下載失敗。\n請到 https://haveno.io/downloads 下載並驗證。 displayUpdateDownloadWindow.installer.failed=無法確定正確的安裝程序。請通過 https://bisq.network/downloads 手動下載和驗證。 -displayUpdateDownloadWindow.verify.failed=驗證失敗。\n請到 https://bisq.io/downloads 手動下載和驗證。 +displayUpdateDownloadWindow.verify.failed=驗證失敗。\n請到 https://haveno.io/downloads 手動下載和驗證。 displayUpdateDownloadWindow.success=新版本成功下載並驗證驗證 。\n\n請打開下載目錄，關閉應用程序並安裝最新版本。 displayUpdateDownloadWindow.download.openDir=打開下載目錄 @@ -1401,7 +1401,7 @@ disputeSummaryWindow.close.noPayout.headline=未支付關閉 disputeSummaryWindow.close.noPayout.text=你想要在未作支付的情況下關閉嗎？ emptyWalletWindow.headline={0} 錢包急救工具 -emptyWalletWindow.info=請在緊急情況下使用，如果您無法從 UI 中訪問您的資金。\n\n請注意，使用此工具時，所有未結報價將自動關閉。\n\n在使用此工具之前，請備份您的數據目錄。您可以在“帳户/備份”中執行此操作。\n\n請報吿我們您的問題，並在 Github 或 Bisq 論壇上提交錯誤報吿，以便我們可以調查導致問題的原因。 +emptyWalletWindow.info=請在緊急情況下使用，如果您無法從 UI 中訪問您的資金。\n\n請注意，使用此工具時，所有未結報價將自動關閉。\n\n在使用此工具之前，請備份您的數據目錄。您可以在“帳户/備份”中執行此操作。\n\n請報吿我們您的問題，並在 Github 或 Haveno 論壇上提交錯誤報吿，以便我們可以調查導致問題的原因。 emptyWalletWindow.balance=您的可用錢包餘額 emptyWalletWindow.address=輸入您的目標地址 @@ -1454,7 +1454,7 @@ offerDetailsWindow.creationDate=創建時間 offerDetailsWindow.makersOnion=賣家的匿名地址 qRCodeWindow.headline=二維碼 -qRCodeWindow.msg=請使用二維碼從外部錢包充值至 Bisq 錢包 +qRCodeWindow.msg=請使用二維碼從外部錢包充值至 Haveno 錢包 qRCodeWindow.request=付款請求：\n{0} selectDepositTxWindow.headline=選擇糾紛的存款交易 @@ -1562,7 +1562,7 @@ popup.headline.error=錯誤 popup.doNotShowAgain=不要再顯示 popup.reportError.log=打開日誌文件 popup.reportError.gitHub=報吿至 Github issue tracker -popup.reportError={0}\n\n為了幫助我們改進軟件，請在 https://github.com/bisq-network/bisq/issues 上打開一個新問題來報吿這個 bug 。\n\n當您單擊下面任意一個按鈕時，上面的錯誤消息將被複制到剪貼板。\n\n如果您通過按下“打開日誌文件”，保存一份副本，並將其附加到 bug 報吿中，如果包含 bisq.log 文件，那麼調試就會變得更容易。 +popup.reportError={0}\n\n為了幫助我們改進軟件，請在 https://github.com/bisq-network/bisq/issues 上打開一個新問題來報吿這個 bug 。\n\n當您單擊下面任意一個按鈕時，上面的錯誤消息將被複制到剪貼板。\n\n如果您通過按下“打開日誌文件”，保存一份副本，並將其附加到 bug 報吿中，如果包含 haveno.log 文件，那麼調試就會變得更容易。 popup.error.tryRestart=請嘗試重啟您的應用程序或者檢查您的網絡連接。 popup.error.takeOfferRequestFailed=當有人試圖接受你的報價時發生了一個錯誤：\n{0} @@ -1573,10 +1573,10 @@ error.closedTradeWithUnconfirmedDepositTx=交易 ID 為 {0} 的已關閉交易 error.closedTradeWithNoDepositTx=交易 ID 為 {0} 的保證金交易已被確認。\n\n請重新啟動應用程序來清理已關閉的交易列表。 popup.warning.walletNotInitialized=錢包至今未初始化 -popup.warning.osxKeyLoggerWarning=由於 MacOS 10.14 及更高版本中的安全措施更加嚴格，因此啟動 Java 應用程序（Bisq 使用Java）會在 MacOS 中引發彈出警吿（``Bisq 希望從任何應用程序接收擊鍵''）.\n\n為了避免該問題，請打開“ MacOS 設置”，然後轉到“安全和隱私”->“隱私”->“輸入監視”，然後從右側列表中刪除“ Bisq”。\n\n一旦解決了技術限制（所需的 Java 版本的 Java 打包程序尚未交付），Bisq將升級到新的 Java 版本，以避免該問題。 -popup.warning.wrongVersion=您這台電腦上可能有錯誤的 Bisq 版本。\n您的電腦的架構是：{0}\n您安裝的 Bisq 二進制文件是：{1}\n請關閉並重新安裝正確的版本（{2}）。 -popup.warning.incompatibleDB=我們檢測到不兼容的數據庫文件！\n\n那些數據庫文件與我們當前的代碼庫不兼容：\n{0}\n\n我們對損壞的文件進行了備份，並將默認值應用於新的數據庫版本。\n\n備份位於：\n{1}/db/backup_of_corrupted_data。\n\n請檢查您是否安裝了最新版本的 Bisq\n您可以下載：\nhttps://bisq.network/downloads\n\n請重新啟動應用程序。 -popup.warning.startupFailed.twoInstances=Bisq 已經在運行。 您不能運行兩個 Bisq 實例。 +popup.warning.osxKeyLoggerWarning=由於 MacOS 10.14 及更高版本中的安全措施更加嚴格，因此啟動 Java 應用程序（Haveno 使用Java）會在 MacOS 中引發彈出警吿（``Haveno 希望從任何應用程序接收擊鍵''）.\n\n為了避免該問題，請打開“ MacOS 設置”，然後轉到“安全和隱私”->“隱私”->“輸入監視”，然後從右側列表中刪除“ Haveno”。\n\n一旦解決了技術限制（所需的 Java 版本的 Java 打包程序尚未交付），Haveno將升級到新的 Java 版本，以避免該問題。 +popup.warning.wrongVersion=您這台電腦上可能有錯誤的 Haveno 版本。\n您的電腦的架構是：{0}\n您安裝的 Haveno 二進制文件是：{1}\n請關閉並重新安裝正確的版本（{2}）。 +popup.warning.incompatibleDB=我們檢測到不兼容的數據庫文件！\n\n那些數據庫文件與我們當前的代碼庫不兼容：\n{0}\n\n我們對損壞的文件進行了備份，並將默認值應用於新的數據庫版本。\n\n備份位於：\n{1}/db/backup_of_corrupted_data。\n\n請檢查您是否安裝了最新版本的 Haveno\n您可以下載：\nhttps://bisq.network/downloads\n\n請重新啟動應用程序。 +popup.warning.startupFailed.twoInstances=Haveno 已經在運行。 您不能運行兩個 Haveno 實例。 popup.warning.tradePeriod.halfReached=您與 ID {0} 的交易已達到最長交易期的一半，且仍未完成。\n\n交易期結束於 {1}\n\n請查看“業務/未完成交易”的交易狀態，以獲取更多信息。 popup.warning.tradePeriod.ended=您與 ID {0} 的已達到最長交易期，且未完成。\n\n交易期結束於 {1}\n\n請查看“業務/未完成交易”的交易狀態，以從調解員獲取更多信息。 popup.warning.noTradingAccountSetup.headline=您還沒有設置交易賬户 @@ -1586,7 +1586,7 @@ popup.warning.noMediatorsAvailable=沒有調解員可用。 popup.warning.notFullyConnected=您需要等到您完全連接到網絡\n在啟動時可能需要2分鐘。 popup.warning.notSufficientConnectionsToBtcNetwork=你需要等待至少有{0}個與比特幣網絡的連接點。 popup.warning.downloadNotComplete=您需要等待，直到丟失的比特幣區塊被下載完畢。 -popup.warning.chainNotSynced=Bisq 錢包區塊鏈高度沒有正確地同步。如果最近才打開應用，請等待一個新發布的比特幣區塊。\n\n你可以檢查區塊鏈高度在設置/網絡信息。如果經過了一個區塊但問題還是沒有解決，你應該及時的完成 SPV 鏈重新同步。https://bisq.wiki/Resyncing_SPV_file +popup.warning.chainNotSynced=Haveno 錢包區塊鏈高度沒有正確地同步。如果最近才打開應用，請等待一個新發布的比特幣區塊。\n\n你可以檢查區塊鏈高度在設置/網絡信息。如果經過了一個區塊但問題還是沒有解決，你應該及時的完成 SPV 鏈重新同步。https://bisq.wiki/Resyncing_SPV_file popup.warning.removeOffer=您確定要移除該報價嗎？\n如果您刪除該報價，{0} 的掛單費將會丟失。 popup.warning.tooLargePercentageValue=您不能設置100％或更大的百分比。 popup.warning.examplePercentageValue=請輸入百分比數字，如 5.4％ 是“5.4” @@ -1604,32 +1604,32 @@ popup.warning.nodeBanned=其中一個 {0} 節點已被禁用 # suppress inspection "UnusedProperty" popup.warning.priceRelay=價格傳遞 popup.warning.seed=種子 -popup.warning.mandatoryUpdate.trading=請更新到最新的 Bisq 版本。強制更新禁止了舊版本進行交易。更多信息請訪問 Bisq 論壇。 -popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers. +popup.warning.mandatoryUpdate.trading=請更新到最新的 Haveno 版本。強制更新禁止了舊版本進行交易。更多信息請訪問 Haveno 論壇。 +popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Haveno developers. popup.warning.burnBTC=這筆交易是無法實現，因為 {0} 的挖礦手續費用會超過 {1} 的轉賬金額。請等到挖礦手續費再次降低或您積累了更多的 BTC 來轉賬。 -popup.warning.openOffer.makerFeeTxRejected=交易 ID 為 {0} 的掛單費交易被比特幣網絡拒絕。\n交易 ID = {1}\n交易已被移至失敗交易。\n請到“設置/網絡信息”進行 SPV 重新同步。\n如需更多幫助，請聯繫 Bisq Keybase 團隊的 Support 頻道 +popup.warning.openOffer.makerFeeTxRejected=交易 ID 為 {0} 的掛單費交易被比特幣網絡拒絕。\n交易 ID = {1}\n交易已被移至失敗交易。\n請到“設置/網絡信息”進行 SPV 重新同步。\n如需更多幫助，請聯繫 Haveno Keybase 團隊的 Support 頻道 popup.warning.trade.txRejected.tradeFee=交易手續費 popup.warning.trade.txRejected.deposit=押金 -popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team. +popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team. -popup.warning.openOfferWithInvalidMakerFeeTx=交易 ID 為 {0} 的掛單費交易無效。\n交易 ID = {1}。\n請到“設置/網絡信息”進行 SPV 重新同步。\n如需更多幫助，請聯繫 Bisq Keybase 團隊的 Support 頻道 +popup.warning.openOfferWithInvalidMakerFeeTx=交易 ID 為 {0} 的掛單費交易無效。\n交易 ID = {1}。\n請到“設置/網絡信息”進行 SPV 重新同步。\n如需更多幫助，請聯繫 Haveno Keybase 團隊的 Support 頻道 -popup.info.securityDepositInfo=為了確保雙方都遵守交易協議，雙方都需要支付保證金。\n\n這筆存款一直保存在您的交易錢包裏，直到您的交易成功完成，然後再退還給您。\n\n請注意：如果您正在創建一個新的報價，Bisq 需要運行另一個交易員接受它。為了讓您的報價在線，保持 Bisq 運行，並確保這台計算機也在線（即，確保它沒有切換到待機模式…顯示器可以待機）。 +popup.info.securityDepositInfo=為了確保雙方都遵守交易協議，雙方都需要支付保證金。\n\n這筆存款一直保存在您的交易錢包裏，直到您的交易成功完成，然後再退還給您。\n\n請注意：如果您正在創建一個新的報價，Haveno 需要運行另一個交易員接受它。為了讓您的報價在線，保持 Haveno 運行，並確保這台計算機也在線（即，確保它沒有切換到待機模式…顯示器可以待機）。 popup.info.cashDepositInfo=請確保您在您的地區有一個銀行分行，以便能夠進行現金存款。\n賣方銀行的銀行 ID（BIC/SWIFT）為：{0}。 popup.info.cashDepositInfo.confirm=我確認我可以支付保證金 -popup.info.shutDownWithOpenOffers=Bisq 正在被關閉，但仍有公開的報價。\n\n當 Bisq 關閉時，這些提供將不能在 P2P 網絡上使用，但是它們將在您下次啟動 Bisq 時重新發布到 P2P 網絡上。\n\n為了讓您的報價在線，保持 Bisq 運行，並確保這台計算機也在線（即，確保它不會進入待機模式…顯示器待機不是問題）。 -popup.info.qubesOSSetupInfo=你似乎好像在 Qubes OS 上運行 Bisq。\n\n請確保您的 Bisq qube 是參考設置指南的説明設置的 https://bisq.wiki/Running_Bisq_on_Qubes -popup.warn.downGradePrevention=不支持從 {0} 版本降級到 {1} 版本。請使用最新的 Bisq 版本。 +popup.info.shutDownWithOpenOffers=Haveno 正在被關閉，但仍有公開的報價。\n\n當 Haveno 關閉時，這些提供將不能在 P2P 網絡上使用，但是它們將在您下次啟動 Haveno 時重新發布到 P2P 網絡上。\n\n為了讓您的報價在線，保持 Haveno 運行，並確保這台計算機也在線（即，確保它不會進入待機模式…顯示器待機不是問題）。 +popup.info.qubesOSSetupInfo=你似乎好像在 Qubes OS 上運行 Haveno。\n\n請確保您的 Haveno qube 是參考設置指南的説明設置的 https://bisq.wiki/Running_Haveno_on_Qubes +popup.warn.downGradePrevention=不支持從 {0} 版本降級到 {1} 版本。請使用最新的 Haveno 版本。 popup.privateNotification.headline=重要私人通知！ popup.securityRecommendation.headline=重要安全建議 popup.securityRecommendation.msg=如果您還沒有啟用，我們想提醒您考慮為您的錢包使用密碼保護。\n\n強烈建議你寫下錢包還原密鑰。 那些還原密鑰就是恢復你的比特幣錢包的主密碼。\n在“錢包密鑰”部分，您可以找到更多信息\n\n此外，您應該在“備份”界面備份完整的應用程序數據文件夾。 -popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) +popup.bitcoinLocalhostNode.msg=Haveno detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Haveno\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf) popup.shutDownInProgress.headline=正在關閉 popup.shutDownInProgress.msg=關閉應用可能會花一點時間。\n請不要打斷關閉過程。 @@ -1692,7 +1692,7 @@ notification.walletUpdate.headline=交易錢包更新 notification.walletUpdate.msg=您的交易錢包充值成功。\n金額：{0} notification.takeOffer.walletUpdate.msg=您的交易錢包已經從早期的下單嘗試中得到足夠的資金支持。\n金額：{0} notification.tradeCompleted.headline=交易完成 -notification.tradeCompleted.msg=您現在可以提現您的資金到您的外部比特幣錢包或者劃轉它到 Bisq 錢包。 +notification.tradeCompleted.msg=您現在可以提現您的資金到您的外部比特幣錢包或者劃轉它到 Haveno 錢包。 #################################################################### @@ -1701,9 +1701,9 @@ notification.tradeCompleted.msg=您現在可以提現您的資金到您的外部 systemTray.show=顯示應用程序窗口 systemTray.hide=隱藏應用程序窗口 -systemTray.info=關於 Bisq 信息 +systemTray.info=關於 Haveno 信息 systemTray.exit=退出 -systemTray.tooltip=Bisq：去中心化比特幣交易網絡 +systemTray.tooltip=Haveno：去中心化比特幣交易網絡 #################################################################### @@ -1845,7 +1845,7 @@ password.deriveKey=從密碼中提取密鑰 password.walletDecrypted=錢包成功解密並移除密碼保護 password.wrongPw=你輸入了錯誤的密碼。\n\n請再次嘗試輸入密碼，仔細檢查拼寫錯誤。 password.walletEncrypted=錢包成功加密並開啟密碼保護。 -password.walletEncryptionFailed=無法設置錢包密碼。您可能導入了與錢包數據庫不匹配的還原密鑰。請在 Keybase 上聯繫開發者（https://keybase.io/team/bisq]） +password.walletEncryptionFailed=無法設置錢包密碼。您可能導入了與錢包數據庫不匹配的還原密鑰。請在 Keybase 上聯繫開發者（https://keybase.io/team/haveno]） password.passwordsDoNotMatch=這2個密碼您輸入的不相同 password.forgotPassword=忘記密碼？ password.backupReminder=請注意，設置錢包密碼時，所有未加密的錢包的自動創建的備份將被刪除。\n\n強烈建議您備份應用程序的目錄，並在設置密碼之前記下您的還原密鑰！ @@ -1863,7 +1863,7 @@ seed.warn.walletNotEmpty.msg=你的比特幣錢包不是空的。\n\n在嘗試 seed.warn.walletNotEmpty.restore=無論如何我要恢復 seed.warn.walletNotEmpty.emptyWallet=我先清空我的錢包 seed.warn.notEncryptedAnymore=你的錢包被加密了。\n\n恢復後，錢包將不再加密，您必須設置新的密碼。\n\n你要繼續嗎？ -seed.warn.walletDateEmpty=由於您尚未指定錢包日期，因此 Bisq 將必須掃描 2013.10.09（BIP39創始日期）之後的區塊鏈。\n\nBIP39 錢包於 Bisq 於 2017.06.28 首次發佈（版本 v0.5）。因此，您可以使用該日期來節省時間。\n\n理想情況下，您應指定創建錢包種子的日期。\n\n\n您確定要繼續而不指定錢包日期嗎？ +seed.warn.walletDateEmpty=由於您尚未指定錢包日期，因此 Haveno 將必須掃描 2013.10.09（BIP39創始日期）之後的區塊鏈。\n\nBIP39 錢包於 Haveno 於 2017.06.28 首次發佈（版本 v0.5）。因此，您可以使用該日期來節省時間。\n\n理想情況下，您應指定創建錢包種子的日期。\n\n\n您確定要繼續而不指定錢包日期嗎？ seed.restore.success=新的還原密鑰成功地恢復了錢包。\n\n您需要關閉並重新啟動應用程序。 seed.restore.error=使用還原密鑰恢復錢包時出現錯誤。{0} seed.restore.openOffers.warn=您有公開報價，如果您從種子詞恢復，則這些報價將被刪除。\n您確定要繼續嗎？ @@ -1949,17 +1949,17 @@ payment.accountType=賬户類型 payment.checking=檢查 payment.savings=保存 payment.personalId=個人 ID -payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.clearXchange.info=Zelle是一項轉賬服務，轉賬到其他銀行做的很好。\n\n1.檢查此頁面以查看您的銀行是否（以及如何）與 Zelle 合作：\nhttps://www.zellepay.com/get-started\n\n2.特別注意您的轉賬限額-匯款限額因銀行而異，銀行通常分別指定每日，每週和每月的限額。\n\n3.如果您的銀行不能使用 Zelle，您仍然可以通過 Zelle 移動應用程序使用它，但是您的轉賬限額會低得多。\n\n4.您的 Bisq 帳户上指定的名稱必須與 Zelle/銀行帳户上的名稱匹配。 \n\n如果您無法按照貿易合同中的規定完成 Zelle 交易，則可能會損失部分（或全部）保證金。\n\n由於 Zelle 的拒付風險較高，因此建議賣家通過電子郵件或 SMS 與未簽名的買家聯繫，以確認買家確實擁有 Bisq 中指定的 Zelle 帳户。 -payment.fasterPayments.newRequirements.info=有些銀行已經開始核實快捷支付收款人的全名。您當前的快捷支付帳户沒有填寫全名。\n\n請考慮在 Bisq 中重新創建您的快捷支付帳户，為將來的 {0} 買家提供一個完整的姓名。\n\n重新創建帳户時，請確保將銀行區號、帳户編號和帳齡驗證鹽值從舊帳户複製到新帳户。這將確保您現有的帳齡和簽名狀態得到保留。 +payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- make offers >{0}, so you only deal with signed/trusted buyers\n- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nHaveno developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.clearXchange.info=Zelle是一項轉賬服務，轉賬到其他銀行做的很好。\n\n1.檢查此頁面以查看您的銀行是否（以及如何）與 Zelle 合作：\nhttps://www.zellepay.com/get-started\n\n2.特別注意您的轉賬限額-匯款限額因銀行而異，銀行通常分別指定每日，每週和每月的限額。\n\n3.如果您的銀行不能使用 Zelle，您仍然可以通過 Zelle 移動應用程序使用它，但是您的轉賬限額會低得多。\n\n4.您的 Haveno 帳户上指定的名稱必須與 Zelle/銀行帳户上的名稱匹配。 \n\n如果您無法按照貿易合同中的規定完成 Zelle 交易，則可能會損失部分（或全部）保證金。\n\n由於 Zelle 的拒付風險較高，因此建議賣家通過電子郵件或 SMS 與未簽名的買家聯繫，以確認買家確實擁有 Haveno 中指定的 Zelle 帳户。 +payment.fasterPayments.newRequirements.info=有些銀行已經開始核實快捷支付收款人的全名。您當前的快捷支付帳户沒有填寫全名。\n\n請考慮在 Haveno 中重新創建您的快捷支付帳户，為將來的 {0} 買家提供一個完整的姓名。\n\n重新創建帳户時，請確保將銀行區號、帳户編號和帳齡驗證鹽值從舊帳户複製到新帳户。這將確保您現有的帳齡和簽名狀態得到保留。 payment.moneyGram.info=使用 MoneyGram 時，BTC 買方必須將授權號碼和收據的照片通過電子郵件發送給 BTC 賣方。收據必須清楚地顯示賣方的全名、國家或地區、州和金額。買方將在交易過程中顯示賣方的電子郵件。 payment.westernUnion.info=使用 Western Union 時，BTC 買方必須通過電子郵件將 MTCN（運單號）和收據照片發送給 BTC 賣方。收據上必須清楚地顯示賣方的全名、城市、國家或地區和金額。買方將在交易過程中顯示賣方的電子郵件。 payment.halCash.info=使用 HalCash 時，BTC 買方需要通過手機短信向 BTC 賣方發送 HalCash 代碼。\n\n請確保不要超過銀行允許您用半現金匯款的最高金額。每次取款的最低金額是 10 歐元，最高金額是 10 歐元。金額是 600 歐元。對於重複取款，每天每個接收者 3000 歐元，每月每個接收者 6000 歐元。請與您的銀行核對這些限額，以確保它們使用與此處所述相同的限額。\n\n提現金額必須是 10 歐元的倍數，因為您不能從 ATM 機提取其他金額。 創建報價和下單屏幕中的 UI 將調整 BTC 金額，使 EUR 金額正確。你不能使用基於市場的價格，因為歐元的數量會隨着價格的變化而變化。\n # suppress inspection "UnusedMessageFormatParameter" -payment.limits.info=請注意，所有銀行轉賬都有一定的退款風險。為了降低這一風險，Bisq 基於使用的付款方式的退款風險。\n\n對於付款方式，您的每筆交易的出售和購買的限額為{2}\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Bisq Wiki 查看更多信息[HYPERLINK:https://bisq.wiki/Account_limits]。 +payment.limits.info=請注意，所有銀行轉賬都有一定的退款風險。為了降低這一風險，Haveno 基於使用的付款方式的退款風險。\n\n對於付款方式，您的每筆交易的出售和購買的限額為{2}\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Haveno Wiki 查看更多信息[HYPERLINK:https://bisq.wiki/Account_limits]。 # suppress inspection "UnusedProperty" -payment.limits.info.withSigning=為了降低這一風險，Bisq 基於兩個因素對該付款方式每筆交易設置了限制：\n\n1. 使用的付款方法的預估退款風險水平\n2. 您的付款方式的賬齡\n\n這個付款賬户還沒有被驗證，所以他每個交易最多購買{0}。在驗證之後，購買限制會以以下規則逐漸增加：\n\n●簽署前，以及簽署後30天內，您的每筆最大交易將限制為{0}\n●簽署後30天，每筆最大交易將限制為{1}\n●簽署後60天，每筆最大交易將限制為{2}\n\n出售限制不會被賬户驗證狀態限制，你可以理科進行單筆為{2}的交易\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Bisq Wiki 上查看更多：\nhttps://bisq.wiki/Account_limits +payment.limits.info.withSigning=為了降低這一風險，Haveno 基於兩個因素對該付款方式每筆交易設置了限制：\n\n1. 使用的付款方法的預估退款風險水平\n2. 您的付款方式的賬齡\n\n這個付款賬户還沒有被驗證，所以他每個交易最多購買{0}。在驗證之後，購買限制會以以下規則逐漸增加：\n\n●簽署前，以及簽署後30天內，您的每筆最大交易將限制為{0}\n●簽署後30天，每筆最大交易將限制為{1}\n●簽署後60天，每筆最大交易將限制為{2}\n\n出售限制不會被賬户驗證狀態限制，你可以理科進行單筆為{2}的交易\n\n限制只應用在單筆交易，你可以儘可能多的進行交易。\n\n在 Haveno Wiki 上查看更多：\nhttps://bisq.wiki/Account_limits payment.cashDeposit.info=請確認您的銀行允許您將現金存款匯入他人賬户。例如，美國銀行和富國銀行不再允許此類存款。 @@ -1971,9 +1971,9 @@ payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the cou payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status. payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account -payment.usPostalMoneyOrder.info=在 Bisq 上交易 US Postal Money Orders （USPMO）您必須理解下述條款：\n\n- BTC 買方必須在發送方和收款人字段中都寫上 BTC 賣方的名稱，並在發送之前對 USPMO 和信封進行高分辨率照片拍照，並帶有跟蹤證明。\n- BTC 買方必須將 USPMO 連同交貨確認書一起發送給 BTC 賣方。\n\n如果需要調解，或有交易糾紛，您將需要將照片連同 USPMO 編號，郵局編號和交易金額一起發送給 Bisq 調解員或退款代理，以便他們進行驗證美國郵局網站上的詳細信息。\n\n如未能提供要求的交易數據將在糾紛中直接判負\n\n在所有爭議案件中，USPMO 發送方在向調解人或仲裁員提供證據/證明時承擔 100％ 的責任。\n\n如果您不理解這些要求，請不要在 Bisq 上使用 USPMO 進行交易。 +payment.usPostalMoneyOrder.info=在 Haveno 上交易 US Postal Money Orders （USPMO）您必須理解下述條款：\n\n- BTC 買方必須在發送方和收款人字段中都寫上 BTC 賣方的名稱，並在發送之前對 USPMO 和信封進行高分辨率照片拍照，並帶有跟蹤證明。\n- BTC 買方必須將 USPMO 連同交貨確認書一起發送給 BTC 賣方。\n\n如果需要調解，或有交易糾紛，您將需要將照片連同 USPMO 編號，郵局編號和交易金額一起發送給 Haveno 調解員或退款代理，以便他們進行驗證美國郵局網站上的詳細信息。\n\n如未能提供要求的交易數據將在糾紛中直接判負\n\n在所有爭議案件中，USPMO 發送方在向調解人或仲裁員提供證據/證明時承擔 100％ 的責任。\n\n如果您不理解這些要求，請不要在 Haveno 上使用 USPMO 進行交易。 -payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq. +payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno. payment.cashByMail.contact=聯繫方式 payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to @@ -1996,7 +1996,7 @@ payment.japan.recipient=名稱 payment.australia.payid=PayID payment.payid=PayID 需鏈接至金融機構。例如電子郵件地址或手機。 payment.payid.info=PayID，如電話號碼、電子郵件地址或澳大利亞商業號碼（ABN），您可以安全地連接到您的銀行、信用合作社或建立社會帳户。你需要在你的澳大利亞金融機構創建一個 PayID。發送和接收金融機構都必須支持 PayID。更多信息請查看[HYPERLINK:https://payid.com.au/faqs/] -payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) +payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nHaveno will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it) # We use constants from the code so we do not use our normal naming convention diff --git a/core/src/test/java/bisq/core/account/sign/SignedWitnessServiceTest.java b/core/src/test/java/haveno/core/account/sign/SignedWitnessServiceTest.java similarity index 96% rename from core/src/test/java/bisq/core/account/sign/SignedWitnessServiceTest.java rename to core/src/test/java/haveno/core/account/sign/SignedWitnessServiceTest.java index 3565a4bc..be20dc12 100644 --- a/core/src/test/java/bisq/core/account/sign/SignedWitnessServiceTest.java +++ b/core/src/test/java/haveno/core/account/sign/SignedWitnessServiceTest.java @@ -15,26 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.core.account.sign; +package haveno.core.account.sign; -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.filter.FilterManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.Sig; -import bisq.common.util.Utilities; - import org.bitcoinj.core.ECKey; import com.google.common.base.Charsets; - +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.Sig; +import haveno.common.util.Utilities; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.filter.FilterManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; import java.math.BigInteger; import java.security.KeyPair; @@ -46,8 +44,8 @@ import java.util.Date; import org.junit.Before; import org.junit.Test; -import static bisq.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR; -import static bisq.core.account.sign.SignedWitness.VerificationMethod.TRADE; +import static haveno.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR; +import static haveno.core.account.sign.SignedWitness.VerificationMethod.TRADE; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; diff --git a/core/src/test/java/bisq/core/account/sign/SignedWitnessTest.java b/core/src/test/java/haveno/core/account/sign/SignedWitnessTest.java similarity index 87% rename from core/src/test/java/bisq/core/account/sign/SignedWitnessTest.java rename to core/src/test/java/haveno/core/account/sign/SignedWitnessTest.java index 7b4381c8..a259a236 100644 --- a/core/src/test/java/bisq/core/account/sign/SignedWitnessTest.java +++ b/core/src/test/java/haveno/core/account/sign/SignedWitnessTest.java @@ -1,20 +1,19 @@ -package bisq.core.account.sign; - -import bisq.common.crypto.Sig; -import bisq.common.util.Utilities; +package haveno.core.account.sign; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; import com.google.common.base.Charsets; - +import haveno.common.crypto.Sig; +import haveno.common.util.Utilities; +import haveno.core.account.sign.SignedWitness; import java.time.Instant; import org.junit.Before; import org.junit.Test; -import static bisq.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR; -import static bisq.core.account.sign.SignedWitness.VerificationMethod.TRADE; +import static haveno.core.account.sign.SignedWitness.VerificationMethod.ARBITRATOR; +import static haveno.core.account.sign.SignedWitness.VerificationMethod.TRADE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/bisq/core/account/witness/AccountAgeWitnessServiceTest.java b/core/src/test/java/haveno/core/account/witness/AccountAgeWitnessServiceTest.java similarity index 92% rename from core/src/test/java/bisq/core/account/witness/AccountAgeWitnessServiceTest.java rename to core/src/test/java/haveno/core/account/witness/AccountAgeWitnessServiceTest.java index ce65fb36..7dda5e85 100644 --- a/core/src/test/java/bisq/core/account/witness/AccountAgeWitnessServiceTest.java +++ b/core/src/test/java/haveno/core/account/witness/AccountAgeWitnessServiceTest.java @@ -15,35 +15,35 @@ * along with Haveno. If not, see . */ -package bisq.core.account.witness; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.filter.FilterManager; -import bisq.core.locale.CountryUtil; -import bisq.core.offer.OfferPayload; -import bisq.core.payment.ChargeBackRisk; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SepaAccountPayload; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.arbitration.TraderDataItem; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Hash; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; -import bisq.common.util.Utilities; +package haveno.core.account.witness; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Hash; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.common.util.Utilities; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.filter.FilterManager; +import haveno.core.locale.CountryUtil; +import haveno.core.offer.OfferPayload; +import haveno.core.payment.ChargeBackRisk; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SepaAccountPayload; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.arbitration.TraderDataItem; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; import org.bitcoinj.core.ECKey; import java.security.KeyPair; @@ -63,7 +63,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import static bisq.core.payment.payload.PaymentMethod.getPaymentMethod; +import static haveno.core.payment.payload.PaymentMethod.getPaymentMethod; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/core/src/test/java/bisq/core/app/HavenoHelpFormatterTest.java b/core/src/test/java/haveno/core/app/HavenoHelpFormatterTest.java similarity index 94% rename from core/src/test/java/bisq/core/app/HavenoHelpFormatterTest.java rename to core/src/test/java/haveno/core/app/HavenoHelpFormatterTest.java index 7a2f7b92..efcc9628 100644 --- a/core/src/test/java/bisq/core/app/HavenoHelpFormatterTest.java +++ b/core/src/test/java/haveno/core/app/HavenoHelpFormatterTest.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.app; - -import bisq.common.config.HavenoHelpFormatter; +package haveno.core.app; import joptsimple.OptionParser; @@ -36,6 +34,8 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; +import haveno.common.config.HavenoHelpFormatter; + public class HavenoHelpFormatterTest { @Test @@ -43,13 +43,13 @@ public class HavenoHelpFormatterTest { OptionParser parser = new OptionParser(); - parser.formatHelpWith(new HavenoHelpFormatter("Bisq Test", "bisq-test", "0.1.0")); + parser.formatHelpWith(new HavenoHelpFormatter("Haveno Test", "haveno-test", "0.1.0")); parser.accepts("name", - "The name of the Bisq node") + "The name of the Haveno node") .withRequiredArg() .ofType(String.class) - .defaultsTo("Bisq"); + .defaultsTo("Haveno"); parser.accepts("another-option", "This is a long description which will need to break over multiple linessssssssssss such " + @@ -116,7 +116,7 @@ public class HavenoHelpFormatterTest { "Application data directory") .withRequiredArg() .ofType(File.class) - .defaultsTo(new File("/Users/cbeams/Library/Application Support/Bisq")); + .defaultsTo(new File("/Users/cbeams/Library/Application Support/Haveno")); parser.accepts("enum-opt", "Some option that accepts an enum value as an argument") diff --git a/core/src/test/java/bisq/core/arbitration/ArbitratorManagerTest.java b/core/src/test/java/haveno/core/arbitration/ArbitratorManagerTest.java similarity index 91% rename from core/src/test/java/bisq/core/arbitration/ArbitratorManagerTest.java rename to core/src/test/java/haveno/core/arbitration/ArbitratorManagerTest.java index 7cf1c434..34169f44 100644 --- a/core/src/test/java/bisq/core/arbitration/ArbitratorManagerTest.java +++ b/core/src/test/java/haveno/core/arbitration/ArbitratorManagerTest.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.core.arbitration; - -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorService; -import bisq.core.user.User; - -import bisq.network.p2p.NodeAddress; +package haveno.core.arbitration; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorService; +import haveno.core.user.User; +import haveno.network.p2p.NodeAddress; import java.util.ArrayList; import org.junit.Test; diff --git a/core/src/test/java/bisq/core/arbitration/ArbitratorTest.java b/core/src/test/java/haveno/core/arbitration/ArbitratorTest.java similarity index 85% rename from core/src/test/java/bisq/core/arbitration/ArbitratorTest.java rename to core/src/test/java/haveno/core/arbitration/ArbitratorTest.java index e5b8de08..2186b546 100644 --- a/core/src/test/java/bisq/core/arbitration/ArbitratorTest.java +++ b/core/src/test/java/haveno/core/arbitration/ArbitratorTest.java @@ -15,16 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.core.arbitration; - -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.PubKeyRing; +package haveno.core.arbitration; import com.google.common.collect.Lists; - +import haveno.common.crypto.PubKeyRing; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.network.p2p.NodeAddress; import org.apache.commons.lang3.RandomUtils; import java.util.Date; @@ -34,7 +30,7 @@ import org.junit.Ignore; @SuppressWarnings({"SameParameterValue", "UnusedAssignment"}) public class ArbitratorTest { - @Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") + @Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") public void testRoundtrip() { Arbitrator arbitrator = getArbitratorMock(); diff --git a/core/src/test/java/bisq/core/arbitration/MediatorTest.java b/core/src/test/java/haveno/core/arbitration/MediatorTest.java similarity index 80% rename from core/src/test/java/bisq/core/arbitration/MediatorTest.java rename to core/src/test/java/haveno/core/arbitration/MediatorTest.java index b29506b8..846be128 100644 --- a/core/src/test/java/bisq/core/arbitration/MediatorTest.java +++ b/core/src/test/java/haveno/core/arbitration/MediatorTest.java @@ -15,25 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.core.arbitration; +package haveno.core.arbitration; -import bisq.core.support.dispute.mediation.mediator.Mediator; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.PubKeyRing; +import static haveno.core.arbitration.ArbitratorTest.getBytes; import com.google.common.collect.Lists; - +import haveno.common.crypto.PubKeyRing; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.network.p2p.NodeAddress; import java.util.Date; import org.junit.Ignore; -import static bisq.core.arbitration.ArbitratorTest.getBytes; - public class MediatorTest { - @Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") + @Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") public void testRoundtrip() { Mediator Mediator = getMediatorMock(); diff --git a/core/src/test/java/bisq/core/arbitration/TraderDataItemTest.java b/core/src/test/java/haveno/core/arbitration/TraderDataItemTest.java similarity index 91% rename from core/src/test/java/bisq/core/arbitration/TraderDataItemTest.java rename to core/src/test/java/haveno/core/arbitration/TraderDataItemTest.java index 3b3ff01f..04df2913 100644 --- a/core/src/test/java/bisq/core/arbitration/TraderDataItemTest.java +++ b/core/src/test/java/haveno/core/arbitration/TraderDataItemTest.java @@ -1,8 +1,4 @@ -package bisq.core.arbitration; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.support.dispute.arbitration.TraderDataItem; -import bisq.core.payment.payload.PaymentAccountPayload; +package haveno.core.arbitration; import java.math.BigInteger; import java.security.PublicKey; @@ -14,6 +10,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.mockito.Mockito.mock; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.support.dispute.arbitration.TraderDataItem; + /* * This file is part of Haveno. * diff --git a/core/src/test/java/bisq/core/btc/nodes/BtcNetworkConfigTest.java b/core/src/test/java/haveno/core/btc/nodes/BtcNetworkConfigTest.java similarity index 93% rename from core/src/test/java/bisq/core/btc/nodes/BtcNetworkConfigTest.java rename to core/src/test/java/haveno/core/btc/nodes/BtcNetworkConfigTest.java index c6ce7223..381a8236 100644 --- a/core/src/test/java/bisq/core/btc/nodes/BtcNetworkConfigTest.java +++ b/core/src/test/java/haveno/core/btc/nodes/BtcNetworkConfigTest.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.core.btc.setup.WalletConfig; - -import bisq.network.Socks5MultiDiscovery; +package haveno.core.btc.nodes; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.core.PeerAddress; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.core.btc.nodes.BtcNetworkConfig; +import haveno.core.btc.setup.WalletConfig; +import haveno.network.Socks5MultiDiscovery; import java.util.Collections; import org.junit.Before; diff --git a/core/src/test/java/bisq/core/btc/nodes/BtcNodeConverterTest.java b/core/src/test/java/haveno/core/btc/nodes/BtcNodeConverterTest.java similarity index 92% rename from core/src/test/java/bisq/core/btc/nodes/BtcNodeConverterTest.java rename to core/src/test/java/haveno/core/btc/nodes/BtcNodeConverterTest.java index 87e7b9c8..5aa948f6 100644 --- a/core/src/test/java/bisq/core/btc/nodes/BtcNodeConverterTest.java +++ b/core/src/test/java/haveno/core/btc/nodes/BtcNodeConverterTest.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.core.btc.nodes.BtcNodeConverter.Facade; -import bisq.core.btc.nodes.BtcNodes.BtcNode; - -import bisq.network.DnsLookupException; +package haveno.core.btc.nodes; import org.bitcoinj.core.PeerAddress; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.core.btc.nodes.BtcNodeConverter; +import haveno.core.btc.nodes.BtcNodeConverter.Facade; +import haveno.core.btc.nodes.BtcNodes.BtcNode; +import haveno.network.DnsLookupException; import java.net.InetAddress; import org.junit.Test; diff --git a/core/src/test/java/bisq/core/btc/nodes/BtcNodesRepositoryTest.java b/core/src/test/java/haveno/core/btc/nodes/BtcNodesRepositoryTest.java similarity index 95% rename from core/src/test/java/bisq/core/btc/nodes/BtcNodesRepositoryTest.java rename to core/src/test/java/haveno/core/btc/nodes/BtcNodesRepositoryTest.java index 8f5cfef7..b18b2075 100644 --- a/core/src/test/java/bisq/core/btc/nodes/BtcNodesRepositoryTest.java +++ b/core/src/test/java/haveno/core/btc/nodes/BtcNodesRepositoryTest.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.core.btc.nodes.BtcNodes.BtcNode; +package haveno.core.btc.nodes; import org.bitcoinj.core.PeerAddress; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.core.btc.nodes.BtcNodeConverter; +import haveno.core.btc.nodes.BtcNodesRepository; +import haveno.core.btc.nodes.BtcNodes.BtcNode; import com.google.common.collect.Lists; import java.util.Collections; diff --git a/core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java b/core/src/test/java/haveno/core/btc/nodes/BtcNodesSetupPreferencesTest.java similarity index 84% rename from core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java rename to core/src/test/java/haveno/core/btc/nodes/BtcNodesSetupPreferencesTest.java index 035cf5f6..0b9b4892 100644 --- a/core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java +++ b/core/src/test/java/haveno/core/btc/nodes/BtcNodesSetupPreferencesTest.java @@ -15,22 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.nodes; - -import bisq.core.btc.nodes.BtcNodes.BtcNode; -import bisq.core.user.Preferences; +package haveno.core.btc.nodes; import java.util.List; import org.junit.Test; -import static bisq.core.btc.nodes.BtcNodes.BitcoinNodesOption.CUSTOM; -import static bisq.core.btc.nodes.BtcNodes.BitcoinNodesOption.PUBLIC; +import static haveno.core.btc.nodes.BtcNodes.BitcoinNodesOption.CUSTOM; +import static haveno.core.btc.nodes.BtcNodes.BitcoinNodesOption.PUBLIC; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import haveno.core.btc.nodes.BtcNodes; +import haveno.core.btc.nodes.BtcNodesSetupPreferences; +import haveno.core.btc.nodes.BtcNodes.BtcNode; +import haveno.core.user.Preferences; + public class BtcNodesSetupPreferencesTest { @Test public void testSelectPreferredNodesWhenPublicOption() { diff --git a/core/src/test/java/bisq/core/btc/wallet/RestrictionsTest.java b/core/src/test/java/haveno/core/btc/wallet/RestrictionsTest.java similarity index 95% rename from core/src/test/java/bisq/core/btc/wallet/RestrictionsTest.java rename to core/src/test/java/haveno/core/btc/wallet/RestrictionsTest.java index fc08dff3..4da12048 100644 --- a/core/src/test/java/bisq/core/btc/wallet/RestrictionsTest.java +++ b/core/src/test/java/haveno/core/btc/wallet/RestrictionsTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.btc.wallet; +package haveno.core.btc.wallet; import org.bitcoinj.core.Coin; @@ -24,6 +24,8 @@ import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import haveno.core.btc.wallet.Restrictions; + @SuppressWarnings("ConstantConditions") public class RestrictionsTest { @Test diff --git a/core/src/test/java/bisq/core/crypto/EncryptionTest.java b/core/src/test/java/haveno/core/crypto/EncryptionTest.java similarity index 90% rename from core/src/test/java/bisq/core/crypto/EncryptionTest.java rename to core/src/test/java/haveno/core/crypto/EncryptionTest.java index 5ff236ff..314848d4 100644 --- a/core/src/test/java/bisq/core/crypto/EncryptionTest.java +++ b/core/src/test/java/haveno/core/crypto/EncryptionTest.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.core.crypto; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.file.FileUtil; +package haveno.core.crypto; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; - +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.file.FileUtil; import java.io.File; import java.io.IOException; diff --git a/core/src/test/java/bisq/core/crypto/SigTest.java b/core/src/test/java/haveno/core/crypto/SigTest.java similarity index 91% rename from core/src/test/java/bisq/core/crypto/SigTest.java rename to core/src/test/java/haveno/core/crypto/SigTest.java index d93a29c1..73ab38d0 100644 --- a/core/src/test/java/bisq/core/crypto/SigTest.java +++ b/core/src/test/java/haveno/core/crypto/SigTest.java @@ -15,13 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.crypto; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.crypto.Sig; -import bisq.common.file.FileUtil; +package haveno.core.crypto; import java.io.File; import java.io.IOException; @@ -37,6 +31,12 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.crypto.Sig; +import haveno.common.file.FileUtil; + public class SigTest { private static final Logger log = LoggerFactory.getLogger(SigTest.class); private KeyRing keyRing; diff --git a/core/src/test/java/bisq/core/locale/BankUtilTest.java b/core/src/test/java/haveno/core/locale/BankUtilTest.java similarity index 91% rename from core/src/test/java/bisq/core/locale/BankUtilTest.java rename to core/src/test/java/haveno/core/locale/BankUtilTest.java index a3403f5b..b0ca697f 100644 --- a/core/src/test/java/bisq/core/locale/BankUtilTest.java +++ b/core/src/test/java/haveno/core/locale/BankUtilTest.java @@ -1,4 +1,4 @@ -package bisq.core.locale; +package haveno.core.locale; import java.util.Locale; @@ -9,6 +9,10 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import haveno.core.locale.BankUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; + public class BankUtilTest { @Before diff --git a/core/src/test/java/bisq/core/locale/CurrencyUtilTest.java b/core/src/test/java/haveno/core/locale/CurrencyUtilTest.java similarity index 93% rename from core/src/test/java/bisq/core/locale/CurrencyUtilTest.java rename to core/src/test/java/haveno/core/locale/CurrencyUtilTest.java index dc86b296..dbbfa9e4 100644 --- a/core/src/test/java/bisq/core/locale/CurrencyUtilTest.java +++ b/core/src/test/java/haveno/core/locale/CurrencyUtilTest.java @@ -15,15 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; - -import bisq.common.config.BaseCurrencyNetwork; - -import bisq.asset.Asset; -import bisq.asset.AssetRegistry; -import bisq.asset.Coin; -import bisq.asset.coins.Ether; +package haveno.core.locale; +import haveno.asset.Asset; +import haveno.asset.AssetRegistry; +import haveno.asset.Coin; +import haveno.asset.coins.Ether; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/core/src/test/java/bisq/core/locale/MockTestnetCoin.java b/core/src/test/java/haveno/core/locale/MockTestnetCoin.java similarity index 93% rename from core/src/test/java/bisq/core/locale/MockTestnetCoin.java rename to core/src/test/java/haveno/core/locale/MockTestnetCoin.java index c40bd250..151c7444 100644 --- a/core/src/test/java/bisq/core/locale/MockTestnetCoin.java +++ b/core/src/test/java/haveno/core/locale/MockTestnetCoin.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.core.locale; +package haveno.core.locale; +import haveno.asset.AddressValidationResult; +import haveno.asset.Base58AddressValidator; +import haveno.asset.Coin; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.params.MainNetParams; import org.bitcoinj.params.RegTestParams; import org.bitcoinj.params.TestNet3Params; - - -import bisq.asset.AddressValidationResult; -import bisq.asset.Base58AddressValidator; -import bisq.asset.Coin; - public class MockTestnetCoin extends Coin { public MockTestnetCoin(Network network, NetworkParameters networkParameters) { diff --git a/core/src/test/java/bisq/core/message/MarshallerTest.java b/core/src/test/java/haveno/core/message/MarshallerTest.java similarity index 98% rename from core/src/test/java/bisq/core/message/MarshallerTest.java rename to core/src/test/java/haveno/core/message/MarshallerTest.java index ce83ab9e..e70f13ad 100644 --- a/core/src/test/java/bisq/core/message/MarshallerTest.java +++ b/core/src/test/java/haveno/core/message/MarshallerTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.message; +package haveno.core.message; import java.io.ByteArrayInputStream; diff --git a/core/src/test/java/bisq/core/monetary/PriceTest.java b/core/src/test/java/haveno/core/monetary/PriceTest.java similarity index 98% rename from core/src/test/java/bisq/core/monetary/PriceTest.java rename to core/src/test/java/haveno/core/monetary/PriceTest.java index e9f5a400..746a98db 100644 --- a/core/src/test/java/bisq/core/monetary/PriceTest.java +++ b/core/src/test/java/haveno/core/monetary/PriceTest.java @@ -15,8 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.core.monetary; +package haveno.core.monetary; +import haveno.core.monetary.Price; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java b/core/src/test/java/haveno/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java similarity index 90% rename from core/src/test/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java rename to core/src/test/java/haveno/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java index d269e502..65da9016 100644 --- a/core/src/test/java/bisq/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java +++ b/core/src/test/java/haveno/core/network/p2p/seed/DefaultSeedNodeRepositoryTest.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.network.p2p.seed; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.config.Config; +package haveno.core.network.p2p.seed; +import haveno.common.config.Config; +import haveno.core.network.p2p.seed.DefaultSeedNodeRepository; +import haveno.network.p2p.NodeAddress; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/bisq/core/notifications/MobileModelTest.java b/core/src/test/java/haveno/core/notifications/MobileModelTest.java similarity index 96% rename from core/src/test/java/bisq/core/notifications/MobileModelTest.java rename to core/src/test/java/haveno/core/notifications/MobileModelTest.java index 6b3ff89c..c7769961 100644 --- a/core/src/test/java/bisq/core/notifications/MobileModelTest.java +++ b/core/src/test/java/haveno/core/notifications/MobileModelTest.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.notifications; - -import bisq.common.util.Tuple2; +package haveno.core.notifications; import java.util.Arrays; import java.util.List; @@ -28,6 +26,9 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; +import haveno.common.util.Tuple2; +import haveno.core.notifications.MobileModel; + @Slf4j public class MobileModelTest { diff --git a/core/src/test/java/bisq/core/offer/OfferMaker.java b/core/src/test/java/haveno/core/offer/OfferMaker.java similarity index 95% rename from core/src/test/java/bisq/core/offer/OfferMaker.java rename to core/src/test/java/haveno/core/offer/OfferMaker.java index 791004cb..9cf84862 100644 --- a/core/src/test/java/bisq/core/offer/OfferMaker.java +++ b/core/src/test/java/haveno/core/offer/OfferMaker.java @@ -15,11 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; import static com.natpryce.makeiteasy.MakeItEasy.a; diff --git a/core/src/test/java/bisq/core/offer/OfferTest.java b/core/src/test/java/haveno/core/offer/OfferTest.java similarity index 93% rename from core/src/test/java/bisq/core/offer/OfferTest.java rename to core/src/test/java/haveno/core/offer/OfferTest.java index 5fd4939d..46a6f9f3 100644 --- a/core/src/test/java/bisq/core/offer/OfferTest.java +++ b/core/src/test/java/haveno/core/offer/OfferTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.offer; +package haveno.core.offer; import org.junit.Test; @@ -24,6 +24,9 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; + public class OfferTest { @Test diff --git a/core/src/test/java/bisq/core/offer/OpenOfferManagerTest.java b/core/src/test/java/haveno/core/offer/OpenOfferManagerTest.java similarity index 88% rename from core/src/test/java/bisq/core/offer/OpenOfferManagerTest.java rename to core/src/test/java/haveno/core/offer/OpenOfferManagerTest.java index 86b44c22..5ba567bc 100644 --- a/core/src/test/java/bisq/core/offer/OpenOfferManagerTest.java +++ b/core/src/test/java/haveno/core/offer/OpenOfferManagerTest.java @@ -1,19 +1,21 @@ -package bisq.core.offer; - -import bisq.core.api.CoreContext; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.trade.TradableList; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.peers.PeerManager; - -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; -import bisq.common.persistence.PersistenceManager; +package haveno.core.offer; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.core.api.CoreContext; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.offer.OfferBookService; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.offer.SignedOfferList; +import haveno.core.trade.TradableList; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.peers.PeerManager; import java.nio.file.Files; import java.util.concurrent.atomic.AtomicBoolean; @@ -22,8 +24,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static bisq.core.offer.OfferMaker.btcUsdOffer; import static com.natpryce.makeiteasy.MakeItEasy.make; +import static haveno.core.offer.OfferMaker.btcUsdOffer; import static junit.framework.TestCase.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; diff --git a/core/src/test/java/bisq/core/offer/availability/ArbitratorSelectionTest.java b/core/src/test/java/haveno/core/offer/availability/ArbitratorSelectionTest.java similarity index 97% rename from core/src/test/java/bisq/core/offer/availability/ArbitratorSelectionTest.java rename to core/src/test/java/haveno/core/offer/availability/ArbitratorSelectionTest.java index d1b338c8..619d9bba 100644 --- a/core/src/test/java/bisq/core/offer/availability/ArbitratorSelectionTest.java +++ b/core/src/test/java/haveno/core/offer/availability/ArbitratorSelectionTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.offer.availability; +package haveno.core.offer.availability; import java.util.Arrays; import java.util.HashSet; @@ -26,6 +26,8 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; +import haveno.core.offer.availability.DisputeAgentSelection; + public class ArbitratorSelectionTest { @Test public void testGetLeastUsedArbitrator() { diff --git a/core/src/test/java/bisq/core/payment/PaymentAccountsTest.java b/core/src/test/java/haveno/core/payment/PaymentAccountsTest.java similarity index 89% rename from core/src/test/java/bisq/core/payment/PaymentAccountsTest.java rename to core/src/test/java/haveno/core/payment/PaymentAccountsTest.java index 2a37a9c0..575fe3af 100644 --- a/core/src/test/java/bisq/core/payment/PaymentAccountsTest.java +++ b/core/src/test/java/haveno/core/payment/PaymentAccountsTest.java @@ -15,12 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentAccountPayload; +package haveno.core.payment; import java.util.Collections; @@ -32,6 +27,13 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.offer.Offer; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccounts; +import haveno.core.payment.payload.PaymentAccountPayload; + public class PaymentAccountsTest { @Test public void testGetOldestPaymentAccountForOfferWhenNoValidAccounts() { diff --git a/core/src/test/java/bisq/core/payment/ReceiptPredicatesTest.java b/core/src/test/java/haveno/core/payment/ReceiptPredicatesTest.java similarity index 88% rename from core/src/test/java/bisq/core/payment/ReceiptPredicatesTest.java rename to core/src/test/java/haveno/core/payment/ReceiptPredicatesTest.java index 8f4686d6..0c5ce797 100644 --- a/core/src/test/java/bisq/core/payment/ReceiptPredicatesTest.java +++ b/core/src/test/java/haveno/core/payment/ReceiptPredicatesTest.java @@ -15,14 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.locale.CryptoCurrency; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentMethod; +package haveno.core.payment; import com.google.common.collect.Lists; - +import haveno.core.locale.CryptoCurrency; +import haveno.core.offer.Offer; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.NationalBankAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.ReceiptPredicates; +import haveno.core.payment.SepaAccount; +import haveno.core.payment.SepaInstantAccount; +import haveno.core.payment.payload.PaymentMethod; import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/core/src/test/java/bisq/core/payment/ReceiptValidatorTest.java b/core/src/test/java/haveno/core/payment/ReceiptValidatorTest.java similarity index 96% rename from core/src/test/java/bisq/core/payment/ReceiptValidatorTest.java rename to core/src/test/java/haveno/core/payment/ReceiptValidatorTest.java index 0a58bc19..c4a5600e 100644 --- a/core/src/test/java/bisq/core/payment/ReceiptValidatorTest.java +++ b/core/src/test/java/haveno/core/payment/ReceiptValidatorTest.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; - -import bisq.core.offer.Offer; +package haveno.core.payment; import org.junit.After; import org.junit.Before; @@ -29,6 +27,17 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; +import haveno.core.offer.Offer; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.MoneyGramAccount; +import haveno.core.payment.NationalBankAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.ReceiptPredicates; +import haveno.core.payment.ReceiptValidator; +import haveno.core.payment.SameBankAccount; +import haveno.core.payment.SpecificBanksAccount; +import haveno.core.payment.WesternUnionAccount; + @RunWith(MockitoJUnitRunner.StrictStubs.class) public class ReceiptValidatorTest { private ReceiptValidator validator; diff --git a/core/src/test/java/bisq/core/payment/TradeLimitsTest.java b/core/src/test/java/haveno/core/payment/TradeLimitsTest.java similarity index 96% rename from core/src/test/java/bisq/core/payment/TradeLimitsTest.java rename to core/src/test/java/haveno/core/payment/TradeLimitsTest.java index f1cdf4d0..787aa5d0 100644 --- a/core/src/test/java/bisq/core/payment/TradeLimitsTest.java +++ b/core/src/test/java/haveno/core/payment/TradeLimitsTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.payment; +package haveno.core.payment; import org.junit.Test; diff --git a/core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java b/core/src/test/java/haveno/core/payment/validation/AltCoinAddressValidatorTest.java similarity index 86% rename from core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java rename to core/src/test/java/haveno/core/payment/validation/AltCoinAddressValidatorTest.java index ce1af2d9..66357598 100644 --- a/core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java +++ b/core/src/test/java/haveno/core/payment/validation/AltCoinAddressValidatorTest.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.core.payment.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; - -import bisq.asset.AssetRegistry; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.core.payment.validation; +import haveno.asset.AssetRegistry; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.AltCoinAddressValidator; import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/core/src/test/java/bisq/core/provider/mempool/TxValidatorTest.java b/core/src/test/java/haveno/core/provider/mempool/TxValidatorTest.java similarity index 97% rename from core/src/test/java/bisq/core/provider/mempool/TxValidatorTest.java rename to core/src/test/java/haveno/core/provider/mempool/TxValidatorTest.java index 2052ef71..e5cde0cb 100644 --- a/core/src/test/java/bisq/core/provider/mempool/TxValidatorTest.java +++ b/core/src/test/java/haveno/core/provider/mempool/TxValidatorTest.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.mempool; +package haveno.core.provider.mempool; -import bisq.core.util.ParsingUtils; import com.google.gson.Gson; - +import haveno.core.provider.mempool.TxValidator; +import haveno.core.util.ParsingUtils; import org.apache.commons.io.IOUtils; import org.bitcoinj.core.Coin; diff --git a/core/src/test/java/bisq/core/provider/price/MarketPriceFeedServiceTest.java b/core/src/test/java/haveno/core/provider/price/MarketPriceFeedServiceTest.java similarity index 94% rename from core/src/test/java/bisq/core/provider/price/MarketPriceFeedServiceTest.java rename to core/src/test/java/haveno/core/provider/price/MarketPriceFeedServiceTest.java index b8a6e6d4..6db7ebef 100644 --- a/core/src/test/java/bisq/core/provider/price/MarketPriceFeedServiceTest.java +++ b/core/src/test/java/haveno/core/provider/price/MarketPriceFeedServiceTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.provider.price; +package haveno.core.provider.price; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +25,8 @@ import org.junit.Test; import static junit.framework.TestCase.assertTrue; +import haveno.core.provider.price.PriceFeedService; + @Ignore public class MarketPriceFeedServiceTest { private static final Logger log = LoggerFactory.getLogger(MarketPriceFeedServiceTest.class); diff --git a/core/src/test/java/bisq/core/trade/TradableListTest.java b/core/src/test/java/haveno/core/trade/TradableListTest.java similarity index 91% rename from core/src/test/java/bisq/core/trade/TradableListTest.java rename to core/src/test/java/haveno/core/trade/TradableListTest.java index 2b48d4b5..7df8170b 100644 --- a/core/src/test/java/bisq/core/trade/TradableListTest.java +++ b/core/src/test/java/haveno/core/trade/TradableListTest.java @@ -15,11 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.trade; - -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOffer; +package haveno.core.trade; import org.junit.Test; @@ -28,6 +24,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static protobuf.PersistableEnvelope.MessageCase.TRADABLE_LIST; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.trade.TradableList; + public class TradableListTest { @Test diff --git a/core/src/test/java/bisq/core/trade/txproof/xmr/XmrTxProofParserTest.java b/core/src/test/java/haveno/core/trade/txproof/xmr/XmrTxProofParserTest.java similarity index 96% rename from core/src/test/java/bisq/core/trade/txproof/xmr/XmrTxProofParserTest.java rename to core/src/test/java/haveno/core/trade/txproof/xmr/XmrTxProofParserTest.java index af91a7d4..f798f483 100644 --- a/core/src/test/java/bisq/core/trade/txproof/xmr/XmrTxProofParserTest.java +++ b/core/src/test/java/haveno/core/trade/txproof/xmr/XmrTxProofParserTest.java @@ -1,6 +1,4 @@ -package bisq.core.trade.txproof.xmr; - -import bisq.core.user.AutoConfirmSettings; +package haveno.core.trade.txproof.xmr; import java.time.Instant; @@ -10,10 +8,15 @@ import java.util.Date; import org.junit.Before; import org.junit.Test; -import static bisq.core.trade.txproof.xmr.XmrTxProofParser.MAX_DATE_TOLERANCE; +import static haveno.core.trade.txproof.xmr.XmrTxProofParser.MAX_DATE_TOLERANCE; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; +import haveno.core.trade.txproof.xmr.XmrTxProofModel; +import haveno.core.trade.txproof.xmr.XmrTxProofParser; +import haveno.core.trade.txproof.xmr.XmrTxProofRequest; +import haveno.core.user.AutoConfirmSettings; + public class XmrTxProofParserTest { private XmrTxProofModel xmrTxProofModel; private String recipientAddressHex = "e957dac72bcec80d59b2fecacfa7522223b6a5df895b7e388e60297e85f3f867b42f43e8d9f086a99a997704ceb92bd9cd99d33952de90c9f5f93c82c62360ae"; diff --git a/core/src/test/java/bisq/core/user/PreferencesTest.java b/core/src/test/java/haveno/core/user/PreferencesTest.java similarity index 91% rename from core/src/test/java/bisq/core/user/PreferencesTest.java rename to core/src/test/java/haveno/core/user/PreferencesTest.java index 0181fe8c..8fdcef8d 100644 --- a/core/src/test/java/bisq/core/user/PreferencesTest.java +++ b/core/src/test/java/haveno/core/user/PreferencesTest.java @@ -15,19 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; +package haveno.core.user; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.user.Preferences; +import haveno.core.user.PreferencesPayload; import javafx.collections.ObservableList; import java.util.ArrayList; diff --git a/core/src/test/java/bisq/core/user/UserPayloadModelVOTest.java b/core/src/test/java/haveno/core/user/UserPayloadModelVOTest.java similarity index 84% rename from core/src/test/java/bisq/core/user/UserPayloadModelVOTest.java rename to core/src/test/java/haveno/core/user/UserPayloadModelVOTest.java index 526cf66e..4e9d30b2 100644 --- a/core/src/test/java/bisq/core/user/UserPayloadModelVOTest.java +++ b/core/src/test/java/haveno/core/user/UserPayloadModelVOTest.java @@ -15,29 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.core.user; - -import bisq.core.alert.Alert; -import bisq.core.arbitration.ArbitratorTest; -import bisq.core.arbitration.MediatorTest; -import bisq.core.filter.Filter; -import bisq.core.proto.CoreProtoResolver; +package haveno.core.user; import com.google.common.collect.Lists; - +import haveno.core.alert.Alert; +import haveno.core.arbitration.ArbitratorTest; +import haveno.core.arbitration.MediatorTest; +import haveno.core.filter.Filter; +import haveno.core.proto.CoreProtoResolver; +import haveno.core.user.UserPayload; import java.util.HashSet; import org.junit.Ignore; public class UserPayloadModelVOTest { - @Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") + @Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") public void testRoundtrip() { UserPayload vo = new UserPayload(); vo.setAccountId("accountId"); UserPayload newVo = UserPayload.fromProto(vo.toProtoMessage().getUserPayload(), new CoreProtoResolver()); } - @Ignore("TODO InvalidKeySpecException at bisq.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") + @Ignore("TODO InvalidKeySpecException at haveno.common.crypto.Sig.getPublicKeyFromBytes(Sig.java:135)") public void testRoundtripFull() { UserPayload vo = new UserPayload(); vo.setAccountId("accountId"); diff --git a/core/src/test/java/bisq/core/util/FormattingUtilsTest.java b/core/src/test/java/haveno/core/util/FormattingUtilsTest.java similarity index 94% rename from core/src/test/java/bisq/core/util/FormattingUtilsTest.java rename to core/src/test/java/haveno/core/util/FormattingUtilsTest.java index c93c5bdb..d0bfc620 100644 --- a/core/src/test/java/bisq/core/util/FormattingUtilsTest.java +++ b/core/src/test/java/haveno/core/util/FormattingUtilsTest.java @@ -1,9 +1,4 @@ -package bisq.core.util; - -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; +package haveno.core.util; import org.bitcoinj.utils.Fiat; @@ -13,7 +8,11 @@ import java.util.concurrent.TimeUnit; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; - +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.util.FormattingUtils; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/bisq/core/util/ProtoUtilTest.java b/core/src/test/java/haveno/core/util/ProtoUtilTest.java similarity index 92% rename from core/src/test/java/bisq/core/util/ProtoUtilTest.java rename to core/src/test/java/haveno/core/util/ProtoUtilTest.java index 089bdc04..43149edc 100644 --- a/core/src/test/java/bisq/core/util/ProtoUtilTest.java +++ b/core/src/test/java/haveno/core/util/ProtoUtilTest.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.core.util; - -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OpenOffer; - -import bisq.common.proto.ProtoUtil; +package haveno.core.util; +import haveno.common.proto.ProtoUtil; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OpenOffer; import protobuf.OfferPayload; import org.junit.Test; @@ -32,7 +30,7 @@ import static org.junit.Assert.fail; @SuppressWarnings("UnusedAssignment") public class ProtoUtilTest { - //TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in bisq.common. + //TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in haveno.common. @Test public void testEnum() { OfferDirection direction = OfferDirection.SELL; diff --git a/core/src/test/java/bisq/core/util/RegexValidatorTest.java b/core/src/test/java/haveno/core/util/RegexValidatorTest.java similarity index 98% rename from core/src/test/java/bisq/core/util/RegexValidatorTest.java rename to core/src/test/java/haveno/core/util/RegexValidatorTest.java index 53a2df3c..feb03f63 100644 --- a/core/src/test/java/bisq/core/util/RegexValidatorTest.java +++ b/core/src/test/java/haveno/core/util/RegexValidatorTest.java @@ -15,12 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.util; - -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.util.validation.RegexValidator; -import bisq.core.util.validation.RegexValidatorFactory; +package haveno.core.util; import java.util.Locale; @@ -30,6 +25,11 @@ import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.util.validation.RegexValidator; +import haveno.core.util.validation.RegexValidatorFactory; + public class RegexValidatorTest { diff --git a/core/src/test/java/bisq/core/util/coin/CoinUtilTest.java b/core/src/test/java/haveno/core/util/coin/CoinUtilTest.java similarity index 96% rename from core/src/test/java/bisq/core/util/coin/CoinUtilTest.java rename to core/src/test/java/haveno/core/util/coin/CoinUtilTest.java index d9159422..a507a5b3 100644 --- a/core/src/test/java/bisq/core/util/coin/CoinUtilTest.java +++ b/core/src/test/java/haveno/core/util/coin/CoinUtilTest.java @@ -15,11 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.core.util.coin; - -import bisq.core.btc.wallet.Restrictions; -import bisq.core.monetary.Price; -import bisq.core.trade.HavenoUtils; +package haveno.core.util.coin; import org.bitcoinj.core.Coin; @@ -28,6 +24,10 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.monetary.Price; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.coin.CoinUtil; import java.math.BigInteger; public class CoinUtilTest { diff --git a/core/src/test/resources/bisq/core/app/cli-output.txt b/core/src/test/resources/haveno/core/app/cli-output.txt similarity index 91% rename from core/src/test/resources/bisq/core/app/cli-output.txt rename to core/src/test/resources/haveno/core/app/cli-output.txt index 02391b6f..9e519fca 100644 --- a/core/src/test/resources/bisq/core/app/cli-output.txt +++ b/core/src/test/resources/haveno/core/app/cli-output.txt @@ -1,11 +1,11 @@ -Bisq Test version 0.1.0 +Haveno Test version 0.1.0 -Usage: bisq-test [options] +Usage: haveno-test [options] Options: - --name= (default: Bisq) - The name of the Bisq node + --name= (default: Haveno) + The name of the Haveno node --another-option= (default: WAT) This is a long description which will need to break over multiple @@ -49,7 +49,7 @@ Options: --with-default-value= (default: Wat) Some option with a default value - --data-dir= (default: /Users/cbeams/Library/Application Support/Bisq) + --data-dir= (default: /Users/cbeams/Library/Application Support/Haveno) Application data directory --enum-opt= (default: foo) diff --git a/core/src/test/resources/bisq/core/app/cli-output_windows.txt b/core/src/test/resources/haveno/core/app/cli-output_windows.txt similarity index 91% rename from core/src/test/resources/bisq/core/app/cli-output_windows.txt rename to core/src/test/resources/haveno/core/app/cli-output_windows.txt index e07fcca8..ca36bdc7 100644 --- a/core/src/test/resources/bisq/core/app/cli-output_windows.txt +++ b/core/src/test/resources/haveno/core/app/cli-output_windows.txt @@ -1,11 +1,11 @@ -Bisq Test version 0.1.0 +Haveno Test version 0.1.0 -Usage: bisq-test [options] +Usage: haveno-test [options] Options: - --name= (default: Bisq) - The name of the Bisq node + --name= (default: Haveno) + The name of the Haveno node --another-option= (default: WAT) This is a long description which will need to break over multiple @@ -49,7 +49,7 @@ Options: --with-default-value= (default: Wat) Some option with a default value - --data-dir= (default: \Users\cbeams\Library\Application Support\Bisq) + --data-dir= (default: \Users\cbeams\Library\Application Support\Haveno) Application data directory --enum-opt= (default: foo) diff --git a/core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-0.txt b/core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-0.txt similarity index 100% rename from core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-0.txt rename to core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-0.txt diff --git a/core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-1.json b/core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-1.json similarity index 100% rename from core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-1.json rename to core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-1.json diff --git a/core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-2.json b/core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-2.json similarity index 100% rename from core/src/test/resources/bisq/core/dao/node/full/rpc/getblock-result-verbosity-2.json rename to core/src/test/resources/haveno/core/dao/node/full/rpc/getblock-result-verbosity-2.json diff --git a/core/src/test/resources/bisq/core/dao/node/full/rpc/getnetworkinfo-result.json b/core/src/test/resources/haveno/core/dao/node/full/rpc/getnetworkinfo-result.json similarity index 100% rename from core/src/test/resources/bisq/core/dao/node/full/rpc/getnetworkinfo-result.json rename to core/src/test/resources/haveno/core/dao/node/full/rpc/getnetworkinfo-result.json diff --git a/core/src/test/resources/bisq/core/provider/mempool/badOfferTestData.json b/core/src/test/resources/haveno/core/provider/mempool/badOfferTestData.json similarity index 100% rename from core/src/test/resources/bisq/core/provider/mempool/badOfferTestData.json rename to core/src/test/resources/haveno/core/provider/mempool/badOfferTestData.json diff --git a/core/src/test/resources/bisq/core/provider/mempool/offerTestData.json b/core/src/test/resources/haveno/core/provider/mempool/offerTestData.json similarity index 100% rename from core/src/test/resources/bisq/core/provider/mempool/offerTestData.json rename to core/src/test/resources/haveno/core/provider/mempool/offerTestData.json diff --git a/core/src/test/resources/bisq/core/provider/mempool/txInfo.json b/core/src/test/resources/haveno/core/provider/mempool/txInfo.json similarity index 100% rename from core/src/test/resources/bisq/core/provider/mempool/txInfo.json rename to core/src/test/resources/haveno/core/provider/mempool/txInfo.json diff --git a/core/src/test/resources/regtest.seednodes b/core/src/test/resources/regtest.seednodes index 58f66ba9..5a0f7e61 100644 --- a/core/src/test/resources/regtest.seednodes +++ b/core/src/test/resources/regtest.seednodes @@ -1,6 +1,6 @@ # For development you need to change that to your local onion addresses -# 1. Run a seed node with prog args: --bitcoinNetwork=regtest --nodePort=8002 --appName=bisq_seed_node_rxdkppp3vicnbgqt.onion_8002 -# 2. Find your local onion address in bisq_seed_node_rxdkppp3vicnbgqt.onion_8002/regtest/tor/hiddenservice/hostname +# 1. Run a seed node with prog args: --bitcoinNetwork=regtest --nodePort=8002 --appName=haveno_seed_node_rxdkppp3vicnbgqt.onion_8002 +# 2. Find your local onion address in haveno_seed_node_rxdkppp3vicnbgqt.onion_8002/regtest/tor/hiddenservice/hostname # 3. Shut down the seed node # 4. Rename the directory with your local onion address # 5. Edit here your found onion address (new NodeAddress("YOUR_ONION.onion:8002") diff --git a/core/update_translations.sh b/core/update_translations.sh index 0ea9070b..fc015e88 100755 --- a/core/update_translations.sh +++ b/core/update_translations.sh @@ -3,7 +3,7 @@ cd $(dirname $0) tx pull -l de,es,ja,pt,ru,zh_CN,zh_TW,vi,th_TH,fa,fr,pt_BR,it,cs -translations="translations/bisq-desktop.displaystringsproperties" +translations="translations/haveno-desktop.displaystringsproperties" i18n="src/main/resources/i18n" mv "$translations/de.properties" "$i18n/displayStrings_de.properties" diff --git a/daemon/src/main/java/bisq/daemon/app/HavenoDaemon.java b/daemon/src/main/java/haveno/daemon/app/HavenoDaemon.java similarity index 91% rename from daemon/src/main/java/bisq/daemon/app/HavenoDaemon.java rename to daemon/src/main/java/haveno/daemon/app/HavenoDaemon.java index d544605b..300573e0 100644 --- a/daemon/src/main/java/bisq/daemon/app/HavenoDaemon.java +++ b/daemon/src/main/java/haveno/daemon/app/HavenoDaemon.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.daemon.app; +package haveno.daemon.app; -import bisq.core.app.HavenoHeadlessApp; +import haveno.core.app.HavenoHeadlessApp; public class HavenoDaemon extends HavenoHeadlessApp { } diff --git a/daemon/src/main/java/bisq/daemon/app/HavenoDaemonMain.java b/daemon/src/main/java/haveno/daemon/app/HavenoDaemonMain.java similarity index 95% rename from daemon/src/main/java/bisq/daemon/app/HavenoDaemonMain.java rename to daemon/src/main/java/haveno/daemon/app/HavenoDaemonMain.java index e26bccb9..4b0a8ac1 100644 --- a/daemon/src/main/java/bisq/daemon/app/HavenoDaemonMain.java +++ b/daemon/src/main/java/haveno/daemon/app/HavenoDaemonMain.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.daemon.app; - -import bisq.core.api.AccountServiceListener; -import bisq.core.app.ConsoleInput; -import bisq.core.app.CoreModule; -import bisq.core.app.HavenoHeadlessAppMain; - -import bisq.common.UserThread; -import bisq.common.app.AppModule; -import bisq.common.crypto.IncorrectPasswordException; -import bisq.common.handlers.ResultHandler; -import bisq.common.persistence.PersistenceManager; +package haveno.daemon.app; import com.google.common.util.concurrent.ThreadFactoryBuilder; - +import haveno.common.UserThread; +import haveno.common.app.AppModule; +import haveno.common.crypto.IncorrectPasswordException; +import haveno.common.handlers.ResultHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.core.api.AccountServiceListener; +import haveno.core.app.ConsoleInput; +import haveno.core.app.CoreModule; +import haveno.core.app.HavenoHeadlessAppMain; +import haveno.daemon.grpc.GrpcServer; import java.io.Console; import java.util.concurrent.CancellationException; @@ -42,8 +40,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import lombok.extern.slf4j.Slf4j; -import bisq.daemon.grpc.GrpcServer; - @Slf4j public class HavenoDaemonMain extends HavenoHeadlessAppMain { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcAccountService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcAccountService.java similarity index 85% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcAccountService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcAccountService.java index 5c997ef8..81968415 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcAccountService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcAccountService.java @@ -14,47 +14,47 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.AccountGrpc.getAccountExistsMethod; -import static bisq.proto.grpc.AccountGrpc.getBackupAccountMethod; -import static bisq.proto.grpc.AccountGrpc.getChangePasswordMethod; -import static bisq.proto.grpc.AccountGrpc.getCloseAccountMethod; -import static bisq.proto.grpc.AccountGrpc.getCreateAccountMethod; -import static bisq.proto.grpc.AccountGrpc.getDeleteAccountMethod; -import static bisq.proto.grpc.AccountGrpc.getIsAccountOpenMethod; -import static bisq.proto.grpc.AccountGrpc.getOpenAccountMethod; -import static bisq.proto.grpc.AccountGrpc.getRestoreAccountMethod; +import static haveno.proto.grpc.AccountGrpc.getAccountExistsMethod; +import static haveno.proto.grpc.AccountGrpc.getBackupAccountMethod; +import static haveno.proto.grpc.AccountGrpc.getChangePasswordMethod; +import static haveno.proto.grpc.AccountGrpc.getCloseAccountMethod; +import static haveno.proto.grpc.AccountGrpc.getCreateAccountMethod; +import static haveno.proto.grpc.AccountGrpc.getDeleteAccountMethod; +import static haveno.proto.grpc.AccountGrpc.getIsAccountOpenMethod; +import static haveno.proto.grpc.AccountGrpc.getOpenAccountMethod; +import static haveno.proto.grpc.AccountGrpc.getRestoreAccountMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; -import bisq.common.crypto.IncorrectPasswordException; -import bisq.core.api.CoreApi; -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; -import bisq.proto.grpc.AccountExistsReply; -import bisq.proto.grpc.AccountExistsRequest; -import bisq.proto.grpc.AccountGrpc.AccountImplBase; -import bisq.proto.grpc.BackupAccountReply; -import bisq.proto.grpc.BackupAccountRequest; -import bisq.proto.grpc.ChangePasswordReply; -import bisq.proto.grpc.ChangePasswordRequest; -import bisq.proto.grpc.CloseAccountReply; -import bisq.proto.grpc.CloseAccountRequest; -import bisq.proto.grpc.CreateAccountReply; -import bisq.proto.grpc.CreateAccountRequest; -import bisq.proto.grpc.DeleteAccountReply; -import bisq.proto.grpc.DeleteAccountRequest; -import bisq.proto.grpc.IsAccountOpenReply; -import bisq.proto.grpc.IsAccountOpenRequest; -import bisq.proto.grpc.IsAppInitializedReply; -import bisq.proto.grpc.IsAppInitializedRequest; -import bisq.proto.grpc.OpenAccountReply; -import bisq.proto.grpc.OpenAccountRequest; -import bisq.proto.grpc.RestoreAccountReply; -import bisq.proto.grpc.RestoreAccountRequest; +import haveno.proto.grpc.AccountExistsReply; +import haveno.proto.grpc.AccountExistsRequest; +import haveno.proto.grpc.AccountGrpc.AccountImplBase; +import haveno.proto.grpc.BackupAccountReply; +import haveno.proto.grpc.BackupAccountRequest; +import haveno.proto.grpc.ChangePasswordReply; +import haveno.proto.grpc.ChangePasswordRequest; +import haveno.proto.grpc.CloseAccountReply; +import haveno.proto.grpc.CloseAccountRequest; +import haveno.proto.grpc.CreateAccountReply; +import haveno.proto.grpc.CreateAccountRequest; +import haveno.proto.grpc.DeleteAccountReply; +import haveno.proto.grpc.DeleteAccountRequest; +import haveno.proto.grpc.IsAccountOpenReply; +import haveno.proto.grpc.IsAccountOpenRequest; +import haveno.proto.grpc.IsAppInitializedReply; +import haveno.proto.grpc.IsAppInitializedRequest; +import haveno.proto.grpc.OpenAccountReply; +import haveno.proto.grpc.OpenAccountRequest; +import haveno.proto.grpc.RestoreAccountReply; +import haveno.proto.grpc.RestoreAccountRequest; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.ByteString; +import haveno.common.crypto.IncorrectPasswordException; +import haveno.core.api.CoreApi; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; import java.io.ByteArrayInputStream; diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcDisputeAgentsService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcDisputeAgentsService.java similarity index 83% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcDisputeAgentsService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcDisputeAgentsService.java index d996abdd..908c4120 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcDisputeAgentsService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcDisputeAgentsService.java @@ -1,11 +1,12 @@ -package bisq.daemon.grpc; - -import bisq.core.api.CoreApi; -import bisq.proto.grpc.RegisterDisputeAgentReply; -import bisq.proto.grpc.RegisterDisputeAgentRequest; -import bisq.proto.grpc.UnregisterDisputeAgentReply; -import bisq.proto.grpc.UnregisterDisputeAgentRequest; +package haveno.daemon.grpc; +import haveno.proto.grpc.RegisterDisputeAgentReply; +import haveno.proto.grpc.RegisterDisputeAgentRequest; +import haveno.proto.grpc.UnregisterDisputeAgentReply; +import haveno.proto.grpc.UnregisterDisputeAgentRequest; +import haveno.core.api.CoreApi; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -16,17 +17,12 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.DisputeAgentsGrpc.DisputeAgentsImplBase; -import static bisq.proto.grpc.DisputeAgentsGrpc.getRegisterDisputeAgentMethod; -import static bisq.proto.grpc.DisputeAgentsGrpc.getUnregisterDisputeAgentMethod; +import static haveno.proto.grpc.DisputeAgentsGrpc.DisputeAgentsImplBase; +import static haveno.proto.grpc.DisputeAgentsGrpc.getRegisterDisputeAgentMethod; +import static haveno.proto.grpc.DisputeAgentsGrpc.getUnregisterDisputeAgentMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcDisputeAgentsService extends DisputeAgentsImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcDisputesService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcDisputesService.java similarity index 81% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcDisputesService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcDisputesService.java index 70268bef..513f9750 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcDisputesService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcDisputesService.java @@ -1,22 +1,22 @@ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; -import bisq.core.support.dispute.Attachment; -import bisq.core.support.dispute.DisputeResult; - -import bisq.common.proto.ProtoUtil; - -import bisq.proto.grpc.DisputesGrpc.DisputesImplBase; -import bisq.proto.grpc.GetDisputeReply; -import bisq.proto.grpc.GetDisputeRequest; -import bisq.proto.grpc.GetDisputesReply; -import bisq.proto.grpc.GetDisputesRequest; -import bisq.proto.grpc.OpenDisputeReply; -import bisq.proto.grpc.OpenDisputeRequest; -import bisq.proto.grpc.ResolveDisputeReply; -import bisq.proto.grpc.ResolveDisputeRequest; -import bisq.proto.grpc.SendDisputeChatMessageReply; -import bisq.proto.grpc.SendDisputeChatMessageRequest; +import haveno.proto.grpc.DisputesGrpc.DisputesImplBase; +import haveno.common.proto.ProtoUtil; +import haveno.core.api.CoreApi; +import haveno.core.support.dispute.Attachment; +import haveno.core.support.dispute.DisputeResult; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; +import haveno.proto.grpc.GetDisputeReply; +import haveno.proto.grpc.GetDisputeRequest; +import haveno.proto.grpc.GetDisputesReply; +import haveno.proto.grpc.GetDisputesRequest; +import haveno.proto.grpc.OpenDisputeReply; +import haveno.proto.grpc.OpenDisputeRequest; +import haveno.proto.grpc.ResolveDisputeReply; +import haveno.proto.grpc.ResolveDisputeRequest; +import haveno.proto.grpc.SendDisputeChatMessageReply; +import haveno.proto.grpc.SendDisputeChatMessageRequest; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -30,17 +30,14 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.DisputesGrpc.getGetDisputeMethod; -import static bisq.proto.grpc.DisputesGrpc.getGetDisputesMethod; -import static bisq.proto.grpc.DisputesGrpc.getOpenDisputeMethod; -import static bisq.proto.grpc.DisputesGrpc.getResolveDisputeMethod; -import static bisq.proto.grpc.DisputesGrpc.getSendDisputeChatMessageMethod; +import static haveno.proto.grpc.DisputesGrpc.getGetDisputeMethod; +import static haveno.proto.grpc.DisputesGrpc.getGetDisputesMethod; +import static haveno.proto.grpc.DisputesGrpc.getOpenDisputeMethod; +import static haveno.proto.grpc.DisputesGrpc.getResolveDisputeMethod; +import static haveno.proto.grpc.DisputesGrpc.getSendDisputeChatMessageMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j public class GrpcDisputesService extends DisputesImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcErrorMessageHandler.java similarity index 92% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcErrorMessageHandler.java index c03a60d6..cedd54aa 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcErrorMessageHandler.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; - -import bisq.common.handlers.ErrorMessageHandler; - -import bisq.proto.grpc.AvailabilityResultWithDescription; -import bisq.proto.grpc.TakeOfferReply; +package haveno.daemon.grpc; +import haveno.proto.grpc.AvailabilityResultWithDescription; +import haveno.proto.grpc.TakeOfferReply; +import haveno.common.handlers.ErrorMessageHandler; import protobuf.AvailabilityResult; import io.grpc.stub.StreamObserver; @@ -30,13 +28,13 @@ import org.slf4j.Logger; import lombok.Getter; -import static bisq.proto.grpc.TradesGrpc.getTakeOfferMethod; +import static haveno.proto.grpc.TradesGrpc.getTakeOfferMethod; import static java.lang.String.format; import static java.util.Arrays.stream; /** - * An implementation of bisq.common.handlers.ErrorMessageHandler that avoids - * an exception loop with the UI's bisq.common.taskrunner framework. + * An implementation of haveno.common.handlers.ErrorMessageHandler that avoids + * an exception loop with the UI's haveno.common.taskrunner framework. * * The legacy ErrorMessageHandler is for reporting error messages only to the UI, but * some core api tasks (takeoffer) require one. This implementation works around @@ -133,7 +131,7 @@ public class GrpcErrorMessageHandler implements ErrorMessageHandler { } private String getAvailabilityResultDescription(AvailabilityResult proto) { - return bisq.core.offer.AvailabilityResult.fromProto(proto).description(); + return haveno.core.offer.AvailabilityResult.fromProto(proto).description(); } private boolean takeOfferWasCalled() { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcExceptionHandler.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcExceptionHandler.java similarity index 99% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcExceptionHandler.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcExceptionHandler.java index 13124feb..365606e1 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcExceptionHandler.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcExceptionHandler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcGetTradeStatisticsService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcGetTradeStatisticsService.java similarity index 77% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcGetTradeStatisticsService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcGetTradeStatisticsService.java index 553ff1b3..3608d07a 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcGetTradeStatisticsService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcGetTradeStatisticsService.java @@ -1,11 +1,11 @@ -package bisq.daemon.grpc; - -import bisq.core.api.CoreApi; -import bisq.core.trade.statistics.TradeStatistics3; - -import bisq.proto.grpc.GetTradeStatisticsReply; -import bisq.proto.grpc.GetTradeStatisticsRequest; +package haveno.daemon.grpc; +import haveno.proto.grpc.GetTradeStatisticsReply; +import haveno.proto.grpc.GetTradeStatisticsRequest; +import haveno.core.api.CoreApi; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -17,16 +17,11 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.GetTradeStatisticsGrpc.GetTradeStatisticsImplBase; -import static bisq.proto.grpc.GetTradeStatisticsGrpc.getGetTradeStatisticsMethod; +import static haveno.proto.grpc.GetTradeStatisticsGrpc.GetTradeStatisticsImplBase; +import static haveno.proto.grpc.GetTradeStatisticsGrpc.getGetTradeStatisticsMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcGetTradeStatisticsService extends GetTradeStatisticsImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcHelpService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcHelpService.java similarity index 83% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcHelpService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcHelpService.java index 69d1d6d3..45f32dcf 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcHelpService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcHelpService.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; - -import bisq.core.api.CoreApi; - -import bisq.proto.grpc.GetMethodHelpReply; -import bisq.proto.grpc.GetMethodHelpRequest; +package haveno.daemon.grpc; +import haveno.proto.grpc.GetMethodHelpReply; +import haveno.proto.grpc.GetMethodHelpRequest; +import haveno.core.api.CoreApi; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -32,16 +32,11 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.HelpGrpc.HelpImplBase; -import static bisq.proto.grpc.HelpGrpc.getGetMethodHelpMethod; +import static haveno.proto.grpc.HelpGrpc.HelpImplBase; +import static haveno.proto.grpc.HelpGrpc.getGetMethodHelpMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcHelpService extends HelpImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcMoneroConnectionsService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcMoneroConnectionsService.java similarity index 89% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcMoneroConnectionsService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcMoneroConnectionsService.java index 2a21dc27..1bf8ba10 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcMoneroConnectionsService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcMoneroConnectionsService.java @@ -15,34 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; -import bisq.proto.grpc.AddConnectionReply; -import bisq.proto.grpc.AddConnectionRequest; -import bisq.proto.grpc.CheckConnectionReply; -import bisq.proto.grpc.CheckConnectionRequest; -import bisq.proto.grpc.CheckConnectionsReply; -import bisq.proto.grpc.CheckConnectionsRequest; -import bisq.proto.grpc.GetBestAvailableConnectionReply; -import bisq.proto.grpc.GetBestAvailableConnectionRequest; -import bisq.proto.grpc.GetConnectionReply; -import bisq.proto.grpc.GetConnectionRequest; -import bisq.proto.grpc.GetConnectionsReply; -import bisq.proto.grpc.GetConnectionsRequest; -import bisq.proto.grpc.RemoveConnectionReply; -import bisq.proto.grpc.RemoveConnectionRequest; -import bisq.proto.grpc.SetAutoSwitchReply; -import bisq.proto.grpc.SetAutoSwitchRequest; -import bisq.proto.grpc.SetConnectionReply; -import bisq.proto.grpc.SetConnectionRequest; -import bisq.proto.grpc.StartCheckingConnectionsReply; -import bisq.proto.grpc.StartCheckingConnectionsRequest; -import bisq.proto.grpc.StopCheckingConnectionsReply; -import bisq.proto.grpc.StopCheckingConnectionsRequest; -import bisq.proto.grpc.UrlConnection; +import haveno.proto.grpc.AddConnectionReply; +import haveno.proto.grpc.AddConnectionRequest; +import haveno.proto.grpc.CheckConnectionReply; +import haveno.proto.grpc.CheckConnectionRequest; +import haveno.proto.grpc.CheckConnectionsReply; +import haveno.proto.grpc.CheckConnectionsRequest; +import haveno.proto.grpc.GetBestAvailableConnectionReply; +import haveno.proto.grpc.GetBestAvailableConnectionRequest; +import haveno.proto.grpc.GetConnectionReply; +import haveno.proto.grpc.GetConnectionRequest; +import haveno.proto.grpc.GetConnectionsReply; +import haveno.proto.grpc.GetConnectionsRequest; +import haveno.proto.grpc.RemoveConnectionReply; +import haveno.proto.grpc.RemoveConnectionRequest; +import haveno.proto.grpc.SetAutoSwitchReply; +import haveno.proto.grpc.SetAutoSwitchRequest; +import haveno.proto.grpc.SetConnectionReply; +import haveno.proto.grpc.SetConnectionRequest; +import haveno.proto.grpc.StartCheckingConnectionsReply; +import haveno.proto.grpc.StartCheckingConnectionsRequest; +import haveno.proto.grpc.StopCheckingConnectionsReply; +import haveno.proto.grpc.StopCheckingConnectionsRequest; +import haveno.proto.grpc.UrlConnection; +import haveno.core.api.CoreApi; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; @@ -55,8 +55,8 @@ import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; import monero.common.MoneroRpcConnection; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.MoneroConnectionsGrpc.*; +import static haveno.proto.grpc.MoneroConnectionsGrpc.*; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; @Slf4j diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcMoneroNodeService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcMoneroNodeService.java similarity index 84% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcMoneroNodeService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcMoneroNodeService.java index 4675e661..2b84f3c6 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcMoneroNodeService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcMoneroNodeService.java @@ -14,20 +14,21 @@ * You should have received a copy of the GNU Affero General Public License * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; -import bisq.core.xmr.MoneroNodeSettings; - -import bisq.proto.grpc.GetMoneroNodeSettingsReply; -import bisq.proto.grpc.GetMoneroNodeSettingsRequest; -import bisq.proto.grpc.IsMoneroNodeOnlineReply; -import bisq.proto.grpc.IsMoneroNodeOnlineRequest; -import bisq.proto.grpc.MoneroNodeGrpc.MoneroNodeImplBase; -import bisq.proto.grpc.StartMoneroNodeReply; -import bisq.proto.grpc.StartMoneroNodeRequest; -import bisq.proto.grpc.StopMoneroNodeReply; -import bisq.proto.grpc.StopMoneroNodeRequest; +import haveno.proto.grpc.GetMoneroNodeSettingsReply; +import haveno.proto.grpc.GetMoneroNodeSettingsRequest; +import haveno.proto.grpc.IsMoneroNodeOnlineReply; +import haveno.proto.grpc.IsMoneroNodeOnlineRequest; +import haveno.proto.grpc.MoneroNodeGrpc.MoneroNodeImplBase; +import haveno.core.api.CoreApi; +import haveno.core.xmr.MoneroNodeSettings; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; +import haveno.proto.grpc.StartMoneroNodeReply; +import haveno.proto.grpc.StartMoneroNodeRequest; +import haveno.proto.grpc.StopMoneroNodeReply; +import haveno.proto.grpc.StopMoneroNodeRequest; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -39,15 +40,13 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.MoneroNodeGrpc.getStartMoneroNodeMethod; -import static bisq.proto.grpc.MoneroNodeGrpc.getStopMoneroNodeMethod; -import static bisq.proto.grpc.MoneroNodeGrpc.getIsMoneroNodeOnlineMethod; -import static bisq.proto.grpc.MoneroNodeGrpc.getGetMoneroNodeSettingsMethod; +import static haveno.proto.grpc.MoneroNodeGrpc.getStartMoneroNodeMethod; +import static haveno.proto.grpc.MoneroNodeGrpc.getStopMoneroNodeMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; +import static haveno.proto.grpc.MoneroNodeGrpc.getIsMoneroNodeOnlineMethod; +import static haveno.proto.grpc.MoneroNodeGrpc.getGetMoneroNodeSettingsMethod; import static java.util.concurrent.TimeUnit.SECONDS; -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; import monero.common.MoneroError; @Slf4j diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcNotificationsService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcNotificationsService.java similarity index 81% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcNotificationsService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcNotificationsService.java index 5c0b44ca..a5f5f676 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcNotificationsService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcNotificationsService.java @@ -1,12 +1,14 @@ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; -import bisq.core.api.NotificationListener; -import bisq.proto.grpc.NotificationMessage; -import bisq.proto.grpc.NotificationsGrpc.NotificationsImplBase; -import bisq.proto.grpc.RegisterNotificationListenerRequest; -import bisq.proto.grpc.SendNotificationReply; -import bisq.proto.grpc.SendNotificationRequest; +import haveno.proto.grpc.NotificationMessage; +import haveno.proto.grpc.NotificationsGrpc.NotificationsImplBase; +import haveno.core.api.CoreApi; +import haveno.core.api.NotificationListener; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; +import haveno.proto.grpc.RegisterNotificationListenerRequest; +import haveno.proto.grpc.SendNotificationReply; +import haveno.proto.grpc.SendNotificationRequest; import io.grpc.Context; import io.grpc.ServerInterceptor; import io.grpc.stub.ServerCallStreamObserver; @@ -21,16 +23,11 @@ import lombok.NonNull; import lombok.Value; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.NotificationsGrpc.getRegisterNotificationListenerMethod; -import static bisq.proto.grpc.NotificationsGrpc.getSendNotificationMethod; +import static haveno.proto.grpc.NotificationsGrpc.getRegisterNotificationListenerMethod; +import static haveno.proto.grpc.NotificationsGrpc.getSendNotificationMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcNotificationsService extends NotificationsImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcOffersService.java similarity index 89% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcOffersService.java index 9e8bd6f4..5949c7f0 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcOffersService.java @@ -15,24 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; -import bisq.core.api.model.OfferInfo; -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOffer; -import bisq.proto.grpc.CancelOfferReply; -import bisq.proto.grpc.CancelOfferRequest; -import bisq.proto.grpc.PostOfferReply; -import bisq.proto.grpc.PostOfferRequest; -import bisq.proto.grpc.GetMyOfferReply; -import bisq.proto.grpc.GetMyOfferRequest; -import bisq.proto.grpc.GetMyOffersReply; -import bisq.proto.grpc.GetMyOffersRequest; -import bisq.proto.grpc.GetOfferReply; -import bisq.proto.grpc.GetOfferRequest; -import bisq.proto.grpc.GetOffersReply; -import bisq.proto.grpc.GetOffersRequest; +import haveno.proto.grpc.CancelOfferReply; +import haveno.proto.grpc.CancelOfferRequest; +import haveno.proto.grpc.PostOfferReply; +import haveno.proto.grpc.PostOfferRequest; +import haveno.core.api.CoreApi; +import haveno.core.api.model.OfferInfo; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOffer; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; +import haveno.proto.grpc.GetMyOfferReply; +import haveno.proto.grpc.GetMyOfferRequest; +import haveno.proto.grpc.GetMyOffersReply; +import haveno.proto.grpc.GetMyOffersRequest; +import haveno.proto.grpc.GetOfferReply; +import haveno.proto.grpc.GetOfferRequest; +import haveno.proto.grpc.GetOffersReply; +import haveno.proto.grpc.GetOffersRequest; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -46,15 +48,10 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.OffersGrpc.*; +import static haveno.proto.grpc.OffersGrpc.*; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcOffersService extends OffersImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcPaymentAccountsService.java similarity index 84% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcPaymentAccountsService.java index ad9abdc3..2d65a423 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcPaymentAccountsService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcPaymentAccountsService.java @@ -15,30 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; -import bisq.core.api.model.PaymentAccountForm; -import bisq.core.api.model.PaymentAccountFormField; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountFactory; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.proto.CoreProtoResolver; -import bisq.proto.grpc.CreateCryptoCurrencyPaymentAccountReply; -import bisq.proto.grpc.CreateCryptoCurrencyPaymentAccountRequest; -import bisq.proto.grpc.CreatePaymentAccountReply; -import bisq.proto.grpc.CreatePaymentAccountRequest; -import bisq.proto.grpc.GetCryptoCurrencyPaymentMethodsReply; -import bisq.proto.grpc.GetCryptoCurrencyPaymentMethodsRequest; -import bisq.proto.grpc.GetPaymentAccountFormReply; -import bisq.proto.grpc.GetPaymentAccountFormRequest; -import bisq.proto.grpc.GetPaymentAccountsReply; -import bisq.proto.grpc.GetPaymentAccountsRequest; -import bisq.proto.grpc.GetPaymentMethodsReply; -import bisq.proto.grpc.GetPaymentMethodsRequest; -import bisq.proto.grpc.ValidateFormFieldReply; -import bisq.proto.grpc.ValidateFormFieldRequest; +import haveno.proto.grpc.CreateCryptoCurrencyPaymentAccountReply; +import haveno.proto.grpc.CreateCryptoCurrencyPaymentAccountRequest; +import haveno.proto.grpc.CreatePaymentAccountReply; +import haveno.proto.grpc.CreatePaymentAccountRequest; +import haveno.proto.grpc.GetCryptoCurrencyPaymentMethodsReply; +import haveno.proto.grpc.GetCryptoCurrencyPaymentMethodsRequest; +import haveno.proto.grpc.GetPaymentAccountFormReply; +import haveno.proto.grpc.GetPaymentAccountFormRequest; +import haveno.proto.grpc.GetPaymentAccountsReply; +import haveno.proto.grpc.GetPaymentAccountsRequest; +import haveno.proto.grpc.GetPaymentMethodsReply; +import haveno.proto.grpc.GetPaymentMethodsRequest; +import haveno.proto.grpc.ValidateFormFieldReply; +import haveno.proto.grpc.ValidateFormFieldRequest; +import haveno.core.api.CoreApi; +import haveno.core.api.model.PaymentAccountForm; +import haveno.core.api.model.PaymentAccountFormField; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountFactory; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.proto.CoreProtoResolver; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -50,15 +52,10 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.PaymentAccountsGrpc.*; +import static haveno.proto.grpc.PaymentAccountsGrpc.*; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcPaymentAccountsService extends PaymentAccountsImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcPriceService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcPriceService.java similarity index 83% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcPriceService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcPriceService.java index 055e36cd..1a678fb9 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcPriceService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcPriceService.java @@ -15,18 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; - -import bisq.core.api.CoreApi; -import bisq.core.api.model.MarketDepthInfo; -import bisq.core.api.model.MarketPriceInfo; -import bisq.proto.grpc.MarketDepthReply; -import bisq.proto.grpc.MarketDepthRequest; -import bisq.proto.grpc.MarketPriceReply; -import bisq.proto.grpc.MarketPriceRequest; -import bisq.proto.grpc.MarketPricesReply; -import bisq.proto.grpc.MarketPricesRequest; +package haveno.daemon.grpc; +import haveno.proto.grpc.MarketDepthReply; +import haveno.proto.grpc.MarketDepthRequest; +import haveno.proto.grpc.MarketPriceReply; +import haveno.proto.grpc.MarketPriceRequest; +import haveno.proto.grpc.MarketPricesReply; +import haveno.proto.grpc.MarketPricesRequest; +import haveno.core.api.CoreApi; +import haveno.core.api.model.MarketDepthInfo; +import haveno.core.api.model.MarketPriceInfo; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -38,16 +39,11 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.PriceGrpc.PriceImplBase; -import static bisq.proto.grpc.PriceGrpc.getGetMarketPriceMethod; +import static haveno.proto.grpc.PriceGrpc.PriceImplBase; +import static haveno.proto.grpc.PriceGrpc.getGetMarketPriceMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcPriceService extends PriceImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcServer.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcServer.java similarity index 95% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcServer.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcServer.java index e17d7cea..ca8a1241 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcServer.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcServer.java @@ -15,12 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; - -import bisq.core.api.CoreContext; - -import bisq.common.UserThread; -import bisq.common.config.Config; +package haveno.daemon.grpc; import io.grpc.Server; import io.grpc.ServerBuilder; @@ -35,9 +30,10 @@ import lombok.extern.slf4j.Slf4j; import static io.grpc.ServerInterceptors.interceptForward; - - -import bisq.daemon.grpc.interceptor.PasswordAuthInterceptor; +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.core.api.CoreContext; +import haveno.daemon.grpc.interceptor.PasswordAuthInterceptor; @Singleton @Slf4j diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcShutdownService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcShutdownService.java similarity index 89% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcShutdownService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcShutdownService.java index 2ed08062..55d699fb 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcShutdownService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcShutdownService.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; - -import bisq.core.app.HavenoHeadlessApp; - -import bisq.common.UserThread; - -import bisq.proto.grpc.ShutdownServerGrpc; -import bisq.proto.grpc.StopReply; -import bisq.proto.grpc.StopRequest; +package haveno.daemon.grpc; +import haveno.proto.grpc.ShutdownServerGrpc; +import haveno.proto.grpc.StopReply; +import haveno.proto.grpc.StopRequest; +import haveno.common.UserThread; +import haveno.core.app.HavenoHeadlessApp; import io.grpc.stub.StreamObserver; import javax.inject.Inject; diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcTradesService.java similarity index 89% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcTradesService.java index 94c4b9ef..ecc665c6 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcTradesService.java @@ -15,28 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; -import bisq.core.api.model.TradeInfo; -import bisq.core.trade.Trade; - -import bisq.proto.grpc.ConfirmPaymentReceivedReply; -import bisq.proto.grpc.ConfirmPaymentReceivedRequest; -import bisq.proto.grpc.ConfirmPaymentSentReply; -import bisq.proto.grpc.ConfirmPaymentSentRequest; -import bisq.proto.grpc.GetChatMessagesReply; -import bisq.proto.grpc.GetChatMessagesRequest; -import bisq.proto.grpc.GetTradeReply; -import bisq.proto.grpc.GetTradeRequest; -import bisq.proto.grpc.GetTradesReply; -import bisq.proto.grpc.GetTradesRequest; -import bisq.proto.grpc.CompleteTradeReply; -import bisq.proto.grpc.CompleteTradeRequest; -import bisq.proto.grpc.SendChatMessageReply; -import bisq.proto.grpc.SendChatMessageRequest; -import bisq.proto.grpc.TakeOfferReply; -import bisq.proto.grpc.TakeOfferRequest; +import haveno.proto.grpc.ConfirmPaymentReceivedReply; +import haveno.proto.grpc.ConfirmPaymentReceivedRequest; +import haveno.proto.grpc.ConfirmPaymentSentReply; +import haveno.proto.grpc.ConfirmPaymentSentRequest; +import haveno.proto.grpc.GetChatMessagesReply; +import haveno.proto.grpc.GetChatMessagesRequest; +import haveno.proto.grpc.GetTradeReply; +import haveno.proto.grpc.GetTradeRequest; +import haveno.proto.grpc.GetTradesReply; +import haveno.proto.grpc.GetTradesRequest; +import haveno.proto.grpc.CompleteTradeReply; +import haveno.proto.grpc.CompleteTradeRequest; +import haveno.proto.grpc.SendChatMessageReply; +import haveno.proto.grpc.SendChatMessageRequest; +import haveno.proto.grpc.TakeOfferReply; +import haveno.proto.grpc.TakeOfferRequest; +import haveno.core.api.CoreApi; +import haveno.core.api.model.TradeInfo; +import haveno.core.trade.Trade; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -48,17 +49,12 @@ import java.util.Optional; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.core.api.model.TradeInfo.toTradeInfo; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.TradesGrpc.*; +import static haveno.proto.grpc.TradesGrpc.*; +import static haveno.core.api.model.TradeInfo.toTradeInfo; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @Slf4j class GrpcTradesService extends TradesImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcVersionService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcVersionService.java similarity index 83% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcVersionService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcVersionService.java index dfde23a6..c37ad7e7 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcVersionService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcVersionService.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.core.api.CoreApi; - -import bisq.proto.grpc.GetVersionReply; -import bisq.proto.grpc.GetVersionRequest; +import haveno.proto.grpc.GetVersionReply; +import haveno.proto.grpc.GetVersionRequest; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -28,22 +26,19 @@ import io.grpc.stub.StreamObserver; import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; - +import haveno.core.api.CoreApi; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import java.util.HashMap; import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.GetVersionGrpc.GetVersionImplBase; -import static bisq.proto.grpc.GetVersionGrpc.getGetVersionMethod; +import static haveno.proto.grpc.GetVersionGrpc.GetVersionImplBase; +import static haveno.proto.grpc.GetVersionGrpc.getGetVersionMethod; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; - @VisibleForTesting @Slf4j public class GrpcVersionService extends GetVersionImplBase { diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcWalletsService.java b/daemon/src/main/java/haveno/daemon/grpc/GrpcWalletsService.java similarity index 86% rename from daemon/src/main/java/bisq/daemon/grpc/GrpcWalletsService.java rename to daemon/src/main/java/haveno/daemon/grpc/GrpcWalletsService.java index 6cfaf519..0b720334 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcWalletsService.java +++ b/daemon/src/main/java/haveno/daemon/grpc/GrpcWalletsService.java @@ -15,39 +15,35 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc; +package haveno.daemon.grpc; -import bisq.common.UserThread; -import bisq.core.api.CoreApi; -import bisq.core.api.model.AddressBalanceInfo; - -import bisq.proto.grpc.GetAddressBalanceReply; -import bisq.proto.grpc.GetAddressBalanceRequest; -import bisq.proto.grpc.GetBalancesReply; -import bisq.proto.grpc.GetBalancesRequest; -import bisq.proto.grpc.GetFundingAddressesReply; -import bisq.proto.grpc.GetFundingAddressesRequest; -import bisq.proto.grpc.GetXmrNewSubaddressRequest; -import bisq.proto.grpc.GetXmrPrimaryAddressReply; -import bisq.proto.grpc.GetXmrPrimaryAddressRequest; -import bisq.proto.grpc.GetXmrNewSubaddressReply; -import bisq.proto.grpc.GetXmrTxsRequest; -import bisq.proto.grpc.GetXmrTxsReply; -import bisq.proto.grpc.CreateXmrTxRequest; -import bisq.proto.grpc.CreateXmrTxReply; -import bisq.proto.grpc.RelayXmrTxRequest; -import bisq.proto.grpc.RelayXmrTxReply; -import bisq.proto.grpc.GetXmrSeedReply; -import bisq.proto.grpc.GetXmrSeedRequest; -import bisq.proto.grpc.LockWalletReply; -import bisq.proto.grpc.LockWalletRequest; -import bisq.proto.grpc.RemoveWalletPasswordReply; -import bisq.proto.grpc.RemoveWalletPasswordRequest; -import bisq.proto.grpc.SendBtcRequest; -import bisq.proto.grpc.SetWalletPasswordReply; -import bisq.proto.grpc.SetWalletPasswordRequest; -import bisq.proto.grpc.UnlockWalletReply; -import bisq.proto.grpc.UnlockWalletRequest; +import haveno.proto.grpc.GetAddressBalanceReply; +import haveno.proto.grpc.GetAddressBalanceRequest; +import haveno.proto.grpc.GetBalancesReply; +import haveno.proto.grpc.GetBalancesRequest; +import haveno.proto.grpc.GetFundingAddressesReply; +import haveno.proto.grpc.GetFundingAddressesRequest; +import haveno.proto.grpc.GetXmrNewSubaddressRequest; +import haveno.proto.grpc.GetXmrPrimaryAddressReply; +import haveno.proto.grpc.GetXmrPrimaryAddressRequest; +import haveno.proto.grpc.GetXmrNewSubaddressReply; +import haveno.proto.grpc.GetXmrTxsRequest; +import haveno.proto.grpc.GetXmrTxsReply; +import haveno.proto.grpc.CreateXmrTxRequest; +import haveno.proto.grpc.CreateXmrTxReply; +import haveno.proto.grpc.RelayXmrTxRequest; +import haveno.proto.grpc.RelayXmrTxReply; +import haveno.proto.grpc.GetXmrSeedReply; +import haveno.proto.grpc.GetXmrSeedRequest; +import haveno.proto.grpc.LockWalletReply; +import haveno.proto.grpc.LockWalletRequest; +import haveno.proto.grpc.RemoveWalletPasswordReply; +import haveno.proto.grpc.RemoveWalletPasswordRequest; +import haveno.proto.grpc.SendBtcRequest; +import haveno.proto.grpc.SetWalletPasswordReply; +import haveno.proto.grpc.SetWalletPasswordRequest; +import haveno.proto.grpc.UnlockWalletReply; +import haveno.proto.grpc.UnlockWalletRequest; import io.grpc.ServerInterceptor; import io.grpc.stub.StreamObserver; @@ -57,7 +53,11 @@ import org.bitcoinj.core.Transaction; import javax.inject.Inject; import com.google.common.util.concurrent.FutureCallback; - +import haveno.common.UserThread; +import haveno.core.api.CoreApi; +import haveno.core.api.model.AddressBalanceInfo; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; import java.math.BigInteger; import java.util.HashMap; @@ -69,16 +69,12 @@ import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import static bisq.core.api.model.XmrTx.toXmrTx; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; -import static bisq.proto.grpc.WalletsGrpc.*; +import static haveno.proto.grpc.WalletsGrpc.*; +import static haveno.core.api.model.XmrTx.toXmrTx; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; - - -import bisq.daemon.grpc.interceptor.CallRateMeteringInterceptor; -import bisq.daemon.grpc.interceptor.GrpcCallRateMeter; import monero.wallet.model.MoneroDestination; import monero.wallet.model.MoneroTxWallet; diff --git a/daemon/src/main/java/bisq/daemon/grpc/interceptor/CallRateMeteringInterceptor.java b/daemon/src/main/java/haveno/daemon/grpc/interceptor/CallRateMeteringInterceptor.java similarity index 96% rename from daemon/src/main/java/bisq/daemon/grpc/interceptor/CallRateMeteringInterceptor.java rename to daemon/src/main/java/haveno/daemon/grpc/interceptor/CallRateMeteringInterceptor.java index e8ed2ace..966c13c6 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/interceptor/CallRateMeteringInterceptor.java +++ b/daemon/src/main/java/haveno/daemon/grpc/interceptor/CallRateMeteringInterceptor.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc.interceptor; +package haveno.daemon.grpc.interceptor; import io.grpc.Metadata; import io.grpc.ServerCall; @@ -93,7 +93,7 @@ public final class CallRateMeteringInterceptor implements ServerInterceptor { // The derived method name may not be an exact match to CLI's method name. String timeUnitName = StringUtils.chop(rateMeter.getTimeUnit().name().toLowerCase()); // Just print 'getversion', not the grpc method descriptor's - // full-method-name: 'io.bisq.protobuffer.getversion/getversion'. + // full-method-name: 'io.haveno.protobuffer.getversion/getversion'. String loggedMethodName = methodName.split("/")[1]; return format("The maximum allowed number of %s calls (%d/%s) has been exceeded", loggedMethodName, @@ -109,7 +109,7 @@ public final class CallRateMeteringInterceptor implements ServerInterceptor { private String getRateMeterKey(ServerCall serverCall) { // Get the rate meter map key from the server call method descriptor. The - // returned String (e.g., 'io.bisq.protobuffer.Offers/CreateOffer') will match + // returned String (e.g., 'io.haveno.protobuffer.Offers/CreateOffer') will match // a map entry key in the 'serviceCallRateMeters' constructor argument, if it // was defined in the Grpc*Service class' rateMeteringInterceptor method. return serverCall.getMethodDescriptor().getFullMethodName(); diff --git a/daemon/src/main/java/bisq/daemon/grpc/interceptor/GrpcCallRateMeter.java b/daemon/src/main/java/haveno/daemon/grpc/interceptor/GrpcCallRateMeter.java similarity index 96% rename from daemon/src/main/java/bisq/daemon/grpc/interceptor/GrpcCallRateMeter.java rename to daemon/src/main/java/haveno/daemon/grpc/interceptor/GrpcCallRateMeter.java index 678be0ec..e215a056 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/interceptor/GrpcCallRateMeter.java +++ b/daemon/src/main/java/haveno/daemon/grpc/interceptor/GrpcCallRateMeter.java @@ -1,4 +1,4 @@ -package bisq.daemon.grpc.interceptor; +package haveno.daemon.grpc.interceptor; import org.apache.commons.lang3.StringUtils; @@ -61,7 +61,7 @@ public class GrpcCallRateMeter { synchronized (callTimestamps) { String shortTimeUnitName = StringUtils.chop(timeUnit.name().toLowerCase()); // Just print 'GetVersion has been called N times...', - // not 'io.bisq.protobuffer.GetVersion/GetVersion has been called N times...' + // not 'io.haveno.protobuffer.GetVersion/GetVersion has been called N times...' String loggedMethodName = calledMethodName.split("/")[1]; return format("%s has been called %d time%s in the last %s, rate limit is %d/%s", loggedMethodName, diff --git a/daemon/src/main/java/bisq/daemon/grpc/interceptor/GrpcServiceRateMeteringConfig.java b/daemon/src/main/java/haveno/daemon/grpc/interceptor/GrpcServiceRateMeteringConfig.java similarity index 98% rename from daemon/src/main/java/bisq/daemon/grpc/interceptor/GrpcServiceRateMeteringConfig.java rename to daemon/src/main/java/haveno/daemon/grpc/interceptor/GrpcServiceRateMeteringConfig.java index 4a217b79..f02c38fc 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/interceptor/GrpcServiceRateMeteringConfig.java +++ b/daemon/src/main/java/haveno/daemon/grpc/interceptor/GrpcServiceRateMeteringConfig.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc.interceptor; +package haveno.daemon.grpc.interceptor; import io.grpc.ServerInterceptor; @@ -41,9 +41,9 @@ import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import static bisq.common.file.FileUtil.deleteFileIfExists; -import static bisq.common.file.FileUtil.renameFile; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.common.file.FileUtil.deleteFileIfExists; +import static haveno.common.file.FileUtil.renameFile; import static java.lang.String.format; import static java.lang.System.getProperty; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/daemon/src/main/java/bisq/daemon/grpc/interceptor/PasswordAuthInterceptor.java b/daemon/src/main/java/haveno/daemon/grpc/interceptor/PasswordAuthInterceptor.java similarity index 95% rename from daemon/src/main/java/bisq/daemon/grpc/interceptor/PasswordAuthInterceptor.java rename to daemon/src/main/java/haveno/daemon/grpc/interceptor/PasswordAuthInterceptor.java index f8a603e5..15d5dd6f 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/interceptor/PasswordAuthInterceptor.java +++ b/daemon/src/main/java/haveno/daemon/grpc/interceptor/PasswordAuthInterceptor.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc.interceptor; - -import bisq.common.config.Config; +package haveno.daemon.grpc.interceptor; import io.grpc.Metadata; import io.grpc.ServerCall; @@ -32,11 +30,13 @@ import static io.grpc.Metadata.Key; import static io.grpc.Status.UNAUTHENTICATED; import static java.lang.String.format; +import haveno.common.config.Config; + /** * Authorizes rpc server calls by comparing the value of the caller's * {@value PASSWORD_KEY} header to an expected value set at server startup time. * - * @see bisq.common.config.Config#apiPassword + * @see haveno.common.config.Config#apiPassword */ public class PasswordAuthInterceptor implements ServerInterceptor { diff --git a/daemon/src/test/java/bisq/daemon/grpc/interceptor/GrpcServiceRateMeteringConfigTest.java b/daemon/src/test/java/haveno/daemon/grpc/interceptor/GrpcServiceRateMeteringConfigTest.java similarity index 94% rename from daemon/src/test/java/bisq/daemon/grpc/interceptor/GrpcServiceRateMeteringConfigTest.java rename to daemon/src/test/java/haveno/daemon/grpc/interceptor/GrpcServiceRateMeteringConfigTest.java index efef3258..eaba951c 100644 --- a/daemon/src/test/java/bisq/daemon/grpc/interceptor/GrpcServiceRateMeteringConfigTest.java +++ b/daemon/src/test/java/haveno/daemon/grpc/interceptor/GrpcServiceRateMeteringConfigTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.daemon.grpc.interceptor; +package haveno.daemon.grpc.interceptor; import io.grpc.ServerInterceptor; @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static bisq.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; +import static haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig.getCustomRateMeteringInterceptor; import static java.lang.System.getProperty; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.HOURS; @@ -44,9 +44,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; - - -import bisq.daemon.grpc.GrpcVersionService; +import haveno.daemon.grpc.GrpcVersionService; +import haveno.daemon.grpc.interceptor.CallRateMeteringInterceptor; +import haveno.daemon.grpc.interceptor.GrpcCallRateMeter; +import haveno.daemon.grpc.interceptor.GrpcServiceRateMeteringConfig; @Slf4j public class GrpcServiceRateMeteringConfigTest { diff --git a/desktop/package/README.md b/desktop/package/README.md index 0cc04745..15dbdf71 100644 --- a/desktop/package/README.md +++ b/desktop/package/README.md @@ -20,10 +20,10 @@ Error: Invalid or unsupported type: [rpm] On Ubuntu, resolve by running `sudo apt install rpm`. For deb, ensure dpkg is installed. ``` -Exception in thread "main" java.io.IOException: Failed to rename /tmp/Bisq-stripped15820156885694375398.tmp to /storage/src/haveno/desktop/build/libs/fatJar/desktop-1.0.0-SNAPSHOT-all.jar - at bisq.tools.Utils.renameFile(Utils.java:36) +Exception in thread "main" java.io.IOException: Failed to rename /tmp/Haveno-stripped15820156885694375398.tmp to /storage/src/haveno/desktop/build/libs/fatJar/desktop-1.0.0-SNAPSHOT-all.jar + at haveno.tools.Utils.renameFile(Utils.java:36) at io.github.zlika.reproducible.StipZipFile.strip(StipZipFile.java:35) - at bisq.tools.DeterministicBuildTool.main(DeterministicBuildTool.java:24) + at haveno.tools.DeterministicBuildTool.main(DeterministicBuildTool.java:24) ``` diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index c60ab307..f0152b2f 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -15,6 +15,6 @@ apt-get install -y vim fakeroot COPY 64bitBuild.sh /root -COPY bisq-$version.jar /root +COPY haveno-$version.jar /root # cd to the Dex directory and execute the jar. #CMD cd ~/Dex && java -jar Dex.jar diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh index f0c2ff7b..395f00c9 100755 --- a/desktop/package/macosx/copy_dbs.sh +++ b/desktop/package/macosx/copy_dbs.sh @@ -4,13 +4,13 @@ cd $(dirname $0)/../../../ version="0.0.1" -# Set BISQ_DIR as environment var to the path of your locally synced Bisq data directory e.g. BISQ_DIR=~/Library/Application\ Support/Bisq +# Set HAVENO_DIR as environment var to the path of your locally synced Haveno data directory e.g. HAVENO_DIR=~/Library/Application\ Support/Haveno -dbDir=$BISQ_DIR/btc_mainnet/db +dbDir=$HAVENO_DIR/btc_mainnet/db resDir=p2p/src/main/resources # Only commit new TradeStatistics3Store if you plan to add it to -# https://github.com/bisq-network/bisq/blob/0345c795e2c227d827a1f239a323dda1250f4e69/common/src/main/java/bisq/common/app/Version.java#L40 as well. +# https://github.com/bisq-network/bisq/blob/0345c795e2c227d827a1f239a323dda1250f4e69/common/src/main/java/haveno/common/app/Version.java#L40 as well. cp "$dbDir/TradeStatistics3Store" "$resDir/TradeStatistics3Store_${version}_BTC_MAINNET" cp "$dbDir/AccountAgeWitnessStore" "$resDir/AccountAgeWitnessStore_${version}_BTC_MAINNET" cp "$dbDir/DaoStateStore" "$resDir/DaoStateStore_BTC_MAINNET" diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index cb3c38c4..4fce731e 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -6,10 +6,10 @@ version="0.0.1-SNAPSHOT" target_dir="releases/$version" -# Set BISQ_GPG_USER as environment var to the email address used for gpg signing. e.g. BISQ_GPG_USER=manfred@bitsquare.io -# Set BISQ_VM_PATH as environment var to the directory where your shared folders for virtual box are residing +# Set HAVENO_GPG_USER as environment var to the email address used for gpg signing. e.g. HAVENO_GPG_USER=manfred@bitsquare.io +# Set HAVENO_VM_PATH as environment var to the directory where your shared folders for virtual box are residing -vmPath=$BISQ_VM_PATH +vmPath=$HAVENO_VM_PATH linux64=$vmPath/vm_shared_ubuntu win64=$vmPath/vm_shared_windows macos=$vmPath/vm_shared_macosx @@ -29,19 +29,19 @@ cp "$target_dir/../../package/29CDFD3B.asc" "$target_dir/" # signing key cp "$target_dir/../../package/signingkey.asc" "$target_dir/" -dmg="Bisq-$version.dmg" +dmg="Haveno-$version.dmg" cp "$macos/$dmg" "$target_dir/" -deb="bisq_$version-1_amd64.deb" -deb64="Bisq-64bit-$version.deb" +deb="haveno_$version-1_amd64.deb" +deb64="Haveno-64bit-$version.deb" cp "$linux64/$deb" "$target_dir/$deb64" -rpm="bisq-$version-1.x86_64.rpm" -rpm64="Bisq-64bit-$version.rpm" +rpm="haveno-$version-1.x86_64.rpm" +rpm64="Haveno-64bit-$version.rpm" cp "$linux64/$rpm" "$target_dir/$rpm64" -exe="Bisq-$version.exe" -exe64="Bisq-64bit-$version.exe" +exe="Haveno-$version.exe" +exe64="Haveno-64bit-$version.exe" cp "$win64/$exe" "$target_dir/$exe64" rpi="jar-lib-for-raspberry-pi-$version.zip" @@ -50,11 +50,11 @@ cp "$deployDir/$rpi" "$target_dir/" cd "$target_dir" echo Create signatures -gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $dmg.asc --detach-sig --armor $dmg -gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $deb64.asc --detach-sig --armor $deb64 -gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $rpm64.asc --detach-sig --armor $rpm64 -gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $exe64.asc --detach-sig --armor $exe64 -gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $rpi.asc --detach-sig --armor $rpi +gpg --digest-algo SHA256 --local-user $HAVENO_GPG_USER --output $dmg.asc --detach-sig --armor $dmg +gpg --digest-algo SHA256 --local-user $HAVENO_GPG_USER --output $deb64.asc --detach-sig --armor $deb64 +gpg --digest-algo SHA256 --local-user $HAVENO_GPG_USER --output $rpm64.asc --detach-sig --armor $rpm64 +gpg --digest-algo SHA256 --local-user $HAVENO_GPG_USER --output $exe64.asc --detach-sig --armor $exe64 +gpg --digest-algo SHA256 --local-user $HAVENO_GPG_USER --output $rpi.asc --detach-sig --armor $rpi echo Verify signatures gpg --digest-algo SHA256 --verify $dmg{.asc*,} diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index 6ad0247d..5b3b0e7d 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -244,7 +244,7 @@ task packageInstallers { // Options for creating the application launcher " --main-jar ${mainJarName}" + - " --main-class bisq.desktop.app.HavenoAppMain" + + " --main-class haveno.desktop.app.HavenoAppMain" + " --java-options -Xss1280k" + " --java-options -XX:MaxRAM=4g" + " --java-options -Djava.net.preferIPv4Stack=true" + diff --git a/desktop/src/main/java/bisq/desktop/CandleStickChart.css b/desktop/src/main/java/haveno/desktop/CandleStickChart.css similarity index 100% rename from desktop/src/main/java/bisq/desktop/CandleStickChart.css rename to desktop/src/main/java/haveno/desktop/CandleStickChart.css diff --git a/desktop/src/main/java/bisq/desktop/DesktopModule.java b/desktop/src/main/java/haveno/desktop/DesktopModule.java similarity index 76% rename from desktop/src/main/java/bisq/desktop/DesktopModule.java rename to desktop/src/main/java/haveno/desktop/DesktopModule.java index 615c708f..8ea29712 100644 --- a/desktop/src/main/java/bisq/desktop/DesktopModule.java +++ b/desktop/src/main/java/haveno/desktop/DesktopModule.java @@ -15,25 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.desktop; +package haveno.desktop; -import bisq.desktop.common.fxml.FxmlViewLoader; -import bisq.desktop.common.view.ViewFactory; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.common.view.guice.InjectorViewFactory; - -import bisq.core.locale.Res; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +import static haveno.common.config.Config.APP_NAME; import com.google.inject.Singleton; import com.google.inject.name.Names; - +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.core.locale.Res; +import haveno.desktop.common.fxml.FxmlViewLoader; +import haveno.desktop.common.view.ViewFactory; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.common.view.guice.InjectorViewFactory; import java.util.ResourceBundle; -import static bisq.common.config.Config.APP_NAME; - public class DesktopModule extends AppModule { public DesktopModule(Config config) { diff --git a/desktop/src/main/java/bisq/desktop/Navigation.java b/desktop/src/main/java/haveno/desktop/Navigation.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/Navigation.java rename to desktop/src/main/java/haveno/desktop/Navigation.java index 85590251..7dc81c2c 100644 --- a/desktop/src/main/java/bisq/desktop/Navigation.java +++ b/desktop/src/main/java/haveno/desktop/Navigation.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop; - -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewPath; -import bisq.desktop.main.MainView; -import bisq.desktop.main.market.MarketView; - -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.NavigationPath; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.desktop; import com.google.inject.Inject; - +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.NavigationPath; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewPath; +import haveno.desktop.main.MainView; +import haveno.desktop.main.market.MarketView; import javax.inject.Singleton; import java.util.ArrayList; diff --git a/desktop/src/main/java/bisq/desktop/app/HavenoApp.java b/desktop/src/main/java/haveno/desktop/app/HavenoApp.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/app/HavenoApp.java rename to desktop/src/main/java/haveno/desktop/app/HavenoApp.java index b9d32ce7..bf1faeb5 100644 --- a/desktop/src/main/java/bisq/desktop/app/HavenoApp.java +++ b/desktop/src/main/java/haveno/desktop/app/HavenoApp.java @@ -15,43 +15,39 @@ * along with Haveno. If not, see . */ -package bisq.desktop.app; - -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.main.MainView; -import bisq.desktop.main.debug.DebugView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.BtcEmptyWalletWindow; -import bisq.desktop.main.overlays.windows.FilterWindow; -import bisq.desktop.main.overlays.windows.ManualPayoutTxWindow; -import bisq.desktop.main.overlays.windows.SendAlertMessageWindow; -import bisq.desktop.main.overlays.windows.ShowWalletDataWindow; -import bisq.desktop.util.CssTheme; -import bisq.desktop.util.ImageUtil; - -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.user.Cookie; -import bisq.core.user.CookieKey; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.common.app.DevEnv; -import bisq.common.app.Log; -import bisq.common.config.Config; -import bisq.common.setup.GracefulShutDownHandler; -import bisq.common.setup.UncaughtExceptionHandler; -import bisq.common.util.Utilities; +package haveno.desktop.app; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.name.Names; - +import haveno.common.app.DevEnv; +import haveno.common.app.Log; +import haveno.common.config.Config; +import haveno.common.setup.GracefulShutDownHandler; +import haveno.common.setup.UncaughtExceptionHandler; +import haveno.common.util.Utilities; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.user.Cookie; +import haveno.core.user.CookieKey; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.main.MainView; +import haveno.desktop.main.debug.DebugView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.BtcEmptyWalletWindow; +import haveno.desktop.main.overlays.windows.FilterWindow; +import haveno.desktop.main.overlays.windows.ManualPayoutTxWindow; +import haveno.desktop.main.overlays.windows.SendAlertMessageWindow; +import haveno.desktop.main.overlays.windows.ShowWalletDataWindow; +import haveno.desktop.util.CssTheme; +import haveno.desktop.util.ImageUtil; import com.google.common.base.Joiner; import javafx.application.Application; @@ -77,6 +73,11 @@ import java.util.function.Consumer; import org.slf4j.LoggerFactory; +import static haveno.desktop.util.Layout.INITIAL_WINDOW_HEIGHT; +import static haveno.desktop.util.Layout.INITIAL_WINDOW_WIDTH; +import static haveno.desktop.util.Layout.MIN_WINDOW_HEIGHT; +import static haveno.desktop.util.Layout.MIN_WINDOW_WIDTH; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -84,11 +85,6 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.Layout.INITIAL_WINDOW_HEIGHT; -import static bisq.desktop.util.Layout.INITIAL_WINDOW_WIDTH; -import static bisq.desktop.util.Layout.MIN_WINDOW_HEIGHT; -import static bisq.desktop.util.Layout.MIN_WINDOW_WIDTH; - @Slf4j public class HavenoApp extends Application implements UncaughtExceptionHandler { @Setter @@ -361,7 +357,7 @@ public class HavenoApp extends Application implements UncaughtExceptionHandler { return; } - // We show a popup to inform user that open offers will be removed if Bisq is not running. + // We show a popup to inform user that open offers will be removed if Haveno is not running. String key = "showOpenOfferWarnPopupAtShutDown"; if (injector.getInstance(Preferences.class).showAgain(key) && !DevEnv.isDevMode()) { new Popup().information(Res.get("popup.info.shutDownWithOpenOffers")) diff --git a/desktop/src/main/java/bisq/desktop/app/HavenoAppMain.java b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/app/HavenoAppMain.java rename to desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java index 1bc67388..9b190e9f 100644 --- a/desktop/src/main/java/bisq/desktop/app/HavenoAppMain.java +++ b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.app; +package haveno.desktop.app; -import bisq.desktop.common.UITimer; -import bisq.desktop.common.view.guice.InjectorViewFactory; -import bisq.desktop.setup.DesktopPersistedDataHost; -import bisq.desktop.util.ImageUtil; - -import bisq.core.app.AvoidStandbyModeService; -import bisq.core.app.HavenoExecutable; - -import bisq.common.UserThread; -import bisq.common.app.AppModule; -import bisq.common.app.Version; -import bisq.common.crypto.IncorrectPasswordException; +import haveno.common.UserThread; +import haveno.common.app.AppModule; +import haveno.common.app.Version; +import haveno.common.crypto.IncorrectPasswordException; +import haveno.core.app.AvoidStandbyModeService; +import haveno.core.app.HavenoExecutable; +import haveno.desktop.common.UITimer; +import haveno.desktop.common.view.guice.InjectorViewFactory; +import haveno.desktop.setup.DesktopPersistedDataHost; +import haveno.desktop.util.ImageUtil; import javafx.application.Application; import javafx.application.Platform; @@ -57,7 +55,7 @@ public class HavenoAppMain extends HavenoExecutable { private HavenoApp application; public HavenoAppMain() { - super("Bisq Desktop", "bisq-desktop", DEFAULT_APP_NAME, Version.VERSION); + super("Haveno Desktop", "haveno-desktop", DEFAULT_APP_NAME, Version.VERSION); } public static void main(String[] args) { diff --git a/desktop/src/main/java/bisq/desktop/app/HavenoAppModule.java b/desktop/src/main/java/haveno/desktop/app/HavenoAppModule.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/app/HavenoAppModule.java rename to desktop/src/main/java/haveno/desktop/app/HavenoAppModule.java index 32ccb6e7..abaded6a 100644 --- a/desktop/src/main/java/bisq/desktop/app/HavenoAppModule.java +++ b/desktop/src/main/java/haveno/desktop/app/HavenoAppModule.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.app; +package haveno.desktop.app; -import bisq.desktop.DesktopModule; - -import bisq.core.app.CoreModule; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.core.app.CoreModule; +import haveno.desktop.DesktopModule; public class HavenoAppModule extends AppModule { diff --git a/desktop/src/main/java/bisq/desktop/common/UITimer.java b/desktop/src/main/java/haveno/desktop/common/UITimer.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/common/UITimer.java rename to desktop/src/main/java/haveno/desktop/common/UITimer.java index 5ea42304..e2aa8fa2 100644 --- a/desktop/src/main/java/bisq/desktop/common/UITimer.java +++ b/desktop/src/main/java/haveno/desktop/common/UITimer.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.reactfx.FxTimer; +package haveno.desktop.common; import javafx.application.Platform; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.reactfx.FxTimer; import java.time.Duration; import org.slf4j.Logger; @@ -30,7 +28,7 @@ import org.slf4j.LoggerFactory; public class UITimer implements Timer { private final Logger log = LoggerFactory.getLogger(UITimer.class); - private bisq.common.reactfx.Timer timer; + private haveno.common.reactfx.Timer timer; public UITimer() { } diff --git a/desktop/src/main/java/bisq/desktop/common/ViewfxException.java b/desktop/src/main/java/haveno/desktop/common/ViewfxException.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/ViewfxException.java rename to desktop/src/main/java/haveno/desktop/common/ViewfxException.java index 59ca7d86..a6a7f960 100644 --- a/desktop/src/main/java/bisq/desktop/common/ViewfxException.java +++ b/desktop/src/main/java/haveno/desktop/common/ViewfxException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common; +package haveno.desktop.common; import static java.lang.String.format; diff --git a/desktop/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java b/desktop/src/main/java/haveno/desktop/common/fxml/FxmlViewLoader.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java rename to desktop/src/main/java/haveno/desktop/common/fxml/FxmlViewLoader.java index a82ecb21..aeac2846 100644 --- a/desktop/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java +++ b/desktop/src/main/java/haveno/desktop/common/fxml/FxmlViewLoader.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.fxml; - -import bisq.desktop.common.ViewfxException; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewFactory; -import bisq.desktop.common.view.ViewLoader; - -import bisq.common.util.Utilities; +package haveno.desktop.common.fxml; import javax.inject.Inject; import javax.inject.Singleton; import com.google.common.base.Joiner; - +import haveno.common.util.Utilities; +import haveno.desktop.common.ViewfxException; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewFactory; +import haveno.desktop.common.view.ViewLoader; import javafx.fxml.FXMLLoader; import java.net.URL; @@ -130,7 +127,7 @@ public class FxmlViewLoader implements ViewLoader { /** * Copied and adapted from Spring Framework v4.3.6's AnnotationUtils#defaultValue - * method in order to make it possible to drop Bisq's dependency on Spring altogether. + * method in order to make it possible to drop Haveno's dependency on Spring altogether. */ @SuppressWarnings("SameParameterValue") private static Object getDefaultValue(Class annotationType, String attributeName) { diff --git a/desktop/src/main/java/bisq/desktop/common/model/Activatable.java b/desktop/src/main/java/haveno/desktop/common/model/Activatable.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/common/model/Activatable.java rename to desktop/src/main/java/haveno/desktop/common/model/Activatable.java index b42963d7..4bdc495b 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/Activatable.java +++ b/desktop/src/main/java/haveno/desktop/common/model/Activatable.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; public interface Activatable { diff --git a/desktop/src/main/java/bisq/desktop/common/model/ActivatableDataModel.java b/desktop/src/main/java/haveno/desktop/common/model/ActivatableDataModel.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/common/model/ActivatableDataModel.java rename to desktop/src/main/java/haveno/desktop/common/model/ActivatableDataModel.java index 50774be1..36aef907 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/ActivatableDataModel.java +++ b/desktop/src/main/java/haveno/desktop/common/model/ActivatableDataModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/desktop/src/main/java/bisq/desktop/common/model/ActivatableViewModel.java b/desktop/src/main/java/haveno/desktop/common/model/ActivatableViewModel.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/common/model/ActivatableViewModel.java rename to desktop/src/main/java/haveno/desktop/common/model/ActivatableViewModel.java index e8c8dc02..6b9e595c 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/ActivatableViewModel.java +++ b/desktop/src/main/java/haveno/desktop/common/model/ActivatableViewModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/desktop/src/main/java/bisq/desktop/common/model/ActivatableWithDataModel.java b/desktop/src/main/java/haveno/desktop/common/model/ActivatableWithDataModel.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/model/ActivatableWithDataModel.java rename to desktop/src/main/java/haveno/desktop/common/model/ActivatableWithDataModel.java index 08f202e6..f7e449bc 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/ActivatableWithDataModel.java +++ b/desktop/src/main/java/haveno/desktop/common/model/ActivatableWithDataModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; public class ActivatableWithDataModel extends WithDataModel implements Activatable { diff --git a/desktop/src/main/java/bisq/desktop/common/model/DataModel.java b/desktop/src/main/java/haveno/desktop/common/model/DataModel.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/common/model/DataModel.java rename to desktop/src/main/java/haveno/desktop/common/model/DataModel.java index 40f645b9..407e2b19 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/DataModel.java +++ b/desktop/src/main/java/haveno/desktop/common/model/DataModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; public interface DataModel extends Model { } diff --git a/desktop/src/main/java/bisq/desktop/common/model/Model.java b/desktop/src/main/java/haveno/desktop/common/model/Model.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/common/model/Model.java rename to desktop/src/main/java/haveno/desktop/common/model/Model.java index 367731fa..820867f0 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/Model.java +++ b/desktop/src/main/java/haveno/desktop/common/model/Model.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; public interface Model { } diff --git a/desktop/src/main/java/bisq/desktop/common/model/ViewModel.java b/desktop/src/main/java/haveno/desktop/common/model/ViewModel.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/common/model/ViewModel.java rename to desktop/src/main/java/haveno/desktop/common/model/ViewModel.java index 7502a70d..22223a24 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/ViewModel.java +++ b/desktop/src/main/java/haveno/desktop/common/model/ViewModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; public interface ViewModel extends Model { } diff --git a/desktop/src/main/java/bisq/desktop/common/model/WithDataModel.java b/desktop/src/main/java/haveno/desktop/common/model/WithDataModel.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/common/model/WithDataModel.java rename to desktop/src/main/java/haveno/desktop/common/model/WithDataModel.java index bcda4c2e..08504734 100644 --- a/desktop/src/main/java/bisq/desktop/common/model/WithDataModel.java +++ b/desktop/src/main/java/haveno/desktop/common/model/WithDataModel.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.model; +package haveno.desktop.common.model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/desktop/src/main/java/bisq/desktop/common/view/AbstractView.java b/desktop/src/main/java/haveno/desktop/common/view/AbstractView.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/view/AbstractView.java rename to desktop/src/main/java/haveno/desktop/common/view/AbstractView.java index 432d78d8..f1b7f657 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/AbstractView.java +++ b/desktop/src/main/java/haveno/desktop/common/view/AbstractView.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/common/view/ActivatableView.java b/desktop/src/main/java/haveno/desktop/common/view/ActivatableView.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/view/ActivatableView.java rename to desktop/src/main/java/haveno/desktop/common/view/ActivatableView.java index 563f198d..37d14b26 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/ActivatableView.java +++ b/desktop/src/main/java/haveno/desktop/common/view/ActivatableView.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import javafx.scene.Node; diff --git a/desktop/src/main/java/bisq/desktop/common/view/ActivatableViewAndModel.java b/desktop/src/main/java/haveno/desktop/common/view/ActivatableViewAndModel.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/common/view/ActivatableViewAndModel.java rename to desktop/src/main/java/haveno/desktop/common/view/ActivatableViewAndModel.java index 15e8a61b..e69e2051 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/ActivatableViewAndModel.java +++ b/desktop/src/main/java/haveno/desktop/common/view/ActivatableViewAndModel.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; - -import bisq.desktop.common.model.Activatable; +package haveno.desktop.common.view; import javafx.scene.Node; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.desktop.common.model.Activatable; + public abstract class ActivatableViewAndModel extends ActivatableView { public ActivatableViewAndModel(M model) { diff --git a/desktop/src/main/java/bisq/desktop/common/view/CachingViewLoader.java b/desktop/src/main/java/haveno/desktop/common/view/CachingViewLoader.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/view/CachingViewLoader.java rename to desktop/src/main/java/haveno/desktop/common/view/CachingViewLoader.java index a50d30a1..c309c12e 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/CachingViewLoader.java +++ b/desktop/src/main/java/haveno/desktop/common/view/CachingViewLoader.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/desktop/src/main/java/bisq/desktop/common/view/DefaultPathConvention.java b/desktop/src/main/java/haveno/desktop/common/view/DefaultPathConvention.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/common/view/DefaultPathConvention.java rename to desktop/src/main/java/haveno/desktop/common/view/DefaultPathConvention.java index 6ddfe382..52f172f3 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/DefaultPathConvention.java +++ b/desktop/src/main/java/haveno/desktop/common/view/DefaultPathConvention.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; public class DefaultPathConvention implements FxmlView.PathConvention { diff --git a/desktop/src/main/java/bisq/desktop/common/view/FxmlView.java b/desktop/src/main/java/haveno/desktop/common/view/FxmlView.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/view/FxmlView.java rename to desktop/src/main/java/haveno/desktop/common/view/FxmlView.java index 122cab7a..90768e6b 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/FxmlView.java +++ b/desktop/src/main/java/haveno/desktop/common/view/FxmlView.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import java.util.function.Function; diff --git a/desktop/src/main/java/bisq/desktop/common/view/InitializableView.java b/desktop/src/main/java/haveno/desktop/common/view/InitializableView.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/view/InitializableView.java rename to desktop/src/main/java/haveno/desktop/common/view/InitializableView.java index 4b3e8a6f..4661d8e4 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/InitializableView.java +++ b/desktop/src/main/java/haveno/desktop/common/view/InitializableView.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import javafx.fxml.Initializable; diff --git a/desktop/src/main/java/bisq/desktop/common/view/View.java b/desktop/src/main/java/haveno/desktop/common/view/View.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/common/view/View.java rename to desktop/src/main/java/haveno/desktop/common/view/View.java index a03c65b4..d636982f 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/View.java +++ b/desktop/src/main/java/haveno/desktop/common/view/View.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import javafx.scene.Node; diff --git a/desktop/src/main/java/bisq/desktop/common/view/ViewFactory.java b/desktop/src/main/java/haveno/desktop/common/view/ViewFactory.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/common/view/ViewFactory.java rename to desktop/src/main/java/haveno/desktop/common/view/ViewFactory.java index 3e3dda9d..7f2dc677 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/ViewFactory.java +++ b/desktop/src/main/java/haveno/desktop/common/view/ViewFactory.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import javafx.util.Callback; diff --git a/desktop/src/main/java/bisq/desktop/common/view/ViewLoader.java b/desktop/src/main/java/haveno/desktop/common/view/ViewLoader.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/common/view/ViewLoader.java rename to desktop/src/main/java/haveno/desktop/common/view/ViewLoader.java index 8cfb4764..0bdfc7ba 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/ViewLoader.java +++ b/desktop/src/main/java/haveno/desktop/common/view/ViewLoader.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; public interface ViewLoader { View load(Class viewClass); diff --git a/desktop/src/main/java/bisq/desktop/common/view/ViewPath.java b/desktop/src/main/java/haveno/desktop/common/view/ViewPath.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/common/view/ViewPath.java rename to desktop/src/main/java/haveno/desktop/common/view/ViewPath.java index 190ab3f9..54217763 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/ViewPath.java +++ b/desktop/src/main/java/haveno/desktop/common/view/ViewPath.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view; +package haveno.desktop.common.view; import java.util.ArrayList; import java.util.Arrays; diff --git a/desktop/src/main/java/bisq/desktop/common/view/guice/InjectorViewFactory.java b/desktop/src/main/java/haveno/desktop/common/view/guice/InjectorViewFactory.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/common/view/guice/InjectorViewFactory.java rename to desktop/src/main/java/haveno/desktop/common/view/guice/InjectorViewFactory.java index 4988d9fb..ebcafaf6 100644 --- a/desktop/src/main/java/bisq/desktop/common/view/guice/InjectorViewFactory.java +++ b/desktop/src/main/java/haveno/desktop/common/view/guice/InjectorViewFactory.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.view.guice; - -import bisq.desktop.common.view.ViewFactory; +package haveno.desktop.common.view.guice; import com.google.inject.Injector; - +import haveno.desktop.common.view.ViewFactory; import javax.inject.Singleton; import com.google.common.base.Preconditions; diff --git a/desktop/src/main/java/bisq/desktop/components/AccountStatusTooltipLabel.java b/desktop/src/main/java/haveno/desktop/components/AccountStatusTooltipLabel.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/components/AccountStatusTooltipLabel.java rename to desktop/src/main/java/haveno/desktop/components/AccountStatusTooltipLabel.java index 194dbd20..bc91b570 100644 --- a/desktop/src/main/java/bisq/desktop/components/AccountStatusTooltipLabel.java +++ b/desktop/src/main/java/haveno/desktop/components/AccountStatusTooltipLabel.java @@ -15,22 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.components.controlsfx.control.PopOver; -import bisq.desktop.main.offer.offerbook.OfferBookListItem; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.locale.Res; -import bisq.core.offer.OfferRestrictions; -import bisq.core.trade.HavenoUtils; - -import bisq.common.UserThread; +package haveno.desktop.components; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.locale.Res; +import haveno.core.offer.OfferRestrictions; +import haveno.core.trade.HavenoUtils; +import haveno.desktop.components.controlsfx.control.PopOver; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; import javafx.scene.Node; import javafx.scene.control.ContentDisplay; import javafx.scene.control.Hyperlink; diff --git a/desktop/src/main/java/bisq/desktop/components/AddressTextField.java b/desktop/src/main/java/haveno/desktop/components/AddressTextField.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/components/AddressTextField.java rename to desktop/src/main/java/haveno/desktop/components/AddressTextField.java index 5e37bb47..b4d522ca 100644 --- a/desktop/src/main/java/bisq/desktop/components/AddressTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/AddressTextField.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.common.util.Utilities; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.GUIUtil; import com.jfoenix.controls.JFXTextField; import javafx.scene.control.Label; diff --git a/desktop/src/main/java/bisq/desktop/components/AddressWithIconAndDirection.java b/desktop/src/main/java/haveno/desktop/components/AddressWithIconAndDirection.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/AddressWithIconAndDirection.java rename to desktop/src/main/java/haveno/desktop/components/AddressWithIconAndDirection.java index 455bed18..c3930e20 100644 --- a/desktop/src/main/java/bisq/desktop/components/AddressWithIconAndDirection.java +++ b/desktop/src/main/java/haveno/desktop/components/AddressWithIconAndDirection.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; diff --git a/desktop/src/main/java/bisq/desktop/components/AutoTooltipButton.java b/desktop/src/main/java/haveno/desktop/components/AutoTooltipButton.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/components/AutoTooltipButton.java rename to desktop/src/main/java/haveno/desktop/components/AutoTooltipButton.java index 3d659224..b06d03a8 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutoTooltipButton.java +++ b/desktop/src/main/java/haveno/desktop/components/AutoTooltipButton.java @@ -15,7 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; + +import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated; import com.jfoenix.controls.JFXButton; import com.jfoenix.skins.JFXButtonSkin; @@ -23,8 +25,6 @@ import com.jfoenix.skins.JFXButtonSkin; import javafx.scene.Node; import javafx.scene.control.Skin; -import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated; - public class AutoTooltipButton extends JFXButton { public AutoTooltipButton() { diff --git a/desktop/src/main/java/bisq/desktop/components/AutoTooltipCheckBox.java b/desktop/src/main/java/haveno/desktop/components/AutoTooltipCheckBox.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/components/AutoTooltipCheckBox.java rename to desktop/src/main/java/haveno/desktop/components/AutoTooltipCheckBox.java index fc355db3..ad683aee 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutoTooltipCheckBox.java +++ b/desktop/src/main/java/haveno/desktop/components/AutoTooltipCheckBox.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; + +import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated; import com.jfoenix.controls.JFXCheckBox; import com.jfoenix.skins.JFXCheckBoxSkin; import javafx.scene.control.Skin; -import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated; - public class AutoTooltipCheckBox extends JFXCheckBox { public AutoTooltipCheckBox() { diff --git a/desktop/src/main/java/bisq/desktop/components/AutoTooltipLabel.java b/desktop/src/main/java/haveno/desktop/components/AutoTooltipLabel.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/components/AutoTooltipLabel.java rename to desktop/src/main/java/haveno/desktop/components/AutoTooltipLabel.java index 4be3e50c..0add5813 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutoTooltipLabel.java +++ b/desktop/src/main/java/haveno/desktop/components/AutoTooltipLabel.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; + +import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated; import javafx.scene.control.Label; import javafx.scene.control.Skin; import javafx.scene.control.skin.LabelSkin; -import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated; - public class AutoTooltipLabel extends Label { public AutoTooltipLabel() { diff --git a/desktop/src/main/java/bisq/desktop/components/AutoTooltipRadioButton.java b/desktop/src/main/java/haveno/desktop/components/AutoTooltipRadioButton.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/components/AutoTooltipRadioButton.java rename to desktop/src/main/java/haveno/desktop/components/AutoTooltipRadioButton.java index ec98f8bb..68c1afd6 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutoTooltipRadioButton.java +++ b/desktop/src/main/java/haveno/desktop/components/AutoTooltipRadioButton.java @@ -15,14 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; + +import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated; import com.jfoenix.controls.JFXRadioButton; import javafx.scene.control.Skin; -import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated; - public class AutoTooltipRadioButton extends JFXRadioButton { public AutoTooltipRadioButton() { @@ -38,7 +38,7 @@ public class AutoTooltipRadioButton extends JFXRadioButton { return new AutoTooltipRadioButtonSkin(this); } - private class AutoTooltipRadioButtonSkin extends JFXRadioButtonSkinBisqStyle { + private class AutoTooltipRadioButtonSkin extends JFXRadioButtonSkinHavenoStyle { public AutoTooltipRadioButtonSkin(JFXRadioButton radioButton) { super(radioButton); } diff --git a/desktop/src/main/java/bisq/desktop/components/AutoTooltipSlideToggleButton.java b/desktop/src/main/java/haveno/desktop/components/AutoTooltipSlideToggleButton.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/AutoTooltipSlideToggleButton.java rename to desktop/src/main/java/haveno/desktop/components/AutoTooltipSlideToggleButton.java index 4c98e594..52a686c6 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutoTooltipSlideToggleButton.java +++ b/desktop/src/main/java/haveno/desktop/components/AutoTooltipSlideToggleButton.java @@ -1,12 +1,12 @@ -package bisq.desktop.components; +package haveno.desktop.components; + +import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated; import com.jfoenix.controls.JFXToggleButton; import com.jfoenix.skins.JFXToggleButtonSkin; import javafx.scene.control.Skin; -import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated; - public class AutoTooltipSlideToggleButton extends JFXToggleButton { public AutoTooltipSlideToggleButton() { super(); diff --git a/desktop/src/main/java/bisq/desktop/components/AutoTooltipTableColumn.java b/desktop/src/main/java/haveno/desktop/components/AutoTooltipTableColumn.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/components/AutoTooltipTableColumn.java rename to desktop/src/main/java/haveno/desktop/components/AutoTooltipTableColumn.java index 68f6af10..201344c5 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutoTooltipTableColumn.java +++ b/desktop/src/main/java/haveno/desktop/components/AutoTooltipTableColumn.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.components.controlsfx.control.PopOver; -import bisq.desktop.util.FormBuilder; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.desktop.components.controlsfx.control.PopOver; +import haveno.desktop.util.FormBuilder; import javafx.scene.Node; import javafx.scene.control.Label; import javafx.scene.control.TableColumn; diff --git a/desktop/src/main/java/bisq/desktop/components/AutoTooltipToggleButton.java b/desktop/src/main/java/haveno/desktop/components/AutoTooltipToggleButton.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/components/AutoTooltipToggleButton.java rename to desktop/src/main/java/haveno/desktop/components/AutoTooltipToggleButton.java index 158ed61a..8dcd3580 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutoTooltipToggleButton.java +++ b/desktop/src/main/java/haveno/desktop/components/AutoTooltipToggleButton.java @@ -15,15 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; + +import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated; import javafx.scene.Node; import javafx.scene.control.Skin; import javafx.scene.control.ToggleButton; import javafx.scene.control.skin.ToggleButtonSkin; -import static bisq.desktop.components.TooltipUtil.showTooltipIfTruncated; - public class AutoTooltipToggleButton extends ToggleButton { public AutoTooltipToggleButton() { diff --git a/desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java b/desktop/src/main/java/haveno/desktop/components/AutocompleteComboBox.java similarity index 99% rename from desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java rename to desktop/src/main/java/haveno/desktop/components/AutocompleteComboBox.java index fcadf8f0..852a279f 100644 --- a/desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java +++ b/desktop/src/main/java/haveno/desktop/components/AutocompleteComboBox.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.common.UserThread; +package haveno.desktop.components; import org.apache.commons.lang3.StringUtils; import com.jfoenix.controls.JFXComboBox; import com.jfoenix.skins.JFXComboBoxListViewSkin; - +import haveno.common.UserThread; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; diff --git a/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java b/desktop/src/main/java/haveno/desktop/components/BalanceTextField.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/components/BalanceTextField.java rename to desktop/src/main/java/haveno/desktop/components/BalanceTextField.java index b3a997a5..db29498d 100644 --- a/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/BalanceTextField.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.core.trade.HavenoUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.components; import com.jfoenix.controls.JFXTextField; - +import haveno.core.trade.HavenoUtils; +import haveno.core.util.coin.CoinFormatter; import javafx.scene.effect.BlurType; import javafx.scene.effect.DropShadow; import javafx.scene.effect.Effect; diff --git a/desktop/src/main/java/bisq/desktop/components/BusyAnimation.java b/desktop/src/main/java/haveno/desktop/components/BusyAnimation.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/BusyAnimation.java rename to desktop/src/main/java/haveno/desktop/components/BusyAnimation.java index c573675e..c76a2fe9 100644 --- a/desktop/src/main/java/bisq/desktop/components/BusyAnimation.java +++ b/desktop/src/main/java/haveno/desktop/components/BusyAnimation.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import com.jfoenix.controls.JFXSpinner; diff --git a/desktop/src/main/java/bisq/desktop/components/ColoredDecimalPlacesWithZerosText.java b/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/ColoredDecimalPlacesWithZerosText.java rename to desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java index be96bfec..faf2f1d0 100644 --- a/desktop/src/main/java/bisq/desktop/components/ColoredDecimalPlacesWithZerosText.java +++ b/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.core.util.FormattingUtils; - -import bisq.common.util.Tuple2; +package haveno.desktop.components; +import haveno.common.util.Tuple2; +import haveno.core.util.FormattingUtils; import javafx.scene.control.Label; import javafx.scene.layout.HBox; diff --git a/desktop/src/main/java/bisq/desktop/components/ExplorerAddressTextField.java b/desktop/src/main/java/haveno/desktop/components/ExplorerAddressTextField.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/ExplorerAddressTextField.java rename to desktop/src/main/java/haveno/desktop/components/ExplorerAddressTextField.java index 54a48fd2..1e39eb92 100644 --- a/desktop/src/main/java/bisq/desktop/components/ExplorerAddressTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/ExplorerAddressTextField.java @@ -15,19 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.Res; -import bisq.core.user.BlockChainExplorer; -import bisq.core.user.Preferences; - -import bisq.common.util.Utilities; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.user.BlockChainExplorer; +import haveno.core.user.Preferences; +import haveno.desktop.util.GUIUtil; import com.jfoenix.controls.JFXTextField; import javafx.scene.control.Label; diff --git a/desktop/src/main/java/bisq/desktop/components/ExternalHyperlink.java b/desktop/src/main/java/haveno/desktop/components/ExternalHyperlink.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/components/ExternalHyperlink.java rename to desktop/src/main/java/haveno/desktop/components/ExternalHyperlink.java index 091c4433..c2d85e42 100644 --- a/desktop/src/main/java/bisq/desktop/components/ExternalHyperlink.java +++ b/desktop/src/main/java/haveno/desktop/components/ExternalHyperlink.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; diff --git a/desktop/src/main/java/bisq/desktop/components/FundsTextField.java b/desktop/src/main/java/haveno/desktop/components/FundsTextField.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/components/FundsTextField.java rename to desktop/src/main/java/haveno/desktop/components/FundsTextField.java index 51dc136b..d4e677ef 100644 --- a/desktop/src/main/java/bisq/desktop/components/FundsTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/FundsTextField.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; -import bisq.core.locale.Res; - -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.getIcon; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.util.Utilities; +import haveno.core.locale.Res; import javafx.scene.control.Label; import javafx.scene.control.Tooltip; import javafx.scene.layout.AnchorPane; @@ -34,8 +33,6 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.util.FormBuilder.getIcon; - public class FundsTextField extends InfoTextField { public static final Logger log = LoggerFactory.getLogger(FundsTextField.class); diff --git a/desktop/src/main/java/bisq/desktop/components/HavenoTextArea.java b/desktop/src/main/java/haveno/desktop/components/HavenoTextArea.java similarity index 68% rename from desktop/src/main/java/bisq/desktop/components/HavenoTextArea.java rename to desktop/src/main/java/haveno/desktop/components/HavenoTextArea.java index 172ae87e..ed94922f 100644 --- a/desktop/src/main/java/bisq/desktop/components/HavenoTextArea.java +++ b/desktop/src/main/java/haveno/desktop/components/HavenoTextArea.java @@ -1,4 +1,4 @@ -package bisq.desktop.components; +package haveno.desktop.components; import com.jfoenix.controls.JFXTextArea; @@ -7,6 +7,6 @@ import javafx.scene.control.Skin; public class HavenoTextArea extends JFXTextArea { @Override protected Skin createDefaultSkin() { - return new JFXTextAreaSkinBisqStyle(this); + return new JFXTextAreaSkinHavenoStyle(this); } } diff --git a/desktop/src/main/java/bisq/desktop/components/HavenoTextField.java b/desktop/src/main/java/haveno/desktop/components/HavenoTextField.java similarity index 77% rename from desktop/src/main/java/bisq/desktop/components/HavenoTextField.java rename to desktop/src/main/java/haveno/desktop/components/HavenoTextField.java index 2b941c01..b1cdb00f 100644 --- a/desktop/src/main/java/bisq/desktop/components/HavenoTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/HavenoTextField.java @@ -1,4 +1,4 @@ -package bisq.desktop.components; +package haveno.desktop.components; import com.jfoenix.controls.JFXTextField; @@ -16,6 +16,6 @@ public class HavenoTextField extends JFXTextField { @Override protected Skin createDefaultSkin() { - return new JFXTextFieldSkinBisqStyle<>(this, 0); + return new JFXTextFieldSkinHavenoStyle<>(this, 0); } } diff --git a/desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java b/desktop/src/main/java/haveno/desktop/components/HyperlinkWithIcon.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java rename to desktop/src/main/java/haveno/desktop/components/HyperlinkWithIcon.java index 5ec6711a..c2f3a842 100644 --- a/desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java +++ b/desktop/src/main/java/haveno/desktop/components/HyperlinkWithIcon.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.util.FormBuilder; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.glyphs.GlyphIcons; - +import haveno.desktop.util.FormBuilder; import javafx.scene.Node; import javafx.scene.control.ContentDisplay; import javafx.scene.control.Hyperlink; diff --git a/desktop/src/main/java/bisq/desktop/components/InfoAutoTooltipLabel.java b/desktop/src/main/java/haveno/desktop/components/InfoAutoTooltipLabel.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/InfoAutoTooltipLabel.java rename to desktop/src/main/java/haveno/desktop/components/InfoAutoTooltipLabel.java index 947abb86..f79134d0 100644 --- a/desktop/src/main/java/bisq/desktop/components/InfoAutoTooltipLabel.java +++ b/desktop/src/main/java/haveno/desktop/components/InfoAutoTooltipLabel.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; -import bisq.desktop.components.controlsfx.control.PopOver; +import static haveno.desktop.util.FormBuilder.getIcon; import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.glyphs.GlyphIcons; - +import haveno.desktop.components.controlsfx.control.PopOver; import javafx.scene.Node; import javafx.scene.control.ContentDisplay; import javafx.scene.control.Label; import javafx.geometry.Insets; -import static bisq.desktop.util.FormBuilder.getIcon; - public class InfoAutoTooltipLabel extends AutoTooltipLabel { public static final int DEFAULT_WIDTH = 300; diff --git a/desktop/src/main/java/bisq/desktop/components/InfoDisplay.java b/desktop/src/main/java/haveno/desktop/components/InfoDisplay.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/InfoDisplay.java rename to desktop/src/main/java/haveno/desktop/components/InfoDisplay.java index d0393adb..530426c0 100644 --- a/desktop/src/main/java/bisq/desktop/components/InfoDisplay.java +++ b/desktop/src/main/java/haveno/desktop/components/InfoDisplay.java @@ -15,16 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.util.FormBuilder; - -import bisq.core.locale.Res; - -import bisq.common.UserThread; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.UserThread; +import haveno.core.locale.Res; +import haveno.desktop.util.FormBuilder; import javafx.scene.Parent; import javafx.scene.control.Hyperlink; import javafx.scene.control.Label; diff --git a/desktop/src/main/java/bisq/desktop/components/InfoInputTextField.java b/desktop/src/main/java/haveno/desktop/components/InfoInputTextField.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/InfoInputTextField.java rename to desktop/src/main/java/haveno/desktop/components/InfoInputTextField.java index 5d4f18ca..3985b096 100644 --- a/desktop/src/main/java/bisq/desktop/components/InfoInputTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/InfoInputTextField.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.components.controlsfx.control.PopOver; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.desktop.components.controlsfx.control.PopOver; import javafx.scene.Node; import javafx.scene.control.Label; import javafx.scene.layout.AnchorPane; diff --git a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java b/desktop/src/main/java/haveno/desktop/components/InfoTextField.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/InfoTextField.java rename to desktop/src/main/java/haveno/desktop/components/InfoTextField.java index 46d55fc5..10cb8897 100644 --- a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/InfoTextField.java @@ -15,12 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.components.controlsfx.control.PopOver; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; +import haveno.desktop.components.controlsfx.control.PopOver; + +import static haveno.desktop.util.FormBuilder.getIcon; +import static haveno.desktop.util.FormBuilder.getRegularIconForLabel; import com.jfoenix.controls.JFXTextField; @@ -37,9 +39,6 @@ import org.slf4j.LoggerFactory; import lombok.Getter; -import static bisq.desktop.util.FormBuilder.getIcon; -import static bisq.desktop.util.FormBuilder.getRegularIconForLabel; - public class InfoTextField extends AnchorPane { public static final Logger log = LoggerFactory.getLogger(InfoTextField.class); diff --git a/desktop/src/main/java/bisq/desktop/components/InputTextField.java b/desktop/src/main/java/haveno/desktop/components/InputTextField.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/InputTextField.java rename to desktop/src/main/java/haveno/desktop/components/InputTextField.java index edaee3e7..96d229e3 100644 --- a/desktop/src/main/java/bisq/desktop/components/InputTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/InputTextField.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; -import bisq.desktop.util.validation.JFXInputValidator; import com.jfoenix.controls.JFXTextField; - +import haveno.core.locale.Res; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.util.validation.JFXInputValidator; import javafx.scene.control.Skin; import javafx.beans.property.ObjectProperty; @@ -145,6 +144,6 @@ public class InputTextField extends JFXTextField { } protected Skin createDefaultSkin() { - return new JFXTextFieldSkinBisqStyle<>(this, inputLineExtension); + return new JFXTextFieldSkinHavenoStyle<>(this, inputLineExtension); } } diff --git a/desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java b/desktop/src/main/java/haveno/desktop/components/JFXRadioButtonSkinHavenoStyle.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java rename to desktop/src/main/java/haveno/desktop/components/JFXRadioButtonSkinHavenoStyle.java index b4ea6ea2..16e79e98 100644 --- a/desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java +++ b/desktop/src/main/java/haveno/desktop/components/JFXRadioButtonSkinHavenoStyle.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import com.jfoenix.controls.JFXRadioButton; import com.jfoenix.controls.JFXRippler; @@ -45,7 +45,7 @@ import javafx.util.Duration; * Code copied and adapted from com.jfoenix.skins.JFXRadioButtonSkin */ -public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin { +public class JFXRadioButtonSkinHavenoStyle extends RadioButtonSkin { private final JFXRippler rippler; private double padding = 12; @@ -54,7 +54,7 @@ public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin { private JFXAnimationTimer timer; - public JFXRadioButtonSkinBisqStyle(JFXRadioButton control) { + public JFXRadioButtonSkinHavenoStyle(JFXRadioButton control) { super(control); final double radioRadius = 7; diff --git a/desktop/src/main/java/bisq/desktop/components/JFXTextAreaSkinBisqStyle.java b/desktop/src/main/java/haveno/desktop/components/JFXTextAreaSkinHavenoStyle.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/components/JFXTextAreaSkinBisqStyle.java rename to desktop/src/main/java/haveno/desktop/components/JFXTextAreaSkinHavenoStyle.java index 07a4f6d3..51182429 100644 --- a/desktop/src/main/java/bisq/desktop/components/JFXTextAreaSkinBisqStyle.java +++ b/desktop/src/main/java/haveno/desktop/components/JFXTextAreaSkinHavenoStyle.java @@ -1,4 +1,4 @@ -package bisq.desktop.components; +package haveno.desktop.components; import com.jfoenix.adapters.ReflectionHelper; import com.jfoenix.controls.JFXTextArea; @@ -25,7 +25,7 @@ import java.lang.reflect.Field; * Code copied and adapted from com.jfoenix.skins.JFXTextAreaSkin */ -public class JFXTextAreaSkinBisqStyle extends TextAreaSkin { +public class JFXTextAreaSkinHavenoStyle extends TextAreaSkin { private boolean invalid = true; @@ -35,7 +35,7 @@ public class JFXTextAreaSkinBisqStyle extends TextAreaSkin { private ValidationPane errorContainer; private PromptLinesWrapper linesWrapper; - public JFXTextAreaSkinBisqStyle(JFXTextArea textArea) { + public JFXTextAreaSkinHavenoStyle(JFXTextArea textArea) { super(textArea); // init text area properties scrollPane = (ScrollPane) getChildren().get(0); diff --git a/desktop/src/main/java/bisq/desktop/components/JFXTextFieldSkinBisqStyle.java b/desktop/src/main/java/haveno/desktop/components/JFXTextFieldSkinHavenoStyle.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/components/JFXTextFieldSkinBisqStyle.java rename to desktop/src/main/java/haveno/desktop/components/JFXTextFieldSkinHavenoStyle.java index 4aca7692..15c2ad04 100644 --- a/desktop/src/main/java/bisq/desktop/components/JFXTextFieldSkinBisqStyle.java +++ b/desktop/src/main/java/haveno/desktop/components/JFXTextFieldSkinHavenoStyle.java @@ -1,4 +1,4 @@ -package bisq.desktop.components; +package haveno.desktop.components; import com.jfoenix.adapters.ReflectionHelper; import com.jfoenix.controls.base.IFXLabelFloatControl; @@ -20,7 +20,7 @@ import java.lang.reflect.Field; * Code copied and adapted from com.jfoenix.skins.JFXTextFieldSkin */ -public class JFXTextFieldSkinBisqStyle extends TextFieldSkin { +public class JFXTextFieldSkinHavenoStyle extends TextFieldSkin { private double inputLineExtension; private boolean invalid = true; @@ -34,7 +34,7 @@ public class JFXTextFieldSkinBisqStyle errorContainer; private PromptLinesWrapper linesWrapper; - public JFXTextFieldSkinBisqStyle(T textField, double inputLineExtension) { + public JFXTextFieldSkinHavenoStyle(T textField, double inputLineExtension) { super(textField); textPane = (Pane) this.getChildren().get(0); this.inputLineExtension = inputLineExtension; diff --git a/desktop/src/main/java/bisq/desktop/components/MenuItem.java b/desktop/src/main/java/haveno/desktop/components/MenuItem.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/components/MenuItem.java rename to desktop/src/main/java/haveno/desktop/components/MenuItem.java index 606d7cda..97dec249 100644 --- a/desktop/src/main/java/bisq/desktop/components/MenuItem.java +++ b/desktop/src/main/java/haveno/desktop/components/MenuItem.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.View; +package haveno.desktop.components; import com.jfoenix.controls.JFXButton; - +import haveno.desktop.Navigation; +import haveno.desktop.common.view.View; import javafx.scene.control.Toggle; import javafx.scene.control.ToggleGroup; diff --git a/desktop/src/main/java/bisq/desktop/components/NewBadge.java b/desktop/src/main/java/haveno/desktop/components/NewBadge.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/NewBadge.java rename to desktop/src/main/java/haveno/desktop/components/NewBadge.java index 80a1d48a..b04861ae 100644 --- a/desktop/src/main/java/bisq/desktop/components/NewBadge.java +++ b/desktop/src/main/java/haveno/desktop/components/NewBadge.java @@ -1,10 +1,8 @@ -package bisq.desktop.components; - -import bisq.core.locale.Res; -import bisq.core.user.Preferences; +package haveno.desktop.components; import com.jfoenix.controls.JFXBadge; - +import haveno.core.locale.Res; +import haveno.core.user.Preferences; import javafx.scene.Node; import javafx.collections.MapChangeListener; diff --git a/desktop/src/main/java/bisq/desktop/components/PasswordTextField.java b/desktop/src/main/java/haveno/desktop/components/PasswordTextField.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/components/PasswordTextField.java rename to desktop/src/main/java/haveno/desktop/components/PasswordTextField.java index dc1ef05c..d6fb4fa2 100644 --- a/desktop/src/main/java/bisq/desktop/components/PasswordTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/PasswordTextField.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import com.jfoenix.controls.JFXPasswordField; @@ -30,6 +30,6 @@ public class PasswordTextField extends JFXPasswordField { @Override protected Skin createDefaultSkin() { - return new JFXTextFieldSkinBisqStyle<>(this, 0); + return new JFXTextFieldSkinHavenoStyle<>(this, 0); } } diff --git a/desktop/src/main/java/bisq/desktop/components/PeerInfoIcon.java b/desktop/src/main/java/haveno/desktop/components/PeerInfoIcon.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/PeerInfoIcon.java rename to desktop/src/main/java/haveno/desktop/components/PeerInfoIcon.java index 8b7ca3d5..ab223ded 100644 --- a/desktop/src/main/java/bisq/desktop/components/PeerInfoIcon.java +++ b/desktop/src/main/java/haveno/desktop/components/PeerInfoIcon.java @@ -15,21 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.main.overlays.editor.PeerInfoWithTagEditor; -import bisq.desktop.util.DisplayUtils; - -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; - -import bisq.network.p2p.NodeAddress; +package haveno.desktop.components; import com.google.common.base.Charsets; - +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.desktop.main.overlays.editor.PeerInfoWithTagEditor; +import haveno.desktop.util.DisplayUtils; +import haveno.network.p2p.NodeAddress; import javafx.scene.Group; import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; diff --git a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconDispute.java b/desktop/src/main/java/haveno/desktop/components/PeerInfoIconDispute.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/PeerInfoIconDispute.java rename to desktop/src/main/java/haveno/desktop/components/PeerInfoIconDispute.java index 539d0a3a..ef172d42 100644 --- a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconDispute.java +++ b/desktop/src/main/java/haveno/desktop/components/PeerInfoIconDispute.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; -import bisq.core.locale.Res; -import bisq.core.user.Preferences; - -import bisq.network.p2p.NodeAddress; +import static haveno.desktop.util.Colors.AVATAR_GREY; +import haveno.core.locale.Res; +import haveno.core.user.Preferences; +import haveno.network.p2p.NodeAddress; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.Colors.AVATAR_GREY; - @Slf4j public class PeerInfoIconDispute extends PeerInfoIcon { diff --git a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconSmall.java b/desktop/src/main/java/haveno/desktop/components/PeerInfoIconSmall.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/components/PeerInfoIconSmall.java rename to desktop/src/main/java/haveno/desktop/components/PeerInfoIconSmall.java index 5d444f3b..28c52095 100644 --- a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconSmall.java +++ b/desktop/src/main/java/haveno/desktop/components/PeerInfoIconSmall.java @@ -1,13 +1,11 @@ -package bisq.desktop.components; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.offer.Offer; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; - -import bisq.network.p2p.NodeAddress; +package haveno.desktop.components; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.offer.Offer; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.network.p2p.NodeAddress; import javax.annotation.Nullable; public class PeerInfoIconSmall extends PeerInfoIconTrading { diff --git a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java b/desktop/src/main/java/haveno/desktop/components/PeerInfoIconTrading.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java rename to desktop/src/main/java/haveno/desktop/components/PeerInfoIconTrading.java index 06c257c2..7e23062c 100644 --- a/desktop/src/main/java/bisq/desktop/components/PeerInfoIconTrading.java +++ b/desktop/src/main/java/haveno/desktop/components/PeerInfoIconTrading.java @@ -15,20 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.util.Tuple5; +package haveno.desktop.components; +import haveno.common.util.Tuple5; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.network.p2p.NodeAddress; import org.apache.commons.lang3.StringUtils; import javafx.scene.paint.Color; @@ -39,11 +36,11 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.desktop.util.Colors.AVATAR_BLUE; -import static bisq.desktop.util.Colors.AVATAR_GREEN; -import static bisq.desktop.util.Colors.AVATAR_ORANGE; -import static bisq.desktop.util.Colors.AVATAR_RED; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.desktop.util.Colors.AVATAR_BLUE; +import static haveno.desktop.util.Colors.AVATAR_GREEN; +import static haveno.desktop.util.Colors.AVATAR_ORANGE; +import static haveno.desktop.util.Colors.AVATAR_RED; @Slf4j public class PeerInfoIconTrading extends PeerInfoIcon { diff --git a/desktop/src/main/java/bisq/desktop/components/PopOverWrapper.java b/desktop/src/main/java/haveno/desktop/components/PopOverWrapper.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/components/PopOverWrapper.java rename to desktop/src/main/java/haveno/desktop/components/PopOverWrapper.java index ce80d004..070e8432 100644 --- a/desktop/src/main/java/bisq/desktop/components/PopOverWrapper.java +++ b/desktop/src/main/java/haveno/desktop/components/PopOverWrapper.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.components.controlsfx.control.PopOver; - -import bisq.common.UserThread; +package haveno.desktop.components; +import haveno.common.UserThread; +import haveno.desktop.components.controlsfx.control.PopOver; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; diff --git a/desktop/src/main/java/bisq/desktop/components/SimpleMarkdownLabel.java b/desktop/src/main/java/haveno/desktop/components/SimpleMarkdownLabel.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/components/SimpleMarkdownLabel.java rename to desktop/src/main/java/haveno/desktop/components/SimpleMarkdownLabel.java index 13612293..7c041341 100644 --- a/desktop/src/main/java/bisq/desktop/components/SimpleMarkdownLabel.java +++ b/desktop/src/main/java/haveno/desktop/components/SimpleMarkdownLabel.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.util.GUIUtil; - -import bisq.core.util.SimpleMarkdownParser; +package haveno.desktop.components; +import haveno.core.util.SimpleMarkdownParser; +import haveno.desktop.util.GUIUtil; import javafx.scene.Node; import javafx.scene.control.Hyperlink; import javafx.scene.text.Text; diff --git a/desktop/src/main/java/bisq/desktop/components/TableGroupHeadline.java b/desktop/src/main/java/haveno/desktop/components/TableGroupHeadline.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/TableGroupHeadline.java rename to desktop/src/main/java/haveno/desktop/components/TableGroupHeadline.java index 3becaaa2..0c06901f 100644 --- a/desktop/src/main/java/bisq/desktop/components/TableGroupHeadline.java +++ b/desktop/src/main/java/haveno/desktop/components/TableGroupHeadline.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; diff --git a/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java b/desktop/src/main/java/haveno/desktop/components/TextFieldWithCopyIcon.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java rename to desktop/src/main/java/haveno/desktop/components/TextFieldWithCopyIcon.java index 288c4367..75a3dfe0 100644 --- a/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java +++ b/desktop/src/main/java/haveno/desktop/components/TextFieldWithCopyIcon.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.core.locale.Res; - -import bisq.common.util.Utilities; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.util.Utilities; +import haveno.core.locale.Res; import com.jfoenix.controls.JFXTextField; import javafx.scene.control.Label; diff --git a/desktop/src/main/java/bisq/desktop/components/TextFieldWithIcon.java b/desktop/src/main/java/haveno/desktop/components/TextFieldWithIcon.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/components/TextFieldWithIcon.java rename to desktop/src/main/java/haveno/desktop/components/TextFieldWithIcon.java index 4684d4b7..78b38bc8 100644 --- a/desktop/src/main/java/bisq/desktop/components/TextFieldWithIcon.java +++ b/desktop/src/main/java/haveno/desktop/components/TextFieldWithIcon.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import bisq.common.UserThread; +import haveno.common.UserThread; import com.jfoenix.controls.JFXTextField; import javafx.scene.control.Label; diff --git a/desktop/src/main/java/bisq/desktop/components/TitledGroupBg.java b/desktop/src/main/java/haveno/desktop/components/TitledGroupBg.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/components/TitledGroupBg.java rename to desktop/src/main/java/haveno/desktop/components/TitledGroupBg.java index 4b933eb0..1da74a02 100644 --- a/desktop/src/main/java/bisq/desktop/components/TitledGroupBg.java +++ b/desktop/src/main/java/haveno/desktop/components/TitledGroupBg.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; +package haveno.desktop.components; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; import javafx.scene.layout.HBox; diff --git a/desktop/src/main/java/bisq/desktop/components/TooltipUtil.java b/desktop/src/main/java/haveno/desktop/components/TooltipUtil.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/TooltipUtil.java rename to desktop/src/main/java/haveno/desktop/components/TooltipUtil.java index 16b1db1d..5ccd1610 100644 --- a/desktop/src/main/java/bisq/desktop/components/TooltipUtil.java +++ b/desktop/src/main/java/haveno/desktop/components/TooltipUtil.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import javafx.scene.control.Labeled; import javafx.scene.control.SkinBase; diff --git a/desktop/src/main/java/bisq/desktop/components/TxIdTextField.java b/desktop/src/main/java/haveno/desktop/components/TxIdTextField.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/TxIdTextField.java rename to desktop/src/main/java/haveno/desktop/components/TxIdTextField.java index 9aff0d09..c13c9780 100644 --- a/desktop/src/main/java/bisq/desktop/components/TxIdTextField.java +++ b/desktop/src/main/java/haveno/desktop/components/TxIdTextField.java @@ -15,21 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; - -import bisq.desktop.components.indicator.TxConfidenceIndicator; -import bisq.desktop.util.GUIUtil; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.user.BlockChainExplorer; -import bisq.core.user.Preferences; - -import bisq.common.util.Utilities; - +package haveno.desktop.components; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; +import haveno.common.util.Utilities; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.user.BlockChainExplorer; +import haveno.core.user.Preferences; +import haveno.desktop.components.indicator.TxConfidenceIndicator; +import haveno.desktop.util.GUIUtil; import com.jfoenix.controls.JFXTextField; import javafx.scene.control.Label; diff --git a/desktop/src/main/java/bisq/desktop/components/chart/ChartDataModel.java b/desktop/src/main/java/haveno/desktop/components/chart/ChartDataModel.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/components/chart/ChartDataModel.java rename to desktop/src/main/java/haveno/desktop/components/chart/ChartDataModel.java index 0b695184..efd7c5ab 100644 --- a/desktop/src/main/java/bisq/desktop/components/chart/ChartDataModel.java +++ b/desktop/src/main/java/haveno/desktop/components/chart/ChartDataModel.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.chart; - -import bisq.desktop.common.model.ActivatableDataModel; +package haveno.desktop.components.chart; +import haveno.desktop.common.model.ActivatableDataModel; import java.time.Instant; import java.time.temporal.TemporalAdjuster; diff --git a/desktop/src/main/java/bisq/desktop/components/chart/ChartView.java b/desktop/src/main/java/haveno/desktop/components/chart/ChartView.java similarity index 99% rename from desktop/src/main/java/bisq/desktop/components/chart/ChartView.java rename to desktop/src/main/java/haveno/desktop/components/chart/ChartView.java index 92e5285d..8b3583ad 100644 --- a/desktop/src/main/java/bisq/desktop/components/chart/ChartView.java +++ b/desktop/src/main/java/haveno/desktop/components/chart/ChartView.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.chart; - -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.components.AutoTooltipSlideToggleButton; -import bisq.desktop.components.AutoTooltipToggleButton; - -import bisq.core.locale.Res; - -import bisq.common.UserThread; +package haveno.desktop.components.chart; +import haveno.common.UserThread; +import haveno.core.locale.Res; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.components.AutoTooltipSlideToggleButton; +import haveno.desktop.components.AutoTooltipToggleButton; import javafx.stage.PopupWindow; import javafx.stage.Stage; diff --git a/desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java b/desktop/src/main/java/haveno/desktop/components/chart/ChartViewModel.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java rename to desktop/src/main/java/haveno/desktop/components/chart/ChartViewModel.java index 931e4da1..e3042570 100644 --- a/desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java +++ b/desktop/src/main/java/haveno/desktop/components/chart/ChartViewModel.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.chart; - -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.util.DisplayUtils; - -import bisq.common.util.Tuple2; +package haveno.desktop.components.chart; +import haveno.common.util.Tuple2; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.util.DisplayUtils; import javafx.scene.chart.XYChart; import javafx.util.StringConverter; diff --git a/desktop/src/main/java/bisq/desktop/components/chart/TemporalAdjusterModel.java b/desktop/src/main/java/haveno/desktop/components/chart/TemporalAdjusterModel.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/components/chart/TemporalAdjusterModel.java rename to desktop/src/main/java/haveno/desktop/components/chart/TemporalAdjusterModel.java index cbc2c82d..c0ebc3d1 100644 --- a/desktop/src/main/java/bisq/desktop/components/chart/TemporalAdjusterModel.java +++ b/desktop/src/main/java/haveno/desktop/components/chart/TemporalAdjusterModel.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.chart; - -import bisq.common.util.MathUtils; +package haveno.desktop.components.chart; import java.time.DayOfWeek; import java.time.Instant; @@ -33,6 +31,8 @@ import lombok.extern.slf4j.Slf4j; import static java.time.temporal.ChronoField.DAY_OF_YEAR; +import haveno.common.util.MathUtils; + @Slf4j public class TemporalAdjusterModel { private static final ZoneId ZONE_ID = ZoneId.systemDefault(); diff --git a/desktop/src/main/java/bisq/desktop/components/controlsfx/README.md b/desktop/src/main/java/haveno/desktop/components/controlsfx/README.md similarity index 100% rename from desktop/src/main/java/bisq/desktop/components/controlsfx/README.md rename to desktop/src/main/java/haveno/desktop/components/controlsfx/README.md diff --git a/desktop/src/main/java/bisq/desktop/components/controlsfx/control/PopOver.java b/desktop/src/main/java/haveno/desktop/components/controlsfx/control/PopOver.java similarity index 99% rename from desktop/src/main/java/bisq/desktop/components/controlsfx/control/PopOver.java rename to desktop/src/main/java/haveno/desktop/components/controlsfx/control/PopOver.java index b5b6a526..80d98ed0 100644 --- a/desktop/src/main/java/bisq/desktop/components/controlsfx/control/PopOver.java +++ b/desktop/src/main/java/haveno/desktop/components/controlsfx/control/PopOver.java @@ -25,9 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package bisq.desktop.components.controlsfx.control; - -import bisq.desktop.components.controlsfx.skin.PopOverSkin; +package haveno.desktop.components.controlsfx.control; import javafx.animation.FadeTransition; @@ -67,6 +65,8 @@ import org.slf4j.LoggerFactory; import static java.util.Objects.requireNonNull; import static javafx.scene.input.MouseEvent.MOUSE_CLICKED; +import haveno.desktop.components.controlsfx.skin.PopOverSkin; + /** * The PopOver control provides detailed information about an owning node in a * popup window. The popup window has a very lightweight appearance (no default diff --git a/desktop/src/main/java/bisq/desktop/components/controlsfx/control/popover.css b/desktop/src/main/java/haveno/desktop/components/controlsfx/control/popover.css similarity index 100% rename from desktop/src/main/java/bisq/desktop/components/controlsfx/control/popover.css rename to desktop/src/main/java/haveno/desktop/components/controlsfx/control/popover.css diff --git a/desktop/src/main/java/bisq/desktop/components/controlsfx/skin/PopOverSkin.java b/desktop/src/main/java/haveno/desktop/components/controlsfx/skin/PopOverSkin.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/controlsfx/skin/PopOverSkin.java rename to desktop/src/main/java/haveno/desktop/components/controlsfx/skin/PopOverSkin.java index e449f847..7f41bf69 100644 --- a/desktop/src/main/java/bisq/desktop/components/controlsfx/skin/PopOverSkin.java +++ b/desktop/src/main/java/haveno/desktop/components/controlsfx/skin/PopOverSkin.java @@ -24,10 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package bisq.desktop.components.controlsfx.skin; - -import bisq.desktop.components.controlsfx.control.PopOver; -import bisq.desktop.components.controlsfx.control.PopOver.ArrowLocation; +package haveno.desktop.components.controlsfx.skin; import javafx.stage.Window; @@ -64,12 +61,15 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.components.controlsfx.control.PopOver.ArrowLocation.*; +import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.*; import static java.lang.Double.MAX_VALUE; import static javafx.geometry.Pos.CENTER_LEFT; import static javafx.scene.control.ContentDisplay.GRAPHIC_ONLY; import static javafx.scene.paint.Color.YELLOW; +import haveno.desktop.components.controlsfx.control.PopOver; +import haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation; + public class PopOverSkin implements Skin { private static final String DETACHED_STYLE_CLASS = "detached"; //$NON-NLS-1$ diff --git a/desktop/src/main/java/bisq/desktop/components/indicator/TxConfidenceIndicator.java b/desktop/src/main/java/haveno/desktop/components/indicator/TxConfidenceIndicator.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/components/indicator/TxConfidenceIndicator.java rename to desktop/src/main/java/haveno/desktop/components/indicator/TxConfidenceIndicator.java index 20b53611..cb61c13b 100644 --- a/desktop/src/main/java/bisq/desktop/components/indicator/TxConfidenceIndicator.java +++ b/desktop/src/main/java/haveno/desktop/components/indicator/TxConfidenceIndicator.java @@ -40,16 +40,14 @@ * questions. */ -package bisq.desktop.components.indicator; - -import bisq.desktop.components.indicator.skin.StaticProgressIndicatorSkin; +package haveno.desktop.components.indicator; import javafx.scene.control.Control; import javafx.scene.control.Skin; import javafx.css.PseudoClass; import javafx.css.StyleableProperty; - +import haveno.desktop.components.indicator.skin.StaticProgressIndicatorSkin; import javafx.beans.property.DoubleProperty; import javafx.beans.property.DoublePropertyBase; import javafx.beans.property.ReadOnlyBooleanProperty; diff --git a/desktop/src/main/java/bisq/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java b/desktop/src/main/java/haveno/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java similarity index 99% rename from desktop/src/main/java/bisq/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java rename to desktop/src/main/java/haveno/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java index 2cb5b20b..13281f36 100644 --- a/desktop/src/main/java/bisq/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java +++ b/desktop/src/main/java/haveno/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java @@ -40,9 +40,7 @@ * questions. */ -package bisq.desktop.components.indicator.skin; - -import bisq.desktop.components.indicator.TxConfidenceIndicator; +package haveno.desktop.components.indicator.skin; import javafx.scene.Node; import javafx.scene.control.SkinBase; @@ -77,7 +75,7 @@ import javafx.beans.property.ObjectProperty; import javafx.collections.ObservableList; import javafx.collections.FXCollections; - +import haveno.desktop.components.indicator.TxConfidenceIndicator; import java.util.ArrayList; import java.util.List; diff --git a/desktop/src/main/java/bisq/desktop/components/list/FilterBox.java b/desktop/src/main/java/haveno/desktop/components/list/FilterBox.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/components/list/FilterBox.java rename to desktop/src/main/java/haveno/desktop/components/list/FilterBox.java index 8de9bc4d..28445c6e 100644 --- a/desktop/src/main/java/bisq/desktop/components/list/FilterBox.java +++ b/desktop/src/main/java/haveno/desktop/components/list/FilterBox.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.list; - -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.filtering.FilterableListItem; - -import bisq.core.locale.Res; +package haveno.desktop.components.list; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.filtering.FilterableListItem; import javafx.scene.control.TableView; import javafx.scene.layout.HBox; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AchTransferForm.java similarity index 85% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/AchTransferForm.java index e4bd32f5..9b0eadfe 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AchTransferForm.java @@ -15,27 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.Res; -import bisq.core.payment.AchTransferAccount; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.AchTransferAccountPayload; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; import javafx.scene.control.ComboBox; import javafx.scene.layout.GridPane; import javafx.collections.FXCollections; -import static bisq.desktop.util.FormBuilder.*; +import static haveno.desktop.util.FormBuilder.*; + +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.Res; +import haveno.core.payment.AchTransferAccount; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.AchTransferAccountPayload; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; public class AchTransferForm extends GeneralUsBankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AdvancedCashForm.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/AdvancedCashForm.java index a1e82cdc..a1fb5b41 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AdvancedCashForm.java @@ -15,30 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.AdvancedCashAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.AdvancedCashAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.AdvancedCashValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane; +import haveno.common.util.Tuple2; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.AdvancedCashAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.AdvancedCashAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.AdvancedCashValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.Label; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane; - @Deprecated public class AdvancedCashForm extends PaymentMethodForm { private final AdvancedCashAccount advancedCashAccount; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AliPayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java similarity index 75% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/AliPayForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java index 97fdc1d8..32ceb200 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AliPayForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java @@ -15,21 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.AliPayAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.AliPayAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.AliPayValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; + +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.AliPayAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.AliPayAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.AliPayValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; public class AliPayForm extends GeneralAccountNumberForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java index 51a153f6..fbed29c9 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java @@ -15,24 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.AmazonGiftCardAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.AmazonGiftCardAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.*; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.AmazonGiftCardAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.AmazonGiftCardAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.Layout; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; @@ -45,8 +45,6 @@ import java.util.HashMap; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.*; - @Slf4j public class AmazonGiftCardForm extends PaymentMethodForm { ComboBox countryCombo; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AssetsForm.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/AssetsForm.java index 096fb154..8fae0cca 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AssetsForm.java @@ -15,31 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.AutocompleteComboBox; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.filter.FilterManager; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.AssetAccount; -import bisq.core.payment.InstantCryptoCurrencyAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.AssetAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.AltCoinAddressValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.UserThread; -import bisq.common.util.Tuple3; +import static haveno.desktop.util.DisplayUtils.createAssetsAccountName; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addLabelCheckBox; +import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell; +import haveno.common.UserThread; +import haveno.common.util.Tuple3; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.filter.FilterManager; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.AssetAccount; +import haveno.core.payment.InstantCryptoCurrencyAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.AssetAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.AltCoinAddressValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.AutocompleteComboBox; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.CheckBox; import javafx.scene.control.Label; import javafx.scene.control.TextField; @@ -50,12 +53,6 @@ import javafx.geometry.Insets; import javafx.util.StringConverter; -import static bisq.desktop.util.DisplayUtils.createAssetsAccountName; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addLabelCheckBox; -import static bisq.desktop.util.GUIUtil.getComboBoxButtonCell; - public class AssetsForm extends PaymentMethodForm { public static final String INSTANT_TRADE_NEWS = "instantTradeNews0.9.5"; private final AssetAccount assetAccount; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AustraliaPayidForm.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/AustraliaPayidForm.java index a19d8343..dcdd0f4e 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/AustraliaPayidForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.AustraliaPayidAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.AustraliaPayidAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.AustraliaPayidValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.AustraliaPayidAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.AustraliaPayidAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.AustraliaPayidValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class AustraliaPayidForm extends PaymentMethodForm { private final AustraliaPayidAccount australiaPayidAccount; private final AustraliaPayidValidator australiaPayidValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/BankForm.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/BankForm.java index 87277bd1..792ef11e 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/BankForm.java @@ -15,29 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple4; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple4; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.GUIUtil; import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.control.TextField; @@ -45,8 +44,6 @@ import javafx.scene.layout.GridPane; import javafx.collections.FXCollections; -import static bisq.desktop.util.FormBuilder.*; - abstract class BankForm extends GeneralBankForm { static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/BizumForm.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/BizumForm.java index 34130c15..47bba6aa 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/BizumForm.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.BizumAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.BizumAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.BizumAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.BizumAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; - public class BizumForm extends PaymentMethodForm { private final BizumAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CapitualForm.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/CapitualForm.java index 890dc40d..4d9fc5e6 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CapitualForm.java @@ -15,30 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.CapitualAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.CapitualAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.CapitualValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane; +import haveno.common.util.Tuple2; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.CapitualAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.CapitualAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.CapitualValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.Label; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane; - public class CapitualForm extends PaymentMethodForm { private final CapitualAccount capitualAccount; private final CapitualValidator capitualValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java index 7a05fd19..d6c520d7 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java @@ -15,31 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.CashByMailAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.CashByMailAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.*; import com.jfoenix.controls.JFXTextArea; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.CashByMailAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.CashByMailAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.Layout; import javafx.scene.control.TextArea; import javafx.scene.layout.GridPane; import javafx.collections.FXCollections; -import static bisq.desktop.util.FormBuilder.*; - public class CashByMailForm extends PaymentMethodForm { private final CashByMailAccount cashByMailAccount; private TextArea postalAddressTextArea; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashDepositForm.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/CashDepositForm.java index c8a4c042..f24a5ba2 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashDepositForm.java @@ -15,29 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.GUIUtil; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.CashDepositAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple4; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple4; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.CashDepositAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.GUIUtil; import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.control.TextArea; @@ -46,8 +46,6 @@ import javafx.scene.layout.GridPane; import javafx.collections.FXCollections; -import static bisq.desktop.util.FormBuilder.*; - public class CashDepositForm extends GeneralBankForm { public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CelPayForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/CelPayForm.java index f796e2ef..1cb34610 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/CelPayForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.CelPayAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.CelPayAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.CelPayAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.CelPayAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class CelPayForm extends PaymentMethodForm { private final CelPayAccount account; private final EmailValidator validator = new EmailValidator(); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/ChaseQuickPayForm.java similarity index 85% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/ChaseQuickPayForm.java index ce601124..1a579d72 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/ChaseQuickPayForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.ChaseQuickPayAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.ChaseQuickPayAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.ChaseQuickPayValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.ChaseQuickPayAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.ChaseQuickPayAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.ChaseQuickPayValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class ChaseQuickPayForm extends PaymentMethodForm { private final ChaseQuickPayAccount chaseQuickPayAccount; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/ClearXchangeForm.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/ClearXchangeForm.java index 2eb85671..6d51313c 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/ClearXchangeForm.java @@ -15,28 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.ClearXchangeAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.ClearXchangeAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.EmailOrMobileNrValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.ClearXchangeAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.ClearXchangeAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.EmailOrMobileNrValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class ClearXchangeForm extends PaymentMethodForm { private final ClearXchangeAccount clearXchangeAccount; private final EmailOrMobileNrValidator clearXchangeValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/DomesticWireTransferForm.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/DomesticWireTransferForm.java index 36e3214b..1c6dca11 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/DomesticWireTransferForm.java @@ -15,19 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.payment.DomesticWireTransferAccount; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.DomesticWireTransferAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.DomesticWireTransferAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.DomesticWireTransferAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; import javafx.scene.layout.GridPane; public class DomesticWireTransferForm extends GeneralUsBankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/F2FForm.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/F2FForm.java index e8057e5a..7ab07c83 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/F2FForm.java @@ -15,37 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.GUIUtil; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.F2FAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.F2FAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.F2FValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.*; import com.jfoenix.controls.JFXTextArea; - +import haveno.common.util.Tuple2; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.F2FAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.F2FAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.F2FValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.GUIUtil; import javafx.scene.control.ComboBox; import javafx.scene.control.TextArea; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.*; - public class F2FForm extends PaymentMethodForm { private final F2FAccount f2fAccount; private final F2FValidator f2fValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/FasterPaymentsForm.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/FasterPaymentsForm.java index 4601d092..32283022 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/FasterPaymentsForm.java @@ -15,28 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.FasterPaymentsAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.FasterPaymentsAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.AccountNrValidator; -import bisq.core.payment.validation.BranchIdValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.FasterPaymentsAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.FasterPaymentsAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.AccountNrValidator; +import haveno.core.payment.validation.BranchIdValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class FasterPaymentsForm extends PaymentMethodForm { private static final String UK_SORT_CODE = "UK sort code"; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralAccountNumberForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralAccountNumberForm.java index 249813e8..f5164171 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralAccountNumberForm.java @@ -1,21 +1,19 @@ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public abstract class GeneralAccountNumberForm extends PaymentMethodForm { GeneralAccountNumberForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralBankForm.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralBankForm.java index 62dbfbb5..32622fc9 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralBankForm.java @@ -1,18 +1,17 @@ -package bisq.desktop.components.paymentmethods; - -import bisq.desktop.components.InputTextField; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.validation.AccountNrValidator; -import bisq.core.payment.validation.BankIdValidator; -import bisq.core.payment.validation.BranchIdValidator; -import bisq.core.payment.validation.NationalAccountIdValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.validation.AccountNrValidator; +import haveno.core.payment.validation.BankIdValidator; +import haveno.core.payment.validation.BranchIdValidator; +import haveno.core.payment.validation.NationalAccountIdValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; import org.apache.commons.lang3.StringUtils; import javafx.scene.layout.GridPane; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralSepaForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralSepaForm.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralSepaForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralSepaForm.java index f09c936f..65f4010c 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralSepaForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralSepaForm.java @@ -1,22 +1,21 @@ -package bisq.desktop.components.paymentmethods; - -import bisq.desktop.components.AutoTooltipCheckBox; -import bisq.desktop.util.FormBuilder; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; import org.apache.commons.lang3.StringUtils; +import static haveno.desktop.util.FormBuilder.addTopLabelWithVBox; + import com.jfoenix.controls.JFXComboBox; import com.jfoenix.controls.JFXTextField; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.AutoTooltipCheckBox; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.CheckBox; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; @@ -30,8 +29,6 @@ import javafx.util.StringConverter; import java.util.List; import java.util.Objects; -import static bisq.desktop.util.FormBuilder.addTopLabelWithVBox; - public abstract class GeneralSepaForm extends PaymentMethodForm { static final String BIC = "BIC"; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralUsBankForm.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralUsBankForm.java index ebaca47b..edffe61b 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralUsBankForm.java @@ -15,32 +15,30 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.Layout; import javafx.scene.control.TextArea; import javafx.scene.layout.GridPane; import javax.annotation.Nullable; -import static bisq.common.util.Utilities.cleanString; -import static bisq.desktop.util.FormBuilder.*; +import static haveno.common.util.Utilities.cleanString; +import static haveno.desktop.util.FormBuilder.*; public abstract class GeneralUsBankForm extends GeneralBankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/HalCashForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/HalCashForm.java index d63e9708..6fe70f08 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/HalCashForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.HalCashAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.HalCashAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.HalCashValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.HalCashAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.HalCashAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.HalCashValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class HalCashForm extends PaymentMethodForm { private final HalCashAccount halCashAccount; private final HalCashValidator halCashValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/IfscBankForm.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/IfscBankForm.java index 6961f187..6ddd2907 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/IfscBankForm.java @@ -15,30 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.IfscBasedAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.IfscBasedAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; - public class IfscBankForm extends PaymentMethodForm { private final IfscBasedAccountPayload ifscBasedAccountPayload; private final RegexValidator ifscValidator; // https://en.wikipedia.org/wiki/Indian_Financial_System_Code diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ImpsForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/ImpsForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/ImpsForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/ImpsForm.java index 21245b94..0fa676d0 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ImpsForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/ImpsForm.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; import javafx.scene.layout.GridPane; public class ImpsForm extends IfscBankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/InteracETransferForm.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/InteracETransferForm.java index 334a92e1..e972dfa1 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/InteracETransferForm.java @@ -15,26 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.InteracETransferAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.InteracETransferAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.InteracETransferValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.InteracETransferAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.InteracETransferAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.InteracETransferValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class InteracETransferForm extends PaymentMethodForm { private final InteracETransferAccount interacETransferAccount; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/JapanBankTransferForm.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/JapanBankTransferForm.java index b317b97f..d2a5bbab 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/JapanBankTransferForm.java @@ -15,31 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.AutocompleteComboBox; -import bisq.desktop.components.InputTextField; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.JapanBankAccount; -import bisq.core.payment.JapanBankData; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.JapanBankAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.JapanBankAccountNameValidator; -import bisq.core.payment.validation.JapanBankAccountNumberValidator; -import bisq.core.payment.validation.JapanBankBranchCodeValidator; -import bisq.core.payment.validation.JapanBankBranchNameValidator; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.RegexValidator; - -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Tuple4; +import static haveno.desktop.util.FormBuilder.*; +import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Tuple4; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.JapanBankAccount; +import haveno.core.payment.JapanBankData; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.JapanBankAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.JapanBankAccountNameValidator; +import haveno.core.payment.validation.JapanBankAccountNumberValidator; +import haveno.core.payment.validation.JapanBankBranchCodeValidator; +import haveno.core.payment.validation.JapanBankBranchNameValidator; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.RegexValidator; +import haveno.desktop.components.AutocompleteComboBox; +import haveno.desktop.components.InputTextField; import org.apache.commons.lang3.StringUtils; import javafx.scene.control.ComboBox; @@ -51,9 +52,6 @@ import javafx.scene.layout.GridPane; import javafx.util.StringConverter; -import static bisq.desktop.util.FormBuilder.*; -import static bisq.desktop.util.GUIUtil.getComboBoxButtonCell; - public class JapanBankTransferForm extends PaymentMethodForm { private final JapanBankAccount japanBankAccount; protected ComboBox bankComboBox; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneseForm.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneseForm.java index 82c501d3..e0fcea55 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneseForm.java @@ -15,26 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.MoneseAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.MoneseAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.MoneseAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.MoneseAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class MoneseForm extends PaymentMethodForm { private final MoneseAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyBeamForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyBeamForm.java index 0b1f8673..e63c33df 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyBeamForm.java @@ -15,28 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.MoneyBeamAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.MoneyBeamAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.MoneyBeamValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.MoneyBeamAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.MoneyBeamAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.MoneyBeamValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class MoneyBeamForm extends PaymentMethodForm { private final MoneyBeamAccount account; private final MoneyBeamValidator validator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyGramForm.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyGramForm.java index 3fceb53e..20f606dc 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyGramForm.java @@ -15,37 +15,35 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.MoneyGramAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.MoneyGramAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane; +import haveno.common.util.Tuple2; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.MoneyGramAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.MoneyGramAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javafx.scene.control.Label; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane; - @Slf4j public class MoneyGramForm extends PaymentMethodForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NationalBankForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/NationalBankForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/NationalBankForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/NationalBankForm.java index 331755e0..53e56b27 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NationalBankForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/NationalBankForm.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; import javafx.scene.layout.GridPane; public class NationalBankForm extends BankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NeftForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/NeftForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/NeftForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/NeftForm.java index 59d2ded3..e671bb07 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NeftForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/NeftForm.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; import javafx.scene.layout.GridPane; public class NeftForm extends IfscBankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NequiForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/NequiForm.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/NequiForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/NequiForm.java index 5024b2b6..35edb59f 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NequiForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/NequiForm.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.NequiAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.NequiAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.NequiAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.NequiAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; - public class NequiForm extends PaymentMethodForm { private final NequiAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaxumForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaxumForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PaxumForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PaxumForm.java index e693eb08..7c93419d 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaxumForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaxumForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaxumAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaxumAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaxumAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaxumAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class PaxumForm extends PaymentMethodForm { private final PaxumAccount account; private final EmailValidator validator = new EmailValidator(); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaymentMethodForm.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PaymentMethodForm.java index 588fb944..d04a8af5 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaymentMethodForm.java @@ -15,40 +15,39 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.desktop.components.AutoTooltipCheckBox; -import bisq.desktop.components.InfoTextField; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.payment.AssetAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +package haveno.desktop.components.paymentmethods; import org.bitcoinj.core.Coin; import org.apache.commons.lang3.StringUtils; -import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; +import static haveno.desktop.util.DisplayUtils.createAccountName; +import static haveno.desktop.util.FormBuilder.*; +import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.payment.AssetAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.AutoTooltipCheckBox; +import haveno.desktop.components.InfoTextField; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javafx.scene.control.CheckBox; import javafx.scene.control.ComboBox; import javafx.scene.control.Label; @@ -71,9 +70,6 @@ import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.DisplayUtils.createAccountName; -import static bisq.desktop.util.FormBuilder.*; - @Slf4j public abstract class PaymentMethodForm { protected final PaymentAccount paymentAccount; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PayseraForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PayseraForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PayseraForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PayseraForm.java index ff605d91..37b86fbb 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PayseraForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PayseraForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PayseraAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PayseraAccountPayload; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PayseraAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PayseraAccountPayload; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class PayseraForm extends PaymentMethodForm { private final PayseraAccount account; private final EmailValidator validator = new EmailValidator(); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaytmForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaytmForm.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PaytmForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PaytmForm.java index 0da8b9dc..c99e4f93 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaytmForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PaytmForm.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaytmAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaytmAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaytmAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaytmAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; - public class PaytmForm extends PaymentMethodForm { private final PaytmAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PerfectMoneyForm.java similarity index 76% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PerfectMoneyForm.java index 1d8a30aa..3c0e15e3 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PerfectMoneyForm.java @@ -15,24 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PerfectMoneyAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PerfectMoneyAccountPayload; -import bisq.core.payment.validation.PerfectMoneyValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; import javafx.scene.layout.GridPane; import javafx.collections.FXCollections; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; + +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PerfectMoneyAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PerfectMoneyAccountPayload; +import haveno.core.payment.validation.PerfectMoneyValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; public class PerfectMoneyForm extends GeneralAccountNumberForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PixForm.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PixForm.java index 5fe825bf..f9116b6a 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PixForm.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PixAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PixAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PixAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PixAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; - public class PixForm extends PaymentMethodForm { private final PixAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PopmoneyForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PopmoneyForm.java index d8cb6100..7a6fcf2e 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PopmoneyForm.java @@ -15,28 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PopmoneyAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PopmoneyAccountPayload; -import bisq.core.payment.validation.PopmoneyValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PopmoneyAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PopmoneyAccountPayload; +import haveno.core.payment.validation.PopmoneyValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class PopmoneyForm extends PaymentMethodForm { private final PopmoneyAccount account; private final PopmoneyValidator validator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PromptPayForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PromptPayForm.java index e030572e..3490eb5a 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PromptPayForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PromptPayAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PromptPayAccountPayload; -import bisq.core.payment.validation.PromptPayValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PromptPayAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PromptPayAccountPayload; +import haveno.core.payment.validation.PromptPayValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class PromptPayForm extends PaymentMethodForm { private final PromptPayAccount promptPayAccount; private final PromptPayValidator promptPayValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/RevolutForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/RevolutForm.java index d157741d..409f4122 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/RevolutForm.java @@ -15,33 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.RevolutAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.RevolutAccountPayload; -import bisq.core.payment.validation.RevolutValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane; +import haveno.common.util.Tuple2; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.RevolutAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.RevolutAccountPayload; +import haveno.core.payment.validation.RevolutValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane; - @Slf4j public class RevolutForm extends PaymentMethodForm { private final RevolutAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RtgsForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/RtgsForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/RtgsForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/RtgsForm.java index 8d73718c..34bbc508 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RtgsForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/RtgsForm.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; import javafx.scene.layout.GridPane; public class RtgsForm extends IfscBankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SameBankForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SameBankForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/SameBankForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/SameBankForm.java index 0e06a66c..ff0625d4 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SameBankForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SameBankForm.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; import javafx.scene.layout.GridPane; public class SameBankForm extends BankForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SatispayForm.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/SatispayForm.java index 680e0d96..c583a5ae 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SatispayForm.java @@ -15,27 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.SatispayAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.SatispayAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.SatispayAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.SatispayAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class SatispayForm extends PaymentMethodForm { private final SatispayAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaForm.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaForm.java index cf1077bf..5b35f333 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaForm.java @@ -15,27 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.SepaAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.SepaAccountPayload; -import bisq.core.payment.validation.BICValidator; -import bisq.core.payment.validation.SepaIBANValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.normalization.IBANNormalizer; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.SepaAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.SepaAccountPayload; +import haveno.core.payment.validation.BICValidator; +import haveno.core.payment.validation.SepaIBANValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.normalization.IBANNormalizer; import java.util.List; import java.util.Optional; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaInstantForm.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaInstantForm.java index b601489d..fdfb929e 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaInstantForm.java @@ -15,25 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.normalization.IBANNormalizer; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.SepaInstantAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.SepaInstantAccountPayload; -import bisq.core.payment.validation.BICValidator; -import bisq.core.payment.validation.SepaIBANValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.SepaInstantAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.SepaInstantAccountPayload; +import haveno.core.payment.validation.BICValidator; +import haveno.core.payment.validation.SepaIBANValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.normalization.IBANNormalizer; import javafx.scene.control.ComboBox; import javafx.scene.control.TextFormatter; import javafx.scene.layout.GridPane; @@ -43,9 +45,6 @@ import javafx.collections.FXCollections; import java.util.List; import java.util.Optional; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class SepaInstantForm extends GeneralSepaForm { public static int addFormForBuyer(GridPane gridPane, int gridRow, diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SpecificBankForm.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/SpecificBankForm.java index 8379da93..a411e3fd 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SpecificBankForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SpecificBankForm.java @@ -15,22 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.SpecificBanksAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple3; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelInputTextFieldButton; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldButton; import com.google.common.base.Joiner; - +import haveno.common.util.Tuple3; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.SpecificBanksAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TextField; @@ -39,10 +39,6 @@ import javafx.scene.layout.GridPane; import javafx.beans.binding.Bindings; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelInputTextFieldButton; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldButton; - public class SpecificBankForm extends BankForm { private final SpecificBanksAccountPayload specificBanksAccountPayload; private TextField acceptedBanksTextField; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/StrikeForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/StrikeForm.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/StrikeForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/StrikeForm.java index 2adc0a11..cbe4bec8 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/StrikeForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/StrikeForm.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.StrikeAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.StrikeAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.StrikeAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.StrikeAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; - public class StrikeForm extends PaymentMethodForm { private final StrikeAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SwiftForm.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/SwiftForm.java index a6a1e175..f8974234 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SwiftForm.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipCheckBox; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.windows.SwiftPaymentDetails; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.SwiftAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.SwiftAccountPayload; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.trade.Trade; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; import com.jfoenix.controls.JFXTextArea; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.SwiftAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.SwiftAccountPayload; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.trade.Trade; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipCheckBox; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.windows.SwiftPaymentDetails; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -49,11 +47,11 @@ import javafx.geometry.Insets; import java.util.function.Consumer; -import static bisq.common.util.Utilities.cleanString; -import static bisq.core.payment.payload.SwiftAccountPayload.*; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextArea; +import static haveno.common.util.Utilities.cleanString; +import static haveno.core.payment.payload.SwiftAccountPayload.*; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextArea; public class SwiftForm extends PaymentMethodForm { private final SwiftAccountPayload formData; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SwishForm.java similarity index 85% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/SwishForm.java index 9a73322e..c47b0301 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/SwishForm.java @@ -15,30 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.SwishAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.SwishAccountPayload; -import bisq.core.payment.validation.SwishValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.SwishAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.SwishAccountPayload; +import haveno.core.payment.validation.SwishValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - @Slf4j public class SwishForm extends PaymentMethodForm { private final SwishAccount swishAccount; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TikkieForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/TikkieForm.java similarity index 80% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/TikkieForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/TikkieForm.java index 94b17356..2684dbe5 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TikkieForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/TikkieForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.TikkieAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.TikkieAccountPayload; -import bisq.core.payment.validation.IBANValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.TikkieAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.TikkieAccountPayload; +import haveno.core.payment.validation.IBANValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class TikkieForm extends PaymentMethodForm { private final TikkieAccount account; private final IBANValidator ibanValidator = new IBANValidator("NL"); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/TransferwiseForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/TransferwiseForm.java index 927613a0..2afb73ff 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/TransferwiseForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.TransferwiseAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.TransferwiseAccountPayload; -import bisq.core.payment.validation.TransferwiseValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.TransferwiseAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.TransferwiseAccountPayload; +import haveno.core.payment.validation.TransferwiseValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class TransferwiseForm extends PaymentMethodForm { private final TransferwiseAccount account; private final TransferwiseValidator validator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/TransferwiseUsdForm.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/TransferwiseUsdForm.java index e3bfadc4..333acf72 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/TransferwiseUsdForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.Layout; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.TransferwiseUsdAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.TransferwiseUsdAccountPayload; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.TransferwiseUsdAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.TransferwiseUsdAccountPayload; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.Layout; import javafx.scene.control.TextArea; import javafx.scene.layout.GridPane; -import static bisq.common.util.Utilities.cleanString; -import static bisq.desktop.util.FormBuilder.*; +import static haveno.common.util.Utilities.cleanString; +import static haveno.desktop.util.FormBuilder.*; public class TransferwiseUsdForm extends PaymentMethodForm { private final TransferwiseUsdAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/USPostalMoneyOrderForm.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/USPostalMoneyOrderForm.java index ea089b68..498e32f4 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/USPostalMoneyOrderForm.java @@ -15,26 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.USPostalMoneyOrderAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload; -import bisq.core.payment.validation.USPostalMoneyOrderValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.*; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.USPostalMoneyOrderAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.USPostalMoneyOrderAccountPayload; +import haveno.core.payment.validation.USPostalMoneyOrderValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextArea; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.*; - public class USPostalMoneyOrderForm extends PaymentMethodForm { private final USPostalMoneyOrderAccount usPostalMoneyOrderAccount; private final USPostalMoneyOrderValidator usPostalMoneyOrderValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/UpholdForm.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/UpholdForm.java index bbf9fc3b..66b4460f 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/UpholdForm.java @@ -15,27 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.UpholdAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.UpholdAccountPayload; -import bisq.core.payment.validation.UpholdValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.UpholdAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.UpholdAccountPayload; +import haveno.core.payment.validation.UpholdValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class UpholdForm extends PaymentMethodForm { private final UpholdAccount upholdAccount; private final UpholdValidator upholdValidator; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpiForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/UpiForm.java similarity index 83% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/UpiForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/UpiForm.java index 50ef1a58..d00a4119 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpiForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/UpiForm.java @@ -15,28 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.UpiAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.UpiAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.UpiAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.UpiAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public class UpiForm extends PaymentMethodForm { private final UpiAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/VerseForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/VerseForm.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/VerseForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/VerseForm.java index 3d610275..18cef342 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/VerseForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/VerseForm.java @@ -15,27 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.VerseAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.VerseAccountPayload; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.VerseAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.VerseAccountPayload; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - public class VerseForm extends PaymentMethodForm { private final VerseAccount account; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WeChatPayForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/WeChatPayForm.java similarity index 75% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/WeChatPayForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/WeChatPayForm.java index 238a0ace..76bb97ee 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WeChatPayForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/WeChatPayForm.java @@ -15,21 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.WeChatPayAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.WeChatPayAccountPayload; -import bisq.core.payment.validation.WeChatPayValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; +package haveno.desktop.components.paymentmethods; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; + +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.WeChatPayAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.WeChatPayAccountPayload; +import haveno.core.payment.validation.WeChatPayValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; public class WeChatPayForm extends GeneralAccountNumberForm { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/WesternUnionForm.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/WesternUnionForm.java index dd285bac..0252dcae 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java +++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/WesternUnionForm.java @@ -15,36 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components.paymentmethods; +package haveno.desktop.components.paymentmethods; -import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.BankUtil; -import bisq.core.locale.Country; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.WesternUnionAccountPayload; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import haveno.common.util.Tuple2; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.BankUtil; +import haveno.core.locale.Country; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.WesternUnionAccountPayload; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; import javafx.scene.control.ComboBox; import javafx.scene.layout.GridPane; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; - @Slf4j public class WesternUnionForm extends PaymentMethodForm { public static int addFormForBuyer(GridPane gridPane, int gridRow, diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/haveno/desktop/haveno.css similarity index 100% rename from desktop/src/main/java/bisq/desktop/bisq.css rename to desktop/src/main/java/haveno/desktop/haveno.css diff --git a/desktop/src/main/java/bisq/desktop/images.css b/desktop/src/main/java/haveno/desktop/images.css similarity index 100% rename from desktop/src/main/java/bisq/desktop/images.css rename to desktop/src/main/java/haveno/desktop/images.css diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.fxml b/desktop/src/main/java/haveno/desktop/main/MainView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/MainView.fxml rename to desktop/src/main/java/haveno/desktop/main/MainView.fxml index f1163d63..42c6a40e 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/MainView.fxml @@ -17,6 +17,6 @@ --> - diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/haveno/desktop/main/MainView.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/MainView.java rename to desktop/src/main/java/haveno/desktop/main/MainView.java index 13c91bf1..23a16540 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.java +++ b/desktop/src/main/java/haveno/desktop/main/MainView.java @@ -15,52 +15,48 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.InitializableView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipToggleButton; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.main.account.AccountView; -import bisq.desktop.main.funds.FundsView; -import bisq.desktop.main.market.MarketView; -import bisq.desktop.main.market.offerbook.OfferBookChartView; -import bisq.desktop.main.offer.BuyOfferView; -import bisq.desktop.main.offer.SellOfferView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.TorNetworkSettingsWindow; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.settings.SettingsView; -import bisq.desktop.main.shared.PriceFeedComboBoxItem; -import bisq.desktop.main.support.SupportView; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.Transitions; - -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.LanguageUtil; -import bisq.core.locale.Res; -import bisq.core.provider.price.MarketPrice; - -import bisq.common.HavenoException; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.desktop.main; import javax.inject.Inject; import com.jfoenix.controls.JFXBadge; import com.jfoenix.controls.JFXComboBox; import com.jfoenix.controls.JFXProgressBar; - +import haveno.common.HavenoException; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.LanguageUtil; +import haveno.core.locale.Res; +import haveno.core.provider.price.MarketPrice; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.InitializableView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipToggleButton; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.main.account.AccountView; +import haveno.desktop.main.funds.FundsView; +import haveno.desktop.main.market.MarketView; +import haveno.desktop.main.market.offerbook.OfferBookChartView; +import haveno.desktop.main.offer.BuyOfferView; +import haveno.desktop.main.offer.SellOfferView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.TorNetworkSettingsWindow; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.settings.SettingsView; +import haveno.desktop.main.shared.PriceFeedComboBoxItem; +import haveno.desktop.main.support.SupportView; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.Transitions; import javafx.animation.Animation; import javafx.animation.KeyFrame; import javafx.animation.Timeline; @@ -494,8 +490,8 @@ public class MainView extends InitializableView { label.setText(Res.get("mainView.marketPriceWithProvider.label", "Haveno Price Index")); label.setTooltip(new Tooltip(getPriceProviderTooltipString())); } else { - label.setText(Res.get("mainView.marketPrice.bisqInternalPrice")); - final Tooltip tooltip = new Tooltip(Res.get("mainView.marketPrice.tooltip.bisqInternalPrice")); + label.setText(Res.get("mainView.marketPrice.havenoInternalPrice")); + final Tooltip tooltip = new Tooltip(Res.get("mainView.marketPrice.tooltip.havenoInternalPrice")); label.setTooltip(tooltip); } } else { diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/MainViewModel.java rename to desktop/src/main/java/haveno/desktop/main/MainViewModel.java index 28771a2f..e68253f4 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java @@ -15,68 +15,63 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ViewModel; -import bisq.desktop.components.TxIdTextField; -import bisq.desktop.main.account.AccountView; -import bisq.desktop.main.account.content.backup.BackupView; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.notifications.NotificationCenter; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.DisplayAlertMessageWindow; -import bisq.desktop.main.overlays.windows.TacWindow; -import bisq.desktop.main.overlays.windows.TorNetworkSettingsWindow; -import bisq.desktop.main.overlays.windows.UpdateAmazonGiftCardAccountWindow; -import bisq.desktop.main.overlays.windows.UpdateRevolutAccountWindow; -import bisq.desktop.main.overlays.windows.WalletPasswordWindow; -import bisq.desktop.main.overlays.windows.downloadupdate.DisplayUpdateDownloadWindow; -import bisq.desktop.main.presentation.AccountPresentation; -import bisq.desktop.main.presentation.MarketPricePresentation; -import bisq.desktop.main.presentation.SettingsPresentation; -import bisq.desktop.main.shared.PriceFeedComboBoxItem; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.app.HavenoSetup; -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.AliPayAccount; -import bisq.core.payment.AmazonGiftCardAccount; -import bisq.core.payment.CryptoCurrencyAccount; -import bisq.core.payment.RevolutAccount; -import bisq.core.presentation.BalancePresentation; -import bisq.core.presentation.SupportTicketsPresentation; -import bisq.core.presentation.TradePresentation; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.TradeManager; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.util.Tuple2; +package haveno.desktop.main; import com.google.inject.Inject; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.util.Tuple2; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.app.HavenoSetup; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.AliPayAccount; +import haveno.core.payment.AmazonGiftCardAccount; +import haveno.core.payment.CryptoCurrencyAccount; +import haveno.core.payment.RevolutAccount; +import haveno.core.presentation.BalancePresentation; +import haveno.core.presentation.SupportTicketsPresentation; +import haveno.core.presentation.TradePresentation; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.TradeManager; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ViewModel; +import haveno.desktop.components.TxIdTextField; +import haveno.desktop.main.account.AccountView; +import haveno.desktop.main.account.content.backup.BackupView; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.notifications.NotificationCenter; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.DisplayAlertMessageWindow; +import haveno.desktop.main.overlays.windows.TacWindow; +import haveno.desktop.main.overlays.windows.TorNetworkSettingsWindow; +import haveno.desktop.main.overlays.windows.UpdateAmazonGiftCardAccountWindow; +import haveno.desktop.main.overlays.windows.UpdateRevolutAccountWindow; +import haveno.desktop.main.overlays.windows.WalletPasswordWindow; +import haveno.desktop.main.overlays.windows.downloadupdate.DisplayUpdateDownloadWindow; +import haveno.desktop.main.presentation.AccountPresentation; +import haveno.desktop.main.presentation.MarketPricePresentation; +import haveno.desktop.main.presentation.SettingsPresentation; +import haveno.desktop.main.shared.PriceFeedComboBoxItem; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; import org.fxmisc.easybind.EasyBind; import org.fxmisc.easybind.monadic.MonadicBinding; diff --git a/desktop/src/main/java/bisq/desktop/main/SharedPresentation.java b/desktop/src/main/java/haveno/desktop/main/SharedPresentation.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/SharedPresentation.java rename to desktop/src/main/java/haveno/desktop/main/SharedPresentation.java index cec79f9f..332de1ba 100644 --- a/desktop/src/main/java/bisq/desktop/main/SharedPresentation.java +++ b/desktop/src/main/java/haveno/desktop/main/SharedPresentation.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main; - -import bisq.desktop.app.HavenoApp; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; - -import bisq.common.UserThread; -import bisq.common.file.FileUtil; +package haveno.desktop.main; +import haveno.common.UserThread; +import haveno.common.file.FileUtil; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.desktop.app.HavenoApp; +import haveno.desktop.main.overlays.popups.Popup; import org.bitcoinj.wallet.DeterministicSeed; import java.io.File; diff --git a/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml b/desktop/src/main/java/haveno/desktop/main/account/AccountView.fxml similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/AccountView.fxml index ff6ba5f7..34f628b2 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/AccountView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.account; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.main.MainView; -import bisq.desktop.main.account.content.altcoinaccounts.AltCoinAccountsView; -import bisq.desktop.main.account.content.backup.BackupView; -import bisq.desktop.main.account.content.fiataccounts.FiatAccountsView; -import bisq.desktop.main.account.content.notifications.MobileNotificationsView; -import bisq.desktop.main.account.content.password.PasswordView; -import bisq.desktop.main.account.content.seedwords.SeedWordsView; -import bisq.desktop.main.account.content.walletinfo.WalletInfoView; -import bisq.desktop.main.account.register.arbitrator.ArbitratorRegistrationView; -import bisq.desktop.main.account.register.mediator.MediatorRegistrationView; -import bisq.desktop.main.account.register.refundagent.RefundAgentRegistrationView; -import bisq.desktop.main.account.register.signing.SigningView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.presentation.AccountPresentation; - -import bisq.core.locale.Res; -import bisq.core.user.DontShowAgainLookup; - -import bisq.common.app.DevEnv; -import bisq.common.util.Utilities; +package haveno.desktop.main.account; +import haveno.common.app.DevEnv; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.user.DontShowAgainLookup; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.main.MainView; +import haveno.desktop.main.account.content.altcoinaccounts.AltCoinAccountsView; +import haveno.desktop.main.account.content.backup.BackupView; +import haveno.desktop.main.account.content.fiataccounts.FiatAccountsView; +import haveno.desktop.main.account.content.notifications.MobileNotificationsView; +import haveno.desktop.main.account.content.password.PasswordView; +import haveno.desktop.main.account.content.seedwords.SeedWordsView; +import haveno.desktop.main.account.content.walletinfo.WalletInfoView; +import haveno.desktop.main.account.register.arbitrator.ArbitratorRegistrationView; +import haveno.desktop.main.account.register.mediator.MediatorRegistrationView; +import haveno.desktop.main.account.register.refundagent.RefundAgentRegistrationView; +import haveno.desktop.main.account.register.signing.SigningView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.presentation.AccountPresentation; import javax.inject.Inject; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/PaymentAccountsView.java b/desktop/src/main/java/haveno/desktop/main/account/content/PaymentAccountsView.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/account/content/PaymentAccountsView.java rename to desktop/src/main/java/haveno/desktop/main/account/content/PaymentAccountsView.java index f1cf254c..89f4c84c 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/PaymentAccountsView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/PaymentAccountsView.java @@ -1,22 +1,19 @@ -package bisq.desktop.main.account.content; - -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.InfoAutoTooltipLabel; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.ImageUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; - -import bisq.common.UserThread; -import bisq.common.util.Utilities; +package haveno.desktop.main.account.content; +import haveno.common.UserThread; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.InfoAutoTooltipLabel; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.ImageUtil; import org.apache.commons.lang3.StringUtils; import javafx.scene.Node; diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java b/desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java rename to desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java index adbaf3ea..cf879102 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java @@ -15,28 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.content.altcoinaccounts; - -import bisq.desktop.common.model.ActivatableDataModel; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.AssetAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.common.crypto.KeyRing; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.proto.persistable.PersistenceProtoResolver; +package haveno.desktop.main.account.content.altcoinaccounts; import com.google.inject.Inject; - +import haveno.common.crypto.KeyRing; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.AssetAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.common.model.ActivatableDataModel; +import haveno.desktop.util.GUIUtil; import javafx.stage.Stage; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml b/desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml index f72c2de8..9e3265d2 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml @@ -22,7 +22,7 @@ -. */ -package bisq.desktop.main.account.content.altcoinaccounts; +package haveno.desktop.main.account.content.altcoinaccounts; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.components.paymentmethods.AssetsForm; -import bisq.desktop.components.paymentmethods.PaymentMethodForm; -import bisq.desktop.main.account.content.PaymentAccountsView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.filter.FilterManager; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountFactory; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.validation.AltCoinAddressValidator; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.InputValidator; - -import bisq.asset.AltCoinAccountDisclaimer; -import bisq.asset.Asset; -import bisq.asset.coins.Monero; - -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; +import static haveno.desktop.components.paymentmethods.AssetsForm.INSTANT_TRADE_NEWS; +import static haveno.desktop.util.FormBuilder.add2ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.add3ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelListView; +import haveno.asset.AltCoinAccountDisclaimer; +import haveno.asset.Asset; +import haveno.asset.coins.Monero; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.filter.FilterManager; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountFactory; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.validation.AltCoinAddressValidator; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.components.paymentmethods.AssetsForm; +import haveno.desktop.components.paymentmethods.PaymentMethodForm; +import haveno.desktop.main.account.content.PaymentAccountsView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javax.inject.Inject; import javax.inject.Named; @@ -63,12 +65,6 @@ import javafx.collections.ObservableList; import java.util.Optional; -import static bisq.desktop.components.paymentmethods.AssetsForm.INSTANT_TRADE_NEWS; -import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.add3ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelListView; - @FxmlView public class AltCoinAccountsView extends PaymentAccountsView { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java b/desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java rename to desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java index 6de2213c..be7b7586 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.content.altcoinaccounts; - -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.model.ViewModel; - -import bisq.core.payment.PaymentAccount; +package haveno.desktop.main.account.content.altcoinaccounts; import com.google.inject.Inject; - +import haveno.core.payment.PaymentAccount; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.model.ViewModel; import javafx.collections.ObservableList; class AltCoinAccountsViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/backup/BackupView.fxml b/desktop/src/main/java/haveno/desktop/main/account/content/backup/BackupView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/account/content/backup/BackupView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/content/backup/BackupView.fxml index 40db82b2..a1854fff 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/backup/BackupView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/content/backup/BackupView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.account.content.backup; +package haveno.desktop.main.account.content.backup; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.Layout; - -import bisq.core.locale.Res; -import bisq.core.user.Preferences; - -import bisq.common.config.Config; -import bisq.common.file.FileUtil; -import bisq.common.persistence.PersistenceManager; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.add2Buttons; +import static haveno.desktop.util.FormBuilder.add2ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import haveno.common.config.Config; +import haveno.common.file.FileUtil; +import haveno.common.persistence.PersistenceManager; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.user.Preferences; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.Layout; import javax.inject.Inject; import javafx.stage.DirectoryChooser; @@ -52,11 +54,6 @@ import java.util.Date; import javax.annotation.Nullable; -import static bisq.desktop.util.FormBuilder.add2Buttons; -import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; - @FxmlView public class BackupView extends ActivatableView { private final File dataDir, logFile; @@ -77,7 +74,7 @@ public class BackupView extends ActivatableView { super(); this.preferences = preferences; dataDir = new File(config.appDataDir.getPath()); - logFile = new File(Paths.get(dataDir.getPath(), "bisq.log").toString()); + logFile = new File(Paths.get(dataDir.getPath(), "haveno.log").toString()); } @@ -140,7 +137,7 @@ public class BackupView extends ActivatableView { PersistenceManager.flushAllDataToDiskAtBackup(() -> { try { String dateString = new SimpleDateFormat("yyyy-MM-dd-HHmmss").format(new Date()); - String destination = Paths.get(backupDirectory, "bisq_backup_" + dateString).toString(); + String destination = Paths.get(backupDirectory, "haveno_backup_" + dateString).toString(); FileUtil.copyDirectory(dataDir, new File(destination)); new Popup().feedback(Res.get("account.backup.success", destination)).show(); } catch (IOException e) { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java b/desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java rename to desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java index e815f379..fbc45199 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java @@ -15,29 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.content.fiataccounts; - -import bisq.desktop.common.model.ActivatableDataModel; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.AssetAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.common.crypto.KeyRing; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.proto.persistable.PersistenceProtoResolver; +package haveno.desktop.main.account.content.fiataccounts; import com.google.inject.Inject; - +import haveno.common.crypto.KeyRing; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.AssetAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.common.model.ActivatableDataModel; +import haveno.desktop.util.GUIUtil; import javafx.stage.Stage; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.fxml b/desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsView.fxml index 445f95ef..b06a595f 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsView.fxml @@ -22,7 +22,7 @@ -. */ -package bisq.desktop.main.account.content.fiataccounts; +package haveno.desktop.main.account.content.fiataccounts; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.components.paymentmethods.AchTransferForm; -import bisq.desktop.components.paymentmethods.AdvancedCashForm; -import bisq.desktop.components.paymentmethods.AliPayForm; -import bisq.desktop.components.paymentmethods.AmazonGiftCardForm; -import bisq.desktop.components.paymentmethods.AustraliaPayidForm; -import bisq.desktop.components.paymentmethods.BizumForm; -import bisq.desktop.components.paymentmethods.CapitualForm; -import bisq.desktop.components.paymentmethods.CashByMailForm; -import bisq.desktop.components.paymentmethods.CashDepositForm; -import bisq.desktop.components.paymentmethods.CelPayForm; -import bisq.desktop.components.paymentmethods.ChaseQuickPayForm; -import bisq.desktop.components.paymentmethods.ClearXchangeForm; -import bisq.desktop.components.paymentmethods.DomesticWireTransferForm; -import bisq.desktop.components.paymentmethods.F2FForm; -import bisq.desktop.components.paymentmethods.FasterPaymentsForm; -import bisq.desktop.components.paymentmethods.HalCashForm; -import bisq.desktop.components.paymentmethods.ImpsForm; -import bisq.desktop.components.paymentmethods.InteracETransferForm; -import bisq.desktop.components.paymentmethods.JapanBankTransferForm; -import bisq.desktop.components.paymentmethods.MoneseForm; -import bisq.desktop.components.paymentmethods.MoneyBeamForm; -import bisq.desktop.components.paymentmethods.MoneyGramForm; -import bisq.desktop.components.paymentmethods.NationalBankForm; -import bisq.desktop.components.paymentmethods.NeftForm; -import bisq.desktop.components.paymentmethods.NequiForm; -import bisq.desktop.components.paymentmethods.PaxumForm; -import bisq.desktop.components.paymentmethods.PaymentMethodForm; -import bisq.desktop.components.paymentmethods.PayseraForm; -import bisq.desktop.components.paymentmethods.PaytmForm; -import bisq.desktop.components.paymentmethods.PerfectMoneyForm; -import bisq.desktop.components.paymentmethods.PixForm; -import bisq.desktop.components.paymentmethods.PopmoneyForm; -import bisq.desktop.components.paymentmethods.PromptPayForm; -import bisq.desktop.components.paymentmethods.RevolutForm; -import bisq.desktop.components.paymentmethods.RtgsForm; -import bisq.desktop.components.paymentmethods.SameBankForm; -import bisq.desktop.components.paymentmethods.SatispayForm; -import bisq.desktop.components.paymentmethods.SepaForm; -import bisq.desktop.components.paymentmethods.SepaInstantForm; -import bisq.desktop.components.paymentmethods.SpecificBankForm; -import bisq.desktop.components.paymentmethods.StrikeForm; -import bisq.desktop.components.paymentmethods.SwiftForm; -import bisq.desktop.components.paymentmethods.SwishForm; -import bisq.desktop.components.paymentmethods.TikkieForm; -import bisq.desktop.components.paymentmethods.TransferwiseForm; -import bisq.desktop.components.paymentmethods.TransferwiseUsdForm; -import bisq.desktop.components.paymentmethods.USPostalMoneyOrderForm; -import bisq.desktop.components.paymentmethods.UpholdForm; -import bisq.desktop.components.paymentmethods.UpiForm; -import bisq.desktop.components.paymentmethods.VerseForm; -import bisq.desktop.components.paymentmethods.WeChatPayForm; -import bisq.desktop.components.paymentmethods.WesternUnionForm; -import bisq.desktop.main.account.content.PaymentAccountsView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.offer.OfferRestrictions; -import bisq.core.payment.AmazonGiftCardAccount; -import bisq.core.payment.AustraliaPayidAccount; -import bisq.core.payment.CashByMailAccount; -import bisq.core.payment.CashDepositAccount; -import bisq.core.payment.ClearXchangeAccount; -import bisq.core.payment.F2FAccount; -import bisq.core.payment.HalCashAccount; -import bisq.core.payment.MoneyGramAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountFactory; -import bisq.core.payment.RevolutAccount; -import bisq.core.payment.USPostalMoneyOrderAccount; -import bisq.core.payment.WesternUnionAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.validation.AdvancedCashValidator; -import bisq.core.payment.validation.AliPayValidator; -import bisq.core.payment.validation.AustraliaPayidValidator; -import bisq.core.payment.validation.BICValidator; -import bisq.core.payment.validation.CapitualValidator; -import bisq.core.payment.validation.ChaseQuickPayValidator; -import bisq.core.payment.validation.EmailOrMobileNrValidator; -import bisq.core.payment.validation.F2FValidator; -import bisq.core.payment.validation.HalCashValidator; -import bisq.core.payment.validation.InteracETransferValidator; -import bisq.core.payment.validation.JapanBankTransferValidator; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.payment.validation.MoneyBeamValidator; -import bisq.core.payment.validation.PerfectMoneyValidator; -import bisq.core.payment.validation.PopmoneyValidator; -import bisq.core.payment.validation.PromptPayValidator; -import bisq.core.payment.validation.RevolutValidator; -import bisq.core.payment.validation.SwishValidator; -import bisq.core.payment.validation.TransferwiseValidator; -import bisq.core.payment.validation.USPostalMoneyOrderValidator; -import bisq.core.payment.validation.UpholdValidator; -import bisq.core.payment.validation.WeChatPayValidator; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.add2ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.add3ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelListView; +import haveno.common.config.Config; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.offer.OfferRestrictions; +import haveno.core.payment.AmazonGiftCardAccount; +import haveno.core.payment.AustraliaPayidAccount; +import haveno.core.payment.CashByMailAccount; +import haveno.core.payment.CashDepositAccount; +import haveno.core.payment.ClearXchangeAccount; +import haveno.core.payment.F2FAccount; +import haveno.core.payment.HalCashAccount; +import haveno.core.payment.MoneyGramAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountFactory; +import haveno.core.payment.RevolutAccount; +import haveno.core.payment.USPostalMoneyOrderAccount; +import haveno.core.payment.WesternUnionAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.validation.AdvancedCashValidator; +import haveno.core.payment.validation.AliPayValidator; +import haveno.core.payment.validation.AustraliaPayidValidator; +import haveno.core.payment.validation.BICValidator; +import haveno.core.payment.validation.CapitualValidator; +import haveno.core.payment.validation.ChaseQuickPayValidator; +import haveno.core.payment.validation.EmailOrMobileNrValidator; +import haveno.core.payment.validation.F2FValidator; +import haveno.core.payment.validation.HalCashValidator; +import haveno.core.payment.validation.InteracETransferValidator; +import haveno.core.payment.validation.JapanBankTransferValidator; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.payment.validation.MoneyBeamValidator; +import haveno.core.payment.validation.PerfectMoneyValidator; +import haveno.core.payment.validation.PopmoneyValidator; +import haveno.core.payment.validation.PromptPayValidator; +import haveno.core.payment.validation.RevolutValidator; +import haveno.core.payment.validation.SwishValidator; +import haveno.core.payment.validation.TransferwiseValidator; +import haveno.core.payment.validation.USPostalMoneyOrderValidator; +import haveno.core.payment.validation.UpholdValidator; +import haveno.core.payment.validation.WeChatPayValidator; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.components.paymentmethods.AchTransferForm; +import haveno.desktop.components.paymentmethods.AdvancedCashForm; +import haveno.desktop.components.paymentmethods.AliPayForm; +import haveno.desktop.components.paymentmethods.AmazonGiftCardForm; +import haveno.desktop.components.paymentmethods.AustraliaPayidForm; +import haveno.desktop.components.paymentmethods.BizumForm; +import haveno.desktop.components.paymentmethods.CapitualForm; +import haveno.desktop.components.paymentmethods.CashByMailForm; +import haveno.desktop.components.paymentmethods.CashDepositForm; +import haveno.desktop.components.paymentmethods.CelPayForm; +import haveno.desktop.components.paymentmethods.ChaseQuickPayForm; +import haveno.desktop.components.paymentmethods.ClearXchangeForm; +import haveno.desktop.components.paymentmethods.DomesticWireTransferForm; +import haveno.desktop.components.paymentmethods.F2FForm; +import haveno.desktop.components.paymentmethods.FasterPaymentsForm; +import haveno.desktop.components.paymentmethods.HalCashForm; +import haveno.desktop.components.paymentmethods.ImpsForm; +import haveno.desktop.components.paymentmethods.InteracETransferForm; +import haveno.desktop.components.paymentmethods.JapanBankTransferForm; +import haveno.desktop.components.paymentmethods.MoneseForm; +import haveno.desktop.components.paymentmethods.MoneyBeamForm; +import haveno.desktop.components.paymentmethods.MoneyGramForm; +import haveno.desktop.components.paymentmethods.NationalBankForm; +import haveno.desktop.components.paymentmethods.NeftForm; +import haveno.desktop.components.paymentmethods.NequiForm; +import haveno.desktop.components.paymentmethods.PaxumForm; +import haveno.desktop.components.paymentmethods.PaymentMethodForm; +import haveno.desktop.components.paymentmethods.PayseraForm; +import haveno.desktop.components.paymentmethods.PaytmForm; +import haveno.desktop.components.paymentmethods.PerfectMoneyForm; +import haveno.desktop.components.paymentmethods.PixForm; +import haveno.desktop.components.paymentmethods.PopmoneyForm; +import haveno.desktop.components.paymentmethods.PromptPayForm; +import haveno.desktop.components.paymentmethods.RevolutForm; +import haveno.desktop.components.paymentmethods.RtgsForm; +import haveno.desktop.components.paymentmethods.SameBankForm; +import haveno.desktop.components.paymentmethods.SatispayForm; +import haveno.desktop.components.paymentmethods.SepaForm; +import haveno.desktop.components.paymentmethods.SepaInstantForm; +import haveno.desktop.components.paymentmethods.SpecificBankForm; +import haveno.desktop.components.paymentmethods.StrikeForm; +import haveno.desktop.components.paymentmethods.SwiftForm; +import haveno.desktop.components.paymentmethods.SwishForm; +import haveno.desktop.components.paymentmethods.TikkieForm; +import haveno.desktop.components.paymentmethods.TransferwiseForm; +import haveno.desktop.components.paymentmethods.TransferwiseUsdForm; +import haveno.desktop.components.paymentmethods.USPostalMoneyOrderForm; +import haveno.desktop.components.paymentmethods.UpholdForm; +import haveno.desktop.components.paymentmethods.UpiForm; +import haveno.desktop.components.paymentmethods.VerseForm; +import haveno.desktop.components.paymentmethods.WeChatPayForm; +import haveno.desktop.components.paymentmethods.WesternUnionForm; +import haveno.desktop.main.account.content.PaymentAccountsView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javax.inject.Inject; import javax.inject.Named; @@ -145,11 +148,6 @@ import java.math.BigInteger; import java.util.List; import java.util.stream.Collectors; -import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.add3ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelListView; - @FxmlView public class FiatAccountsView extends PaymentAccountsView { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsViewModel.java b/desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsViewModel.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsViewModel.java rename to desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsViewModel.java index 881e1f6e..2aca1041 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/fiataccounts/FiatAccountsViewModel.java @@ -15,15 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.content.fiataccounts; - -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.model.ViewModel; - -import bisq.core.payment.PaymentAccount; +package haveno.desktop.main.account.content.fiataccounts; import com.google.inject.Inject; - +import haveno.core.payment.PaymentAccount; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.model.ViewModel; import javafx.collections.ObservableList; class FiatAccountsViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/notifications/ManageMarketAlertsWindow.java b/desktop/src/main/java/haveno/desktop/main/account/content/notifications/ManageMarketAlertsWindow.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/account/content/notifications/ManageMarketAlertsWindow.java rename to desktop/src/main/java/haveno/desktop/main/account/content/notifications/ManageMarketAlertsWindow.java index a7209b6f..a98ba1fb 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/notifications/ManageMarketAlertsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/notifications/ManageMarketAlertsWindow.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.content.notifications; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.ImageUtil; - -import bisq.core.locale.Res; -import bisq.core.notifications.alerts.market.MarketAlertFilter; -import bisq.core.notifications.alerts.market.MarketAlerts; -import bisq.core.util.FormattingUtils; - -import bisq.common.UserThread; +package haveno.desktop.main.account.content.notifications; +import haveno.common.UserThread; +import haveno.core.locale.Res; +import haveno.core.notifications.alerts.market.MarketAlertFilter; +import haveno.core.notifications.alerts.market.MarketAlerts; +import haveno.core.util.FormattingUtils; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.ImageUtil; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TableCell; diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/notifications/MobileNotificationsView.fxml b/desktop/src/main/java/haveno/desktop/main/account/content/notifications/MobileNotificationsView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/account/content/notifications/MobileNotificationsView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/content/notifications/MobileNotificationsView.fxml index a4a6eeed..f9e09545 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/notifications/MobileNotificationsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/content/notifications/MobileNotificationsView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.account.content.notifications; +package haveno.desktop.main.account.content.notifications; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.InfoInputTextField; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.notifications.MobileMessage; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.notifications.alerts.DisputeMsgEvents; -import bisq.core.notifications.alerts.MyOfferTakenEvents; -import bisq.core.notifications.alerts.TradeEvents; -import bisq.core.notifications.alerts.market.MarketAlertFilter; -import bisq.core.notifications.alerts.market.MarketAlerts; -import bisq.core.notifications.alerts.price.PriceAlert; -import bisq.core.notifications.alerts.price.PriceAlertFilter; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.validation.PercentageNumberValidator; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.ParsingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.validation.AltcoinValidator; -import bisq.core.util.validation.FiatPriceValidator; -import bisq.core.util.validation.InputValidator; - -import bisq.common.UserThread; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.UserThread; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.notifications.MobileMessage; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.notifications.alerts.DisputeMsgEvents; +import haveno.core.notifications.alerts.MyOfferTakenEvents; +import haveno.core.notifications.alerts.TradeEvents; +import haveno.core.notifications.alerts.market.MarketAlertFilter; +import haveno.core.notifications.alerts.market.MarketAlerts; +import haveno.core.notifications.alerts.price.PriceAlert; +import haveno.core.notifications.alerts.price.PriceAlertFilter; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.validation.PercentageNumberValidator; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.ParsingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.validation.AltcoinValidator; +import haveno.core.util.validation.FiatPriceValidator; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.InfoInputTextField; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javax.inject.Inject; import javafx.scene.control.Button; @@ -78,8 +78,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static bisq.desktop.util.FormBuilder.*; - @FxmlView public class MobileNotificationsView extends ActivatableView { private final Preferences preferences; @@ -231,7 +229,7 @@ public class MobileNotificationsView extends ActivatableView { // Setup private void onDownload() { - GUIUtil.openWebPage("https://bisq.network/downloads"); + GUIUtil.openWebPage("https://haveno.network/downloads"); } private void onErase() { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/notifications/NoWebCamFoundException.java b/desktop/src/main/java/haveno/desktop/main/account/content/notifications/NoWebCamFoundException.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/account/content/notifications/NoWebCamFoundException.java rename to desktop/src/main/java/haveno/desktop/main/account/content/notifications/NoWebCamFoundException.java index 7a9c8b26..c78ea84d 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/notifications/NoWebCamFoundException.java +++ b/desktop/src/main/java/haveno/desktop/main/account/content/notifications/NoWebCamFoundException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.content.notifications; +package haveno.desktop.main.account.content.notifications; public class NoWebCamFoundException extends Throwable { public NoWebCamFoundException(String msg) { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/password/PasswordView.fxml b/desktop/src/main/java/haveno/desktop/main/account/content/password/PasswordView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/account/content/password/PasswordView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/content/password/PasswordView.fxml index 916f6d1b..38782b94 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/password/PasswordView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/content/password/PasswordView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.account.content.password; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.PasswordTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.MainView; -import bisq.desktop.main.account.AccountView; -import bisq.desktop.main.account.content.backup.BackupView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.Layout; -import bisq.desktop.util.validation.PasswordValidator; - -import bisq.core.api.CoreAccountService; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; - -import bisq.common.util.Tuple4; +package haveno.desktop.main.account.content.password; import javax.inject.Inject; import com.jfoenix.validation.RequiredFieldValidator; - +import haveno.common.util.Tuple4; +import haveno.core.api.CoreAccountService; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.PasswordTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.MainView; +import haveno.desktop.main.account.AccountView; +import haveno.desktop.main.account.content.backup.BackupView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.Layout; +import haveno.desktop.util.validation.PasswordValidator; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; @@ -48,11 +44,11 @@ import javafx.scene.layout.HBox; import javafx.beans.value.ChangeListener; -import static bisq.desktop.util.FormBuilder.addButtonBusyAnimationLabel; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addPasswordTextField; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; import static com.google.common.base.Preconditions.checkArgument; +import static haveno.desktop.util.FormBuilder.addButtonBusyAnimationLabel; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addPasswordTextField; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; @FxmlView public class PasswordView extends ActivatableView { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.fxml b/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.fxml index 0a59c109..f5c5e717 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.account.content.seedwords; - -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.SharedPresentation; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.WalletPasswordWindow; -import bisq.desktop.util.Layout; - -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; -import bisq.core.user.DontShowAgainLookup; - -import bisq.common.config.Config; +package haveno.desktop.main.account.content.seedwords; import org.bitcoinj.crypto.MnemonicCode; import org.bitcoinj.crypto.MnemonicException; @@ -40,7 +25,18 @@ import javax.inject.Inject; import javax.inject.Named; import com.google.common.base.Splitter; - +import haveno.common.config.Config; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.core.user.DontShowAgainLookup; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.SharedPresentation; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.WalletPasswordWindow; +import haveno.desktop.util.Layout; import javafx.scene.control.Button; import javafx.scene.control.DatePicker; import javafx.scene.control.TextArea; @@ -60,7 +56,7 @@ import java.io.IOException; import java.util.TimeZone; -import static bisq.desktop.util.FormBuilder.*; +import static haveno.desktop.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createBooleanBinding; @FxmlView @@ -272,7 +268,7 @@ public class SeedWordsView extends ActivatableView { private LocalDate getWalletDate() { LocalDate walletDate = restoreDatePicker.getValue(); - // Even though no current Bisq wallet could have been created before the v0.5 release date (2017.06.28), + // Even though no current Haveno wallet could have been created before the v0.5 release date (2017.06.28), // the user may want to import from a seed generated by another wallet. // So use when the BIP39 standard was finalised (2013.10.09) as the oldest possible wallet date. LocalDate oldestWalletDate = LocalDate.ofInstant( diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/walletinfo/WalletInfoView.fxml b/desktop/src/main/java/haveno/desktop/main/account/content/walletinfo/WalletInfoView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/account/content/walletinfo/WalletInfoView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/content/walletinfo/WalletInfoView.fxml index 7ffe5e5a..9f3c832d 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/walletinfo/WalletInfoView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/content/walletinfo/WalletInfoView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.account.content.walletinfo; - -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.ShowWalletDataWindow; -import bisq.desktop.util.Layout; - -import bisq.core.btc.listeners.BalanceListener; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.WalletService; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; +package haveno.desktop.main.account.content.walletinfo; +import haveno.common.config.Config; +import haveno.core.btc.listeners.BalanceListener; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.WalletService; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.ShowWalletDataWindow; +import haveno.desktop.util.Layout; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; import org.bitcoinj.script.Script; @@ -45,10 +42,10 @@ import javafx.scene.control.Button; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; -import static bisq.desktop.util.FormBuilder.addButtonAfterGroup; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addButtonAfterGroup; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; import static org.bitcoinj.wallet.Wallet.BalanceType.ESTIMATED_SPENDABLE; @FxmlView diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java b/desktop/src/main/java/haveno/desktop/main/account/register/AgentRegistrationView.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java rename to desktop/src/main/java/haveno/desktop/main/account/register/AgentRegistrationView.java index 0922ec1e..3dee356f 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/AgentRegistrationView.java @@ -15,27 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register; +package haveno.desktop.main.account.register; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.UnlockDisputeAgentRegistrationWindow; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.ImageUtil; -import bisq.desktop.util.Layout; - -import bisq.core.locale.LanguageUtil; -import bisq.core.locale.Res; -import bisq.core.support.dispute.agent.DisputeAgent; - -import bisq.common.UserThread; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; +import static haveno.desktop.util.FormBuilder.add2ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.common.UserThread; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.core.locale.LanguageUtil; +import haveno.core.locale.Res; +import haveno.core.support.dispute.agent.DisputeAgent; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.UnlockDisputeAgentRegistrationWindow; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.ImageUtil; +import haveno.desktop.util.Layout; import javafx.scene.control.Button; import javafx.scene.control.ComboBox; import javafx.scene.control.Label; @@ -59,11 +61,6 @@ import javafx.collections.ListChangeListener; import javafx.util.Callback; import javafx.util.StringConverter; -import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public abstract class AgentRegistrationView> extends ActivatableViewAndModel { diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationViewModel.java b/desktop/src/main/java/haveno/desktop/main/account/register/AgentRegistrationViewModel.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationViewModel.java rename to desktop/src/main/java/haveno/desktop/main/account/register/AgentRegistrationViewModel.java index e68e85a9..64efbd41 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/AgentRegistrationViewModel.java @@ -15,24 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register; - -import bisq.desktop.common.model.ActivatableViewModel; -import bisq.desktop.util.GUIUtil; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.LanguageUtil; -import bisq.core.support.dispute.agent.DisputeAgent; -import bisq.core.support.dispute.agent.DisputeAgentManager; -import bisq.core.user.User; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.crypto.KeyRing; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.desktop.main.account.register; +import haveno.common.crypto.KeyRing; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.LanguageUtil; +import haveno.core.support.dispute.agent.DisputeAgent; +import haveno.core.support.dispute.agent.DisputeAgentManager; +import haveno.core.user.User; +import haveno.desktop.common.model.ActivatableViewModel; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.fxml b/desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.fxml index ab066c88..ad09a41d 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.fxml @@ -18,7 +18,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java b/desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java similarity index 80% rename from desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java rename to desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java index 5f70bbc6..c2b54272 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register.arbitrator; +package haveno.desktop.main.account.register.arbitrator; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.account.register.AgentRegistrationView; - -import bisq.core.locale.Res; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; - -import bisq.common.config.Config; - +import haveno.common.config.Config; +import haveno.core.locale.Res; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.account.register.AgentRegistrationView; import javax.inject.Named; import javax.inject.Inject; diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationViewModel.java b/desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationViewModel.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationViewModel.java rename to desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationViewModel.java index f0cef0c4..68bab563 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/arbitrator/ArbitratorRegistrationViewModel.java @@ -15,20 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register.arbitrator; - -import bisq.desktop.main.account.register.AgentRegistrationViewModel; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; - -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.account.register.arbitrator; import com.google.inject.Inject; +import haveno.common.crypto.KeyRing; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.user.User; +import haveno.desktop.main.account.register.AgentRegistrationViewModel; +import haveno.network.p2p.P2PService; import java.util.ArrayList; import java.util.Date; diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.fxml b/desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationView.fxml index cdf446ed..485ce1c7 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationView.fxml @@ -18,7 +18,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.java b/desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationView.java similarity index 80% rename from desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.java rename to desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationView.java index 8f5eae56..90131a3d 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationView.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register.mediator; +package haveno.desktop.main.account.register.mediator; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.account.register.AgentRegistrationView; - -import bisq.core.locale.Res; -import bisq.core.support.dispute.mediation.mediator.Mediator; - -import bisq.common.config.Config; - +import haveno.common.config.Config; +import haveno.core.locale.Res; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.account.register.AgentRegistrationView; import javax.inject.Named; import javax.inject.Inject; diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationViewModel.java b/desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationViewModel.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationViewModel.java rename to desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationViewModel.java index e361b1d8..c395c850 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/mediator/MediatorRegistrationViewModel.java @@ -15,21 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register.mediator; - -import bisq.desktop.main.account.register.AgentRegistrationViewModel; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.support.dispute.mediation.mediator.Mediator; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; - -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.account.register.mediator; import com.google.inject.Inject; - +import haveno.common.crypto.KeyRing; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.user.User; +import haveno.desktop.main.account.register.AgentRegistrationViewModel; +import haveno.network.p2p.P2PService; import java.util.ArrayList; import java.util.Date; diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.fxml b/desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationView.fxml index b02f020a..6e6ede08 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationView.fxml @@ -18,7 +18,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java b/desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java similarity index 80% rename from desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java rename to desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java index d2ff879a..812a78b7 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register.refundagent; +package haveno.desktop.main.account.register.refundagent; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.account.register.AgentRegistrationView; - -import bisq.core.locale.Res; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; - -import bisq.common.config.Config; - +import haveno.common.config.Config; +import haveno.core.locale.Res; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.account.register.AgentRegistrationView; import javax.inject.Named; import javax.inject.Inject; diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java b/desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java rename to desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java index 2ad5c6c8..7296aa02 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java @@ -15,22 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register.refundagent; +package haveno.desktop.main.account.register.refundagent; -import bisq.desktop.main.account.register.AgentRegistrationViewModel; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; - -import bisq.common.crypto.KeyRing; - import com.google.inject.Inject; - +import haveno.common.crypto.KeyRing; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.core.user.User; +import haveno.desktop.main.account.register.AgentRegistrationViewModel; +import haveno.network.p2p.P2PService; import java.util.ArrayList; import java.util.Date; diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/signing/SigningView.fxml b/desktop/src/main/java/haveno/desktop/main/account/register/signing/SigningView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/account/register/signing/SigningView.fxml rename to desktop/src/main/java/haveno/desktop/main/account/register/signing/SigningView.fxml index 33fbdff1..b82d77d1 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/signing/SigningView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/account/register/signing/SigningView.fxml @@ -18,7 +18,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/signing/SigningView.java b/desktop/src/main/java/haveno/desktop/main/account/register/signing/SigningView.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/main/account/register/signing/SigningView.java rename to desktop/src/main/java/haveno/desktop/main/account/register/signing/SigningView.java index 51fe2d24..36bf3b1a 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/register/signing/SigningView.java +++ b/desktop/src/main/java/haveno/desktop/main/account/register/signing/SigningView.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.account.register.signing; +package haveno.desktop.main.account.register.signing; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.SignPaymentAccountsWindow; -import bisq.desktop.main.overlays.windows.SignSpecificWitnessWindow; -import bisq.desktop.main.overlays.windows.SignUnsignedPubKeysWindow; - -import bisq.common.util.Utilities; - +import haveno.common.util.Utilities; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.SignPaymentAccountsWindow; +import haveno.desktop.main.overlays.windows.SignSpecificWitnessWindow; +import haveno.desktop.main.overlays.windows.SignUnsignedPubKeysWindow; import javax.inject.Inject; import javafx.scene.Scene; diff --git a/desktop/src/main/java/bisq/desktop/main/debug/DebugView.fxml b/desktop/src/main/java/haveno/desktop/main/debug/DebugView.fxml similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/debug/DebugView.fxml rename to desktop/src/main/java/haveno/desktop/main/debug/DebugView.fxml index 2ff96050..dd5877a5 100644 --- a/desktop/src/main/java/bisq/desktop/main/debug/DebugView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/debug/DebugView.fxml @@ -20,7 +20,7 @@ -. */ -package bisq.desktop.main.debug; +package haveno.desktop.main.debug; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.InitializableView; -import bisq.desktop.components.TitledGroupBg; - -import bisq.core.offer.availability.tasks.ProcessOfferAvailabilityResponse; -import bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest; -import bisq.core.offer.placeoffer.tasks.AddToOfferBook; -import bisq.core.offer.placeoffer.tasks.MakerReserveOfferFunds; -import bisq.core.offer.placeoffer.tasks.ValidateOffer; -import bisq.core.trade.protocol.tasks.ApplyFilter; -import bisq.core.trade.protocol.tasks.BuyerPreparePaymentSentMessage; -import bisq.core.trade.protocol.tasks.ProcessPaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.BuyerSendPaymentSentMessage; -import bisq.core.trade.protocol.tasks.MakerSetLockTime; -import bisq.core.trade.protocol.tasks.RemoveOffer; -import bisq.core.trade.protocol.tasks.SellerPreparePaymentReceivedMessage; -import bisq.core.trade.protocol.tasks.ProcessPaymentSentMessage; -import bisq.core.trade.protocol.tasks.SellerPublishDepositTx; -import bisq.core.trade.protocol.tasks.SellerPublishTradeStatistics; -import bisq.core.trade.protocol.tasks.SellerSendPaymentReceivedMessageToBuyer; -import bisq.core.trade.protocol.tasks.TakerVerifyMakerFeePayment; -import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; -import bisq.common.taskrunner.Task; -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addTopLabelComboBox; +import haveno.common.taskrunner.Task; +import haveno.common.util.Tuple2; +import haveno.core.offer.availability.tasks.ProcessOfferAvailabilityResponse; +import haveno.core.offer.availability.tasks.SendOfferAvailabilityRequest; +import haveno.core.offer.placeoffer.tasks.AddToOfferBook; +import haveno.core.offer.placeoffer.tasks.MakerReserveOfferFunds; +import haveno.core.offer.placeoffer.tasks.ValidateOffer; +import haveno.core.trade.protocol.tasks.ApplyFilter; +import haveno.core.trade.protocol.tasks.BuyerPreparePaymentSentMessage; +import haveno.core.trade.protocol.tasks.BuyerSendPaymentSentMessage; +import haveno.core.trade.protocol.tasks.MakerSetLockTime; +import haveno.core.trade.protocol.tasks.ProcessPaymentReceivedMessage; +import haveno.core.trade.protocol.tasks.ProcessPaymentSentMessage; +import haveno.core.trade.protocol.tasks.RemoveOffer; +import haveno.core.trade.protocol.tasks.SellerPreparePaymentReceivedMessage; +import haveno.core.trade.protocol.tasks.SellerPublishDepositTx; +import haveno.core.trade.protocol.tasks.SellerPublishTradeStatistics; +import haveno.core.trade.protocol.tasks.SellerSendPaymentReceivedMessageToBuyer; +import haveno.core.trade.protocol.tasks.TakerVerifyMakerFeePayment; +import haveno.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.InitializableView; +import haveno.desktop.components.TitledGroupBg; import javax.inject.Inject; import javafx.fxml.FXML; @@ -57,8 +57,6 @@ import javafx.util.StringConverter; import java.util.Arrays; -import static bisq.desktop.util.FormBuilder.addTopLabelComboBox; - // Not maintained anymore with new trade protocol, but leave it...If used needs to be adopted to current protocol. @FxmlView public class DebugView extends InitializableView { diff --git a/desktop/src/main/java/bisq/desktop/main/funds/FundsView.fxml b/desktop/src/main/java/haveno/desktop/main/funds/FundsView.fxml similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/funds/FundsView.fxml rename to desktop/src/main/java/haveno/desktop/main/funds/FundsView.fxml index 9f1e702c..56d57ebe 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/FundsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/funds/FundsView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/funds/FundsView.java b/desktop/src/main/java/haveno/desktop/main/funds/FundsView.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/main/funds/FundsView.java rename to desktop/src/main/java/haveno/desktop/main/funds/FundsView.java index fd0c8411..28c802fb 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/FundsView.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/FundsView.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.main.MainView; -import bisq.desktop.main.funds.deposit.DepositView; -import bisq.desktop.main.funds.transactions.TransactionsView; -import bisq.desktop.main.funds.withdrawal.WithdrawalView; - -import bisq.core.locale.Res; +package haveno.desktop.main.funds; +import haveno.core.locale.Res; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.main.MainView; +import haveno.desktop.main.funds.deposit.DepositView; +import haveno.desktop.main.funds.transactions.TransactionsView; +import haveno.desktop.main.funds.withdrawal.WithdrawalView; import javax.inject.Inject; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositListItem.java b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositListItem.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositListItem.java rename to desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositListItem.java index 8186e70f..0eb3a760 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositListItem.java @@ -15,18 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.deposit; +package haveno.desktop.main.funds.deposit; -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.desktop.components.indicator.TxConfidenceIndicator; -import bisq.desktop.util.GUIUtil; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.indicator.TxConfidenceIndicator; +import haveno.desktop.util.GUIUtil; import java.math.BigInteger; import java.util.List; import javafx.beans.property.SimpleStringProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.fxml b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.fxml similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.fxml rename to desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.fxml index ad7fbc0d..c63b7f10 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.fxml @@ -23,7 +23,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java rename to desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java index cff5aec5..b4d895fc 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/deposit/DepositView.java @@ -15,35 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.deposit; +package haveno.desktop.main.funds.deposit; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AddressTextField; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.ExternalHyperlink; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.QRCodeWindow; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; - -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.ParsingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.util.Tuple3; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.util.Tuple3; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.ParsingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AddressTextField; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.ExternalHyperlink; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.QRCodeWindow; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import org.bitcoinj.core.Coin; import net.glxn.qrgen.QRCode; @@ -89,8 +88,6 @@ import java.util.concurrent.TimeUnit; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.util.FormBuilder.*; - @FxmlView public class DepositView extends ActivatableView { diff --git a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java b/desktop/src/main/java/haveno/desktop/main/funds/locked/LockedListItem.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java rename to desktop/src/main/java/haveno/desktop/main/funds/locked/LockedListItem.java index a77fd559..0d090e7c 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/locked/LockedListItem.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.locked; - -import bisq.desktop.util.DisplayUtils; - -import bisq.core.btc.listeners.BalanceListener; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.Res; -import bisq.core.trade.Trade; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.funds.locked; +import haveno.core.btc.listeners.BalanceListener; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.locale.Res; +import haveno.core.trade.Trade; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.util.DisplayUtils; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.fxml b/desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.fxml rename to desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.fxml index dde22b64..7420f16d 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.fxml @@ -17,7 +17,7 @@ ~ along with Haveno. If not, see . --> - + @@ -25,7 +25,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java b/desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java rename to desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.java index 8cbc4c3e..da48b8d9 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/locked/LockedView.java @@ -15,30 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.locked; - -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.ExternalHyperlink; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.util.GUIUtil; - -import bisq.core.btc.listeners.BalanceListener; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.funds.locked; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; @@ -49,7 +26,27 @@ import javax.inject.Inject; import javax.inject.Named; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.core.btc.listeners.BalanceListener; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.ExternalHyperlink; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.util.GUIUtil; import javafx.fxml.FXML; import javafx.stage.Stage; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedListItem.java b/desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedListItem.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedListItem.java rename to desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedListItem.java index bcf3b748..37cc1988 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedListItem.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.reserved; - -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.util.DisplayUtils; - -import bisq.core.btc.listeners.BalanceListener; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.funds.reserved; +import haveno.core.btc.listeners.BalanceListener; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.util.DisplayUtils; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedView.fxml b/desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedView.fxml rename to desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.fxml index 9fc68b43..f5ce3c73 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.fxml @@ -17,7 +17,7 @@ ~ along with Haveno. If not, see . --> - + @@ -25,7 +25,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedView.java b/desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedView.java rename to desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.java index 85ba838b..d442195b 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedView.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/reserved/ReservedView.java @@ -15,30 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.reserved; - -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.ExternalHyperlink; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.util.GUIUtil; - -import bisq.core.btc.listeners.BalanceListener; -import bisq.core.btc.model.AddressEntry; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.funds.reserved; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; @@ -49,7 +26,27 @@ import javax.inject.Inject; import javax.inject.Named; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.core.btc.listeners.BalanceListener; +import haveno.core.btc.model.AddressEntry; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.ExternalHyperlink; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.util.GUIUtil; import javafx.fxml.FXML; import javafx.stage.Stage; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactions.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactions.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactions.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactions.java index 5b39ae86..01fcd732 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactions.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactions.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.trade.Tradable; +package haveno.desktop.main.funds.transactions; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.trade.Tradable; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsFactory.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactionsFactory.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsFactory.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactionsFactory.java index 62f252c2..bd96e417 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsFactory.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/DisplayedTransactionsFactory.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.btc.wallet.XmrWalletService; +package haveno.desktop.main.funds.transactions; +import haveno.core.btc.wallet.XmrWalletService; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/DummyTransactionAwareTradable.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/DummyTransactionAwareTradable.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/DummyTransactionAwareTradable.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/DummyTransactionAwareTradable.java index 6113ad16..ba3dfc26 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/DummyTransactionAwareTradable.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/DummyTransactionAwareTradable.java @@ -15,12 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.trade.Tradable; - - +package haveno.desktop.main.funds.transactions; +import haveno.core.trade.Tradable; import monero.wallet.model.MoneroTxWallet; class DummyTransactionAwareTradable implements TransactionAwareTradable { diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/ObservableListDecorator.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/ObservableListDecorator.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/ObservableListDecorator.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/ObservableListDecorator.java index 87ab555d..e9f6976d 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/ObservableListDecorator.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/ObservableListDecorator.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; +package haveno.desktop.main.funds.transactions; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TradableRepository.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TradableRepository.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TradableRepository.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TradableRepository.java index 59578476..ad5c5f9a 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TradableRepository.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TradableRepository.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.offer.OpenOfferManager; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.TradeManager; -import bisq.core.trade.failed.FailedTradesManager; +package haveno.desktop.main.funds.transactions; import javax.inject.Inject; import javax.inject.Singleton; import com.google.common.collect.ImmutableSet; - +import haveno.core.offer.OpenOfferManager; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.TradeManager; +import haveno.core.trade.failed.FailedTradesManager; import java.util.Set; @Singleton diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareOpenOffer.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareOpenOffer.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareOpenOffer.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareOpenOffer.java index 8460aec3..c02eccc3 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareOpenOffer.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareOpenOffer.java @@ -15,14 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOffer; -import bisq.core.trade.Tradable; - - +package haveno.desktop.main.funds.transactions; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOffer; +import haveno.core.trade.Tradable; import monero.wallet.model.MoneroTxWallet; class TransactionAwareOpenOffer implements TransactionAwareTradable { diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradable.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTradable.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradable.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTradable.java index 3dfbda1f..892e045f 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradable.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTradable.java @@ -15,12 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.trade.Tradable; - - +package haveno.desktop.main.funds.transactions; +import haveno.core.trade.Tradable; import monero.wallet.model.MoneroTxWallet; interface TransactionAwareTradable { diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTradableFactory.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTradableFactory.java index 3f2998ad..7e2a4731 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTradableFactory.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.OpenOffer; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; - -import bisq.common.crypto.PubKeyRingProvider; +package haveno.desktop.main.funds.transactions; +import haveno.common.crypto.PubKeyRingProvider; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.OpenOffer; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTrade.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTrade.java index 0cb7fb12..9d8c7ff0 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionAwareTrade.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.Offer; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; - -import bisq.common.crypto.PubKeyRing; +package haveno.desktop.main.funds.transactions; +import haveno.common.crypto.PubKeyRing; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.Offer; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; import javafx.collections.ObservableList; import java.util.Optional; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionListItemFactory.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionListItemFactory.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionListItemFactory.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionListItemFactory.java index 79244c2c..614da41c 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionListItemFactory.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionListItemFactory.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.funds.transactions; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; - +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; import javax.annotation.Nullable; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java index 47cdb73d..66ee9789 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java @@ -15,20 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; +package haveno.desktop.main.funds.transactions; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOffer; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; -import bisq.desktop.components.indicator.TxConfidenceIndicator; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOffer; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; +import haveno.desktop.components.indicator.TxConfidenceIndicator; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; import java.math.BigInteger; import java.util.Date; import java.util.Optional; @@ -142,7 +142,7 @@ class TransactionsListItem { if (valueSentToMe.compareTo(BigInteger.valueOf(0)) > 0) { details = Res.get("funds.tx.refund", tradeId); } else { - // We have spent the deposit tx outputs to the Bisq donation address to enable + // We have spent the deposit tx outputs to the Haveno donation address to enable // the refund process (refund agent -> reimbursement). As the funds have left our wallet // already when funding the deposit tx we show 0 BTC as amount. // Confirmation is not known from the BitcoinJ side (not 100% clear why) as no funds diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.fxml b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.fxml rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.fxml index 25887c86..92ec31e5 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.fxml @@ -17,7 +17,7 @@ ~ along with Haveno. If not, see . --> - + @@ -25,7 +25,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java rename to desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.java index 14c5d6d3..40cba3ae 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.java @@ -15,35 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AddressWithIconAndDirection; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.ExternalHyperlink; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.util.GUIUtil; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; - -import bisq.network.p2p.P2PService; - -import bisq.common.util.Utilities; +package haveno.desktop.main.funds.transactions; import com.googlecode.jcsv.writer.CSVEntryConverter; import javax.inject.Inject; import monero.wallet.model.MoneroWalletListener; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.util.Utilities; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AddressWithIconAndDirection; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.ExternalHyperlink; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javafx.fxml.FXML; import javafx.stage.Stage; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalListItem.java b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalListItem.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalListItem.java rename to desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalListItem.java index 8e0ccf69..d624c178 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalListItem.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.withdrawal; - -import bisq.desktop.components.AutoTooltipLabel; - -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.funds.withdrawal; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.AutoTooltipLabel; import javafx.scene.control.Label; import java.math.BigInteger; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.fxml b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.fxml similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.fxml rename to desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.fxml index c6d31402..a176fdf2 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.fxml @@ -23,7 +23,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java rename to desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java index c30b13dd..eeec9fc3 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java @@ -15,31 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.withdrawal; +package haveno.desktop.main.funds.withdrawal; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.TxDetails; -import bisq.desktop.main.overlays.windows.WalletPasswordWindow; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.util.validation.BtcAddressValidator; - -import bisq.network.p2p.P2PService; -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.util.Tuple2; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.util.validation.BtcAddressValidator; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.TxDetails; +import haveno.desktop.main.overlays.windows.WalletPasswordWindow; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; +import haveno.network.p2p.P2PService; import javax.inject.Inject; import monero.wallet.model.MoneroTxConfig; import monero.wallet.model.MoneroTxWallet; @@ -58,8 +58,6 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import static bisq.desktop.util.FormBuilder.*; - @FxmlView public class WithdrawalView extends ActivatableView { diff --git a/desktop/src/main/java/bisq/desktop/main/market/MarketView.fxml b/desktop/src/main/java/haveno/desktop/main/market/MarketView.fxml similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/market/MarketView.fxml rename to desktop/src/main/java/haveno/desktop/main/market/MarketView.fxml index edbb96f6..ce1db5b6 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/MarketView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/market/MarketView.fxml @@ -21,7 +21,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/market/MarketView.java b/desktop/src/main/java/haveno/desktop/main/market/MarketView.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/market/MarketView.java rename to desktop/src/main/java/haveno/desktop/main/market/MarketView.java index b0c042a3..0900b596 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/MarketView.java +++ b/desktop/src/main/java/haveno/desktop/main/market/MarketView.java @@ -15,40 +15,36 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.main.MainView; -import bisq.desktop.main.market.offerbook.OfferBookChartView; -import bisq.desktop.main.market.spread.SpreadView; -import bisq.desktop.main.market.spread.SpreadViewPaymentMethod; -import bisq.desktop.main.market.trades.TradesChartsView; -import bisq.desktop.main.offer.offerbook.OfferBook; -import bisq.desktop.main.offer.offerbook.OfferBookListItem; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.DisplayUtils; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.offer.OfferPayload; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.trade.statistics.TradeStatistics3StorageService; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.util.Utilities; +package haveno.desktop.main.market; import javax.inject.Inject; import javax.inject.Named; import com.google.common.base.Joiner; - +import haveno.common.util.Utilities; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.offer.OfferPayload; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.trade.statistics.TradeStatistics3StorageService; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.main.MainView; +import haveno.desktop.main.market.offerbook.OfferBookChartView; +import haveno.desktop.main.market.spread.SpreadView; +import haveno.desktop.main.market.spread.SpreadViewPaymentMethod; +import haveno.desktop.main.market.trades.TradesChartsView; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.DisplayUtils; import org.apache.commons.lang3.StringUtils; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.fxml b/desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.fxml rename to desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartView.fxml index ee4eddf2..ff05b4d0 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartView.fxml @@ -20,7 +20,7 @@ -. */ -package bisq.desktop.main.market.offerbook; +package haveno.desktop.main.market.offerbook; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.AutocompleteComboBox; -import bisq.desktop.components.ColoredDecimalPlacesWithZerosText; -import bisq.desktop.components.PeerInfoIconSmall; -import bisq.desktop.main.offer.offerbook.OfferBookListItem; -import bisq.desktop.util.CurrencyListItem; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.util.Tuple3; -import bisq.common.util.Tuple4; +import static haveno.desktop.util.FormBuilder.addTopLabelAutocompleteComboBox; +import static haveno.desktop.util.Layout.INITIAL_WINDOW_HEIGHT; import javax.inject.Inject; import javax.inject.Named; import com.jfoenix.controls.JFXTabPane; - +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.util.Tuple3; +import haveno.common.util.Tuple4; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.AutocompleteComboBox; +import haveno.desktop.components.ColoredDecimalPlacesWithZerosText; +import haveno.desktop.components.PeerInfoIconSmall; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.util.CurrencyListItem; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.NodeAddress; import javafx.scene.chart.AreaChart; import javafx.scene.chart.NumberAxis; import javafx.scene.chart.XYChart; @@ -93,9 +91,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; -import static bisq.desktop.util.FormBuilder.addTopLabelAutocompleteComboBox; -import static bisq.desktop.util.Layout.INITIAL_WINDOW_HEIGHT; - @FxmlView public class OfferBookChartView extends ActivatableViewAndModel { private final boolean useDevPrivilegeKeys; @@ -127,7 +122,7 @@ public class OfferBookChartView extends ActivatableViewAndModel bisqWindowVerticalSizeListener; + private ChangeListener havenoWindowVerticalSizeListener; /////////////////////////////////////////////////////////////////////////////////////////// // Constructor, lifecycle @@ -263,7 +258,7 @@ public class OfferBookChartView extends ActivatableViewAndModel model.goToOfferView(OfferDirection.BUY); sellTableRowSelectionListener = (observable, oldValue, newValue) -> model.goToOfferView(OfferDirection.SELL); - bisqWindowVerticalSizeListener = (observable, oldValue, newValue) -> layout(); + havenoWindowVerticalSizeListener = (observable, oldValue, newValue) -> layout(); } @Override diff --git a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java b/desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartViewModel.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java rename to desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartViewModel.java index d91bed66..2f37aea6 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartViewModel.java @@ -15,38 +15,36 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ActivatableViewModel; -import bisq.desktop.main.MainView; -import bisq.desktop.main.offer.BuyOfferView; -import bisq.desktop.main.offer.OfferView; -import bisq.desktop.main.offer.OfferViewUtil; -import bisq.desktop.main.offer.SellOfferView; -import bisq.desktop.main.offer.offerbook.OfferBook; -import bisq.desktop.main.offer.offerbook.OfferBookListItem; -import bisq.desktop.main.settings.SettingsView; -import bisq.desktop.main.settings.preferences.PreferencesView; -import bisq.desktop.util.CurrencyList; -import bisq.desktop.util.CurrencyListItem; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.TradeCurrency; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OpenOfferManager; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.Preferences; -import bisq.core.util.VolumeUtil; +package haveno.desktop.main.market.offerbook; import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.TradeCurrency; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OpenOfferManager; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.Preferences; +import haveno.core.util.VolumeUtil; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ActivatableViewModel; +import haveno.desktop.main.MainView; +import haveno.desktop.main.offer.BuyOfferView; +import haveno.desktop.main.offer.OfferView; +import haveno.desktop.main.offer.OfferViewUtil; +import haveno.desktop.main.offer.SellOfferView; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.main.settings.SettingsView; +import haveno.desktop.main.settings.preferences.PreferencesView; +import haveno.desktop.util.CurrencyList; +import haveno.desktop.util.CurrencyListItem; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; import com.google.common.math.LongMath; import javafx.scene.chart.XYChart; diff --git a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferListItem.java b/desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferListItem.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferListItem.java rename to desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferListItem.java index e876d10e..fc993cea 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferListItem.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.offerbook; - -import bisq.core.offer.Offer; +package haveno.desktop.main.market.offerbook; +import haveno.core.offer.Offer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadItem.java b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadItem.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/market/spread/SpreadItem.java rename to desktop/src/main/java/haveno/desktop/main/market/spread/SpreadItem.java index d0bb8b82..321ac182 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadItem.java +++ b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadItem.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.spread; - -import bisq.core.monetary.Price; +package haveno.desktop.main.market.spread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import haveno.core.monetary.Price; import java.math.BigInteger; import javax.annotation.Nullable; diff --git a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadView.fxml b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/market/spread/SpreadView.fxml rename to desktop/src/main/java/haveno/desktop/main/market/spread/SpreadView.fxml index c84db165..20ef83b7 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadView.fxml @@ -20,7 +20,7 @@ -. */ -package bisq.desktop.main.market.spread; - -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.ColoredDecimalPlacesWithZerosText; -import bisq.desktop.util.GUIUtil; -import bisq.common.UserThread; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.market.spread; +import haveno.common.UserThread; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.ColoredDecimalPlacesWithZerosText; +import haveno.desktop.util.GUIUtil; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadViewModel.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java rename to desktop/src/main/java/haveno/desktop/main/market/spread/SpreadViewModel.java index 63de530e..f21a7368 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadViewModel.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.spread; - -import bisq.desktop.common.model.ActivatableViewModel; -import bisq.desktop.main.offer.offerbook.OfferBook; -import bisq.desktop.main.offer.offerbook.OfferBookListItem; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.GUIUtil; -import bisq.common.UserThread; -import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.market.spread; import org.bitcoinj.utils.Fiat; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.core.locale.Res; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.model.ActivatableViewModel; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.GUIUtil; import javax.inject.Named; import javafx.beans.property.IntegerProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewPaymentMethod.fxml b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadViewPaymentMethod.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewPaymentMethod.fxml rename to desktop/src/main/java/haveno/desktop/main/market/spread/SpreadViewPaymentMethod.fxml index 5c019f16..45991809 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewPaymentMethod.fxml +++ b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadViewPaymentMethod.fxml @@ -20,7 +20,7 @@ -. */ -package bisq.desktop.main.market.spread; +package haveno.desktop.main.market.spread; -import bisq.desktop.common.view.FxmlView; - -import bisq.core.locale.Res; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +import static haveno.desktop.util.FormBuilder.addSlideToggleButton; +import haveno.core.locale.Res; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; import javax.inject.Inject; import javax.inject.Named; import javafx.scene.control.ToggleButton; -import static bisq.desktop.util.FormBuilder.addSlideToggleButton; - @FxmlView public class SpreadViewPaymentMethod extends SpreadView { private ToggleButton expandedMode; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/ChartCalculations.java b/desktop/src/main/java/haveno/desktop/main/market/trades/ChartCalculations.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/market/trades/ChartCalculations.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/ChartCalculations.java index 526e733d..d02fa2c1 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/ChartCalculations.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/ChartCalculations.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.trades; - -import bisq.desktop.main.market.trades.charts.CandleData; -import bisq.desktop.util.DisplayUtils; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Altcoin; -import bisq.core.trade.statistics.TradeStatistics3; - -import bisq.common.util.MathUtils; +package haveno.desktop.main.market.trades; import org.bitcoinj.core.Coin; -import com.google.common.annotations.VisibleForTesting; +import static haveno.desktop.main.market.trades.TradesChartsViewModel.MAX_TICKS; +import com.google.common.annotations.VisibleForTesting; +import haveno.common.util.MathUtils; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Altcoin; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.desktop.main.market.trades.charts.CandleData; +import haveno.desktop.util.DisplayUtils; import javafx.scene.chart.XYChart; import javafx.util.Pair; @@ -53,8 +51,6 @@ import java.util.stream.Collectors; import lombok.Getter; -import static bisq.desktop.main.market.trades.TradesChartsViewModel.MAX_TICKS; - public class ChartCalculations { static final ZoneId ZONE_ID = ZoneId.systemDefault(); diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/TradeStatistics3ListItem.java b/desktop/src/main/java/haveno/desktop/main/market/trades/TradeStatistics3ListItem.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/market/trades/TradeStatistics3ListItem.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/TradeStatistics3ListItem.java index a58a132b..9c6f52c7 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/TradeStatistics3ListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/TradeStatistics3ListItem.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.trades; - -import bisq.desktop.util.DisplayUtils; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.market.trades; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.util.DisplayUtils; import lombok.experimental.Delegate; import org.jetbrains.annotations.Nullable; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsView.fxml b/desktop/src/main/java/haveno/desktop/main/market/trades/TradesChartsView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsView.fxml rename to desktop/src/main/java/haveno/desktop/main/market/trades/TradesChartsView.fxml index 250d637e..7eebf616 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/TradesChartsView.fxml @@ -20,7 +20,7 @@ -. */ -package bisq.desktop.main.market.trades; - -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipSlideToggleButton; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.AutoTooltipToggleButton; -import bisq.desktop.components.AutocompleteComboBox; -import bisq.desktop.components.ColoredDecimalPlacesWithZerosText; -import bisq.desktop.main.market.trades.charts.price.CandleStickChart; -import bisq.desktop.main.market.trades.charts.volume.VolumeChart; -import bisq.desktop.util.CurrencyListItem; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.user.CookieKey; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.UserThread; -import bisq.common.util.MathUtils; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; +package haveno.desktop.main.market.trades; import org.bitcoinj.core.Coin; +import static haveno.desktop.main.market.trades.TradesChartsViewModel.MAX_TICKS; +import static haveno.desktop.util.FormBuilder.addTopLabelAutocompleteComboBox; +import static haveno.desktop.util.FormBuilder.getTopLabelWithVBox; + import com.googlecode.jcsv.writer.CSVEntryConverter; import javax.inject.Inject; import javax.inject.Named; import com.jfoenix.controls.JFXTabPane; - +import haveno.common.UserThread; +import haveno.common.util.MathUtils; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.user.CookieKey; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipSlideToggleButton; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.AutoTooltipToggleButton; +import haveno.desktop.components.AutocompleteComboBox; +import haveno.desktop.components.ColoredDecimalPlacesWithZerosText; +import haveno.desktop.main.market.trades.charts.price.CandleStickChart; +import haveno.desktop.main.market.trades.charts.volume.VolumeChart; +import haveno.desktop.util.CurrencyListItem; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; import javafx.stage.Stage; import javafx.scene.Node; @@ -108,10 +108,6 @@ import java.util.stream.Collectors; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.main.market.trades.TradesChartsViewModel.MAX_TICKS; -import static bisq.desktop.util.FormBuilder.addTopLabelAutocompleteComboBox; -import static bisq.desktop.util.FormBuilder.getTopLabelWithVBox; - @FxmlView public class TradesChartsView extends ActivatableViewAndModel { private static final int SHOW_ALL = 0; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java b/desktop/src/main/java/haveno/desktop/main/market/trades/TradesChartsViewModel.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/TradesChartsViewModel.java index 1a4a85a4..3822397c 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/TradesChartsViewModel.java @@ -15,31 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.trades; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ActivatableViewModel; -import bisq.desktop.main.MainView; -import bisq.desktop.main.settings.SettingsView; -import bisq.desktop.main.settings.preferences.PreferencesView; -import bisq.desktop.util.CurrencyList; -import bisq.desktop.util.CurrencyListItem; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.TradeCurrency; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; - -import bisq.common.UserThread; -import bisq.common.util.CompletableFutureUtils; +package haveno.desktop.main.market.trades; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.common.util.CompletableFutureUtils; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.TradeCurrency; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ActivatableViewModel; +import haveno.desktop.main.MainView; +import haveno.desktop.main.settings.SettingsView; +import haveno.desktop.main.settings.preferences.PreferencesView; +import haveno.desktop.util.CurrencyList; +import haveno.desktop.util.CurrencyListItem; +import haveno.desktop.util.GUIUtil; import javafx.scene.chart.XYChart; import javafx.beans.property.BooleanProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/CandleData.java b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/CandleData.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/market/trades/charts/CandleData.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/charts/CandleData.java index a696fa88..ceedae60 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/CandleData.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/CandleData.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.trades.charts; +package haveno.desktop.main.market.trades.charts; public class CandleData { public final long tick; // Is the time tick in the chosen time interval diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/Candle.java b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/Candle.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/Candle.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/Candle.java index 2278d4bc..74871fa9 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/Candle.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/Candle.java @@ -47,10 +47,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package bisq.desktop.main.market.trades.charts.price; - -import bisq.desktop.main.market.trades.charts.CandleData; +package haveno.desktop.main.market.trades.charts.price; +import haveno.desktop.main.market.trades.charts.CandleData; import javafx.scene.Group; import javafx.scene.control.Tooltip; import javafx.scene.layout.Region; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/CandleStickChart.java b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/CandleStickChart.java similarity index 99% rename from desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/CandleStickChart.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/CandleStickChart.java index ad54af12..cbaf647d 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/CandleStickChart.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/CandleStickChart.java @@ -47,9 +47,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package bisq.desktop.main.market.trades.charts.price; - -import bisq.desktop.main.market.trades.charts.CandleData; +package haveno.desktop.main.market.trades.charts.price; import javafx.animation.FadeTransition; @@ -65,7 +63,7 @@ import javafx.event.ActionEvent; import javafx.util.Duration; import javafx.util.StringConverter; - +import haveno.desktop.main.market.trades.charts.CandleData; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/CandleTooltip.java b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/CandleTooltip.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/CandleTooltip.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/CandleTooltip.java index f92bd173..ba749e92 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/price/CandleTooltip.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/price/CandleTooltip.java @@ -47,14 +47,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package bisq.desktop.main.market.trades.charts.price; - -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.main.market.trades.charts.CandleData; -import bisq.desktop.util.Layout; - -import bisq.core.locale.Res; +package haveno.desktop.main.market.trades.charts.price; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.main.market.trades.charts.CandleData; +import haveno.desktop.util.Layout; import javafx.scene.control.Label; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/volume/VolumeBar.java b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/volume/VolumeBar.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/market/trades/charts/volume/VolumeBar.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/charts/volume/VolumeBar.java index 774ab81b..5a3a3d16 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/volume/VolumeBar.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/volume/VolumeBar.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.trades.charts.volume; - -import bisq.desktop.main.market.trades.charts.CandleData; - -import bisq.core.locale.Res; -import bisq.core.util.VolumeUtil; +package haveno.desktop.main.market.trades.charts.volume; +import haveno.core.locale.Res; +import haveno.core.util.VolumeUtil; +import haveno.desktop.main.market.trades.charts.CandleData; import javafx.scene.Group; import javafx.scene.control.Tooltip; import javafx.scene.layout.Region; diff --git a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/volume/VolumeChart.java b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/volume/VolumeChart.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/main/market/trades/charts/volume/VolumeChart.java rename to desktop/src/main/java/haveno/desktop/main/market/trades/charts/volume/VolumeChart.java index 65b930b6..33f7fee7 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/trades/charts/volume/VolumeChart.java +++ b/desktop/src/main/java/haveno/desktop/main/market/trades/charts/volume/VolumeChart.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.trades.charts.volume; - -import bisq.desktop.main.market.trades.charts.CandleData; +package haveno.desktop.main.market.trades.charts.volume; import javafx.animation.FadeTransition; import javafx.animation.KeyFrame; @@ -32,7 +30,7 @@ import javafx.event.ActionEvent; import javafx.util.Duration; import javafx.util.StringConverter; - +import haveno.desktop.main.market.trades.charts.CandleData; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.fxml index f2aa4d3c..2f97e0ce 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.java similarity index 73% rename from desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java rename to desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.java index c525425c..275717e3 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.ViewLoader; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.ViewLoader; +import haveno.network.p2p.P2PService; import javax.inject.Inject; @FxmlView diff --git a/desktop/src/main/java/bisq/desktop/main/offer/ClosableView.java b/desktop/src/main/java/haveno/desktop/main/offer/ClosableView.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/offer/ClosableView.java rename to desktop/src/main/java/haveno/desktop/main/offer/ClosableView.java index 1cd27e0f..9f88fb60 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/ClosableView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/ClosableView.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; +package haveno.desktop.main.offer; public interface ClosableView { public void setCloseHandler(OfferView.CloseHandler closeHandler); diff --git a/desktop/src/main/java/bisq/desktop/main/offer/InitializableViewWithTakeOfferData.java b/desktop/src/main/java/haveno/desktop/main/offer/InitializableViewWithTakeOfferData.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/offer/InitializableViewWithTakeOfferData.java rename to desktop/src/main/java/haveno/desktop/main/offer/InitializableViewWithTakeOfferData.java index 2d03add9..d4abfe78 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/InitializableViewWithTakeOfferData.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/InitializableViewWithTakeOfferData.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; +package haveno.desktop.main.offer; -import bisq.core.offer.Offer; +import haveno.core.offer.Offer; public interface InitializableViewWithTakeOfferData { diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferDataModel.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/MutableOfferDataModel.java index d45b6426..c9160683 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferDataModel.java @@ -15,48 +15,44 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.Navigation; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.CreateOfferService; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.PaymentAccount; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.handlers.TransactionResultHandler; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.CoinUtil; - -import bisq.network.p2p.P2PService; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.util.MathUtils; -import bisq.common.util.Utilities; +package haveno.desktop.main.offer; import org.bitcoinj.core.Coin; import org.jetbrains.annotations.NotNull; import com.google.inject.Inject; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.util.MathUtils; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.CreateOfferService; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.PaymentAccount; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.handlers.TransactionResultHandler; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.CoinUtil; +import haveno.desktop.Navigation; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javax.inject.Named; import javafx.beans.property.BooleanProperty; @@ -89,8 +85,8 @@ import java.util.stream.Collectors; import lombok.Getter; -import static bisq.core.payment.payload.PaymentMethod.HAL_CASH_ID; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.core.payment.payload.PaymentMethod.HAL_CASH_ID; import static java.util.Comparator.comparing; public abstract class MutableOfferDataModel extends OfferDataModel { diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferView.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java rename to desktop/src/main/java/haveno/desktop/main/offer/MutableOfferView.java index 9cd4cd85..435173b3 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferView.java @@ -15,56 +15,52 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.components.AddressTextField; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.BalanceTextField; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.FundsTextField; -import bisq.desktop.components.InfoInputTextField; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.MainView; -import bisq.desktop.main.account.AccountView; -import bisq.desktop.main.account.content.fiataccounts.FiatAccountsView; -import bisq.desktop.main.overlays.notifications.Notification; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.overlays.windows.QRCodeWindow; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.portfolio.openoffer.OpenOffersView; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.payment.FasterPaymentsAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +package haveno.desktop.main.offer; import net.glxn.qrgen.QRCode; import net.glxn.qrgen.image.ImageType; import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.payment.FasterPaymentsAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.components.AddressTextField; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.BalanceTextField; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.FundsTextField; +import haveno.desktop.components.InfoInputTextField; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.MainView; +import haveno.desktop.main.account.AccountView; +import haveno.desktop.main.account.content.fiataccounts.FiatAccountsView; +import haveno.desktop.main.overlays.notifications.Notification; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.overlays.windows.QRCodeWindow; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.portfolio.openoffer.OpenOffersView; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.ComboBox; @@ -114,9 +110,9 @@ import lombok.Setter; import org.jetbrains.annotations.NotNull; -import static bisq.core.payment.payload.PaymentMethod.HAL_CASH_ID; -import static bisq.desktop.main.offer.OfferViewUtil.addPayInfoEntry; -import static bisq.desktop.util.FormBuilder.*; +import static haveno.core.payment.payload.PaymentMethod.HAL_CASH_ID; +import static haveno.desktop.main.offer.OfferViewUtil.addPayInfoEntry; +import static haveno.desktop.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createStringBinding; public abstract class MutableOfferView> extends ActivatableViewAndModel implements ClosableView, SelectableView { diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java index 60a3bd44..ae869a34 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java @@ -15,53 +15,52 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.main.MainView; -import bisq.desktop.main.funds.FundsView; -import bisq.desktop.main.funds.deposit.DepositView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.settings.SettingsView; -import bisq.desktop.main.settings.preferences.PreferencesView; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferRestrictions; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.payment.validation.FiatVolumeValidator; -import bisq.core.payment.validation.SecurityDepositValidator; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.ParsingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.CoinUtil; -import bisq.core.util.validation.AltcoinValidator; -import bisq.core.util.validation.FiatPriceValidator; -import bisq.core.util.validation.InputValidator; -import bisq.core.util.validation.MonetaryValidator; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.util.MathUtils; +package haveno.desktop.main.offer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.util.MathUtils; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferRestrictions; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.validation.FiatVolumeValidator; +import haveno.core.payment.validation.SecurityDepositValidator; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.ParsingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.CoinUtil; +import haveno.core.util.validation.AltcoinValidator; +import haveno.core.util.validation.FiatPriceValidator; +import haveno.core.util.validation.InputValidator; +import haveno.core.util.validation.MonetaryValidator; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.main.MainView; +import haveno.desktop.main.funds.FundsView; +import haveno.desktop.main.funds.deposit.DepositView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.settings.SettingsView; +import haveno.desktop.main.settings.preferences.PreferencesView; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/OfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/offer/OfferDataModel.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/offer/OfferDataModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/OfferDataModel.java index 691cc16d..f4c9bca5 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/OfferDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/OfferDataModel.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.common.model.ActivatableDataModel; - -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.OfferUtil; +package haveno.desktop.main.offer; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.OfferUtil; +import haveno.desktop.common.model.ActivatableDataModel; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/OfferView.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/offer/OfferView.java rename to desktop/src/main/java/haveno/desktop/main/offer/OfferView.java index 3903452d..07f6876f 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/OfferView.java @@ -15,33 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.main.MainView; -import bisq.desktop.main.offer.createoffer.CreateOfferView; -import bisq.desktop.main.offer.offerbook.BtcOfferBookView; -import bisq.desktop.main.offer.offerbook.OfferBookView; -import bisq.desktop.main.offer.offerbook.OtherOfferBookView; -import bisq.desktop.main.offer.offerbook.TopAltcoinOfferBookView; -import bisq.desktop.main.offer.takeoffer.TakeOfferView; -import bisq.desktop.util.GUIUtil; -import bisq.common.UserThread; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer; +import haveno.common.UserThread; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.main.MainView; +import haveno.desktop.main.offer.createoffer.CreateOfferView; +import haveno.desktop.main.offer.offerbook.BtcOfferBookView; +import haveno.desktop.main.offer.offerbook.OfferBookView; +import haveno.desktop.main.offer.offerbook.OtherOfferBookView; +import haveno.desktop.main.offer.offerbook.TopAltcoinOfferBookView; +import haveno.desktop.main.offer.takeoffer.TakeOfferView; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/OfferViewModelUtil.java b/desktop/src/main/java/haveno/desktop/main/offer/OfferViewModelUtil.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/offer/OfferViewModelUtil.java rename to desktop/src/main/java/haveno/desktop/main/offer/OfferViewModelUtil.java index 73b41b0f..5f46caf2 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/OfferViewModelUtil.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/OfferViewModelUtil.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.Res; -import bisq.core.monetary.Volume; -import bisq.core.offer.OfferUtil; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.offer; +import haveno.core.locale.Res; +import haveno.core.monetary.Volume; +import haveno.core.offer.OfferUtil; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; import java.math.BigInteger; import java.util.Optional; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/OfferViewUtil.java b/desktop/src/main/java/haveno/desktop/main/offer/OfferViewUtil.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/main/offer/OfferViewUtil.java rename to desktop/src/main/java/haveno/desktop/main/offer/OfferViewUtil.java index bb8a560d..f408f666 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/OfferViewUtil.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/OfferViewUtil.java @@ -15,30 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.Navigation; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.main.offer.offerbook.BtcOfferBookView; -import bisq.desktop.main.offer.offerbook.OfferBookView; -import bisq.desktop.main.offer.offerbook.OtherOfferBookView; -import bisq.desktop.main.offer.offerbook.TopAltcoinOfferBookView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.GUIUtil; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; - -import bisq.common.UserThread; -import bisq.common.util.Tuple2; +package haveno.desktop.main.offer; +import haveno.common.UserThread; +import haveno.common.util.Tuple2; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.desktop.Navigation; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.main.offer.offerbook.BtcOfferBookView; +import haveno.desktop.main.offer.offerbook.OfferBookView; +import haveno.desktop.main.offer.offerbook.OtherOfferBookView; +import haveno.desktop.main.offer.offerbook.TopAltcoinOfferBookView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.GUIUtil; import javafx.scene.control.Label; import javafx.scene.control.TableView; import javafx.scene.control.TextField; @@ -112,7 +109,7 @@ public class OfferViewUtil { buyBsqButton.setOnAction(e -> openBuyBsqOfferBook(navigation) ); - var info = new AutoTooltipLabel("BSQ is colored BTC that helps fund Bisq developers."); + var info = new AutoTooltipLabel("BSQ is colored BTC that helps fund Haveno developers."); var learnMore = new HyperlinkWithIcon("Learn More"); learnMore.setOnAction(e -> new Popup().headLine(buyBsqText) .information(Res.get("createOffer.buyBsq.popupMessage")) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/SelectableView.java b/desktop/src/main/java/haveno/desktop/main/offer/SelectableView.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/offer/SelectableView.java rename to desktop/src/main/java/haveno/desktop/main/offer/SelectableView.java index dda7cb7f..0978098a 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/SelectableView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/SelectableView.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; +package haveno.desktop.main.offer; public interface SelectableView { public void onTabSelected(boolean isSelected); diff --git a/desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.fxml index 51df8855..9f1fea60 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.java similarity index 74% rename from desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java rename to desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.java index cc656250..11c0013b 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.ViewLoader; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.ViewLoader; +import haveno.network.p2p.P2PService; import javax.inject.Inject; @FxmlView diff --git a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferDataModel.java similarity index 78% rename from desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferDataModel.java index 4793e278..f943ec5e 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferDataModel.java @@ -15,26 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.createoffer; - -import bisq.desktop.Navigation; -import bisq.desktop.main.offer.MutableOfferDataModel; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.offer.CreateOfferService; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.PaymentAccount; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer.createoffer; import com.google.inject.Inject; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.offer.CreateOfferService; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.PaymentAccount; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.main.offer.MutableOfferDataModel; +import haveno.network.p2p.P2PService; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferView.fxml index a00e4224..71471ec8 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferView.fxml @@ -18,6 +18,6 @@ --> - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferView.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.java rename to desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferView.java index a36a727c..4f33af35 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferView.java @@ -15,23 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.createoffer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.offer.MutableOfferView; -import bisq.desktop.main.offer.OfferView; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.util.GUIUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.OfferDirection; -import bisq.core.payment.PaymentAccount; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.offer.createoffer; import com.google.inject.Inject; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.OfferDirection; +import haveno.core.payment.PaymentAccount; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.offer.MutableOfferView; +import haveno.desktop.main.offer.OfferView; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.util.GUIUtil; import java.util.Objects; import java.util.stream.Collectors; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferViewModel.java similarity index 74% rename from desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferViewModel.java index 473b71c9..ba4832ea 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/createoffer/CreateOfferViewModel.java @@ -15,24 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.createoffer; +package haveno.desktop.main.offer.createoffer; -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ViewModel; -import bisq.desktop.main.offer.MutableOfferViewModel; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.payment.validation.FiatVolumeValidator; -import bisq.core.payment.validation.SecurityDepositValidator; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.AltcoinValidator; -import bisq.core.util.validation.FiatPriceValidator; import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.validation.FiatVolumeValidator; +import haveno.core.payment.validation.SecurityDepositValidator; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.AltcoinValidator; +import haveno.core.util.validation.FiatPriceValidator; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ViewModel; +import haveno.desktop.main.offer.MutableOfferViewModel; import javax.inject.Named; class CreateOfferViewModel extends MutableOfferViewModel implements ViewModel { diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookView.fxml index c51e87d6..0dc23fcb 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookView.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookView.java similarity index 78% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookView.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookView.java index 7013a233..7f8721ba 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookView.java @@ -15,22 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.offer.OfferDirection; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; +package haveno.desktop.main.offer.offerbook; +import haveno.common.config.Config; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.offer.OfferDirection; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookViewModel.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookViewModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookViewModel.java index 32698789..381f4870 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/BtcOfferBookViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/BtcOfferBookViewModel.java @@ -15,36 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.CoreApi; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferFilterService; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer.offerbook; import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.CoreApi; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferFilterService; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javax.inject.Named; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBook.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBook.java index 47b8bc11..8bd8bb5e 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBook.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; +package haveno.desktop.main.offer.offerbook; -import bisq.core.filter.FilterManager; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferBookService; -import bisq.core.offer.OfferRestrictions; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.utils.Utils; +import static haveno.core.offer.OfferDirection.BUY; +import haveno.core.filter.FilterManager; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferBookService; +import haveno.core.offer.OfferRestrictions; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.utils.Utils; import javax.inject.Inject; import javax.inject.Singleton; @@ -39,8 +39,6 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.core.offer.OfferDirection.BUY; - /** * Holds and manages the unsorted and unfiltered offerbook list (except for banned offers) of both buy and sell offers. * It is handled as singleton by Guice and is used by 2 instances of OfferBookDataModel (one for Buy one for Sell). diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookListItem.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookListItem.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookListItem.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookListItem.java index 0d046597..6657fa97 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookListItem.java @@ -15,23 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentMethod; - -import bisq.network.p2p.storage.P2PDataStorage; +package haveno.desktop.main.offer.offerbook; import de.jensd.fx.glyphs.GlyphIcons; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.payment.payload.PaymentMethod; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.storage.P2PDataStorage; import java.util.Date; import java.util.Optional; import java.util.concurrent.TimeUnit; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.fxml index b56ce458..2bc304df 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java index 23d7772c..33ab4699 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java @@ -15,66 +15,64 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; +package haveno.desktop.main.offer.offerbook; -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.components.AccountStatusTooltipLabel; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipSlideToggleButton; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.AutocompleteComboBox; -import bisq.desktop.components.ColoredDecimalPlacesWithZerosText; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.InfoAutoTooltipLabel; -import bisq.desktop.components.PeerInfoIconTrading; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.MainView; -import bisq.desktop.main.account.AccountView; -import bisq.desktop.main.account.content.altcoinaccounts.AltCoinAccountsView; -import bisq.desktop.main.account.content.fiataccounts.FiatAccountsView; -import bisq.desktop.main.funds.FundsView; -import bisq.desktop.main.funds.withdrawal.WithdrawalView; -import bisq.desktop.main.offer.OfferView; -import bisq.desktop.main.offer.OfferViewUtil; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.portfolio.editoffer.EditOfferView; -import bisq.desktop.util.CssTheme; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferFilterService; -import bisq.core.offer.OfferRestrictions; -import bisq.core.offer.OpenOffer; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.util.Tuple3; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; import org.bitcoinj.core.Coin; import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.util.Tuple3; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferFilterService; +import haveno.core.offer.OfferRestrictions; +import haveno.core.offer.OpenOffer; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.components.AccountStatusTooltipLabel; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipSlideToggleButton; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.AutocompleteComboBox; +import haveno.desktop.components.ColoredDecimalPlacesWithZerosText; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.InfoAutoTooltipLabel; +import haveno.desktop.components.PeerInfoIconTrading; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.MainView; +import haveno.desktop.main.account.AccountView; +import haveno.desktop.main.account.content.altcoinaccounts.AltCoinAccountsView; +import haveno.desktop.main.account.content.fiataccounts.FiatAccountsView; +import haveno.desktop.main.funds.FundsView; +import haveno.desktop.main.funds.withdrawal.WithdrawalView; +import haveno.desktop.main.offer.OfferView; +import haveno.desktop.main.offer.OfferViewUtil; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.portfolio.editoffer.EditOfferView; +import haveno.desktop.util.CssTheme; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; +import haveno.network.p2p.NodeAddress; import javafx.scene.canvas.Canvas; import javafx.scene.control.ComboBox; import javafx.scene.control.ContentDisplay; @@ -119,8 +117,6 @@ import java.util.Optional; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; - abstract public class OfferBookView extends ActivatableViewAndModel { private final Navigation navigation; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java index d625f510..bf78f71e 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java @@ -15,55 +15,50 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ActivatableViewModel; -import bisq.desktop.main.MainView; -import bisq.desktop.main.offer.OfferView; -import bisq.desktop.main.settings.SettingsView; -import bisq.desktop.main.settings.preferences.PreferencesView; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.CoreApi; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.locale.BankUtil; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferFilterService; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.P2PService; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.desktop.main.offer.offerbook; import com.google.common.base.Joiner; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.CoreApi; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.locale.BankUtil; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferFilterService; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ActivatableViewModel; +import haveno.desktop.main.MainView; +import haveno.desktop.main.offer.OfferView; +import haveno.desktop.main.settings.SettingsView; +import haveno.desktop.main.settings.preferences.PreferencesView; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookView.fxml index 8d1b5435..6d357de1 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookView.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookView.java similarity index 79% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookView.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookView.java index 77a243a1..ce2a24e6 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookView.java @@ -15,22 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.offer.OfferDirection; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; +package haveno.desktop.main.offer.offerbook; +import haveno.common.config.Config; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.offer.OfferDirection; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookViewModel.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookViewModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookViewModel.java index 491a329e..c7ddbdd3 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OtherOfferBookViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OtherOfferBookViewModel.java @@ -15,36 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.main.offer.OfferViewUtil; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.CoreApi; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferFilterService; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer.offerbook; import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.CoreApi; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferFilterService; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.main.offer.OfferViewUtil; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javax.inject.Named; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookView.fxml similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookView.fxml index ee5f7fc3..3d1e3798 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookView.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookView.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookView.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookView.java index ab6dbd47..caa882e2 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookView.java @@ -15,22 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; - -import bisq.core.account.sign.SignedWitnessService; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.offer.OfferDirection; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; +package haveno.desktop.main.offer.offerbook; +import haveno.common.config.Config; +import haveno.core.account.sign.SignedWitnessService; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.offer.OfferDirection; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookViewModel.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookViewModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookViewModel.java index d6d0c6e4..d8defa41 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/TopAltcoinOfferBookViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/TopAltcoinOfferBookViewModel.java @@ -15,32 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.Navigation; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.CoreApi; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferFilterService; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer.offerbook; import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.CoreApi; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferFilterService; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javax.inject.Named; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java index 7ef6a693..95e1b019 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java @@ -15,42 +15,39 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.takeoffer; - -import bisq.desktop.Navigation; -import bisq.desktop.main.offer.OfferDataModel; -import bisq.desktop.main.offer.offerbook.OfferBook; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.GUIUtil; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.listeners.XmrBalanceListener; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.filter.FilterManager; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.mempool.MempoolService; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.TradeManager; -import bisq.core.trade.handlers.TradeResultHandler; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.VolumeUtil; - -import bisq.network.p2p.P2PService; +package haveno.desktop.main.offer.takeoffer; import com.google.inject.Inject; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.listeners.XmrBalanceListener; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.filter.FilterManager; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.mempool.MempoolService; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.TradeManager; +import haveno.core.trade.handlers.TradeResultHandler; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.VolumeUtil; +import haveno.desktop.Navigation; +import haveno.desktop.main.offer.OfferDataModel; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javafx.beans.property.IntegerProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; @@ -69,9 +66,9 @@ import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; -import static bisq.core.payment.payload.PaymentMethod.HAL_CASH_ID; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.core.payment.payload.PaymentMethod.HAL_CASH_ID; /** * Domain for that UI element. diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.fxml b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.fxml rename to desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.fxml index 4be22140..59621c86 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.fxml @@ -18,7 +18,7 @@ --> - diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java rename to desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java index a5e5baf2..28820dad 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java @@ -15,56 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.takeoffer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AddressTextField; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.BalanceTextField; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.FundsTextField; -import bisq.desktop.components.InfoInputTextField; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.MainView; -import bisq.desktop.main.funds.FundsView; -import bisq.desktop.main.funds.withdrawal.WithdrawalView; -import bisq.desktop.main.offer.ClosableView; -import bisq.desktop.main.offer.InitializableViewWithTakeOfferData; -import bisq.desktop.main.offer.OfferView; -import bisq.desktop.main.offer.OfferViewUtil; -import bisq.desktop.main.offer.SelectableView; -import bisq.desktop.main.overlays.notifications.Notification; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.GenericMessageWindow; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.overlays.windows.QRCodeWindow; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesView; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; -import bisq.desktop.util.Transitions; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.payment.FasterPaymentsAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Tuple4; -import bisq.common.util.Utilities; +package haveno.desktop.main.offer.takeoffer; import net.glxn.qrgen.QRCode; import net.glxn.qrgen.image.ImageType; @@ -73,7 +24,52 @@ import javax.inject.Inject; import javax.inject.Named; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Tuple4; +import haveno.common.util.Utilities; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.payment.FasterPaymentsAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AddressTextField; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.BalanceTextField; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.FundsTextField; +import haveno.desktop.components.InfoInputTextField; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.MainView; +import haveno.desktop.main.funds.FundsView; +import haveno.desktop.main.funds.withdrawal.WithdrawalView; +import haveno.desktop.main.offer.ClosableView; +import haveno.desktop.main.offer.InitializableViewWithTakeOfferData; +import haveno.desktop.main.offer.OfferView; +import haveno.desktop.main.offer.OfferViewUtil; +import haveno.desktop.main.offer.SelectableView; +import haveno.desktop.main.overlays.notifications.Notification; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.GenericMessageWindow; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.overlays.windows.QRCodeWindow; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesView; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; +import haveno.desktop.util.Transitions; import com.jfoenix.controls.JFXTextField; import javafx.scene.control.Button; @@ -113,8 +109,8 @@ import java.util.concurrent.TimeUnit; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.main.offer.OfferViewUtil.addPayInfoEntry; -import static bisq.desktop.util.FormBuilder.*; +import static haveno.desktop.main.offer.OfferViewUtil.addPayInfoEntry; +import static haveno.desktop.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createStringBinding; @FxmlView diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java rename to desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java index aa3d7754..c5a61771 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java @@ -15,43 +15,41 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.takeoffer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.model.ViewModel; -import bisq.desktop.main.MainView; -import bisq.desktop.main.funds.FundsView; -import bisq.desktop.main.funds.deposit.DepositView; -import bisq.desktop.main.offer.OfferViewModelUtil; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferRestrictions; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.CoinUtil; -import bisq.core.util.validation.InputValidator; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.common.UserThread; +package haveno.desktop.main.offer.takeoffer; +import haveno.common.UserThread; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferRestrictions; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.CoinUtil; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.model.ViewModel; +import haveno.desktop.main.MainView; +import haveno.desktop.main.funds.FundsView; +import haveno.desktop.main.funds.deposit.DepositView; +import haveno.desktop.main.offer.OfferViewModelUtil; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java b/desktop/src/main/java/haveno/desktop/main/overlays/Overlay.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java rename to desktop/src/main/java/haveno/desktop/main/overlays/Overlay.java index 0817bafd..ef8fd5e6 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/Overlay.java @@ -15,34 +15,30 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays; - -import bisq.desktop.app.HavenoApp; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipCheckBox; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.main.MainView; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Transitions; - -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.LanguageUtil; -import bisq.core.locale.Res; -import bisq.core.user.DontShowAgainLookup; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.util.Utilities; +package haveno.desktop.main.overlays; import com.google.common.reflect.TypeToken; import org.apache.commons.lang3.StringUtils; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.LanguageUtil; +import haveno.core.locale.Res; +import haveno.core.user.DontShowAgainLookup; +import haveno.desktop.app.HavenoApp; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipCheckBox; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.main.MainView; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Transitions; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; @@ -394,7 +390,7 @@ public abstract class Overlay> { public T useReportBugButton() { this.closeButtonText = Res.get("shared.reportBug"); - this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://bisq.network/source/bisq/issues")); + this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://haveno.network/source/haveno/issues")); return cast(); } @@ -860,7 +856,7 @@ public abstract class Overlay> { logButton.setOnAction(event -> { try { File dataDir = Config.appDataDir(); - File logFile = new File(dataDir, "bisq.log"); + File logFile = new File(dataDir, "haveno.log"); Utilities.openFile(logFile); } catch (IOException e) { e.printStackTrace(); @@ -875,7 +871,7 @@ public abstract class Overlay> { gitHubButton.setOnAction(event -> { if (message != null) Utilities.copyToClipboard(message); - GUIUtil.openWebPage("https://bisq.network/source/bisq/issues"); + GUIUtil.openWebPage("https://haveno.network/source/haveno/issues"); hide(); }); } diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/TabbedOverlay.java b/desktop/src/main/java/haveno/desktop/main/overlays/TabbedOverlay.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/overlays/TabbedOverlay.java rename to desktop/src/main/java/haveno/desktop/main/overlays/TabbedOverlay.java index 94783de4..0cb74f66 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/TabbedOverlay.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/TabbedOverlay.java @@ -1,4 +1,4 @@ -package bisq.desktop.main.overlays; +package haveno.desktop.main.overlays; import com.jfoenix.controls.JFXTabPane; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/editor/PeerInfoWithTagEditor.java b/desktop/src/main/java/haveno/desktop/main/overlays/editor/PeerInfoWithTagEditor.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/overlays/editor/PeerInfoWithTagEditor.java rename to desktop/src/main/java/haveno/desktop/main/overlays/editor/PeerInfoWithTagEditor.java index 09b4740f..a4cd4d56 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/editor/PeerInfoWithTagEditor.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/editor/PeerInfoWithTagEditor.java @@ -15,24 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.editor; +package haveno.desktop.main.overlays.editor; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.windows.SendPrivateNotificationWindow; - -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; - -import bisq.common.UserThread; -import bisq.common.crypto.PubKeyRing; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import haveno.common.UserThread; +import haveno.common.crypto.PubKeyRing; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.windows.SendPrivateNotificationWindow; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; @@ -72,9 +72,6 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addInputTextField; - @Slf4j public class PeerInfoWithTagEditor extends Overlay { private final boolean useDevPrivilegeKeys; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/notifications/Notification.java b/desktop/src/main/java/haveno/desktop/main/overlays/notifications/Notification.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/overlays/notifications/Notification.java rename to desktop/src/main/java/haveno/desktop/main/overlays/notifications/Notification.java index 9f8ab48e..ce721775 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/notifications/Notification.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/notifications/Notification.java @@ -15,19 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.notifications; - -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.FormBuilder; - -import bisq.core.locale.Res; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; +package haveno.desktop.main.overlays.notifications; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.core.locale.Res; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.FormBuilder; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java b/desktop/src/main/java/haveno/desktop/main/overlays/notifications/NotificationCenter.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java rename to desktop/src/main/java/haveno/desktop/main/overlays/notifications/NotificationCenter.java index fe79f20f..3fb5a989 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/notifications/NotificationCenter.java @@ -15,39 +15,36 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.notifications; - -import bisq.desktop.Navigation; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesView; -import bisq.desktop.main.support.SupportView; -import bisq.desktop.main.support.dispute.DisputeView; -import bisq.desktop.main.support.dispute.agent.arbitration.ArbitratorView; -import bisq.desktop.main.support.dispute.client.arbitration.ArbitrationClientView; -import bisq.desktop.main.support.dispute.client.mediation.MediationClientView; -import bisq.desktop.main.support.dispute.client.refund.RefundClientView; -import bisq.proto.grpc.NotificationMessage; -import bisq.proto.grpc.NotificationMessage.NotificationType; -import bisq.core.api.NotificationListener; -import bisq.core.locale.Res; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.MakerTrade; -import bisq.core.trade.SellerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; - -import bisq.common.UserThread; +package haveno.desktop.main.overlays.notifications; +import haveno.proto.grpc.NotificationMessage; +import haveno.proto.grpc.NotificationMessage.NotificationType; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.core.api.NotificationListener; +import haveno.core.locale.Res; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.MakerTrade; +import haveno.core.trade.SellerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.desktop.Navigation; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesView; +import haveno.desktop.main.support.SupportView; +import haveno.desktop.main.support.dispute.DisputeView; +import haveno.desktop.main.support.dispute.agent.arbitration.ArbitratorView; +import haveno.desktop.main.support.dispute.client.arbitration.ArbitrationClientView; +import haveno.desktop.main.support.dispute.client.mediation.MediationClientView; +import haveno.desktop.main.support.dispute.client.refund.RefundClientView; import javax.inject.Singleton; import org.fxmisc.easybind.EasyBind; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationManager.java b/desktop/src/main/java/haveno/desktop/main/overlays/notifications/NotificationManager.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationManager.java rename to desktop/src/main/java/haveno/desktop/main/overlays/notifications/NotificationManager.java index a32d4dc7..ad001141 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationManager.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/notifications/NotificationManager.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.notifications; +package haveno.desktop.main.overlays.notifications; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/popups/Popup.java b/desktop/src/main/java/haveno/desktop/main/overlays/popups/Popup.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/overlays/popups/Popup.java rename to desktop/src/main/java/haveno/desktop/main/overlays/popups/Popup.java index e4da338d..416c3566 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/popups/Popup.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/popups/Popup.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.popups; - -import bisq.desktop.main.overlays.Overlay; +package haveno.desktop.main.overlays.popups; +import haveno.desktop.main.overlays.Overlay; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/popups/PopupManager.java b/desktop/src/main/java/haveno/desktop/main/overlays/popups/PopupManager.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/overlays/popups/PopupManager.java rename to desktop/src/main/java/haveno/desktop/main/overlays/popups/PopupManager.java index 405c85f5..8a02ed5f 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/popups/PopupManager.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/popups/PopupManager.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.popups; - -import bisq.common.UserThread; +package haveno.desktop.main.overlays.popups; +import haveno.common.UserThread; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BtcEmptyWalletWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/BtcEmptyWalletWindow.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/BtcEmptyWalletWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/BtcEmptyWalletWindow.java index 05b93647..6651d3b8 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BtcEmptyWalletWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/BtcEmptyWalletWindow.java @@ -1,29 +1,29 @@ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Transitions; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; - -import bisq.common.UserThread; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.Coin; import org.bitcoinj.core.InsufficientMoneyException; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Transitions; +import haveno.network.p2p.P2PService; import javax.inject.Named; import javafx.scene.Scene; @@ -42,10 +42,6 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - public final class BtcEmptyWalletWindow extends Overlay { protected static final Logger log = LoggerFactory.getLogger(BtcEmptyWalletWindow.class); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ClosedTradesSummaryWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ClosedTradesSummaryWindow.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/ClosedTradesSummaryWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/ClosedTradesSummaryWindow.java index 0b64060d..6deaaf11 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ClosedTradesSummaryWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ClosedTradesSummaryWindow.java @@ -15,14 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.portfolio.closedtrades.ClosedTradesViewModel; -import bisq.desktop.util.Layout; - -import bisq.core.locale.Res; +import static haveno.desktop.util.FormBuilder.addConfirmationLabelLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import haveno.core.locale.Res; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.portfolio.closedtrades.ClosedTradesViewModel; +import haveno.desktop.util.Layout; import org.bitcoinj.core.Coin; import javax.inject.Inject; @@ -31,9 +32,6 @@ import javafx.geometry.Insets; import java.util.Map; -import static bisq.desktop.util.FormBuilder.addConfirmationLabelLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; - public class ClosedTradesSummaryWindow extends Overlay { private final ClosedTradesViewModel model; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ContractWindow.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/ContractWindow.java index 482c20b2..57a68f05 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ContractWindow.java @@ -15,40 +15,38 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.UserThread; +import static haveno.desktop.util.DisplayUtils.getAccountWitnessDescription; +import static haveno.desktop.util.FormBuilder.*; import org.bitcoinj.core.Utils; import javax.inject.Inject; import com.google.common.base.Joiner; - +import haveno.common.UserThread; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.Layout; +import haveno.network.p2p.NodeAddress; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.StageStyle; @@ -67,9 +65,6 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.DisplayUtils.getAccountWitnessDescription; -import static bisq.desktop.util.FormBuilder.*; - @Slf4j public class ContractWindow extends Overlay { private final ArbitrationManager arbitrationManager; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisplayAlertMessageWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisplayAlertMessageWindow.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/DisplayAlertMessageWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/DisplayAlertMessageWindow.java index b7944368..5a739b72 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisplayAlertMessageWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisplayAlertMessageWindow.java @@ -15,19 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.FormBuilder; - -import bisq.core.alert.Alert; -import bisq.core.locale.Res; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import haveno.core.alert.Alert; +import haveno.core.locale.Res; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.FormBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; import static com.google.common.base.Preconditions.checkNotNull; public class DisplayAlertMessageWindow extends Overlay { @@ -79,7 +78,7 @@ public class DisplayAlertMessageWindow extends Overlay. */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.components.AutoTooltipRadioButton; -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.api.CoreDisputesService; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.Layout; - -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.handlers.ResultHandler; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; +package haveno.desktop.main.overlays.windows; import org.bitcoinj.core.Coin; import com.google.inject.Inject; import com.google.inject.name.Named; - +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.handlers.ResultHandler; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.core.api.CoreDisputesService; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.AutoTooltipRadioButton; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.Layout; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -82,11 +77,11 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; import monero.wallet.model.MoneroTxWallet; -import static bisq.desktop.util.FormBuilder.add2ButtonsWithBox; -import static bisq.desktop.util.FormBuilder.addConfirmationLabelLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelWithVBox; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.desktop.util.FormBuilder.add2ButtonsWithBox; +import static haveno.desktop.util.FormBuilder.addConfirmationLabelLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelWithVBox; @Slf4j public class DisputeSummaryWindow extends Overlay { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/EditCustomExplorerWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/EditCustomExplorerWindow.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/EditCustomExplorerWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/EditCustomExplorerWindow.java index 98e9f9e1..30f36d1b 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/EditCustomExplorerWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/EditCustomExplorerWindow.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.Layout; -import bisq.core.locale.Res; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.util.validation.UrlInputValidator; - -import bisq.common.util.Tuple2; - -import bisq.core.user.BlockChainExplorer; +package haveno.desktop.main.overlays.windows; +import haveno.common.util.Tuple2; +import haveno.core.locale.Res; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.user.BlockChainExplorer; +import haveno.core.util.validation.UrlInputValidator; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.Layout; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.ListCell; @@ -53,7 +50,7 @@ import javafx.util.Callback; import java.util.ArrayList; -import static bisq.desktop.util.FormBuilder.*; +import static haveno.desktop.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createBooleanBinding; public class EditCustomExplorerWindow extends Overlay { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java index 8eae43ee..56c37866 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java @@ -15,24 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.filter.Filter; -import bisq.core.filter.FilterManager; -import bisq.core.filter.PaymentAccountFilter; -import bisq.core.locale.Res; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.config.Config; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addLabelCheckBox; +import static haveno.desktop.util.FormBuilder.addTopLabelInputTextField; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.core.filter.Filter; +import haveno.core.filter.FilterManager; +import haveno.core.filter.PaymentAccountFilter; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; import javax.inject.Named; import org.apache.commons.lang3.StringUtils; @@ -57,10 +57,6 @@ import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addLabelCheckBox; -import static bisq.desktop.util.FormBuilder.addTopLabelInputTextField; - public class FilterWindow extends Overlay { private final FilterManager filterManager; private final boolean useDevPrivilegeKeys; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/GenericMessageWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/GenericMessageWindow.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/GenericMessageWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/GenericMessageWindow.java index 943a3bbf..13bd3b31 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/GenericMessageWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/GenericMessageWindow.java @@ -15,17 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.Layout; +package haveno.desktop.main.overlays.windows; import javafx.scene.control.Label; import javafx.scene.control.TextArea; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addTextArea; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addTextArea; + +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.Layout; public class GenericMessageWindow extends Overlay { private String preamble; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ManualPayoutTxWindow.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/ManualPayoutTxWindow.java index e4cecd23..63e3e372 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ManualPayoutTxWindow.java @@ -15,36 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.GUIUtil; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.exceptions.TransactionVerificationException; -import bisq.core.btc.exceptions.TxBroadcastException; -import bisq.core.btc.exceptions.WalletException; -import bisq.core.btc.wallet.TradeWalletService; -import bisq.core.btc.wallet.TxBroadcaster; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.payment.validation.PercentageNumberValidator; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.user.BlockChainExplorer; -import bisq.core.user.Preferences; - -import bisq.network.p2p.P2PService; - -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.util.Base64; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.*; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; @@ -60,7 +33,32 @@ import javax.inject.Inject; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.util.Base64; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.exceptions.TransactionVerificationException; +import haveno.core.btc.exceptions.TxBroadcastException; +import haveno.core.btc.exceptions.WalletException; +import haveno.core.btc.wallet.TradeWalletService; +import haveno.core.btc.wallet.TxBroadcaster; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.payment.validation.PercentageNumberValidator; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.user.BlockChainExplorer; +import haveno.core.user.Preferences; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.CheckBox; @@ -98,8 +96,6 @@ import org.slf4j.LoggerFactory; import javax.annotation.Nullable; -import static bisq.desktop.util.FormBuilder.*; - // We don't translate here as it is for dev only purpose public class ManualPayoutTxWindow extends Overlay { private static final int HEX_HASH_LENGTH = 32 * 2; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java index 63091870..3d67980e 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java @@ -15,35 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.Navigation; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; - -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.Trade.State; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.common.UserThread; -import bisq.common.crypto.KeyRing; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple4; +package haveno.desktop.main.overlays.windows; import org.fxmisc.easybind.EasyBind; import org.fxmisc.easybind.Subscription; @@ -51,8 +23,35 @@ import org.fxmisc.easybind.Subscription; import javax.inject.Inject; import javax.inject.Named; -import com.google.common.base.Joiner; +import static haveno.desktop.util.FormBuilder.*; +import com.google.common.base.Joiner; +import haveno.common.UserThread; +import haveno.common.crypto.KeyRing; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple4; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.Trade.State; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TextArea; @@ -71,8 +70,6 @@ import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.util.FormBuilder.*; - public class OfferDetailsWindow extends Overlay { protected static final Logger log = LoggerFactory.getLogger(OfferDetailsWindow.class); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/QRCodeWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/QRCodeWindow.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/QRCodeWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/QRCodeWindow.java index ec0bb768..eb608314 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/QRCodeWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/QRCodeWindow.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.Res; +package haveno.desktop.main.overlays.windows; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.main.overlays.Overlay; import net.glxn.qrgen.QRCode; import net.glxn.qrgen.image.ImageType; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SelectDepositTxWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SelectDepositTxWindow.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SelectDepositTxWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SelectDepositTxWindow.java index 09d82d8b..f7d18b30 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SelectDepositTxWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SelectDepositTxWindow.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.FormBuilder; - -import bisq.core.locale.Res; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import haveno.core.locale.Res; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.FormBuilder; import org.bitcoinj.core.Transaction; import javax.inject.Inject; @@ -40,8 +40,6 @@ import java.util.List; import java.util.Optional; import java.util.function.Consumer; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; - //TODO might be removed, but leave it for now until sure we will not use it anymore. public class SelectDepositTxWindow extends Overlay { private ComboBox transactionsComboBox; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SendAlertMessageWindow.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SendAlertMessageWindow.java index ffbe7f1b..974dac99 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SendAlertMessageWindow.java @@ -15,24 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.core.alert.AlertManager; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.FormBuilder; - -import bisq.core.alert.Alert; -import bisq.core.locale.Res; - -import bisq.common.app.DevEnv; -import bisq.common.config.Config; -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addLabelCheckBox; +import static haveno.desktop.util.FormBuilder.addRadioButton; +import static haveno.desktop.util.FormBuilder.addTopLabelTextArea; import com.google.inject.Inject; - +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.common.util.Tuple2; +import haveno.core.alert.Alert; +import haveno.core.alert.AlertManager; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.FormBuilder; import javax.inject.Named; import javafx.scene.Scene; @@ -49,11 +50,6 @@ import javafx.scene.layout.HBox; import javafx.geometry.HPos; import javafx.geometry.Insets; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addLabelCheckBox; -import static bisq.desktop.util.FormBuilder.addRadioButton; -import static bisq.desktop.util.FormBuilder.addTopLabelTextArea; - public class SendAlertMessageWindow extends Overlay { private final AlertManager alertManager; private final boolean useDevPrivilegeKeys; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SendPrivateNotificationWindow.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SendPrivateNotificationWindow.java index a321e2fb..3a661d56 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SendPrivateNotificationWindow.java @@ -15,25 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.alert.PrivateNotificationPayload; -import bisq.core.locale.Res; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendMailboxMessageListener; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.crypto.PubKeyRing; -import bisq.common.util.Tuple2; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelTextArea; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.crypto.PubKeyRing; +import haveno.common.util.Tuple2; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.alert.PrivateNotificationPayload; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendMailboxMessageListener; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -50,9 +49,6 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelTextArea; - public class SendPrivateNotificationWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(SendPrivateNotificationWindow.class); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SetXmrTxKeyWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SetXmrTxKeyWindow.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SetXmrTxKeyWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SetXmrTxKeyWindow.java index 74760b2b..54ca0a18 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SetXmrTxKeyWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SetXmrTxKeyWindow.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.Res; -import bisq.core.trade.txproof.xmr.XmrTxProofModel; -import bisq.core.util.validation.RegexValidator; +package haveno.desktop.main.overlays.windows; +import haveno.core.locale.Res; +import haveno.core.trade.txproof.xmr.XmrTxProofModel; +import haveno.core.util.validation.RegexValidator; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; @@ -35,9 +33,9 @@ import lombok.Getter; import javax.annotation.Nullable; -import static bisq.common.app.DevEnv.isDevMode; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.common.app.DevEnv.isDevMode; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; import static javafx.beans.binding.Bindings.createBooleanBinding; public class SetXmrTxKeyWindow extends Overlay { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ShowWalletDataWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ShowWalletDataWindow.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/ShowWalletDataWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/ShowWalletDataWindow.java index 47f67698..d9ea467e 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ShowWalletDataWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/ShowWalletDataWindow.java @@ -15,16 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; - -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.addLabelCheckBox; +import static haveno.desktop.util.FormBuilder.addTopLabelTextArea; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.desktop.main.overlays.Overlay; import javafx.scene.Scene; import javafx.scene.control.CheckBox; import javafx.scene.control.Label; @@ -34,9 +34,6 @@ import javafx.scene.layout.Priority; import javafx.geometry.HPos; -import static bisq.desktop.util.FormBuilder.addLabelCheckBox; -import static bisq.desktop.util.FormBuilder.addTopLabelTextArea; - public class ShowWalletDataWindow extends Overlay { private final WalletsManager walletsManager; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignPaymentAccountsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignPaymentAccountsWindow.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SignPaymentAccountsWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SignPaymentAccountsWindow.java index 3f6427f4..0a6edf46 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignPaymentAccountsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignPaymentAccountsWindow.java @@ -15,28 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.arbitration.TraderDataItem; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.util.FormattingUtils; - -import bisq.common.config.Config; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.config.Config; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.arbitration.TraderDataItem; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.util.FormattingUtils; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; @@ -75,8 +74,6 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.*; - @Slf4j public class SignPaymentAccountsWindow extends Overlay { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignSpecificWitnessWindow.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SignSpecificWitnessWindow.java index 3997c894..af87a567 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignSpecificWitnessWindow.java @@ -15,22 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; - -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Utils; @@ -46,8 +45,6 @@ import java.util.Date; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.*; - @Slf4j public class SignSpecificWitnessWindow extends Overlay { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java index 1bc319af..f08404b8 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java @@ -15,22 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.account.sign.SignedWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Res; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; - -import bisq.common.crypto.Hash; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.add2ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addTopLabelListView; +import static haveno.desktop.util.FormBuilder.removeRowsFromGridPane; +import haveno.common.crypto.Hash; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.account.sign.SignedWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.Res; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; import org.bitcoinj.core.Utils; import javax.inject.Inject; @@ -53,11 +55,6 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addTopLabelListView; -import static bisq.desktop.util.FormBuilder.removeRowsFromGridPane; - @Slf4j public class SignUnsignedPubKeysWindow extends Overlay { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SwiftPaymentDetails.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SwiftPaymentDetails.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/SwiftPaymentDetails.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/SwiftPaymentDetails.java index dc4d74ba..53560491 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SwiftPaymentDetails.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/SwiftPaymentDetails.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.CountryUtil; -import bisq.core.locale.Res; -import bisq.core.payment.payload.SwiftAccountPayload; -import bisq.core.trade.Trade; -import bisq.core.util.VolumeUtil; +package haveno.desktop.main.overlays.windows; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.Res; +import haveno.core.payment.payload.SwiftAccountPayload; +import haveno.core.trade.Trade; +import haveno.core.util.VolumeUtil; +import haveno.desktop.main.overlays.Overlay; import javafx.scene.control.Label; import javafx.geometry.Insets; @@ -32,11 +30,11 @@ import javafx.geometry.Insets; import java.util.ArrayList; import java.util.List; -import static bisq.common.util.Utilities.cleanString; -import static bisq.common.util.Utilities.copyToClipboard; -import static bisq.core.payment.payload.SwiftAccountPayload.*; -import static bisq.desktop.util.FormBuilder.addConfirmationLabelLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.common.util.Utilities.cleanString; +import static haveno.common.util.Utilities.copyToClipboard; +import static haveno.core.payment.payload.SwiftAccountPayload.*; +import static haveno.desktop.util.FormBuilder.addConfirmationLabelLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; public class SwiftPaymentDetails extends Overlay { private final SwiftAccountPayload payload; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java index ea171b56..57cb627e 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TacWindow.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.app.HavenoApp; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.Res; +import static haveno.desktop.util.FormBuilder.addHyperlinkWithIcon; import com.google.inject.Inject; - +import haveno.core.locale.Res; +import haveno.desktop.app.HavenoApp; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.main.overlays.Overlay; import javafx.stage.Screen; import javafx.scene.layout.GridPane; @@ -34,8 +33,6 @@ import javafx.geometry.Rectangle2D; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addHyperlinkWithIcon; - @Slf4j public class TacWindow extends Overlay { @@ -62,7 +59,7 @@ public class TacWindow extends Overlay { // We do not translate the tacs because of the legal nature. We would need translations checked by lawyers // in each language which is too expensive atm. - String text = "Note: This document is still related to bisq and will be adapted later on. Haveno is currently for testing only. Do not use real money.\n\n" + + String text = "Note: This document is still related to haveno and will be adapted later on. Haveno is currently for testing only. Do not use real money.\n\n" + "1. In no event, unless for damages caused by acts of intent and gross negligence, damages resulting from personal injury, " + "or damages ensuing from other instances where liability is required by applicable law or agreed to in writing, will any " + "developer, copyright holder and/or any other party who modifies and/or conveys the software as permitted above or " + diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TorNetworkSettingsWindow.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/TorNetworkSettingsWindow.java index 777c95f4..c212589b 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TorNetworkSettingsWindow.java @@ -16,27 +16,25 @@ */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.Layout; - -import bisq.core.app.TorSetup; -import bisq.core.locale.Res; -import bisq.core.user.Preferences; - -import bisq.network.p2p.network.DefaultPluggableTransports; -import bisq.network.p2p.network.NetworkNode; - -import bisq.common.UserThread; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple4; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.UserThread; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple4; +import haveno.common.util.Utilities; +import haveno.core.app.TorSetup; +import haveno.core.locale.Res; +import haveno.core.user.Preferences; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.Layout; +import haveno.network.p2p.network.DefaultPluggableTransports; +import haveno.network.p2p.network.NetworkNode; import javax.inject.Inject; import javax.inject.Singleton; @@ -70,8 +68,6 @@ import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.*; - @Slf4j @Singleton public class TorNetworkSettingsWindow extends Overlay { diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeDetailsWindow.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeDetailsWindow.java index 8772bd6d..3cf194db 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeDetailsWindow.java @@ -15,36 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.txproof.AssetTxProofResult; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.UserThread; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +package haveno.desktop.main.overlays.windows; +import haveno.common.UserThread; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.BtcWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.txproof.AssetTxProofResult; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; +import haveno.network.p2p.NodeAddress; import javax.inject.Inject; import javax.inject.Named; @@ -72,9 +68,9 @@ import javafx.beans.value.ChangeListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.util.DisplayUtils.getAccountWitnessDescription; -import static bisq.desktop.util.FormBuilder.*; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.desktop.util.DisplayUtils.getAccountWitnessDescription; +import static haveno.desktop.util.FormBuilder.*; public class TradeDetailsWindow extends Overlay { protected static final Logger log = LoggerFactory.getLogger(TradeDetailsWindow.class); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeFeedbackWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeFeedbackWindow.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeFeedbackWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeFeedbackWindow.java index de578382..3a550264 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeFeedbackWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeFeedbackWindow.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.Res; +import static haveno.desktop.util.FormBuilder.addHyperlinkWithIcon; import com.google.inject.Inject; - +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.main.overlays.Overlay; import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; @@ -33,8 +32,6 @@ import javafx.geometry.Insets; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addHyperlinkWithIcon; - @Slf4j public class TradeFeedbackWindow extends Overlay { @Inject diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TxDetails.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TxDetails.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/TxDetails.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/TxDetails.java index 2f64c161..3efaef12 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TxDetails.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/TxDetails.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.TxIdTextField; -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.Res; +import static haveno.desktop.util.FormBuilder.*; +import haveno.core.locale.Res; +import haveno.desktop.components.TxIdTextField; +import haveno.desktop.main.overlays.Overlay; import javafx.scene.layout.GridPane; import javafx.scene.layout.Region; -import static bisq.desktop.util.FormBuilder.*; - public class TxDetails extends Overlay { protected String txId, address, amount, fee, memo; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java index 902168f0..642ac9a0 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java @@ -15,18 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.locale.Res; - -import bisq.common.app.DevEnv; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; +import static haveno.desktop.util.FormBuilder.add2ButtonsAfterGroup; +import static haveno.desktop.util.FormBuilder.addTopLabelInputTextFieldWithVBox; +import haveno.common.app.DevEnv; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.core.locale.Res; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -36,9 +36,6 @@ import javafx.scene.layout.VBox; import javafx.beans.value.ChangeListener; -import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; -import static bisq.desktop.util.FormBuilder.addTopLabelInputTextFieldWithVBox; - public class UnlockDisputeAgentRegistrationWindow extends Overlay { private final boolean useDevPrivilegeKeys; private Button unlockButton; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UpdateAmazonGiftCardAccountWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/UpdateAmazonGiftCardAccountWindow.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/UpdateAmazonGiftCardAccountWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/UpdateAmazonGiftCardAccountWindow.java index b55f2f01..67f04ccb 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UpdateAmazonGiftCardAccountWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/UpdateAmazonGiftCardAccountWindow.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.Res; -import bisq.core.locale.Country; -import bisq.core.payment.AmazonGiftCardAccount; -import bisq.core.user.User; - -import bisq.common.UserThread; +package haveno.desktop.main.overlays.windows; +import haveno.common.UserThread; +import haveno.core.locale.Country; +import haveno.core.locale.Res; +import haveno.core.payment.AmazonGiftCardAccount; +import haveno.core.user.User; +import haveno.desktop.main.overlays.Overlay; import javafx.scene.Scene; import javafx.scene.control.ComboBox; @@ -41,11 +38,11 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static bisq.core.locale.CountryUtil.findCountryByCode; -import static bisq.core.locale.CountryUtil.getAllAmazonGiftCardCountries; -import static bisq.desktop.util.FormBuilder.addComboBox; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addLabel; +import static haveno.core.locale.CountryUtil.findCountryByCode; +import static haveno.core.locale.CountryUtil.getAllAmazonGiftCardCountries; +import static haveno.desktop.util.FormBuilder.addComboBox; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addLabel; public class UpdateAmazonGiftCardAccountWindow extends Overlay { private final AmazonGiftCardAccount amazonGiftCardAccount; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UpdateRevolutAccountWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/UpdateRevolutAccountWindow.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/UpdateRevolutAccountWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/UpdateRevolutAccountWindow.java index 9dd214ef..9af37a3f 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UpdateRevolutAccountWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/UpdateRevolutAccountWindow.java @@ -15,21 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.Layout; -import bisq.core.locale.Res; -import bisq.core.payment.RevolutAccount; -import bisq.core.payment.validation.RevolutValidator; -import bisq.core.user.User; +import static haveno.desktop.util.FormBuilder.addInputTextField; +import static haveno.desktop.util.FormBuilder.addLabel; +import haveno.core.locale.Res; +import haveno.core.payment.RevolutAccount; +import haveno.core.payment.validation.RevolutValidator; +import haveno.core.user.User; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.Layout; import javafx.scene.Scene; -import static bisq.desktop.util.FormBuilder.addInputTextField; -import static bisq.desktop.util.FormBuilder.addLabel; - public class UpdateRevolutAccountWindow extends Overlay { private final RevolutValidator revolutValidator; private final RevolutAccount revolutAccount; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java index b6bc6b27..fddb1396 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/VerifyDisputeResultSignatureWindow.java @@ -15,14 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.main.overlays.Overlay; - -import bisq.core.locale.Res; -import bisq.core.support.dispute.DisputeSummaryVerification; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addTopLabelTextArea; +import static haveno.desktop.util.FormBuilder.addTopLabelTextField; +import haveno.core.locale.Res; +import haveno.core.support.dispute.DisputeSummaryVerification; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.desktop.main.overlays.Overlay; import javafx.scene.control.TextArea; import javafx.scene.control.TextField; import javafx.scene.layout.ColumnConstraints; @@ -34,10 +36,6 @@ import javafx.geometry.Insets; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addTopLabelTextArea; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; - @Slf4j public class VerifyDisputeResultSignatureWindow extends Overlay { private TextArea textArea; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/WalletPasswordWindow.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/WalletPasswordWindow.java index 8d33d1e9..4bc1dff4 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/WalletPasswordWindow.java @@ -15,24 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.PasswordTextField; -import bisq.desktop.main.SharedPresentation; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.Layout; -import bisq.core.api.CoreAccountService; -import bisq.core.btc.wallet.WalletsManager; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; - -import bisq.common.config.Config; -import bisq.common.crypto.IncorrectPasswordException; -import bisq.common.util.Tuple2; +package haveno.desktop.main.overlays.windows; import org.bitcoinj.crypto.MnemonicCode; import org.bitcoinj.crypto.MnemonicException; @@ -42,7 +25,21 @@ import javax.inject.Inject; import javax.inject.Named; import com.google.common.base.Splitter; - +import haveno.common.config.Config; +import haveno.common.crypto.IncorrectPasswordException; +import haveno.common.util.Tuple2; +import haveno.core.api.CoreAccountService; +import haveno.core.btc.wallet.WalletsManager; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.PasswordTextField; +import haveno.desktop.main.SharedPresentation; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.Layout; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.DatePicker; @@ -72,11 +69,11 @@ import java.io.IOException; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addPasswordTextField; -import static bisq.desktop.util.FormBuilder.addPrimaryActionButton; -import static bisq.desktop.util.FormBuilder.addTextArea; -import static bisq.desktop.util.FormBuilder.addTopLabelDatePicker; import static com.google.common.base.Preconditions.checkArgument; +import static haveno.desktop.util.FormBuilder.addPasswordTextField; +import static haveno.desktop.util.FormBuilder.addPrimaryActionButton; +import static haveno.desktop.util.FormBuilder.addTextArea; +import static haveno.desktop.util.FormBuilder.addTopLabelDatePicker; import static javafx.beans.binding.Bindings.createBooleanBinding; @Slf4j diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WebCamWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/WebCamWindow.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/WebCamWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/WebCamWindow.java index 283c20c6..7d2b7daa 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/WebCamWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/WebCamWindow.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows; +package haveno.desktop.main.overlays.windows; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.util.FormBuilder; - -import bisq.core.locale.Res; - -import bisq.common.UserThread; - +import haveno.common.UserThread; +import haveno.core.locale.Res; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.util.FormBuilder; import javafx.scene.control.Label; import javafx.scene.image.Image; import javafx.scene.image.ImageView; diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java index fd1a3598..91a8cb41 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java @@ -15,24 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows.downloadupdate; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.main.overlays.Overlay; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.alert.Alert; -import bisq.core.locale.Res; - -import bisq.common.config.Config; -import bisq.common.util.Utilities; +package haveno.desktop.main.overlays.windows.downloadupdate; import com.google.common.base.Joiner; import com.jfoenix.controls.JFXProgressBar; - +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.core.alert.Alert; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.popups.Popup; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -64,9 +60,9 @@ import java.util.Scanner; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addLabel; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.desktop.util.FormBuilder.addLabel; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; @Slf4j public class DisplayUpdateDownloadWindow extends Overlay { @@ -180,7 +176,7 @@ public class DisplayUpdateDownloadWindow extends Overlay { if (installer.isSupportedOS()) { @@ -216,9 +212,9 @@ public class DisplayUpdateDownloadWindow extends Overlay downloadResults = downloadTask.getValue(); - Optional downloadFailed = downloadResults.stream() - .filter(fileDescriptor -> !BisqInstaller.DownloadStatusEnum.OK.equals(fileDescriptor.getDownloadStatus())) + List downloadResults = downloadTask.getValue(); + Optional downloadFailed = downloadResults.stream() + .filter(fileDescriptor -> !HavenoInstaller.DownloadStatusEnum.OK.equals(fileDescriptor.getDownloadStatus())) .findFirst(); downloadedFilesLabel.getStyleClass().removeAll("error-text", "success-text"); if (downloadResults == null || downloadResults.isEmpty() || downloadFailed.isPresent()) { @@ -229,7 +225,7 @@ public class DisplayUpdateDownloadWindow extends Overlay fileDescriptor.getType() == BisqInstaller.DownloadType.JAR_HASH) + .filter(fileDescriptor -> fileDescriptor.getType() == HavenoInstaller.DownloadType.JAR_HASH) .findFirst() .ifPresent(this::copyJarHashToDataDir); @@ -247,10 +243,10 @@ public class DisplayUpdateDownloadWindow extends Overlay verifyResults = verifyTask.getValue(); + List verifyResults = verifyTask.getValue(); // check that there are no failed verifications - Optional verifyFailed = verifyResults.stream() - .filter(verifyDescriptor -> !BisqInstaller.VerifyStatusEnum.OK.equals(verifyDescriptor.getVerifyStatusEnum())).findFirst(); + Optional verifyFailed = verifyResults.stream() + .filter(verifyDescriptor -> !HavenoInstaller.VerifyStatusEnum.OK.equals(verifyDescriptor.getVerifyStatusEnum())).findFirst(); if (verifyResults == null || verifyResults.isEmpty() || verifyFailed.isPresent()) { showErrorMessage(downloadButton, statusLabel, Res.get("displayUpdateDownloadWindow.verify.failed")); } else { @@ -282,7 +278,7 @@ public class DisplayUpdateDownloadWindow extends Overlay. */ -package bisq.desktop.main.overlays.windows.downloadupdate; - -import bisq.common.file.FileUtil; +package haveno.desktop.main.overlays.windows.downloadupdate; import com.google.common.collect.Lists; - +import haveno.common.file.FileUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -44,25 +42,25 @@ import javafx.concurrent.Task; @Slf4j @Getter -public class DownloadTask extends Task> { +public class DownloadTask extends Task> { private static final int EOF = -1; private static final int DEFAULT_BUFFER_SIZE = 1024 * 4; private String fileName = null; - private final List fileDescriptors; + private final List fileDescriptors; private final String saveDir; /** * Prepares a task to download a file from {@code fileDescriptors} to the system's download dir. */ - public DownloadTask(final BisqInstaller.FileDescriptor fileDescriptor) { + public DownloadTask(final HavenoInstaller.FileDescriptor fileDescriptor) { this(Lists.newArrayList(fileDescriptor)); } - public DownloadTask(final BisqInstaller.FileDescriptor fileDescriptor, final String saveDir) { + public DownloadTask(final HavenoInstaller.FileDescriptor fileDescriptor, final String saveDir) { this(Lists.newArrayList(fileDescriptor), saveDir); } - public DownloadTask(final List fileDescriptors) { + public DownloadTask(final List fileDescriptors) { this(Lists.newArrayList(fileDescriptors), System.getProperty("java.io.tmpdir")); } @@ -72,7 +70,7 @@ public class DownloadTask extends Task> { * @param fileDescriptors HTTP URL of the file to be downloaded * @param saveDir path of the directory to save the file */ - public DownloadTask(final List fileDescriptors, final String saveDir) { + public DownloadTask(final List fileDescriptors, final String saveDir) { super(); this.fileDescriptors = fileDescriptors; this.saveDir = saveDir; @@ -86,7 +84,7 @@ public class DownloadTask extends Task> { * @throws IOException Forwarded exceotions from HttpURLConnection and file handling methods */ @Override - protected List call() throws IOException { + protected List call() throws IOException { log.debug("DownloadTask started..."); String partialSaveFilePath = saveDir + (saveDir.endsWith(File.separator) ? "" : File.separator); @@ -101,9 +99,9 @@ public class DownloadTask extends Task> { updateMessage(fileDescriptor.getFileName()); download(new URL(fileDescriptor.getLoadUrl()), fileDescriptor.getSaveFile()); log.info("Download for {} done", fileDescriptor.getLoadUrl()); - fileDescriptor.setDownloadStatus(BisqInstaller.DownloadStatusEnum.OK); + fileDescriptor.setDownloadStatus(HavenoInstaller.DownloadStatusEnum.OK); } catch (Exception e) { - fileDescriptor.setDownloadStatus(BisqInstaller.DownloadStatusEnum.FAIL); + fileDescriptor.setDownloadStatus(HavenoInstaller.DownloadStatusEnum.FAIL); log.error("Error downloading file:" + fileDescriptor.toString(), e); e.printStackTrace(); } diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/HavenoInstaller.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/HavenoInstaller.java index 5de8c4e6..352ba45a 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/HavenoInstaller.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows.downloadupdate; - -import bisq.common.util.Utilities; +package haveno.desktop.main.overlays.windows.downloadupdate; import com.google.common.collect.Lists; - +import haveno.common.util.Utilities; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPObjectFactory; import org.bouncycastle.openpgp.PGPPublicKey; @@ -55,12 +53,12 @@ import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkArgument; @Slf4j -public class BisqInstaller { +public class HavenoInstaller { private static final String FINGER_PRINT_MANFRED_KARRER = "F379A1C6"; private static final String FINGER_PRINT_CHRIS_BEAMS = "5BC5ED73"; private static final String FINGER_PRINT_CHRISTOPH_ATTENEDER = "29CDFD3B"; - private static final String PUB_KEY_HOSTING_URL = "https://bisq.network/pubkey/"; - private static final String DOWNLOAD_HOST_URL = "https://bisq.network/downloads/"; + private static final String PUB_KEY_HOSTING_URL = "https://haveno.network/pubkey/"; + private static final String DOWNLOAD_HOST_URL = "https://haveno.network/downloads/"; public boolean isSupportedOS() { return Utilities.isOSX() || Utilities.isWindows() || Utilities.isDebianLinux() || Utilities.isRedHatLinux(); @@ -94,7 +92,7 @@ public class BisqInstaller { public VerifyTask verify(List fileDescriptors) { VerifyTask verifyTask = new VerifyTask(fileDescriptors); - new Thread(verifyTask, "BisqInstaller VerifyTask").start(); + new Thread(verifyTask, "HavenoInstaller VerifyTask").start(); // TODO: check for problems when creating task return verifyTask; } @@ -119,7 +117,7 @@ public class BisqInstaller { if (saveDir == null) saveDir = Utilities.getDownloadOfHomeDir(); DownloadTask task = new DownloadTask(fileDescriptors, saveDir); - new Thread(task, "BisqInstaller DownloadTask").start(); + new Thread(task, "HavenoInstaller DownloadTask").start(); // TODO: check for problems when creating task return task; } @@ -203,8 +201,8 @@ public class BisqInstaller { @NotNull private FileDescriptor getInstallerDescriptor(String version, String partialUrl) { String fileName; - String prefix = "Bisq-"; - // https://github.com/bisq-network/exchange/releases/download/v0.5.1/Bisq-0.5.1.dmg + String prefix = "Haveno-"; + // https://github.com/bisq-network/exchange/releases/download/v0.5.1/Haveno-0.5.1.dmg if (Utilities.isOSX()) fileName = prefix + version + ".dmg"; else if (Utilities.isWindows()) @@ -237,7 +235,7 @@ public class BisqInstaller { @NotNull private FileDescriptor getJarHashDescriptor(String version, String partialUrl) { - String fileName = "Bisq-" + version + ".jar.txt"; + String fileName = "Haveno-" + version + ".jar.txt"; return FileDescriptor.builder() .type(DownloadType.JAR_HASH) .fileName(fileName) @@ -247,8 +245,8 @@ public class BisqInstaller { } /** - * The files containing the gpg keys of the bisq signers. - * Currently these are 2 hard-coded keys, one included with bisq and the same key online for maximum security. + * The files containing the gpg keys of the haveno signers. + * Currently these are 2 hard-coded keys, one included with haveno and the same key online for maximum security. * * @return list of keys to check agains corresponding sigs. */ diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/VerifyTask.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/VerifyTask.java similarity index 63% rename from desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/VerifyTask.java rename to desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/VerifyTask.java index e21c7021..38445d45 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/VerifyTask.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/downloadupdate/VerifyTask.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows.downloadupdate; +package haveno.desktop.main.overlays.windows.downloadupdate; /** - * A Task to verify the downloaded bisq installer against the available keys/signatures. + * A Task to verify the downloaded haveno installer against the available keys/signatures. */ import com.google.common.collect.Lists; @@ -40,15 +40,15 @@ import javafx.concurrent.Task; @Slf4j @Getter -public class VerifyTask extends Task> { - private final List fileDescriptors; +public class VerifyTask extends Task> { + private final List fileDescriptors; /** * Prepares a task to download a file from {@code fileDescriptors} to {@code saveDir}. * * @param fileDescriptors HTTP URL of the file to be downloaded */ - public VerifyTask(final List fileDescriptors) { + public VerifyTask(final List fileDescriptors) { super(); this.fileDescriptors = fileDescriptors; log.info("Starting VerifyTask with files:{}", fileDescriptors); @@ -61,23 +61,23 @@ public class VerifyTask extends Task> { * @throws IOException Forwarded exceotions from HttpURLConnection and file handling methods */ @Override - protected List call() { + protected List call() { log.debug("VerifyTask started..."); - Optional installer = fileDescriptors.stream() - .filter(fileDescriptor -> BisqInstaller.DownloadType.INSTALLER.equals(fileDescriptor.getType())) + Optional installer = fileDescriptors.stream() + .filter(fileDescriptor -> HavenoInstaller.DownloadType.INSTALLER.equals(fileDescriptor.getType())) .findFirst(); if (!installer.isPresent()) { log.error("No installer file found."); return Lists.newArrayList(); } - Optional signingKeyOptional = fileDescriptors.stream() - .filter(fileDescriptor -> BisqInstaller.DownloadType.SIGNING_KEY.equals(fileDescriptor.getType())) + Optional signingKeyOptional = fileDescriptors.stream() + .filter(fileDescriptor -> HavenoInstaller.DownloadType.SIGNING_KEY.equals(fileDescriptor.getType())) .findAny(); - List verifyDescriptors = Lists.newArrayList(); + List verifyDescriptors = Lists.newArrayList(); if (signingKeyOptional.isPresent()) { - final BisqInstaller.FileDescriptor signingKeyFD = signingKeyOptional.get(); + final HavenoInstaller.FileDescriptor signingKeyFD = signingKeyOptional.get(); StringBuilder sb = new StringBuilder(); try { Scanner scanner = new Scanner(new FileReader(signingKeyFD.getSaveFile())); @@ -88,36 +88,36 @@ public class VerifyTask extends Task> { } catch (Exception e) { log.error(e.toString()); e.printStackTrace(); - BisqInstaller.VerifyDescriptor.VerifyDescriptorBuilder verifyDescriptorBuilder = BisqInstaller.VerifyDescriptor.builder(); - verifyDescriptorBuilder.verifyStatusEnum(BisqInstaller.VerifyStatusEnum.FAIL); + HavenoInstaller.VerifyDescriptor.VerifyDescriptorBuilder verifyDescriptorBuilder = HavenoInstaller.VerifyDescriptor.builder(); + verifyDescriptorBuilder.verifyStatusEnum(HavenoInstaller.VerifyStatusEnum.FAIL); verifyDescriptors.add(verifyDescriptorBuilder.build()); return verifyDescriptors; } String signingKey = sb.toString(); - List sigs = fileDescriptors.stream() - .filter(fileDescriptor -> BisqInstaller.DownloadType.SIG.equals(fileDescriptor.getType())) + List sigs = fileDescriptors.stream() + .filter(fileDescriptor -> HavenoInstaller.DownloadType.SIG.equals(fileDescriptor.getType())) .collect(Collectors.toList()); // iterate all signatures available to us - for (BisqInstaller.FileDescriptor sig : sigs) { - BisqInstaller.VerifyDescriptor.VerifyDescriptorBuilder verifyDescriptorBuilder = BisqInstaller.VerifyDescriptor.builder().sigFile(sig.getSaveFile()); + for (HavenoInstaller.FileDescriptor sig : sigs) { + HavenoInstaller.VerifyDescriptor.VerifyDescriptorBuilder verifyDescriptorBuilder = HavenoInstaller.VerifyDescriptor.builder().sigFile(sig.getSaveFile()); // Sigs are linked to keys, extract all keys which have the same id - List keys = fileDescriptors.stream() - .filter(keyDescriptor -> BisqInstaller.DownloadType.KEY.equals(keyDescriptor.getType())) + List keys = fileDescriptors.stream() + .filter(keyDescriptor -> HavenoInstaller.DownloadType.KEY.equals(keyDescriptor.getType())) .filter(keyDescriptor -> sig.getId().equals(keyDescriptor.getId())) .collect(Collectors.toList()); // iterate all keys which have the same id - for (BisqInstaller.FileDescriptor key : keys) { + for (HavenoInstaller.FileDescriptor key : keys) { if (signingKey.equals(key.getId())) { verifyDescriptorBuilder.keyFile(key.getSaveFile()); try { - verifyDescriptorBuilder.verifyStatusEnum(BisqInstaller.verifySignature(key.getSaveFile(), + verifyDescriptorBuilder.verifyStatusEnum(HavenoInstaller.verifySignature(key.getSaveFile(), sig.getSaveFile(), installer.get().getSaveFile())); updateMessage(key.getFileName()); } catch (Exception e) { - verifyDescriptorBuilder.verifyStatusEnum(BisqInstaller.VerifyStatusEnum.FAIL); + verifyDescriptorBuilder.verifyStatusEnum(HavenoInstaller.VerifyStatusEnum.FAIL); log.error(e.toString()); e.printStackTrace(); } @@ -129,8 +129,8 @@ public class VerifyTask extends Task> { } } else { log.error("signingKey is not found"); - BisqInstaller.VerifyDescriptor.VerifyDescriptorBuilder verifyDescriptorBuilder = BisqInstaller.VerifyDescriptor.builder(); - verifyDescriptorBuilder.verifyStatusEnum(BisqInstaller.VerifyStatusEnum.FAIL); + HavenoInstaller.VerifyDescriptor.VerifyDescriptorBuilder verifyDescriptorBuilder = HavenoInstaller.VerifyDescriptor.builder(); + verifyDescriptorBuilder.verifyStatusEnum(HavenoInstaller.VerifyStatusEnum.FAIL); verifyDescriptors.add(verifyDescriptorBuilder.build()); } diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/PortfolioView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.fxml rename to desktop/src/main/java/haveno/desktop/main/portfolio/PortfolioView.fxml index ba1cd86e..d2641758 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/PortfolioView.fxml @@ -20,7 +20,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/PortfolioView.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/PortfolioView.java index 6a70e689..90a2481f 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/PortfolioView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/PortfolioView.java @@ -15,27 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.main.MainView; -import bisq.desktop.main.portfolio.closedtrades.ClosedTradesView; -import bisq.desktop.main.portfolio.duplicateoffer.DuplicateOfferView; -import bisq.desktop.main.portfolio.editoffer.EditOfferView; -import bisq.desktop.main.portfolio.failedtrades.FailedTradesView; -import bisq.desktop.main.portfolio.openoffer.OpenOffersView; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesView; - -import bisq.core.locale.Res; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOffer; -import bisq.core.trade.Trade; -import bisq.core.trade.failed.FailedTradesManager; +package haveno.desktop.main.portfolio; +import haveno.core.locale.Res; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.trade.Trade; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.main.MainView; +import haveno.desktop.main.portfolio.closedtrades.ClosedTradesView; +import haveno.desktop.main.portfolio.duplicateoffer.DuplicateOfferView; +import haveno.desktop.main.portfolio.editoffer.EditOfferView; +import haveno.desktop.main.portfolio.failedtrades.FailedTradesView; +import haveno.desktop.main.portfolio.openoffer.OpenOffersView; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesView; import javax.inject.Inject; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradableListItem.java b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradableListItem.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradableListItem.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradableListItem.java index 35d3fbdf..d17ec3db 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradableListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradableListItem.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.closedtrades; +package haveno.desktop.main.portfolio.closedtrades; -import bisq.core.trade.Tradable; +import haveno.core.trade.Tradable; /** * We could remove that wrapper if it is not needed for additional UI only fields. diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java index 84068fe4..70a5cf69 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java @@ -15,27 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.closedtrades; - -import bisq.desktop.common.model.ActivatableDataModel; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.ClosedTradableFormatter; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.ClosedTradableUtil; -import bisq.core.trade.Tradable; -import bisq.core.user.Preferences; -import bisq.core.util.PriceUtil; -import bisq.core.util.VolumeUtil; +package haveno.desktop.main.portfolio.closedtrades; import org.bitcoinj.core.Coin; import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.ClosedTradableFormatter; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.ClosedTradableUtil; +import haveno.core.trade.Tradable; +import haveno.core.user.Preferences; +import haveno.core.util.PriceUtil; +import haveno.core.util.VolumeUtil; +import haveno.desktop.common.model.ActivatableDataModel; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesListItem.java b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesListItem.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesListItem.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesListItem.java index 89ca791e..9c7be1de 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesListItem.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.closedtrades; - -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.filtering.FilterableListItem; -import bisq.desktop.util.filtering.FilteringUtils; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.trade.ClosedTradableFormatter; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; +package haveno.desktop.main.portfolio.closedtrades; +import haveno.core.locale.CurrencyUtil; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.trade.ClosedTradableFormatter; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.filtering.FilterableListItem; +import haveno.desktop.util.filtering.FilteringUtils; import org.apache.commons.lang3.StringUtils; import java.math.BigInteger; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml rename to desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml index 49197fb6..776bd4a2 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml @@ -17,7 +17,7 @@ ~ along with Haveno. If not, see . --> - + @@ -25,8 +25,8 @@ - - + diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesView.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesView.java index f6faeaf0..2d8a1a05 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesView.java @@ -15,44 +15,41 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.closedtrades; +package haveno.desktop.main.portfolio.closedtrades; -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.PeerInfoIconTrading; -import bisq.desktop.components.list.FilterBox; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.ClosedTradesSummaryWindow; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.portfolio.presentation.PortfolioUtil; -import bisq.desktop.util.GUIUtil; - -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOffer; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +import static haveno.desktop.util.FormBuilder.getRegularIconButton; import com.googlecode.jcsv.writer.CSVEntryConverter; import javax.inject.Inject; import javax.inject.Named; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.PeerInfoIconTrading; +import haveno.desktop.components.list.FilterBox; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.ClosedTradesSummaryWindow; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.portfolio.presentation.PortfolioUtil; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.NodeAddress; import javafx.fxml.FXML; import javafx.stage.Stage; @@ -88,8 +85,6 @@ import javafx.util.Callback; import java.util.Comparator; import java.util.function.Function; -import static bisq.desktop.util.FormBuilder.getRegularIconButton; - @FxmlView public class ClosedTradesView extends ActivatableViewAndModel { private final boolean useDevPrivilegeKeys; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java index 16967734..23179246 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.closedtrades; - -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.model.ViewModel; - -import bisq.core.trade.ClosedTradableFormatter; +package haveno.desktop.main.portfolio.closedtrades; import org.bitcoinj.core.Coin; import com.google.inject.Inject; - +import haveno.core.trade.ClosedTradableFormatter; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.model.ViewModel; import java.util.Map; public class ClosedTradesViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java index aa364bb8..9d06bfb6 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java @@ -15,34 +15,30 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.duplicateoffer; +package haveno.desktop.main.portfolio.duplicateoffer; -import bisq.desktop.Navigation; -import bisq.desktop.main.offer.MutableOfferDataModel; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.OpenOfferManager; -import bisq.core.offer.CreateOfferService; -import bisq.core.payment.PaymentAccount; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.CoinUtil; - -import bisq.network.p2p.P2PService; - import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.CreateOfferService; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.PaymentAccount; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.CoinUtil; +import haveno.desktop.Navigation; +import haveno.desktop.main.offer.MutableOfferDataModel; +import haveno.network.p2p.P2PService; import javax.inject.Named; import java.math.BigInteger; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.fxml rename to desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.fxml index 58f022c5..b02f74cb 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.fxml @@ -18,7 +18,7 @@ --> - diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.java index bdb9e895..e2188de1 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferView.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.duplicateoffer; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.offer.MutableOfferView; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.offer.OfferPayload; -import bisq.core.payment.PaymentAccount; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.portfolio.duplicateoffer; import com.google.inject.Inject; +import haveno.core.locale.CurrencyUtil; +import haveno.core.offer.OfferPayload; +import haveno.core.payment.PaymentAccount; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.offer.MutableOfferView; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; import javafx.collections.ObservableList; import javafx.geometry.Insets; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferViewModel.java similarity index 76% rename from desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferViewModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferViewModel.java index d47f1df6..7af54dd9 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/duplicateoffer/DuplicateOfferViewModel.java @@ -15,25 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.duplicateoffer; +package haveno.desktop.main.portfolio.duplicateoffer; -import bisq.desktop.Navigation; -import bisq.desktop.main.offer.MutableOfferViewModel; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.payment.validation.FiatVolumeValidator; -import bisq.core.payment.validation.SecurityDepositValidator; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.AltcoinValidator; -import bisq.core.util.validation.FiatPriceValidator; import com.google.inject.Inject; - +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.validation.FiatVolumeValidator; +import haveno.core.payment.validation.SecurityDepositValidator; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.AltcoinValidator; +import haveno.core.util.validation.FiatPriceValidator; +import haveno.desktop.Navigation; +import haveno.desktop.main.offer.MutableOfferViewModel; import javax.inject.Named; import lombok.extern.slf4j.Slf4j; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java index c3c65447..c6461996 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferDataModel.java @@ -15,41 +15,36 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.editoffer; +package haveno.desktop.main.portfolio.editoffer; -import bisq.desktop.Navigation; -import bisq.desktop.main.offer.MutableOfferDataModel; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; -import bisq.core.offer.CreateOfferService; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.payment.PaymentAccount; -import bisq.core.proto.persistable.CorePersistenceProtoResolver; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.CoinUtil; - -import bisq.network.p2p.P2PService; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; - import com.google.inject.Inject; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; +import haveno.core.offer.CreateOfferService; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.PaymentAccount; +import haveno.core.proto.persistable.CorePersistenceProtoResolver; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.CoinUtil; +import haveno.desktop.Navigation; +import haveno.desktop.main.offer.MutableOfferDataModel; +import haveno.network.p2p.P2PService; import javax.inject.Named; import java.util.Optional; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.fxml rename to desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferView.fxml index 2fa934ee..59fbb83f 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferView.fxml @@ -18,7 +18,7 @@ --> - diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferView.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferView.java index 496ae9b8..ab1f6c60 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferView.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.editoffer; +package haveno.desktop.main.portfolio.editoffer; -import bisq.desktop.Navigation; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.main.offer.MutableOfferView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOffer; -import bisq.core.payment.PaymentAccount; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.util.Tuple4; +import static haveno.desktop.util.FormBuilder.addButtonBusyAnimationLabelAfterGroup; import com.google.inject.Inject; - +import haveno.common.util.Tuple4; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOffer; +import haveno.core.payment.PaymentAccount; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.main.offer.MutableOfferView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; import javax.inject.Named; import javafx.scene.control.Button; @@ -50,8 +48,6 @@ import javafx.geometry.HPos; import javafx.geometry.Insets; import javafx.geometry.Pos; -import static bisq.desktop.util.FormBuilder.addButtonBusyAnimationLabelAfterGroup; - @FxmlView public class EditOfferView extends MutableOfferView { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferViewModel.java similarity index 81% rename from desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferViewModel.java index 603d0f40..fa5760c4 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/editoffer/EditOfferViewModel.java @@ -15,28 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.editoffer; - -import bisq.desktop.Navigation; -import bisq.desktop.main.offer.MutableOfferViewModel; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.offer.OfferUtil; -import bisq.core.offer.OpenOffer; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.payment.validation.FiatVolumeValidator; -import bisq.core.payment.validation.SecurityDepositValidator; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.AltcoinValidator; -import bisq.core.util.validation.FiatPriceValidator; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.desktop.main.portfolio.editoffer; import com.google.inject.Inject; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.offer.OfferUtil; +import haveno.core.offer.OpenOffer; +import haveno.core.payment.validation.FiatVolumeValidator; +import haveno.core.payment.validation.SecurityDepositValidator; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.AltcoinValidator; +import haveno.core.util.validation.FiatPriceValidator; +import haveno.desktop.Navigation; +import haveno.desktop.main.offer.MutableOfferViewModel; import javax.inject.Named; class EditOfferViewModel extends MutableOfferViewModel { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java index c0c24674..a434fb81 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.failedtrades; - -import bisq.desktop.common.model.ActivatableDataModel; - -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.failed.FailedTradesManager; +package haveno.desktop.main.portfolio.failedtrades; import com.google.inject.Inject; - +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.failed.FailedTradesManager; +import haveno.desktop.common.model.ActivatableDataModel; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesListItem.java b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesListItem.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesListItem.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesListItem.java index d8147c96..b2ada1cf 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesListItem.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.failedtrades; - -import bisq.core.trade.Trade; +package haveno.desktop.main.portfolio.failedtrades; +import haveno.core.trade.Trade; import lombok.Getter; class FailedTradesListItem { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.fxml rename to desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.fxml index e4a836c6..d36ef18b 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.fxml @@ -17,9 +17,9 @@ ~ along with Haveno. If not, see . --> - - - + + + @@ -28,7 +28,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.java index 9a26fb3d..a3198f00 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.java @@ -15,35 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.failedtrades; - -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.offer.OfferViewUtil; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; - -import bisq.common.util.Utilities; +package haveno.desktop.main.portfolio.failedtrades; import com.googlecode.jcsv.writer.CSVEntryConverter; import javax.inject.Inject; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.util.Utilities; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.offer.OfferViewUtil; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; import com.jfoenix.controls.JFXButton; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesViewModel.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesViewModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesViewModel.java index 56d4bda8..d743d398 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesViewModel.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.failedtrades; - -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.model.ViewModel; -import bisq.desktop.util.DisplayUtils; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; +package haveno.desktop.main.portfolio.failedtrades; import com.google.inject.Inject; - +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.model.ViewModel; +import haveno.desktop.util.DisplayUtils; import javax.inject.Named; import javafx.collections.ObservableList; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOfferListItem.java b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOfferListItem.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOfferListItem.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOfferListItem.java index 6fea89d0..93721abd 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOfferListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOfferListItem.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.openoffer; - -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOffer; +package haveno.desktop.main.portfolio.openoffer; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOffer; import lombok.Getter; /** diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersDataModel.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersDataModel.java index 35c95d79..3f5885b5 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersDataModel.java @@ -15,23 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.openoffer; - -import bisq.desktop.common.model.ActivatableDataModel; - -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOffer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.offer.TriggerPriceService; -import bisq.core.provider.price.PriceFeedService; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.desktop.main.portfolio.openoffer; import com.google.inject.Inject; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.offer.OpenOfferManager; +import haveno.core.offer.TriggerPriceService; +import haveno.core.provider.price.PriceFeedService; +import haveno.desktop.common.model.ActivatableDataModel; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.fxml rename to desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.fxml index 38584206..3f55c12a 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.fxml @@ -17,10 +17,10 @@ ~ along with Haveno. If not, see . --> - - - - + + + + @@ -29,7 +29,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java index f007e707..0a5c2f5e 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java @@ -15,38 +15,37 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.openoffer; +package haveno.desktop.main.portfolio.openoffer; -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipSlideToggleButton; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.MainView; -import bisq.desktop.main.funds.FundsView; -import bisq.desktop.main.funds.withdrawal.WithdrawalView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.OfferDetailsWindow; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.portfolio.duplicateoffer.DuplicateOfferView; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.offer.OpenOffer; -import bisq.core.user.DontShowAgainLookup; +import static haveno.desktop.util.FormBuilder.getRegularIconButton; import com.googlecode.jcsv.writer.CSVEntryConverter; import javax.inject.Inject; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOffer; +import haveno.core.user.DontShowAgainLookup; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipSlideToggleButton; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.MainView; +import haveno.desktop.main.funds.FundsView; +import haveno.desktop.main.funds.withdrawal.WithdrawalView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.OfferDetailsWindow; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.portfolio.duplicateoffer.DuplicateOfferView; +import haveno.desktop.util.GUIUtil; import javafx.fxml.FXML; import javafx.stage.Stage; @@ -85,8 +84,6 @@ import java.util.Comparator; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.util.FormBuilder.getRegularIconButton; - @FxmlView public class OpenOffersView extends ActivatableViewAndModel { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersViewModel.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersViewModel.java index 5d1b3bf4..62bd8447 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersViewModel.java @@ -15,31 +15,26 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.openoffer; - -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.model.ViewModel; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOffer; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.FormattingUtils; -import bisq.core.util.PriceUtil; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; - -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.ResultHandler; +package haveno.desktop.main.portfolio.openoffer; import com.google.inject.Inject; - +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.offer.Offer; +import haveno.core.offer.OpenOffer; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.FormattingUtils; +import haveno.core.util.PriceUtil; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.model.ViewModel; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javax.inject.Named; import javafx.collections.ObservableList; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/BuyerSubView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/BuyerSubView.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/BuyerSubView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/BuyerSubView.java index 8055ca5f..96dcf9b7 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/BuyerSubView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/BuyerSubView.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; - -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeWizardItem; -import bisq.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep1View; -import bisq.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep2View; -import bisq.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep3View; -import bisq.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep4View; - -import bisq.core.locale.Res; +package haveno.desktop.main.portfolio.pendingtrades; +import haveno.core.locale.Res; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeWizardItem; +import haveno.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep1View; +import haveno.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep2View; +import haveno.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep3View; +import haveno.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep4View; import org.fxmisc.easybind.EasyBind; import lombok.extern.slf4j.Slf4j; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java index 39c62565..5b7732ea 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -15,57 +15,54 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ActivatableDataModel; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.notifications.NotificationCenter; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.WalletPasswordWindow; -import bisq.desktop.main.support.SupportView; -import bisq.desktop.main.support.dispute.client.arbitration.ArbitrationClientView; -import bisq.desktop.main.support.dispute.client.mediation.MediationClientView; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.CoreDisputesService; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeAlreadyOpenException; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.traderchat.TraderChatManager; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.SellerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.protocol.BuyerProtocol; -import bisq.core.trade.protocol.SellerProtocol; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.network.p2p.P2PService; -import bisq.common.UserThread; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.PubKeyRingProvider; -import bisq.common.handlers.ErrorMessageHandler; -import bisq.common.handlers.FaultHandler; -import bisq.common.handlers.ResultHandler; +package haveno.desktop.main.portfolio.pendingtrades; import org.bitcoinj.core.Coin; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.PubKeyRingProvider; +import haveno.common.handlers.ErrorMessageHandler; +import haveno.common.handlers.FaultHandler; +import haveno.common.handlers.ResultHandler; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.CoreDisputesService; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeAlreadyOpenException; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.traderchat.TraderChatManager; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.SellerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.protocol.BuyerProtocol; +import haveno.core.trade.protocol.SellerProtocol; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ActivatableDataModel; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.notifications.NotificationCenter; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.WalletPasswordWindow; +import haveno.desktop.main.support.SupportView; +import haveno.desktop.main.support.dispute.client.arbitration.ArbitrationClientView; +import haveno.desktop.main.support.dispute.client.mediation.MediationClientView; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesListItem.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesListItem.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesListItem.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesListItem.java index 0cd8bea3..0c6b8975 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesListItem.java @@ -15,23 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; +package haveno.desktop.main.portfolio.pendingtrades; -import bisq.desktop.util.filtering.FilterableListItem; - -import bisq.core.monetary.Price; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; +import static haveno.core.locale.CurrencyUtil.getCurrencyPair; +import haveno.core.monetary.Price; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.util.filtering.FilterableListItem; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.core.locale.CurrencyUtil.getCurrencyPair; - /** * We could remove that wrapper if it is not needed for additional UI only fields. */ diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.fxml rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.fxml index d813b1fb..5e83e3de 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.fxml @@ -21,8 +21,8 @@ - - + diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java index d91be0ac..25cf252e 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java @@ -15,51 +15,46 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.PeerInfoIconTrading; -import bisq.desktop.components.list.FilterBox; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.portfolio.presentation.PortfolioUtil; -import bisq.desktop.main.shared.ChatView; -import bisq.desktop.util.CssTheme; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.FormBuilder; - -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.offer.OfferPayload; -import bisq.core.support.dispute.mediation.MediationResultState; -import bisq.core.support.messages.ChatMessage; -import bisq.core.support.traderchat.TradeChatSession; -import bisq.core.support.traderchat.TraderChatManager; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.util.Utilities; +package haveno.desktop.main.portfolio.pendingtrades; import javax.inject.Inject; import javax.inject.Named; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.util.Utilities; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.offer.OfferPayload; +import haveno.core.support.dispute.mediation.MediationResultState; +import haveno.core.support.messages.ChatMessage; +import haveno.core.support.traderchat.TradeChatSession; +import haveno.core.support.traderchat.TraderChatManager; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.PeerInfoIconTrading; +import haveno.desktop.components.list.FilterBox; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.portfolio.presentation.PortfolioUtil; +import haveno.desktop.main.shared.ChatView; +import haveno.desktop.util.CssTheme; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.FormBuilder; +import haveno.network.p2p.NodeAddress; import com.jfoenix.controls.JFXBadge; import com.jfoenix.controls.JFXButton; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java index 309524af..05c64397 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java @@ -15,41 +15,36 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; - -import bisq.desktop.Navigation; -import bisq.desktop.common.model.ActivatableWithDataModel; -import bisq.desktop.common.model.ViewModel; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.network.MessageState; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferUtil; -import bisq.core.provider.mempool.MempoolService; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.BuyerTrade; -import bisq.core.trade.ClosedTradableManager; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.SellerTrade; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeUtil; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.BtcAddressValidator; - -import bisq.network.p2p.P2PService; - -import bisq.common.ClockWatcher; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; +package haveno.desktop.main.portfolio.pendingtrades; import com.google.inject.Inject; - +import haveno.common.ClockWatcher; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.network.MessageState; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferUtil; +import haveno.core.provider.mempool.MempoolService; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.BuyerTrade; +import haveno.core.trade.ClosedTradableManager; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.SellerTrade; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeUtil; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.BtcAddressValidator; +import haveno.desktop.Navigation; +import haveno.desktop.common.model.ActivatableWithDataModel; +import haveno.desktop.common.model.ViewModel; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; import javax.inject.Named; import org.fxmisc.easybind.EasyBind; @@ -69,8 +64,8 @@ import lombok.Getter; import javax.annotation.Nullable; -import static bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel.SellerState.UNDEFINED; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel.SellerState.UNDEFINED; public class PendingTradesViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/SellerSubView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/SellerSubView.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/SellerSubView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/SellerSubView.java index a81d0fce..dbf8c018 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/SellerSubView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/SellerSubView.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; - -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeWizardItem; -import bisq.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep1View; -import bisq.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep2View; -import bisq.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep3View; -import bisq.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep4View; - -import bisq.core.locale.Res; +package haveno.desktop.main.portfolio.pendingtrades; +import haveno.core.locale.Res; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeWizardItem; +import haveno.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep1View; +import haveno.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep2View; +import haveno.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep3View; +import haveno.desktop.main.portfolio.pendingtrades.steps.seller.SellerStep4View; import org.fxmisc.easybind.EasyBind; import lombok.extern.slf4j.Slf4j; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/TradeStepInfo.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/TradeStepInfo.java index 8cb1cf65..b26e824b 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/TradeStepInfo.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.SimpleMarkdownLabel; -import bisq.desktop.components.TitledGroupBg; - -import bisq.core.locale.Res; -import bisq.core.trade.Trade; +package haveno.desktop.main.portfolio.pendingtrades; +import haveno.core.locale.Res; +import haveno.core.trade.Trade; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.SimpleMarkdownLabel; +import haveno.desktop.components.TitledGroupBg; import javafx.scene.layout.GridPane; import javafx.event.ActionEvent; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeSubView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/TradeSubView.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeSubView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/TradeSubView.java index f05d1a95..700b1887 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeSubView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/TradeSubView.java @@ -15,18 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades; +package haveno.desktop.main.portfolio.pendingtrades; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.SimpleMarkdownLabel; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeWizardItem; -import bisq.desktop.util.Layout; - -import bisq.core.locale.Res; -import bisq.core.trade.Trade; +import static haveno.desktop.util.FormBuilder.addButtonAfterGroup; +import static haveno.desktop.util.FormBuilder.addSimpleMarkdownLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import haveno.core.locale.Res; +import haveno.core.trade.Trade; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.SimpleMarkdownLabel; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeWizardItem; +import haveno.desktop.util.Layout; import javafx.scene.control.Separator; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; @@ -42,10 +44,6 @@ import org.fxmisc.easybind.Subscription; import lombok.extern.slf4j.Slf4j; -import static bisq.desktop.util.FormBuilder.addButtonAfterGroup; -import static bisq.desktop.util.FormBuilder.addSimpleMarkdownLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; - @Slf4j public abstract class TradeSubView extends HBox { protected final PendingTradesViewModel model; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java index 79150a6f..80ef2445 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java @@ -15,40 +15,35 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps; - -import bisq.desktop.components.InfoTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.components.TxIdTextField; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.TradeStepInfo; -import bisq.desktop.main.portfolio.pendingtrades.TradeSubView; -import bisq.desktop.util.Layout; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.mediation.MediationResultState; -import bisq.core.trade.ArbitratorTrade; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.MakerTrade; -import bisq.core.trade.TakerTrade; -import bisq.core.trade.Trade; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; - -import bisq.network.p2p.BootstrapListener; - -import bisq.common.ClockWatcher; -import bisq.common.UserThread; -import bisq.common.util.Tuple3; +package haveno.desktop.main.portfolio.pendingtrades.steps; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.ClockWatcher; +import haveno.common.UserThread; +import haveno.common.util.Tuple3; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.mediation.MediationResultState; +import haveno.core.trade.ArbitratorTrade; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.MakerTrade; +import haveno.core.trade.TakerTrade; +import haveno.core.trade.Trade; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.desktop.components.InfoTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.components.TxIdTextField; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.TradeStepInfo; +import haveno.desktop.main.portfolio.pendingtrades.TradeSubView; +import haveno.desktop.util.Layout; +import haveno.network.p2p.BootstrapListener; import com.jfoenix.controls.JFXProgressBar; import javafx.scene.control.Label; @@ -78,12 +73,12 @@ import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static bisq.desktop.components.paymentmethods.PaymentMethodForm.addOpenTradeDuration; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelTxIdTextField; import static com.google.common.base.Preconditions.checkNotNull; +import static haveno.desktop.components.paymentmethods.PaymentMethodForm.addOpenTradeDuration; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelTxIdTextField; public abstract class TradeStepView extends AnchorPane { protected final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeWizardItem.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeWizardItem.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeWizardItem.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeWizardItem.java index d0e6d1a7..7a2fde1c 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeWizardItem.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeWizardItem.java @@ -15,10 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps; +package haveno.desktop.main.portfolio.pendingtrades.steps; + +import static haveno.desktop.util.FormBuilder.getBigIcon; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; import javafx.scene.control.Label; import javafx.scene.layout.StackPane; import javafx.scene.text.Text; @@ -27,10 +29,6 @@ import javafx.geometry.Pos; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.util.FormBuilder.getBigIcon; - -import bisq.common.UserThread; - public class TradeWizardItem extends Label { private final String iconLabel; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java index 209a4072..3702bc35 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.buyer; +package haveno.desktop.main.portfolio.pendingtrades.steps.buyer; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; - -import bisq.core.locale.Res; +import haveno.core.locale.Res; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; public class BuyerStep1View extends TradeStepView { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java similarity index 85% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java index b6ad4574..2a61e44e 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java @@ -15,94 +15,97 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.buyer; +package haveno.desktop.main.portfolio.pendingtrades.steps.buyer; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.TextFieldWithCopyIcon; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.components.paymentmethods.AchTransferForm; -import bisq.desktop.components.paymentmethods.AdvancedCashForm; -import bisq.desktop.components.paymentmethods.AliPayForm; -import bisq.desktop.components.paymentmethods.AmazonGiftCardForm; -import bisq.desktop.components.paymentmethods.AssetsForm; -import bisq.desktop.components.paymentmethods.BizumForm; -import bisq.desktop.components.paymentmethods.CapitualForm; -import bisq.desktop.components.paymentmethods.CashByMailForm; -import bisq.desktop.components.paymentmethods.CashDepositForm; -import bisq.desktop.components.paymentmethods.CelPayForm; -import bisq.desktop.components.paymentmethods.ChaseQuickPayForm; -import bisq.desktop.components.paymentmethods.ClearXchangeForm; -import bisq.desktop.components.paymentmethods.DomesticWireTransferForm; -import bisq.desktop.components.paymentmethods.F2FForm; -import bisq.desktop.components.paymentmethods.FasterPaymentsForm; -import bisq.desktop.components.paymentmethods.HalCashForm; -import bisq.desktop.components.paymentmethods.ImpsForm; -import bisq.desktop.components.paymentmethods.InteracETransferForm; -import bisq.desktop.components.paymentmethods.JapanBankTransferForm; -import bisq.desktop.components.paymentmethods.MoneseForm; -import bisq.desktop.components.paymentmethods.MoneyBeamForm; -import bisq.desktop.components.paymentmethods.MoneyGramForm; -import bisq.desktop.components.paymentmethods.NationalBankForm; -import bisq.desktop.components.paymentmethods.NeftForm; -import bisq.desktop.components.paymentmethods.NequiForm; -import bisq.desktop.components.paymentmethods.PaxumForm; -import bisq.desktop.components.paymentmethods.PayseraForm; -import bisq.desktop.components.paymentmethods.PaytmForm; -import bisq.desktop.components.paymentmethods.PerfectMoneyForm; -import bisq.desktop.components.paymentmethods.PixForm; -import bisq.desktop.components.paymentmethods.PopmoneyForm; -import bisq.desktop.components.paymentmethods.PromptPayForm; -import bisq.desktop.components.paymentmethods.RevolutForm; -import bisq.desktop.components.paymentmethods.RtgsForm; -import bisq.desktop.components.paymentmethods.SameBankForm; -import bisq.desktop.components.paymentmethods.SatispayForm; -import bisq.desktop.components.paymentmethods.SepaForm; -import bisq.desktop.components.paymentmethods.SepaInstantForm; -import bisq.desktop.components.paymentmethods.SpecificBankForm; -import bisq.desktop.components.paymentmethods.StrikeForm; -import bisq.desktop.components.paymentmethods.SwiftForm; -import bisq.desktop.components.paymentmethods.SwishForm; -import bisq.desktop.components.paymentmethods.TikkieForm; -import bisq.desktop.components.paymentmethods.TransferwiseForm; -import bisq.desktop.components.paymentmethods.TransferwiseUsdForm; -import bisq.desktop.components.paymentmethods.USPostalMoneyOrderForm; -import bisq.desktop.components.paymentmethods.UpholdForm; -import bisq.desktop.components.paymentmethods.UpiForm; -import bisq.desktop.components.paymentmethods.VerseForm; -import bisq.desktop.components.paymentmethods.WeChatPayForm; -import bisq.desktop.components.paymentmethods.WesternUnionForm; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.SetXmrTxKeyWindow; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; -import bisq.desktop.util.Layout; -import bisq.desktop.util.Transitions; - -import bisq.core.locale.Res; -import bisq.core.network.MessageState; -import bisq.core.offer.Offer; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.payment.payload.AssetAccountPayload; -import bisq.core.payment.payload.CashByMailAccountPayload; -import bisq.core.payment.payload.CashDepositAccountPayload; -import bisq.core.payment.payload.F2FAccountPayload; -import bisq.core.payment.payload.FasterPaymentsAccountPayload; -import bisq.core.payment.payload.HalCashAccountPayload; -import bisq.core.payment.payload.MoneyGramAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SwiftAccountPayload; -import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload; -import bisq.core.payment.payload.WesternUnionAccountPayload; -import bisq.core.trade.Trade; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.util.VolumeUtil; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.util.Tuple4; +import static haveno.desktop.util.FormBuilder.addButtonBusyAnimationLabel; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.util.Tuple4; +import haveno.core.locale.Res; +import haveno.core.network.MessageState; +import haveno.core.offer.Offer; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.payment.payload.AssetAccountPayload; +import haveno.core.payment.payload.CashByMailAccountPayload; +import haveno.core.payment.payload.CashDepositAccountPayload; +import haveno.core.payment.payload.F2FAccountPayload; +import haveno.core.payment.payload.FasterPaymentsAccountPayload; +import haveno.core.payment.payload.HalCashAccountPayload; +import haveno.core.payment.payload.MoneyGramAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SwiftAccountPayload; +import haveno.core.payment.payload.USPostalMoneyOrderAccountPayload; +import haveno.core.payment.payload.WesternUnionAccountPayload; +import haveno.core.trade.Trade; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.util.VolumeUtil; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.TextFieldWithCopyIcon; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.components.paymentmethods.AchTransferForm; +import haveno.desktop.components.paymentmethods.AdvancedCashForm; +import haveno.desktop.components.paymentmethods.AliPayForm; +import haveno.desktop.components.paymentmethods.AmazonGiftCardForm; +import haveno.desktop.components.paymentmethods.AssetsForm; +import haveno.desktop.components.paymentmethods.BizumForm; +import haveno.desktop.components.paymentmethods.CapitualForm; +import haveno.desktop.components.paymentmethods.CashByMailForm; +import haveno.desktop.components.paymentmethods.CashDepositForm; +import haveno.desktop.components.paymentmethods.CelPayForm; +import haveno.desktop.components.paymentmethods.ChaseQuickPayForm; +import haveno.desktop.components.paymentmethods.ClearXchangeForm; +import haveno.desktop.components.paymentmethods.DomesticWireTransferForm; +import haveno.desktop.components.paymentmethods.F2FForm; +import haveno.desktop.components.paymentmethods.FasterPaymentsForm; +import haveno.desktop.components.paymentmethods.HalCashForm; +import haveno.desktop.components.paymentmethods.ImpsForm; +import haveno.desktop.components.paymentmethods.InteracETransferForm; +import haveno.desktop.components.paymentmethods.JapanBankTransferForm; +import haveno.desktop.components.paymentmethods.MoneseForm; +import haveno.desktop.components.paymentmethods.MoneyBeamForm; +import haveno.desktop.components.paymentmethods.MoneyGramForm; +import haveno.desktop.components.paymentmethods.NationalBankForm; +import haveno.desktop.components.paymentmethods.NeftForm; +import haveno.desktop.components.paymentmethods.NequiForm; +import haveno.desktop.components.paymentmethods.PaxumForm; +import haveno.desktop.components.paymentmethods.PayseraForm; +import haveno.desktop.components.paymentmethods.PaytmForm; +import haveno.desktop.components.paymentmethods.PerfectMoneyForm; +import haveno.desktop.components.paymentmethods.PixForm; +import haveno.desktop.components.paymentmethods.PopmoneyForm; +import haveno.desktop.components.paymentmethods.PromptPayForm; +import haveno.desktop.components.paymentmethods.RevolutForm; +import haveno.desktop.components.paymentmethods.RtgsForm; +import haveno.desktop.components.paymentmethods.SameBankForm; +import haveno.desktop.components.paymentmethods.SatispayForm; +import haveno.desktop.components.paymentmethods.SepaForm; +import haveno.desktop.components.paymentmethods.SepaInstantForm; +import haveno.desktop.components.paymentmethods.SpecificBankForm; +import haveno.desktop.components.paymentmethods.StrikeForm; +import haveno.desktop.components.paymentmethods.SwiftForm; +import haveno.desktop.components.paymentmethods.SwishForm; +import haveno.desktop.components.paymentmethods.TikkieForm; +import haveno.desktop.components.paymentmethods.TransferwiseForm; +import haveno.desktop.components.paymentmethods.TransferwiseUsdForm; +import haveno.desktop.components.paymentmethods.USPostalMoneyOrderForm; +import haveno.desktop.components.paymentmethods.UpholdForm; +import haveno.desktop.components.paymentmethods.UpiForm; +import haveno.desktop.components.paymentmethods.VerseForm; +import haveno.desktop.components.paymentmethods.WeChatPayForm; +import haveno.desktop.components.paymentmethods.WesternUnionForm; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.SetXmrTxKeyWindow; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; +import haveno.desktop.util.Layout; +import haveno.desktop.util.Transitions; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; @@ -115,10 +118,6 @@ import org.fxmisc.easybind.Subscription; import java.util.List; import java.util.concurrent.TimeUnit; -import static bisq.desktop.util.FormBuilder.addButtonBusyAnimationLabel; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon; import static com.google.common.base.Preconditions.checkNotNull; public class BuyerStep2View extends TradeStepView { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java index 14fee08c..93974cd2 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java @@ -15,26 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.buyer; +package haveno.desktop.main.portfolio.pendingtrades.steps.buyer; -import bisq.desktop.components.TextFieldWithIcon; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; -import bisq.desktop.util.Layout; - -import bisq.core.locale.Res; -import bisq.core.network.MessageState; +import static haveno.desktop.util.FormBuilder.addMultilineLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithIcon; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.core.locale.Res; +import haveno.core.network.MessageState; +import haveno.desktop.components.TextFieldWithIcon; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; +import haveno.desktop.util.Layout; import javafx.scene.control.Label; import javafx.beans.value.ChangeListener; -import static bisq.desktop.util.FormBuilder.addMultilineLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; -import static bisq.desktop.util.FormBuilder.addTopLabelTextFieldWithIcon; - public class BuyerStep3View extends TradeStepView { private final ChangeListener messageStateChangeListener; private TextFieldWithIcon textFieldWithIcon; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java index 4b2a50f7..bcb76032 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java @@ -15,30 +15,28 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.buyer; +package haveno.desktop.main.portfolio.pendingtrades.steps.buyer; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.notifications.Notification; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.TradeFeedbackWindow; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.portfolio.closedtrades.ClosedTradesView; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; -import bisq.desktop.util.Layout; - -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.locale.Res; -import bisq.core.trade.txproof.AssetTxProofResult; -import bisq.core.user.DontShowAgainLookup; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; import com.jfoenix.controls.JFXBadge; - +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.locale.Res; +import haveno.core.trade.txproof.AssetTxProofResult; +import haveno.core.user.DontShowAgainLookup; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.notifications.Notification; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.TradeFeedbackWindow; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.portfolio.closedtrades.ClosedTradesView; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; +import haveno.desktop.util.Layout; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; @@ -50,8 +48,6 @@ import javafx.geometry.Pos; import java.util.concurrent.TimeUnit; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; - public class BuyerStep4View extends TradeStepView { private Button closeButton; diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java index b02a5801..60772233 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.seller; +package haveno.desktop.main.portfolio.pendingtrades.steps.seller; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; - -import bisq.core.locale.Res; +import haveno.core.locale.Res; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; public class SellerStep1View extends TradeStepView { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java index d75619d1..8305490d 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java @@ -15,17 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.seller; +package haveno.desktop.main.portfolio.pendingtrades.steps.seller; -import bisq.desktop.components.paymentmethods.F2FForm; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; -import bisq.desktop.util.Layout; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; -import bisq.core.locale.Res; -import bisq.core.payment.payload.F2FAccountPayload; +import haveno.core.locale.Res; +import haveno.core.payment.payload.F2FAccountPayload; +import haveno.desktop.components.paymentmethods.F2FForm; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; +import haveno.desktop.util.Layout; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; import static com.google.common.base.Preconditions.checkNotNull; public class SellerStep2View extends TradeStepView { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java index 74b6c82a..86c31cc8 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java @@ -15,45 +15,48 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.seller; +package haveno.desktop.main.portfolio.pendingtrades.steps.seller; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.InfoTextField; -import bisq.desktop.components.TextFieldWithCopyIcon; -import bisq.desktop.components.indicator.TxConfidenceIndicator; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; - -import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.payment.payload.AmazonGiftCardAccountPayload; -import bisq.core.payment.payload.AssetAccountPayload; -import bisq.core.payment.payload.BankAccountPayload; -import bisq.core.payment.payload.CashByMailAccountPayload; -import bisq.core.payment.payload.CashDepositAccountPayload; -import bisq.core.payment.payload.F2FAccountPayload; -import bisq.core.payment.payload.HalCashAccountPayload; -import bisq.core.payment.payload.MoneyGramAccountPayload; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.SepaAccountPayload; -import bisq.core.payment.payload.SepaInstantAccountPayload; -import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload; -import bisq.core.payment.payload.WesternUnionAccountPayload; -import bisq.core.trade.Contract; -import bisq.core.trade.Trade; -import bisq.core.trade.txproof.AssetTxProofResult; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.util.VolumeUtil; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple4; +import static haveno.desktop.util.FormBuilder.*; +import static haveno.desktop.util.Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE; +import static haveno.desktop.util.Layout.COMPACT_GROUP_DISTANCE; +import static haveno.desktop.util.Layout.FLOATING_LABEL_DISTANCE; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple4; +import haveno.core.locale.Res; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.payment.payload.AmazonGiftCardAccountPayload; +import haveno.core.payment.payload.AssetAccountPayload; +import haveno.core.payment.payload.BankAccountPayload; +import haveno.core.payment.payload.CashByMailAccountPayload; +import haveno.core.payment.payload.CashDepositAccountPayload; +import haveno.core.payment.payload.F2FAccountPayload; +import haveno.core.payment.payload.HalCashAccountPayload; +import haveno.core.payment.payload.MoneyGramAccountPayload; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.SepaAccountPayload; +import haveno.core.payment.payload.SepaInstantAccountPayload; +import haveno.core.payment.payload.USPostalMoneyOrderAccountPayload; +import haveno.core.payment.payload.WesternUnionAccountPayload; +import haveno.core.trade.Contract; +import haveno.core.trade.Trade; +import haveno.core.trade.txproof.AssetTxProofResult; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.util.VolumeUtil; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.InfoTextField; +import haveno.desktop.components.TextFieldWithCopyIcon; +import haveno.desktop.components.indicator.TxConfidenceIndicator; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.TradeStepView; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.Layout; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.Tooltip; @@ -73,10 +76,6 @@ import java.util.Optional; import javax.annotation.Nullable; -import static bisq.desktop.util.FormBuilder.*; -import static bisq.desktop.util.Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE; -import static bisq.desktop.util.Layout.COMPACT_GROUP_DISTANCE; -import static bisq.desktop.util.Layout.FLOATING_LABEL_DISTANCE; import static com.google.common.base.Preconditions.checkNotNull; public class SellerStep3View extends TradeStepView { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java index e0d61954..e0676bb1 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.pendingtrades.steps.seller; +package haveno.desktop.main.portfolio.pendingtrades.steps.seller; -import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; -import bisq.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep4View; - -import bisq.core.locale.Res; +import haveno.core.locale.Res; +import haveno.desktop.main.portfolio.pendingtrades.PendingTradesViewModel; +import haveno.desktop.main.portfolio.pendingtrades.steps.buyer.BuyerStep4View; public class SellerStep4View extends BuyerStep4View { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/presentation/PortfolioUtil.java b/desktop/src/main/java/haveno/desktop/main/portfolio/presentation/PortfolioUtil.java similarity index 76% rename from desktop/src/main/java/bisq/desktop/main/portfolio/presentation/PortfolioUtil.java rename to desktop/src/main/java/haveno/desktop/main/portfolio/presentation/PortfolioUtil.java index ea838ec9..e01c55db 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/presentation/PortfolioUtil.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/presentation/PortfolioUtil.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.portfolio.presentation; +package haveno.desktop.main.portfolio.presentation; -import bisq.desktop.Navigation; -import bisq.desktop.main.MainView; -import bisq.desktop.main.portfolio.PortfolioView; -import bisq.desktop.main.portfolio.duplicateoffer.DuplicateOfferView; - -import bisq.core.offer.OfferPayload; +import haveno.core.offer.OfferPayload; +import haveno.desktop.Navigation; +import haveno.desktop.main.MainView; +import haveno.desktop.main.portfolio.PortfolioView; +import haveno.desktop.main.portfolio.duplicateoffer.DuplicateOfferView; public class PortfolioUtil { diff --git a/desktop/src/main/java/bisq/desktop/main/presentation/AccountPresentation.java b/desktop/src/main/java/haveno/desktop/main/presentation/AccountPresentation.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/presentation/AccountPresentation.java rename to desktop/src/main/java/haveno/desktop/main/presentation/AccountPresentation.java index acdfdf49..e9bb109e 100644 --- a/desktop/src/main/java/bisq/desktop/main/presentation/AccountPresentation.java +++ b/desktop/src/main/java/haveno/desktop/main/presentation/AccountPresentation.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.presentation; - -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.locale.Res; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; - -import bisq.common.app.DevEnv; +package haveno.desktop.main.presentation; +import haveno.common.app.DevEnv; +import haveno.core.locale.Res; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.desktop.main.overlays.popups.Popup; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/desktop/src/main/java/bisq/desktop/main/presentation/MarketPricePresentation.java b/desktop/src/main/java/haveno/desktop/main/presentation/MarketPricePresentation.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/presentation/MarketPricePresentation.java rename to desktop/src/main/java/haveno/desktop/main/presentation/MarketPricePresentation.java index f0a86798..ced29a93 100644 --- a/desktop/src/main/java/bisq/desktop/main/presentation/MarketPricePresentation.java +++ b/desktop/src/main/java/haveno/desktop/main/presentation/MarketPricePresentation.java @@ -15,23 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.presentation; - -import bisq.desktop.components.TxIdTextField; -import bisq.desktop.main.shared.PriceFeedComboBoxItem; -import bisq.desktop.util.GUIUtil; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; - -import bisq.common.UserThread; +package haveno.desktop.main.presentation; +import haveno.common.UserThread; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.desktop.components.TxIdTextField; +import haveno.desktop.main.shared.PriceFeedComboBoxItem; +import haveno.desktop.util.GUIUtil; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/desktop/src/main/java/bisq/desktop/main/presentation/SettingsPresentation.java b/desktop/src/main/java/haveno/desktop/main/presentation/SettingsPresentation.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/presentation/SettingsPresentation.java rename to desktop/src/main/java/haveno/desktop/main/presentation/SettingsPresentation.java index dd179f9f..25abf8ef 100644 --- a/desktop/src/main/java/bisq/desktop/main/presentation/SettingsPresentation.java +++ b/desktop/src/main/java/haveno/desktop/main/presentation/SettingsPresentation.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.presentation; - -import bisq.core.user.Preferences; +package haveno.desktop.main.presentation; import javax.inject.Inject; import javax.inject.Singleton; - +import haveno.core.user.Preferences; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/settings/SettingsView.fxml b/desktop/src/main/java/haveno/desktop/main/settings/SettingsView.fxml similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/settings/SettingsView.fxml rename to desktop/src/main/java/haveno/desktop/main/settings/SettingsView.fxml index b261fdb3..b592c2b0 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/SettingsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/settings/SettingsView.fxml @@ -21,7 +21,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/settings/SettingsView.java b/desktop/src/main/java/haveno/desktop/main/settings/SettingsView.java similarity index 84% rename from desktop/src/main/java/bisq/desktop/main/settings/SettingsView.java rename to desktop/src/main/java/haveno/desktop/main/settings/SettingsView.java index 6065c3bd..844d47ad 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/SettingsView.java +++ b/desktop/src/main/java/haveno/desktop/main/settings/SettingsView.java @@ -15,24 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.settings; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.presentation.SettingsPresentation; -import bisq.desktop.main.settings.about.AboutView; -import bisq.desktop.main.settings.network.NetworkSettingsView; -import bisq.desktop.main.settings.preferences.PreferencesView; - -import bisq.core.locale.Res; -import bisq.core.user.Preferences; +package haveno.desktop.main.settings; +import haveno.core.locale.Res; +import haveno.core.user.Preferences; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.presentation.SettingsPresentation; +import haveno.desktop.main.settings.about.AboutView; +import haveno.desktop.main.settings.network.NetworkSettingsView; +import haveno.desktop.main.settings.preferences.PreferencesView; import javax.inject.Inject; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.fxml b/desktop/src/main/java/haveno/desktop/main/settings/about/AboutView.fxml similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.fxml rename to desktop/src/main/java/haveno/desktop/main/settings/about/AboutView.fxml index 8f60b537..768d820d 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/settings/about/AboutView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.settings.about; +package haveno.desktop.main.settings.about; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.util.Layout; - -import bisq.core.locale.Res; - -import bisq.common.app.Version; +import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField; +import static haveno.desktop.util.FormBuilder.addHyperlinkWithIcon; +import static haveno.desktop.util.FormBuilder.addLabel; +import static haveno.desktop.util.FormBuilder.addTitledGroupBg; +import haveno.common.app.Version; +import haveno.core.locale.Res; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.util.Layout; import javax.inject.Inject; import javafx.scene.control.Label; @@ -33,11 +35,6 @@ import javafx.scene.layout.GridPane; import javafx.geometry.HPos; -import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; -import static bisq.desktop.util.FormBuilder.addHyperlinkWithIcon; -import static bisq.desktop.util.FormBuilder.addLabel; -import static bisq.desktop.util.FormBuilder.addTitledGroupBg; - @FxmlView public class AboutView extends ActivatableView { diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/MoneroNetworkListItem.java b/desktop/src/main/java/haveno/desktop/main/settings/network/MoneroNetworkListItem.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/settings/network/MoneroNetworkListItem.java rename to desktop/src/main/java/haveno/desktop/main/settings/network/MoneroNetworkListItem.java index b1fc41fa..8f74f474 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/network/MoneroNetworkListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/settings/network/MoneroNetworkListItem.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.settings.network; +package haveno.desktop.main.settings.network; import monero.daemon.model.MoneroPeer; diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml rename to desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml index a94efdc4..ab049799 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml @@ -17,13 +17,13 @@ ~ along with Haveno. If not, see . --> - - - - - - - + + + + + + + @@ -33,7 +33,7 @@ -. */ -package bisq.desktop.main.settings.network; - -import bisq.desktop.app.HavenoApp; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.TorNetworkSettingsWindow; -import bisq.desktop.util.GUIUtil; - -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.btc.nodes.BtcNodes; -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.btc.setup.WalletsSetup; -import bisq.core.filter.Filter; -import bisq.core.filter.FilterManager; -import bisq.core.locale.Res; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.validation.RegexValidator; -import bisq.core.util.validation.RegexValidatorFactory; -import bisq.network.p2p.P2PService; -import bisq.network.p2p.network.Statistic; - -import bisq.common.ClockWatcher; -import bisq.common.UserThread; +package haveno.desktop.main.settings.network; +import haveno.common.ClockWatcher; +import haveno.common.UserThread; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.btc.nodes.BtcNodes; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.btc.setup.WalletsSetup; +import haveno.core.filter.Filter; +import haveno.core.filter.FilterManager; +import haveno.core.locale.Res; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.validation.RegexValidator; +import haveno.core.util.validation.RegexValidatorFactory; +import haveno.desktop.app.HavenoApp; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.TorNetworkSettingsWindow; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.network.Statistic; import javax.inject.Inject; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/P2pNetworkListItem.java b/desktop/src/main/java/haveno/desktop/main/settings/network/P2pNetworkListItem.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/settings/network/P2pNetworkListItem.java rename to desktop/src/main/java/haveno/desktop/main/settings/network/P2pNetworkListItem.java index f8c9a10d..ef2fbea2 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/network/P2pNetworkListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/settings/network/P2pNetworkListItem.java @@ -15,21 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.settings.network; - -import bisq.desktop.util.DisplayUtils; - -import bisq.core.locale.Res; -import bisq.core.util.FormattingUtils; - -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionState; -import bisq.network.p2p.network.OutboundConnection; -import bisq.network.p2p.network.PeerType; -import bisq.network.p2p.network.Statistic; - -import bisq.common.ClockWatcher; +package haveno.desktop.main.settings.network; +import haveno.common.ClockWatcher; +import haveno.core.locale.Res; +import haveno.core.util.FormattingUtils; +import haveno.desktop.util.DisplayUtils; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionState; +import haveno.network.p2p.network.OutboundConnection; +import haveno.network.p2p.network.PeerType; +import haveno.network.p2p.network.Statistic; import org.apache.commons.lang3.time.DurationFormatUtils; import org.fxmisc.easybind.EasyBind; diff --git a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.fxml b/desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesView.fxml similarity index 94% rename from desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.fxml rename to desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesView.fxml index b74a4cbf..f0e327e4 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesView.fxml @@ -21,7 +21,7 @@ -. */ -package bisq.desktop.main.settings.preferences; +package haveno.desktop.main.settings.preferences; -import bisq.desktop.common.view.ActivatableViewAndModel; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.PasswordTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.EditCustomExplorerWindow; -import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.ImageUtil; -import bisq.desktop.util.Layout; -import bisq.core.btc.wallet.Restrictions; -import bisq.core.filter.Filter; -import bisq.core.filter.FilterManager; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.LanguageUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.ParsingUtils; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.validation.IntegerValidator; -import bisq.core.util.validation.RegexValidator; -import bisq.core.util.validation.RegexValidatorFactory; - -import bisq.common.UserThread; -import bisq.common.app.DevEnv; -import bisq.common.config.Config; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.*; +import haveno.common.UserThread; +import haveno.common.app.DevEnv; +import haveno.common.config.Config; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.btc.wallet.Restrictions; +import haveno.core.filter.Filter; +import haveno.core.filter.FilterManager; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.LanguageUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.ParsingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.validation.IntegerValidator; +import haveno.core.util.validation.RegexValidator; +import haveno.core.util.validation.RegexValidatorFactory; +import haveno.desktop.common.view.ActivatableViewAndModel; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.PasswordTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.EditCustomExplorerWindow; +import haveno.desktop.util.GUIUtil; +import haveno.desktop.util.ImageUtil; +import haveno.desktop.util.Layout; import org.bitcoinj.core.Coin; import javax.inject.Inject; @@ -103,7 +103,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static bisq.desktop.util.FormBuilder.*; import static com.google.common.base.Preconditions.checkArgument; @FxmlView diff --git a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesViewModel.java b/desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesViewModel.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesViewModel.java rename to desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesViewModel.java index 57209c32..6a6c71a8 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesViewModel.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.settings.preferences; +package haveno.desktop.main.settings.preferences; -import bisq.desktop.common.model.ActivatableViewModel; - -import bisq.core.locale.LanguageUtil; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; -import bisq.core.user.Preferences; - import com.google.inject.Inject; - +import haveno.core.locale.LanguageUtil; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.core.user.Preferences; +import haveno.desktop.common.model.ActivatableViewModel; import java.util.stream.Collectors; public class PreferencesViewModel extends ActivatableViewModel { diff --git a/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java b/desktop/src/main/java/haveno/desktop/main/shared/ChatView.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/main/shared/ChatView.java rename to desktop/src/main/java/haveno/desktop/main/shared/ChatView.java index aa208dc1..6d8aad89 100644 --- a/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java +++ b/desktop/src/main/java/haveno/desktop/main/shared/ChatView.java @@ -15,36 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.shared; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.TableGroupHeadline; -import bisq.desktop.components.TextFieldWithIcon; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; - -import bisq.core.locale.Res; -import bisq.core.support.SupportManager; -import bisq.core.support.SupportSession; -import bisq.core.support.dispute.Attachment; -import bisq.core.support.messages.ChatMessage; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.network.Connection; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.util.Utilities; +package haveno.desktop.main.shared; import com.google.common.io.ByteStreams; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.core.support.SupportManager; +import haveno.core.support.SupportSession; +import haveno.core.support.dispute.Attachment; +import haveno.core.support.messages.ChatMessage; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.components.TableGroupHeadline; +import haveno.desktop.components.TextFieldWithIcon; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.network.Connection; import javafx.stage.FileChooser; import javafx.scene.control.Button; diff --git a/desktop/src/main/java/bisq/desktop/main/shared/PriceFeedComboBoxItem.java b/desktop/src/main/java/haveno/desktop/main/shared/PriceFeedComboBoxItem.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/shared/PriceFeedComboBoxItem.java rename to desktop/src/main/java/haveno/desktop/main/shared/PriceFeedComboBoxItem.java index dba131b6..cdaa9d32 100644 --- a/desktop/src/main/java/bisq/desktop/main/shared/PriceFeedComboBoxItem.java +++ b/desktop/src/main/java/haveno/desktop/main/shared/PriceFeedComboBoxItem.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.shared; +package haveno.desktop.main.shared; -import bisq.common.UserThread; +import haveno.common.UserThread; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; diff --git a/desktop/src/main/java/bisq/desktop/main/support/SupportView.fxml b/desktop/src/main/java/haveno/desktop/main/support/SupportView.fxml similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/support/SupportView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/SupportView.fxml index 9f56d00d..7c45636f 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/SupportView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/SupportView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/SupportView.java b/desktop/src/main/java/haveno/desktop/main/support/SupportView.java similarity index 88% rename from desktop/src/main/java/bisq/desktop/main/support/SupportView.java rename to desktop/src/main/java/haveno/desktop/main/support/SupportView.java index 6d116501..009f22e4 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/SupportView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/SupportView.java @@ -15,41 +15,37 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support; - -import bisq.desktop.Navigation; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.main.MainView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.support.dispute.agent.SignedOfferView; -import bisq.desktop.main.support.dispute.agent.arbitration.ArbitratorView; -import bisq.desktop.main.support.dispute.agent.mediation.MediatorView; -import bisq.desktop.main.support.dispute.agent.refund.RefundAgentView; -import bisq.desktop.main.support.dispute.client.arbitration.ArbitrationClientView; -import bisq.desktop.main.support.dispute.client.mediation.MediationClientView; -import bisq.desktop.main.support.dispute.client.refund.RefundClientView; - -import bisq.core.locale.Res; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.mediation.mediator.Mediator; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.DevEnv; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; +package haveno.desktop.main.support; +import haveno.common.app.DevEnv; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.core.locale.Res; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.desktop.Navigation; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.main.MainView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.support.dispute.agent.SignedOfferView; +import haveno.desktop.main.support.dispute.agent.arbitration.ArbitratorView; +import haveno.desktop.main.support.dispute.agent.mediation.MediatorView; +import haveno.desktop.main.support.dispute.agent.refund.RefundAgentView; +import haveno.desktop.main.support.dispute.client.arbitration.ArbitrationClientView; +import haveno.desktop.main.support.dispute.client.mediation.MediationClientView; +import haveno.desktop.main.support.dispute.client.refund.RefundClientView; +import haveno.network.p2p.NodeAddress; import javax.inject.Inject; import javafx.scene.control.Tab; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeChatPopup.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeChatPopup.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeChatPopup.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeChatPopup.java index 84e9c235..43cb3390 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeChatPopup.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeChatPopup.java @@ -15,23 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.main.MainView; -import bisq.desktop.main.shared.ChatView; -import bisq.desktop.util.CssTheme; - -import bisq.core.locale.Res; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.user.Preferences; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.UserThread; +package haveno.desktop.main.support.dispute; +import haveno.common.UserThread; +import haveno.core.locale.Res; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.user.Preferences; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.main.MainView; +import haveno.desktop.main.shared.ChatView; +import haveno.desktop.util.CssTheme; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.StageStyle; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java index 15935f5d..27563cc2 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java @@ -15,58 +15,56 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute; +package haveno.desktop.main.support.dispute; -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.SendPrivateNotificationWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.overlays.windows.VerifyDisputeResultSignatureWindow; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.GUIUtil; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeResult; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.support.dispute.agent.DisputeAgentLookupMap; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.messages.ChatMessage; -import bisq.core.trade.Contract; -import bisq.core.trade.HavenoUtils; -import bisq.core.trade.Trade; -import bisq.core.trade.TradeManager; -import bisq.core.trade.Trade.DisputeState; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.UserThread; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.getIconForLabel; +import static haveno.desktop.util.FormBuilder.getRegularIconButton; import org.bitcoinj.core.Coin; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeResult; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.support.dispute.agent.DisputeAgentLookupMap; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.messages.ChatMessage; +import haveno.core.trade.Contract; +import haveno.core.trade.HavenoUtils; +import haveno.core.trade.Trade; +import haveno.core.trade.TradeManager; +import haveno.core.trade.Trade.DisputeState; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.SendPrivateNotificationWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.overlays.windows.VerifyDisputeResultSignatureWindow; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.GUIUtil; +import haveno.network.p2p.NodeAddress; import com.jfoenix.controls.JFXBadge; import javafx.scene.control.Button; @@ -116,9 +114,6 @@ import lombok.Getter; import javax.annotation.Nullable; -import static bisq.desktop.util.FormBuilder.getIconForLabel; -import static bisq.desktop.util.FormBuilder.getRegularIconButton; - public abstract class DisputeView extends ActivatableView { public enum FilterResult { NO_MATCH("No Match"), diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/DisputeAgentView.java similarity index 92% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/DisputeAgentView.java index fbd46ce9..d8da7555 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/DisputeAgentView.java @@ -15,34 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.agent; +package haveno.desktop.main.support.dispute.agent; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.DisputeView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.DisputeValidation; -import bisq.core.support.dispute.agent.MultipleHolderNameDetection; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.TradeManager; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.crypto.KeyRing; -import bisq.common.util.Utilities; +import static haveno.desktop.util.FormBuilder.getIconForLabel; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.crypto.KeyRing; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.DisputeValidation; +import haveno.core.support.dispute.agent.MultipleHolderNameDetection; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.TradeManager; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.DisputeView; import javafx.scene.control.Label; import javafx.scene.control.TableCell; import javafx.scene.control.TableColumn; @@ -60,8 +58,6 @@ import java.util.List; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.util.FormBuilder.getIconForLabel; - public abstract class DisputeAgentView extends DisputeView implements MultipleHolderNameDetection.Listener { private final MultipleHolderNameDetection multipleHolderNameDetection; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/SignedOfferView.fxml b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/SignedOfferView.fxml similarity index 93% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/SignedOfferView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/SignedOfferView.fxml index 3801ba13..7b766eda 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/SignedOfferView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/SignedOfferView.fxml @@ -25,7 +25,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/SignedOfferView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/SignedOfferView.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/SignedOfferView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/SignedOfferView.java index 7338311b..b3cc29da 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/SignedOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/SignedOfferView.java @@ -15,25 +15,24 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.agent; - -import bisq.desktop.common.view.ActivatableView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipTableColumn; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.InputTextField; -import bisq.desktop.main.offer.OfferViewUtil; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.util.DisplayUtils; -import bisq.desktop.util.GUIUtil; -import bisq.common.UserThread; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Res; -import bisq.core.offer.OpenOfferManager; -import bisq.core.offer.SignedOffer; -import bisq.core.trade.HavenoUtils; +package haveno.desktop.main.support.dispute.agent; +import haveno.common.UserThread; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Res; +import haveno.core.offer.OpenOfferManager; +import haveno.core.offer.SignedOffer; +import haveno.core.trade.HavenoUtils; +import haveno.desktop.common.view.ActivatableView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipTableColumn; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.InputTextField; +import haveno.desktop.main.offer.OfferViewUtil; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.util.DisplayUtils; +import haveno.desktop.util.GUIUtil; import javax.inject.Inject; import javafx.fxml.FXML; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.fxml b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/arbitration/ArbitratorView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/arbitration/ArbitratorView.fxml index daf36103..6f933193 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/arbitration/ArbitratorView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java similarity index 72% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java index 62f74ef8..2c1e8ec7 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java @@ -15,30 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.agent.arbitration; - -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.agent.DisputeAgentView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.arbitration.ArbitrationSession; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.support.dispute.agent.arbitration; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.arbitration.ArbitrationSession; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.agent.DisputeAgentView; import javax.inject.Inject; import javax.inject.Named; @@ -87,7 +84,7 @@ public class ArbitratorView extends DisputeAgentView { long protocolVersion = dispute.getContract().getOfferPayload().getProtocolVersion(); // Only cases with protocolVersion 1 are candidates for legacy arbitration. // This code path is not tested and it is not assumed that it is still be used as old arbitrators would use - // their old Bisq version if still cases are pending. + // their old Haveno version if still cases are pending. // if (protocolVersion == 1) { chatPopup.closeChat(); disputeSummaryWindow.show(dispute); diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.fxml b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/mediation/MediatorView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/mediation/MediatorView.fxml index f5ea4ca7..8da02411 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/mediation/MediatorView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/mediation/MediatorView.java similarity index 75% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/mediation/MediatorView.java index c8bb66e0..075a8e7a 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/mediation/MediatorView.java @@ -15,30 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.agent.mediation; - -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.agent.DisputeAgentView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.mediation.MediationSession; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.support.dispute.agent.mediation; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.mediation.MediationSession; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.agent.DisputeAgentView; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.fxml b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/refund/RefundAgentView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/refund/RefundAgentView.fxml index 5a6963b2..98de32b7 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/refund/RefundAgentView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/refund/RefundAgentView.java similarity index 71% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/agent/refund/RefundAgentView.java index f1fe610b..b7a2d196 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/agent/refund/RefundAgentView.java @@ -15,32 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.agent.refund; - -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.agent.DisputeAgentView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.support.dispute.refund.RefundSession; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.support.dispute.agent.refund; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.support.dispute.refund.RefundSession; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.agent.DisputeAgentView; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/DisputeClientView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/DisputeClientView.java similarity index 75% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/client/DisputeClientView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/client/DisputeClientView.java index 323270b8..202bf117 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/DisputeClientView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/DisputeClientView.java @@ -15,24 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.client; +package haveno.desktop.main.support.dispute.client; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.DisputeView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeList; -import bisq.core.support.dispute.DisputeManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.crypto.KeyRing; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeList; +import haveno.core.support.dispute.DisputeManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.DisputeView; public abstract class DisputeClientView extends DisputeView { public DisputeClientView(DisputeManager> DisputeManager, diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.fxml b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.fxml similarity index 89% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.fxml index 81bccf1f..44702481 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java similarity index 68% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java index 045ee6eb..2d360479 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java @@ -15,30 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.client.arbitration; - -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.client.DisputeClientView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.arbitration.ArbitrationSession; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.support.dispute.client.arbitration; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.arbitration.ArbitrationSession; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.client.DisputeClientView; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.fxml b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/mediation/MediationClientView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/dispute/client/mediation/MediationClientView.fxml index 7f1e66ba..c18bb778 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/mediation/MediationClientView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/mediation/MediationClientView.java similarity index 73% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/client/mediation/MediationClientView.java index 45590096..dbf1a317 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/mediation/MediationClientView.java @@ -15,35 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.client.mediation; - -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.popups.Popup; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.client.DisputeClientView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.locale.Res; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.mediation.MediationSession; -import bisq.core.trade.Contract; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.support.dispute.client.mediation; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.locale.Res; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.mediation.MediationSession; +import haveno.core.trade.Contract; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.client.DisputeClientView; +import haveno.network.p2p.NodeAddress; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.fxml b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/refund/RefundClientView.fxml similarity index 90% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.fxml rename to desktop/src/main/java/haveno/desktop/main/support/dispute/client/refund/RefundClientView.fxml index f289edd5..9e6cf046 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/refund/RefundClientView.fxml @@ -19,7 +19,7 @@ - diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/refund/RefundClientView.java similarity index 69% rename from desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.java rename to desktop/src/main/java/haveno/desktop/main/support/dispute/client/refund/RefundClientView.java index e5c7cb9a..97934b8b 100644 --- a/desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.java +++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/client/refund/RefundClientView.java @@ -15,33 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.support.dispute.client.refund; - -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.main.overlays.windows.ContractWindow; -import bisq.desktop.main.overlays.windows.DisputeSummaryWindow; -import bisq.desktop.main.overlays.windows.TradeDetailsWindow; -import bisq.desktop.main.support.dispute.client.DisputeClientView; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.alert.PrivateNotificationManager; -import bisq.core.support.SupportType; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.DisputeSession; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.support.dispute.refund.RefundSession; -import bisq.core.trade.Contract; -import bisq.core.trade.TradeManager; -import bisq.core.user.Preferences; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; +package haveno.desktop.main.support.dispute.client.refund; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.alert.PrivateNotificationManager; +import haveno.core.support.SupportType; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.DisputeSession; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.support.dispute.refund.RefundSession; +import haveno.core.trade.Contract; +import haveno.core.trade.TradeManager; +import haveno.core.user.Preferences; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.main.overlays.windows.ContractWindow; +import haveno.desktop.main.overlays.windows.DisputeSummaryWindow; +import haveno.desktop.main.overlays.windows.TradeDetailsWindow; +import haveno.desktop.main.support.dispute.client.DisputeClientView; +import haveno.network.p2p.NodeAddress; import javax.inject.Inject; import javax.inject.Named; diff --git a/desktop/src/main/java/bisq/desktop/setup/DesktopPersistedDataHost.java b/desktop/src/main/java/haveno/desktop/setup/DesktopPersistedDataHost.java similarity index 90% rename from desktop/src/main/java/bisq/desktop/setup/DesktopPersistedDataHost.java rename to desktop/src/main/java/haveno/desktop/setup/DesktopPersistedDataHost.java index 45043d6d..f9a80ef3 100644 --- a/desktop/src/main/java/bisq/desktop/setup/DesktopPersistedDataHost.java +++ b/desktop/src/main/java/haveno/desktop/setup/DesktopPersistedDataHost.java @@ -15,14 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.setup; - -import bisq.desktop.Navigation; - -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.desktop.setup; import com.google.inject.Injector; - +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.desktop.Navigation; import java.util.ArrayList; import java.util.List; diff --git a/desktop/src/main/java/bisq/desktop/theme-dark.css b/desktop/src/main/java/haveno/desktop/theme-dark.css similarity index 99% rename from desktop/src/main/java/bisq/desktop/theme-dark.css rename to desktop/src/main/java/haveno/desktop/theme-dark.css index fc3b0ec0..f3d1f8ab 100644 --- a/desktop/src/main/java/bisq/desktop/theme-dark.css +++ b/desktop/src/main/java/haveno/desktop/theme-dark.css @@ -17,7 +17,7 @@ -fx-selection-bar-non-focused: #2a7e2e; -fx-default-button: derive(-fx-accent, 95%); - /* bisq main colors */ + /* haveno main colors */ -bs-color-primary: #25b135; -bs-color-primary-dark: #2ea33c; -bs-text-color: #dadada; diff --git a/desktop/src/main/java/bisq/desktop/theme-dev.css b/desktop/src/main/java/haveno/desktop/theme-dev.css similarity index 100% rename from desktop/src/main/java/bisq/desktop/theme-dev.css rename to desktop/src/main/java/haveno/desktop/theme-dev.css diff --git a/desktop/src/main/java/bisq/desktop/theme-light.css b/desktop/src/main/java/haveno/desktop/theme-light.css similarity index 100% rename from desktop/src/main/java/bisq/desktop/theme-light.css rename to desktop/src/main/java/haveno/desktop/theme-light.css diff --git a/desktop/src/main/java/bisq/desktop/util/AxisInlierUtils.java b/desktop/src/main/java/haveno/desktop/util/AxisInlierUtils.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/util/AxisInlierUtils.java rename to desktop/src/main/java/haveno/desktop/util/AxisInlierUtils.java index a2e13bb4..c503413d 100644 --- a/desktop/src/main/java/bisq/desktop/util/AxisInlierUtils.java +++ b/desktop/src/main/java/haveno/desktop/util/AxisInlierUtils.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.core.util.InlierUtil; - -import bisq.common.util.Tuple2; +package haveno.desktop.util; +import haveno.common.util.Tuple2; +import haveno.core.util.InlierUtil; import javafx.scene.chart.NumberAxis; import javafx.scene.chart.XYChart; diff --git a/desktop/src/main/java/bisq/desktop/util/Colors.java b/desktop/src/main/java/haveno/desktop/util/Colors.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/util/Colors.java rename to desktop/src/main/java/haveno/desktop/util/Colors.java index 87821ce1..c5ce12f8 100644 --- a/desktop/src/main/java/bisq/desktop/util/Colors.java +++ b/desktop/src/main/java/haveno/desktop/util/Colors.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; diff --git a/desktop/src/main/java/bisq/desktop/util/CssTheme.java b/desktop/src/main/java/haveno/desktop/util/CssTheme.java similarity index 93% rename from desktop/src/main/java/bisq/desktop/util/CssTheme.java rename to desktop/src/main/java/haveno/desktop/util/CssTheme.java index 9e1d6ccc..380f96ab 100644 --- a/desktop/src/main/java/bisq/desktop/util/CssTheme.java +++ b/desktop/src/main/java/haveno/desktop/util/CssTheme.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; import javafx.scene.Scene; @@ -27,7 +27,7 @@ public class CssTheme { private static boolean useDevHeader; public static void loadSceneStyles(Scene scene, int cssTheme, boolean devHeader) { - String cssThemeFolder = "/bisq/desktop/"; + String cssThemeFolder = "/haveno/desktop/"; String cssThemeFile = ""; currentCSSTheme = cssTheme; @@ -47,7 +47,7 @@ public class CssTheme { scene.getStylesheets().setAll( // load base styles first - cssThemeFolder + "bisq.css", + cssThemeFolder + "haveno.css", cssThemeFolder + "images.css", cssThemeFolder + "CandleStickChart.css", diff --git a/desktop/src/main/java/bisq/desktop/util/CurrencyList.java b/desktop/src/main/java/haveno/desktop/util/CurrencyList.java similarity index 97% rename from desktop/src/main/java/bisq/desktop/util/CurrencyList.java rename to desktop/src/main/java/haveno/desktop/util/CurrencyList.java index 82475d53..c0cb8b02 100644 --- a/desktop/src/main/java/bisq/desktop/util/CurrencyList.java +++ b/desktop/src/main/java/haveno/desktop/util/CurrencyList.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.core.locale.TradeCurrency; -import bisq.core.user.Preferences; +package haveno.desktop.util; import com.google.common.collect.Lists; - +import haveno.core.locale.TradeCurrency; +import haveno.core.user.Preferences; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/desktop/src/main/java/bisq/desktop/util/CurrencyListItem.java b/desktop/src/main/java/haveno/desktop/util/CurrencyListItem.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/util/CurrencyListItem.java rename to desktop/src/main/java/haveno/desktop/util/CurrencyListItem.java index c165a263..b40b7668 100644 --- a/desktop/src/main/java/bisq/desktop/util/CurrencyListItem.java +++ b/desktop/src/main/java/haveno/desktop/util/CurrencyListItem.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; public class CurrencyListItem { public final TradeCurrency tradeCurrency; diff --git a/desktop/src/main/java/bisq/desktop/util/CurrencyPredicates.java b/desktop/src/main/java/haveno/desktop/util/CurrencyPredicates.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/util/CurrencyPredicates.java rename to desktop/src/main/java/haveno/desktop/util/CurrencyPredicates.java index 8a412712..8ded021c 100644 --- a/desktop/src/main/java/bisq/desktop/util/CurrencyPredicates.java +++ b/desktop/src/main/java/haveno/desktop/util/CurrencyPredicates.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.TradeCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.TradeCurrency; class CurrencyPredicates { boolean isCryptoCurrency(TradeCurrency currency) { diff --git a/desktop/src/main/java/bisq/desktop/util/DisplayUtils.java b/desktop/src/main/java/haveno/desktop/util/DisplayUtils.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/util/DisplayUtils.java rename to desktop/src/main/java/haveno/desktop/util/DisplayUtils.java index 61ebc2f6..3e48bc65 100644 --- a/desktop/src/main/java/bisq/desktop/util/DisplayUtils.java +++ b/desktop/src/main/java/haveno/desktop/util/DisplayUtils.java @@ -1,25 +1,23 @@ -package bisq.desktop.util; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.monetary.Price; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.HavenoUtils; -import bisq.core.util.FormattingUtils; -import bisq.core.offer.OfferDirection; -import bisq.core.payment.PaymentAccount; -import bisq.core.util.ParsingUtils; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; - -import bisq.common.crypto.PubKeyRing; +package haveno.desktop.util; +import haveno.common.crypto.PubKeyRing; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.monetary.Price; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.HavenoUtils; +import haveno.core.util.FormattingUtils; +import haveno.core.util.ParsingUtils; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; import org.bitcoinj.core.Coin; import org.apache.commons.lang3.StringUtils; diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/haveno/desktop/util/FormBuilder.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/util/FormBuilder.java rename to desktop/src/main/java/haveno/desktop/util/FormBuilder.java index 229f53fb..1810ab5b 100644 --- a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java +++ b/desktop/src/main/java/haveno/desktop/util/FormBuilder.java @@ -15,44 +15,43 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.desktop.components.AddressTextField; -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipCheckBox; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.AutoTooltipRadioButton; -import bisq.desktop.components.AutoTooltipSlideToggleButton; -import bisq.desktop.components.AutocompleteComboBox; -import bisq.desktop.components.BalanceTextField; -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.components.HavenoTextField; -import bisq.desktop.components.BusyAnimation; -import bisq.desktop.components.ExplorerAddressTextField; -import bisq.desktop.components.ExternalHyperlink; -import bisq.desktop.components.FundsTextField; -import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.InfoInputTextField; -import bisq.desktop.components.InfoTextField; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.PasswordTextField; -import bisq.desktop.components.SimpleMarkdownLabel; -import bisq.desktop.components.TextFieldWithCopyIcon; -import bisq.desktop.components.TextFieldWithIcon; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.components.TxIdTextField; - -import bisq.core.locale.Res; - -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Tuple4; -import bisq.common.util.Utilities; +package haveno.desktop.util; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.glyphs.GlyphIcons; import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Tuple4; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; +import haveno.desktop.components.AddressTextField; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipCheckBox; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.AutoTooltipRadioButton; +import haveno.desktop.components.AutoTooltipSlideToggleButton; +import haveno.desktop.components.AutocompleteComboBox; +import haveno.desktop.components.BalanceTextField; +import haveno.desktop.components.BusyAnimation; +import haveno.desktop.components.ExplorerAddressTextField; +import haveno.desktop.components.ExternalHyperlink; +import haveno.desktop.components.FundsTextField; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.components.HavenoTextField; +import haveno.desktop.components.HyperlinkWithIcon; +import haveno.desktop.components.InfoInputTextField; +import haveno.desktop.components.InfoTextField; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.PasswordTextField; +import haveno.desktop.components.SimpleMarkdownLabel; +import haveno.desktop.components.TextFieldWithCopyIcon; +import haveno.desktop.components.TextFieldWithIcon; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.components.TxIdTextField; + +import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell; import com.jfoenix.controls.JFXComboBox; import com.jfoenix.controls.JFXDatePicker; @@ -91,8 +90,6 @@ import java.util.concurrent.CopyOnWriteArraySet; import org.jetbrains.annotations.NotNull; -import static bisq.desktop.util.GUIUtil.getComboBoxButtonCell; - public class FormBuilder { private static final String MATERIAL_DESIGN_ICONS = "'Material Design Icons'"; diff --git a/desktop/src/main/java/bisq/desktop/util/GUIProfiler.java b/desktop/src/main/java/haveno/desktop/util/GUIProfiler.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/util/GUIProfiler.java rename to desktop/src/main/java/haveno/desktop/util/GUIProfiler.java index 879399f7..70a01517 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIProfiler.java +++ b/desktop/src/main/java/haveno/desktop/util/GUIProfiler.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; import com.google.common.base.Stopwatch; diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java similarity index 94% rename from desktop/src/main/java/bisq/desktop/util/GUIUtil.java rename to desktop/src/main/java/haveno/desktop/util/GUIUtil.java index 87ed2433..b8d334e6 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java @@ -15,51 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.desktop.Navigation; -import bisq.desktop.app.HavenoApp; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.HavenoTextArea; -import bisq.desktop.components.InfoAutoTooltipLabel; -import bisq.desktop.components.indicator.TxConfidenceIndicator; -import bisq.desktop.main.MainView; -import bisq.desktop.main.account.AccountView; -import bisq.desktop.main.account.content.fiataccounts.FiatAccountsView; -import bisq.desktop.main.overlays.popups.Popup; - -import bisq.core.account.witness.AccountAgeWitness; -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.api.CoreMoneroConnectionsService; -import bisq.core.app.HavenoSetup; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Country; -import bisq.core.locale.CountryUtil; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountList; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.trade.txproof.AssetTxProofResult; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.FormattingUtils; -import bisq.core.util.coin.CoinFormatter; - -import bisq.network.p2p.P2PService; - -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistenceProtoResolver; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple3; -import bisq.common.util.Utilities; +package haveno.desktop.util; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; @@ -79,7 +35,46 @@ import com.google.common.base.Charsets; import org.apache.commons.lang3.StringUtils; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; - +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.common.util.Tuple2; +import haveno.common.util.Tuple3; +import haveno.common.util.Utilities; +import haveno.core.account.witness.AccountAgeWitness; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.api.CoreMoneroConnectionsService; +import haveno.core.app.HavenoSetup; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Country; +import haveno.core.locale.CountryUtil; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountList; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.trade.txproof.AssetTxProofResult; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.FormattingUtils; +import haveno.core.util.coin.CoinFormatter; +import haveno.desktop.Navigation; +import haveno.desktop.app.HavenoApp; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.HavenoTextArea; +import haveno.desktop.components.InfoAutoTooltipLabel; +import haveno.desktop.components.indicator.TxConfidenceIndicator; +import haveno.desktop.main.MainView; +import haveno.desktop.main.account.AccountView; +import haveno.desktop.main.account.content.fiataccounts.FiatAccountsView; +import haveno.desktop.main.overlays.popups.Popup; +import haveno.network.p2p.P2PService; import javafx.stage.DirectoryChooser; import javafx.stage.FileChooser; import javafx.stage.Modality; @@ -141,8 +136,8 @@ import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; -import static bisq.desktop.util.FormBuilder.addTopLabelComboBoxComboBox; import static com.google.common.base.Preconditions.checkArgument; +import static haveno.desktop.util.FormBuilder.addTopLabelComboBoxComboBox; @Slf4j public class GUIUtil { @@ -584,7 +579,7 @@ public class GUIUtil { public static void openWebPage(String target, boolean useReferrer, Runnable closeHandler) { - if (useReferrer && target.contains("bisq.network")) { + if (useReferrer && target.contains("haveno.network")) { // add utm parameters target = appendURI(target, "utm_source=desktop-client&utm_medium=in-app-link&utm_campaign=language_" + preferences.getUserLanguage()); @@ -952,18 +947,18 @@ public class GUIUtil { public static int addRegionCountry(GridPane gridPane, int gridRow, Consumer onCountrySelectedHandler) { - Tuple3, ComboBox> tuple3 = addTopLabelComboBoxComboBox(gridPane, ++gridRow, Res.get("payment.country")); + Tuple3, ComboBox> tuple3 = addTopLabelComboBoxComboBox(gridPane, ++gridRow, Res.get("payment.country")); - ComboBox regionComboBox = tuple3.second; + ComboBox regionComboBox = tuple3.second; regionComboBox.setPromptText(Res.get("payment.select.region")); regionComboBox.setConverter(new StringConverter<>() { @Override - public String toString(bisq.core.locale.Region region) { + public String toString(haveno.core.locale.Region region) { return region.name; } @Override - public bisq.core.locale.Region fromString(String s) { + public haveno.core.locale.Region fromString(String s) { return null; } }); @@ -986,7 +981,7 @@ public class GUIUtil { }); regionComboBox.setOnAction(e -> { - bisq.core.locale.Region selectedItem = regionComboBox.getSelectionModel().getSelectedItem(); + haveno.core.locale.Region selectedItem = regionComboBox.getSelectionModel().getSelectedItem(); if (selectedItem != null) { countryComboBox.setDisable(false); countryComboBox.setItems(FXCollections.observableArrayList(CountryUtil.getAllCountriesForRegion(selectedItem))); diff --git a/desktop/src/main/java/bisq/desktop/util/ImageUtil.java b/desktop/src/main/java/haveno/desktop/util/ImageUtil.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/util/ImageUtil.java rename to desktop/src/main/java/haveno/desktop/util/ImageUtil.java index 1b87c30a..8d0a4e76 100644 --- a/desktop/src/main/java/bisq/desktop/util/ImageUtil.java +++ b/desktop/src/main/java/haveno/desktop/util/ImageUtil.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.core.locale.Country; - -import bisq.common.util.Utilities; +package haveno.desktop.util; +import haveno.common.util.Utilities; +import haveno.core.locale.Country; import javafx.stage.Screen; import javafx.scene.image.Image; diff --git a/desktop/src/main/java/bisq/desktop/util/Layout.java b/desktop/src/main/java/haveno/desktop/util/Layout.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/util/Layout.java rename to desktop/src/main/java/haveno/desktop/util/Layout.java index e2478fdc..44ff50cd 100644 --- a/desktop/src/main/java/bisq/desktop/util/Layout.java +++ b/desktop/src/main/java/haveno/desktop/util/Layout.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; public class Layout { public static final double INITIAL_WINDOW_WIDTH = 1200; diff --git a/desktop/src/main/java/bisq/desktop/util/MovingAverageUtils.java b/desktop/src/main/java/haveno/desktop/util/MovingAverageUtils.java similarity index 99% rename from desktop/src/main/java/bisq/desktop/util/MovingAverageUtils.java rename to desktop/src/main/java/haveno/desktop/util/MovingAverageUtils.java index 9f5a2da1..753be450 100644 --- a/desktop/src/main/java/bisq/desktop/util/MovingAverageUtils.java +++ b/desktop/src/main/java/haveno/desktop/util/MovingAverageUtils.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; import java.util.ArrayDeque; import java.util.Arrays; diff --git a/desktop/src/main/java/bisq/desktop/util/Transitions.java b/desktop/src/main/java/haveno/desktop/util/Transitions.java similarity index 98% rename from desktop/src/main/java/bisq/desktop/util/Transitions.java rename to desktop/src/main/java/haveno/desktop/util/Transitions.java index f94efdb4..4f91af57 100644 --- a/desktop/src/main/java/bisq/desktop/util/Transitions.java +++ b/desktop/src/main/java/haveno/desktop/util/Transitions.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.core.user.Preferences; - -import bisq.common.UserThread; +package haveno.desktop.util; +import haveno.common.UserThread; +import haveno.core.user.Preferences; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/desktop/src/main/java/bisq/desktop/util/filtering/FilterableListItem.java b/desktop/src/main/java/haveno/desktop/util/filtering/FilterableListItem.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/util/filtering/FilterableListItem.java rename to desktop/src/main/java/haveno/desktop/util/filtering/FilterableListItem.java index 304237d9..188972a7 100644 --- a/desktop/src/main/java/bisq/desktop/util/filtering/FilterableListItem.java +++ b/desktop/src/main/java/haveno/desktop/util/filtering/FilterableListItem.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.filtering; +package haveno.desktop.util.filtering; public interface FilterableListItem { boolean match(String filterString); diff --git a/desktop/src/main/java/bisq/desktop/util/filtering/FilteringUtils.java b/desktop/src/main/java/haveno/desktop/util/filtering/FilteringUtils.java similarity index 95% rename from desktop/src/main/java/bisq/desktop/util/filtering/FilteringUtils.java rename to desktop/src/main/java/haveno/desktop/util/filtering/FilteringUtils.java index ff4add9c..6fcd3b0f 100644 --- a/desktop/src/main/java/bisq/desktop/util/filtering/FilteringUtils.java +++ b/desktop/src/main/java/haveno/desktop/util/filtering/FilteringUtils.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.filtering; - -import bisq.core.offer.Offer; -import bisq.core.trade.Contract; -import bisq.core.trade.Trade; +package haveno.desktop.util.filtering; +import haveno.core.offer.Offer; +import haveno.core.trade.Contract; +import haveno.core.trade.Trade; import org.apache.commons.lang3.StringUtils; public class FilteringUtils { diff --git a/desktop/src/main/java/bisq/desktop/util/normalization/IBANNormalizer.java b/desktop/src/main/java/haveno/desktop/util/normalization/IBANNormalizer.java similarity index 86% rename from desktop/src/main/java/bisq/desktop/util/normalization/IBANNormalizer.java rename to desktop/src/main/java/haveno/desktop/util/normalization/IBANNormalizer.java index d9e37632..41529237 100644 --- a/desktop/src/main/java/bisq/desktop/util/normalization/IBANNormalizer.java +++ b/desktop/src/main/java/haveno/desktop/util/normalization/IBANNormalizer.java @@ -1,4 +1,4 @@ -package bisq.desktop.util.normalization; +package haveno.desktop.util.normalization; import javafx.util.StringConverter; diff --git a/desktop/src/main/java/bisq/desktop/util/validation/JFXInputValidator.java b/desktop/src/main/java/haveno/desktop/util/validation/JFXInputValidator.java similarity index 87% rename from desktop/src/main/java/bisq/desktop/util/validation/JFXInputValidator.java rename to desktop/src/main/java/haveno/desktop/util/validation/JFXInputValidator.java index 135cf587..d7ec6a20 100644 --- a/desktop/src/main/java/bisq/desktop/util/validation/JFXInputValidator.java +++ b/desktop/src/main/java/haveno/desktop/util/validation/JFXInputValidator.java @@ -1,8 +1,7 @@ -package bisq.desktop.util.validation; - -import bisq.core.util.validation.InputValidator; +package haveno.desktop.util.validation; import com.jfoenix.validation.base.ValidatorBase; +import haveno.core.util.validation.InputValidator; public class JFXInputValidator extends ValidatorBase { diff --git a/desktop/src/main/java/bisq/desktop/util/validation/PasswordValidator.java b/desktop/src/main/java/haveno/desktop/util/validation/PasswordValidator.java similarity index 96% rename from desktop/src/main/java/bisq/desktop/util/validation/PasswordValidator.java rename to desktop/src/main/java/haveno/desktop/util/validation/PasswordValidator.java index 976c1679..f91b4a1a 100644 --- a/desktop/src/main/java/bisq/desktop/util/validation/PasswordValidator.java +++ b/desktop/src/main/java/haveno/desktop/util/validation/PasswordValidator.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.core.locale.Res; +package haveno.desktop.util.validation; import com.jfoenix.validation.base.ValidatorBase; - +import haveno.core.locale.Res; import javafx.scene.control.TextInputControl; public final class PasswordValidator extends ValidatorBase { diff --git a/desktop/src/test/java/bisq/desktop/AwesomeFontDemo.java b/desktop/src/test/java/haveno/desktop/AwesomeFontDemo.java similarity index 98% rename from desktop/src/test/java/bisq/desktop/AwesomeFontDemo.java rename to desktop/src/test/java/haveno/desktop/AwesomeFontDemo.java index 364d4724..e3a5d67f 100644 --- a/desktop/src/test/java/bisq/desktop/AwesomeFontDemo.java +++ b/desktop/src/test/java/haveno/desktop/AwesomeFontDemo.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop; +package haveno.desktop; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; diff --git a/desktop/src/test/java/bisq/desktop/AwesomeFontDemoLauncher.java b/desktop/src/test/java/haveno/desktop/AwesomeFontDemoLauncher.java similarity index 88% rename from desktop/src/test/java/bisq/desktop/AwesomeFontDemoLauncher.java rename to desktop/src/test/java/haveno/desktop/AwesomeFontDemoLauncher.java index f37dad1a..73d6a34c 100644 --- a/desktop/src/test/java/bisq/desktop/AwesomeFontDemoLauncher.java +++ b/desktop/src/test/java/haveno/desktop/AwesomeFontDemoLauncher.java @@ -1,4 +1,4 @@ -package bisq.desktop; +package haveno.desktop; import javafx.application.Application; diff --git a/desktop/src/test/java/bisq/desktop/BindingTest.java b/desktop/src/test/java/haveno/desktop/BindingTest.java similarity index 93% rename from desktop/src/test/java/bisq/desktop/BindingTest.java rename to desktop/src/test/java/haveno/desktop/BindingTest.java index a50c5d9f..fda80d07 100644 --- a/desktop/src/test/java/bisq/desktop/BindingTest.java +++ b/desktop/src/test/java/haveno/desktop/BindingTest.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop; - -import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.AutoTooltipLabel; +package haveno.desktop; +import haveno.desktop.components.AutoTooltipButton; +import haveno.desktop.components.AutoTooltipLabel; import javafx.application.Application; import javafx.stage.Stage; diff --git a/desktop/src/test/java/bisq/desktop/ComponentsDemo.java b/desktop/src/test/java/haveno/desktop/ComponentsDemo.java similarity index 91% rename from desktop/src/test/java/bisq/desktop/ComponentsDemo.java rename to desktop/src/test/java/haveno/desktop/ComponentsDemo.java index 4ea82f64..9ab47fdd 100644 --- a/desktop/src/test/java/bisq/desktop/ComponentsDemo.java +++ b/desktop/src/test/java/haveno/desktop/ComponentsDemo.java @@ -1,22 +1,21 @@ -package bisq.desktop; +package haveno.desktop; -import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.FundsTextField; -import bisq.desktop.components.InfoInputTextField; -import bisq.desktop.components.InputTextField; -import bisq.desktop.components.TitledGroupBg; -import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; - -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; - -import bisq.common.util.Tuple3; +import static haveno.desktop.util.FormBuilder.addFundsTextfield; +import static haveno.desktop.util.FormBuilder.addTopLabelInputTextFieldSlideToggleButton; import com.jfoenix.controls.JFXBadge; import com.jfoenix.controls.JFXSnackbar; - +import haveno.common.util.Tuple3; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.desktop.components.AutoTooltipLabel; +import haveno.desktop.components.FundsTextField; +import haveno.desktop.components.InfoInputTextField; +import haveno.desktop.components.InputTextField; +import haveno.desktop.components.TitledGroupBg; +import haveno.desktop.util.FormBuilder; +import haveno.desktop.util.Layout; import javafx.application.Application; import javafx.stage.Stage; @@ -39,9 +38,6 @@ import javafx.collections.ObservableList; import java.util.Locale; -import static bisq.desktop.util.FormBuilder.addFundsTextfield; -import static bisq.desktop.util.FormBuilder.addTopLabelInputTextFieldSlideToggleButton; - public class ComponentsDemo extends Application { private JFXSnackbar bar; @@ -202,8 +198,8 @@ public class ComponentsDemo extends Application { Scene scene = new Scene(stackPane, 1000, 650); scene.getStylesheets().setAll( - "/bisq/desktop/bisq.css", - "/bisq/desktop/images.css"); + "/haveno/desktop/haveno.css", + "/haveno/desktop/images.css"); primaryStage.setScene(scene); primaryStage.show(); } diff --git a/desktop/src/test/java/bisq/desktop/ComponentsDemoLauncher.java b/desktop/src/test/java/haveno/desktop/ComponentsDemoLauncher.java similarity index 88% rename from desktop/src/test/java/bisq/desktop/ComponentsDemoLauncher.java rename to desktop/src/test/java/haveno/desktop/ComponentsDemoLauncher.java index dcd7f3b8..99130664 100644 --- a/desktop/src/test/java/bisq/desktop/ComponentsDemoLauncher.java +++ b/desktop/src/test/java/haveno/desktop/ComponentsDemoLauncher.java @@ -1,4 +1,4 @@ -package bisq.desktop; +package haveno.desktop; import javafx.application.Application; diff --git a/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java b/desktop/src/test/java/haveno/desktop/GuiceSetupTest.java similarity index 55% rename from desktop/src/test/java/bisq/desktop/GuiceSetupTest.java rename to desktop/src/test/java/haveno/desktop/GuiceSetupTest.java index c08c2032..9e82a533 100644 --- a/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java +++ b/desktop/src/test/java/haveno/desktop/GuiceSetupTest.java @@ -1,66 +1,62 @@ -package bisq.desktop; - -import bisq.desktop.app.HavenoAppModule; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.ViewLoader; -import bisq.desktop.common.view.guice.InjectorViewFactory; -import bisq.desktop.main.funds.transactions.DisplayedTransactionsFactory; -import bisq.desktop.main.funds.transactions.TradableRepository; -import bisq.desktop.main.funds.transactions.TransactionAwareTradableFactory; -import bisq.desktop.main.funds.transactions.TransactionListItemFactory; -import bisq.desktop.main.offer.offerbook.OfferBook; -import bisq.desktop.main.overlays.notifications.NotificationCenter; -import bisq.desktop.main.overlays.windows.TorNetworkSettingsWindow; -import bisq.desktop.main.presentation.MarketPricePresentation; -import bisq.desktop.util.Transitions; - -import bisq.core.app.AvoidStandbyModeService; -import bisq.core.app.P2PNetworkSetup; -import bisq.core.app.TorSetup; -import bisq.core.app.WalletAppSetup; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.network.p2p.seed.DefaultSeedNodeRepository; -import bisq.core.notifications.MobileMessageEncryption; -import bisq.core.notifications.MobileModel; -import bisq.core.notifications.MobileNotificationService; -import bisq.core.notifications.MobileNotificationValidator; -import bisq.core.notifications.alerts.MyOfferTakenEvents; -import bisq.core.notifications.alerts.TradeEvents; -import bisq.core.notifications.alerts.market.MarketAlerts; -import bisq.core.notifications.alerts.price.PriceAlert; -import bisq.core.payment.ChargeBackRisk; -import bisq.core.payment.TradeLimits; -import bisq.core.proto.network.CoreNetworkProtoResolver; -import bisq.core.proto.persistable.CorePersistenceProtoResolver; -import bisq.core.support.dispute.arbitration.ArbitrationDisputeListService; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorService; -import bisq.core.support.dispute.mediation.MediationDisputeListService; -import bisq.core.support.dispute.mediation.MediationManager; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.mediation.mediator.MediatorService; -import bisq.core.support.traderchat.TraderChatManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; - -import bisq.network.p2p.network.BridgeAddressProvider; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.ClockWatcher; -import bisq.common.config.Config; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.crypto.PubKeyRing; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistenceProtoResolver; +package haveno.desktop; import com.google.inject.Guice; import com.google.inject.Injector; - +import haveno.common.ClockWatcher; +import haveno.common.config.Config; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.crypto.PubKeyRing; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.core.app.AvoidStandbyModeService; +import haveno.core.app.P2PNetworkSetup; +import haveno.core.app.TorSetup; +import haveno.core.app.WalletAppSetup; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.network.p2p.seed.DefaultSeedNodeRepository; +import haveno.core.notifications.MobileMessageEncryption; +import haveno.core.notifications.MobileModel; +import haveno.core.notifications.MobileNotificationService; +import haveno.core.notifications.MobileNotificationValidator; +import haveno.core.notifications.alerts.MyOfferTakenEvents; +import haveno.core.notifications.alerts.TradeEvents; +import haveno.core.notifications.alerts.market.MarketAlerts; +import haveno.core.notifications.alerts.price.PriceAlert; +import haveno.core.payment.ChargeBackRisk; +import haveno.core.payment.TradeLimits; +import haveno.core.proto.network.CoreNetworkProtoResolver; +import haveno.core.proto.persistable.CorePersistenceProtoResolver; +import haveno.core.support.dispute.arbitration.ArbitrationDisputeListService; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorService; +import haveno.core.support.dispute.mediation.MediationDisputeListService; +import haveno.core.support.dispute.mediation.MediationManager; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.mediation.mediator.MediatorService; +import haveno.core.support.traderchat.TraderChatManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.Navigation; +import haveno.desktop.app.HavenoAppModule; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.ViewLoader; +import haveno.desktop.common.view.guice.InjectorViewFactory; +import haveno.desktop.main.funds.transactions.DisplayedTransactionsFactory; +import haveno.desktop.main.funds.transactions.TradableRepository; +import haveno.desktop.main.funds.transactions.TransactionAwareTradableFactory; +import haveno.desktop.main.funds.transactions.TransactionListItemFactory; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.overlays.notifications.NotificationCenter; +import haveno.desktop.main.overlays.windows.TorNetworkSettingsWindow; +import haveno.desktop.main.presentation.MarketPricePresentation; +import haveno.desktop.util.Transitions; +import haveno.network.p2p.network.BridgeAddressProvider; +import haveno.network.p2p.seed.SeedNodeRepository; import org.junit.Before; import org.junit.Test; @@ -99,7 +95,7 @@ public class GuiceSetupTest { assertSingleton(DisplayedTransactionsFactory.class); // core module -// assertSingleton(BisqSetup.class); // this is a can of worms +// assertSingleton(HavenoSetup.class); // this is a can of worms // assertSingleton(DisputeMsgEvents.class); assertSingleton(TorSetup.class); assertSingleton(P2PNetworkSetup.class); diff --git a/desktop/src/test/java/bisq/desktop/MarketsPrintTool.java b/desktop/src/test/java/haveno/desktop/MarketsPrintTool.java similarity index 95% rename from desktop/src/test/java/bisq/desktop/MarketsPrintTool.java rename to desktop/src/test/java/haveno/desktop/MarketsPrintTool.java index 5f7a9c79..9f6fbe13 100644 --- a/desktop/src/test/java/bisq/desktop/MarketsPrintTool.java +++ b/desktop/src/test/java/haveno/desktop/MarketsPrintTool.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop; - -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.FiatCurrency; +package haveno.desktop; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.FiatCurrency; import java.util.Collection; import java.util.Comparator; import java.util.Locale; diff --git a/desktop/src/test/java/bisq/desktop/MaterialDesignIconDemo.java b/desktop/src/test/java/haveno/desktop/MaterialDesignIconDemo.java similarity index 98% rename from desktop/src/test/java/bisq/desktop/MaterialDesignIconDemo.java rename to desktop/src/test/java/haveno/desktop/MaterialDesignIconDemo.java index b1a556bd..a14ef9bb 100644 --- a/desktop/src/test/java/bisq/desktop/MaterialDesignIconDemo.java +++ b/desktop/src/test/java/haveno/desktop/MaterialDesignIconDemo.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop; +package haveno.desktop; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory; diff --git a/desktop/src/test/java/bisq/desktop/MaterialDesignIconDemoLauncher.java b/desktop/src/test/java/haveno/desktop/MaterialDesignIconDemoLauncher.java similarity index 97% rename from desktop/src/test/java/bisq/desktop/MaterialDesignIconDemoLauncher.java rename to desktop/src/test/java/haveno/desktop/MaterialDesignIconDemoLauncher.java index b475da22..763f0e3b 100644 --- a/desktop/src/test/java/bisq/desktop/MaterialDesignIconDemoLauncher.java +++ b/desktop/src/test/java/haveno/desktop/MaterialDesignIconDemoLauncher.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop; +package haveno.desktop; import javafx.application.Application; diff --git a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$Malformed.fxml b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$Malformed.fxml similarity index 100% rename from desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$Malformed.fxml rename to desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$Malformed.fxml diff --git a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml similarity index 100% rename from desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml rename to desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml diff --git a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml similarity index 87% rename from desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml rename to desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml index 7c44e6c3..fdabb1f2 100644 --- a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml +++ b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml @@ -16,6 +16,6 @@ --> - diff --git a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$WellFormed.fxml b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$WellFormed.fxml similarity index 89% rename from desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$WellFormed.fxml rename to desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$WellFormed.fxml index 9af67eb2..459a3913 100644 --- a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests$WellFormed.fxml +++ b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests$WellFormed.fxml @@ -16,6 +16,6 @@ --> - diff --git a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests.java b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests.java similarity index 91% rename from desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests.java rename to desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests.java index d635d100..ad5f2431 100644 --- a/desktop/src/test/java/bisq/desktop/common/fxml/FxmlViewLoaderTests.java +++ b/desktop/src/test/java/haveno/desktop/common/fxml/FxmlViewLoaderTests.java @@ -15,14 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.fxml; - -import bisq.desktop.common.ViewfxException; -import bisq.desktop.common.view.AbstractView; -import bisq.desktop.common.view.FxmlView; -import bisq.desktop.common.view.View; -import bisq.desktop.common.view.ViewFactory; -import bisq.desktop.common.view.ViewLoader; +package haveno.desktop.common.fxml; import javafx.fxml.LoadException; @@ -39,6 +32,14 @@ import static org.junit.Assert.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; +import haveno.desktop.common.ViewfxException; +import haveno.desktop.common.fxml.FxmlViewLoader; +import haveno.desktop.common.view.AbstractView; +import haveno.desktop.common.view.FxmlView; +import haveno.desktop.common.view.View; +import haveno.desktop.common.view.ViewFactory; +import haveno.desktop.common.view.ViewLoader; + // TODO Some refactorings seem to have broken those tests. Investigate and remove @Ignore as soon its fixed. @Ignore public class FxmlViewLoaderTests { diff --git a/desktop/src/test/java/bisq/desktop/common/support/CachingViewLoaderTests.java b/desktop/src/test/java/haveno/desktop/common/support/CachingViewLoaderTests.java similarity index 89% rename from desktop/src/test/java/bisq/desktop/common/support/CachingViewLoaderTests.java rename to desktop/src/test/java/haveno/desktop/common/support/CachingViewLoaderTests.java index d55d64f9..9e0dc005 100644 --- a/desktop/src/test/java/bisq/desktop/common/support/CachingViewLoaderTests.java +++ b/desktop/src/test/java/haveno/desktop/common/support/CachingViewLoaderTests.java @@ -15,11 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.common.support; - -import bisq.desktop.common.view.AbstractView; -import bisq.desktop.common.view.CachingViewLoader; -import bisq.desktop.common.view.ViewLoader; +package haveno.desktop.common.support; import org.junit.Test; @@ -27,6 +23,10 @@ import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; +import haveno.desktop.common.view.AbstractView; +import haveno.desktop.common.view.CachingViewLoader; +import haveno.desktop.common.view.ViewLoader; + public class CachingViewLoaderTests { @Test diff --git a/desktop/src/test/java/bisq/desktop/components/ColoredDecimalPlacesWithZerosTextTest.java b/desktop/src/test/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosTextTest.java similarity index 96% rename from desktop/src/test/java/bisq/desktop/components/ColoredDecimalPlacesWithZerosTextTest.java rename to desktop/src/test/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosTextTest.java index 2a8a24ba..234936ae 100644 --- a/desktop/src/test/java/bisq/desktop/components/ColoredDecimalPlacesWithZerosTextTest.java +++ b/desktop/src/test/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosTextTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.components; +package haveno.desktop.components; import javafx.scene.control.Label; import javafx.scene.text.Text; @@ -24,6 +24,8 @@ import org.junit.Ignore; import static org.junit.Assert.assertEquals; +import haveno.desktop.components.ColoredDecimalPlacesWithZerosText; + public class ColoredDecimalPlacesWithZerosTextTest { @Ignore diff --git a/desktop/src/test/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsTest.java b/desktop/src/test/java/haveno/desktop/main/funds/transactions/DisplayedTransactionsTest.java similarity index 87% rename from desktop/src/test/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsTest.java rename to desktop/src/test/java/haveno/desktop/main/funds/transactions/DisplayedTransactionsTest.java index 264cc0d5..814997ae 100644 --- a/desktop/src/test/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsTest.java +++ b/desktop/src/test/java/haveno/desktop/main/funds/transactions/DisplayedTransactionsTest.java @@ -15,12 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.btc.wallet.XmrWalletService; +package haveno.desktop.main.funds.transactions; import com.google.common.collect.Lists; - +import haveno.core.btc.wallet.XmrWalletService; +import haveno.desktop.main.funds.transactions.DisplayedTransactions; +import haveno.desktop.main.funds.transactions.TradableRepository; +import haveno.desktop.main.funds.transactions.TransactionAwareTradable; +import haveno.desktop.main.funds.transactions.TransactionAwareTradableFactory; +import haveno.desktop.main.funds.transactions.TransactionListItemFactory; import javafx.collections.FXCollections; import java.util.Collections; diff --git a/desktop/src/test/java/bisq/desktop/main/funds/transactions/ObservableListDecoratorTest.java b/desktop/src/test/java/haveno/desktop/main/funds/transactions/ObservableListDecoratorTest.java similarity index 93% rename from desktop/src/test/java/bisq/desktop/main/funds/transactions/ObservableListDecoratorTest.java rename to desktop/src/test/java/haveno/desktop/main/funds/transactions/ObservableListDecoratorTest.java index ff3b38e3..7464fffa 100644 --- a/desktop/src/test/java/bisq/desktop/main/funds/transactions/ObservableListDecoratorTest.java +++ b/desktop/src/test/java/haveno/desktop/main/funds/transactions/ObservableListDecoratorTest.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; +package haveno.desktop.main.funds.transactions; import com.google.common.collect.Lists; - +import haveno.desktop.main.funds.transactions.ObservableListDecorator; import java.util.Collection; import java.util.function.Supplier; diff --git a/desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactoryTest.java b/desktop/src/test/java/haveno/desktop/main/funds/transactions/TransactionAwareTradableFactoryTest.java similarity index 80% rename from desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactoryTest.java rename to desktop/src/test/java/haveno/desktop/main/funds/transactions/TransactionAwareTradableFactoryTest.java index 4f7aa30e..300d25cf 100644 --- a/desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactoryTest.java +++ b/desktop/src/test/java/haveno/desktop/main/funds/transactions/TransactionAwareTradableFactoryTest.java @@ -15,20 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.offer.OpenOffer; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.trade.Tradable; -import bisq.core.trade.Trade; +package haveno.desktop.main.funds.transactions; import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; - - +import haveno.core.offer.OpenOffer; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.trade.Tradable; +import haveno.core.trade.Trade; +import haveno.desktop.main.funds.transactions.TransactionAwareTradable; +import haveno.desktop.main.funds.transactions.TransactionAwareTradableFactory; import monero.wallet.model.MoneroTxWallet; public class TransactionAwareTradableFactoryTest { diff --git a/desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradeTest.java b/desktop/src/test/java/haveno/desktop/main/funds/transactions/TransactionAwareTradeTest.java similarity index 89% rename from desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradeTest.java rename to desktop/src/test/java/haveno/desktop/main/funds/transactions/TransactionAwareTradeTest.java index cec5de42..00544dbd 100644 --- a/desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradeTest.java +++ b/desktop/src/test/java/haveno/desktop/main/funds/transactions/TransactionAwareTradeTest.java @@ -15,13 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.funds.transactions; - -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.support.dispute.Dispute; -import bisq.core.support.dispute.arbitration.ArbitrationManager; -import bisq.core.support.dispute.refund.RefundManager; -import bisq.core.trade.Trade; +package haveno.desktop.main.funds.transactions; import org.bitcoinj.core.Sha256Hash; @@ -37,8 +31,13 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - - +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.support.dispute.Dispute; +import haveno.core.support.dispute.arbitration.ArbitrationManager; +import haveno.core.support.dispute.refund.RefundManager; +import haveno.core.trade.Trade; +import haveno.desktop.main.funds.transactions.TransactionAwareTradable; +import haveno.desktop.main.funds.transactions.TransactionAwareTrade; import monero.wallet.model.MoneroTxWallet; public class TransactionAwareTradeTest { diff --git a/desktop/src/test/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModelTest.java b/desktop/src/test/java/haveno/desktop/main/market/offerbook/OfferBookChartViewModelTest.java similarity index 93% rename from desktop/src/test/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModelTest.java rename to desktop/src/test/java/haveno/desktop/main/market/offerbook/OfferBookChartViewModelTest.java index b617075d..a2933186 100644 --- a/desktop/src/test/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/market/offerbook/OfferBookChartViewModelTest.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.offerbook; - -import bisq.desktop.main.offer.offerbook.OfferBook; -import bisq.desktop.main.offer.offerbook.OfferBookListItem; -import bisq.desktop.main.offer.offerbook.OfferBookListItemMaker; - -import bisq.core.locale.GlobalSettings; -import bisq.core.provider.price.PriceFeedService; +package haveno.desktop.main.market.offerbook; +import haveno.core.locale.GlobalSettings; +import haveno.core.provider.price.PriceFeedService; +import haveno.desktop.main.market.offerbook.OfferBookChartViewModel; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.main.offer.offerbook.OfferBookListItemMaker; import javafx.beans.property.SimpleIntegerProperty; import javafx.collections.FXCollections; @@ -32,12 +31,12 @@ import javafx.collections.ObservableList; import org.junit.Before; import org.junit.Test; -import static bisq.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrBuyItem; -import static bisq.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrSellItem; -import static bisq.desktop.maker.PreferenceMakers.empty; -import static bisq.desktop.maker.TradeCurrencyMakers.usd; import static com.natpryce.makeiteasy.MakeItEasy.make; import static com.natpryce.makeiteasy.MakeItEasy.with; +import static haveno.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrBuyItem; +import static haveno.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrSellItem; +import static haveno.desktop.maker.PreferenceMakers.empty; +import static haveno.desktop.maker.TradeCurrencyMakers.usd; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; diff --git a/desktop/src/test/java/bisq/desktop/main/market/spread/SpreadViewModelTest.java b/desktop/src/test/java/haveno/desktop/main/market/spread/SpreadViewModelTest.java similarity index 82% rename from desktop/src/test/java/bisq/desktop/main/market/spread/SpreadViewModelTest.java rename to desktop/src/test/java/haveno/desktop/main/market/spread/SpreadViewModelTest.java index 8cf69ead..f34e3476 100644 --- a/desktop/src/test/java/bisq/desktop/main/market/spread/SpreadViewModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/market/spread/SpreadViewModelTest.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.spread; +package haveno.desktop.main.market.spread; -import bisq.desktop.main.offer.offerbook.OfferBook; -import bisq.desktop.main.offer.offerbook.OfferBookListItem; -import bisq.desktop.main.offer.offerbook.OfferBookListItemMaker; - -import bisq.core.provider.price.PriceFeedService; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.ImmutableCoinFormatter; - -import bisq.common.config.Config; - +import haveno.common.config.Config; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.ImmutableCoinFormatter; +import haveno.desktop.main.market.spread.SpreadViewModel; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.main.offer.offerbook.OfferBookListItemMaker; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import org.junit.Test; -import static bisq.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrBuyItem; -import static bisq.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrSellItem; -import static bisq.desktop.main.offer.offerbook.OfferBookListItemMaker.id; import static com.natpryce.makeiteasy.MakeItEasy.make; import static com.natpryce.makeiteasy.MakeItEasy.with; +import static haveno.desktop.main.offer.offerbook.OfferBookListItemMaker.id; +import static haveno.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrBuyItem; +import static haveno.desktop.main.offer.offerbook.OfferBookListItemMaker.xmrSellItem; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java b/desktop/src/test/java/haveno/desktop/main/market/trades/TradesChartsViewModelTest.java similarity index 92% rename from desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java rename to desktop/src/test/java/haveno/desktop/main/market/trades/TradesChartsViewModelTest.java index 6fcce459..5649ea41 100644 --- a/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/market/trades/TradesChartsViewModelTest.java @@ -15,20 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.market.trades; - -import bisq.desktop.Navigation; -import bisq.desktop.main.market.trades.charts.CandleData; - -import bisq.core.locale.FiatCurrency; -import bisq.core.monetary.Price; -import bisq.core.offer.OfferPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatistics3; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; +package haveno.desktop.main.market.trades; +import haveno.core.locale.FiatCurrency; +import haveno.core.monetary.Price; +import haveno.core.offer.OfferPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatistics3; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.desktop.Navigation; +import haveno.desktop.main.market.trades.ChartCalculations; +import haveno.desktop.main.market.trades.TradesChartsViewModel; +import haveno.desktop.main.market.trades.charts.CandleData; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java b/desktop/src/test/java/haveno/desktop/main/offer/createoffer/CreateOfferDataModelTest.java similarity index 83% rename from desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java rename to desktop/src/test/java/haveno/desktop/main/offer/createoffer/CreateOfferDataModelTest.java index e9eb69bb..c22340d8 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/offer/createoffer/CreateOfferDataModelTest.java @@ -1,21 +1,4 @@ -package bisq.desktop.main.offer.createoffer; - -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.offer.CreateOfferService; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.ClearXchangeAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.RevolutAccount; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; +package haveno.desktop.main.offer.createoffer; import javafx.collections.FXCollections; @@ -31,6 +14,24 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.offer.CreateOfferService; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.ClearXchangeAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.RevolutAccount; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.desktop.main.offer.createoffer.CreateOfferDataModel; + public class CreateOfferDataModelTest { private CreateOfferDataModel model; diff --git a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java b/desktop/src/test/java/haveno/desktop/main/offer/createoffer/CreateOfferViewModelTest.java similarity index 84% rename from desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java rename to desktop/src/test/java/haveno/desktop/main/offer/createoffer/CreateOfferViewModelTest.java index 923a285b..b3811a6b 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/offer/createoffer/CreateOfferViewModelTest.java @@ -15,35 +15,35 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.createoffer; - -import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.btc.model.XmrAddressEntry; -import bisq.core.btc.wallet.XmrWalletService; -import bisq.core.locale.Country; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.offer.CreateOfferService; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferUtil; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.payment.validation.SecurityDepositValidator; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.Preferences; -import bisq.core.user.User; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.ImmutableCoinFormatter; -import bisq.core.util.validation.AltcoinValidator; -import bisq.core.util.validation.FiatPriceValidator; -import bisq.core.util.validation.InputValidator; - -import bisq.common.config.Config; +package haveno.desktop.main.offer.createoffer; +import haveno.common.config.Config; +import haveno.core.account.witness.AccountAgeWitnessService; +import haveno.core.btc.model.XmrAddressEntry; +import haveno.core.btc.wallet.XmrWalletService; +import haveno.core.locale.Country; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.offer.CreateOfferService; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferUtil; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.validation.SecurityDepositValidator; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.Preferences; +import haveno.core.user.User; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.ImmutableCoinFormatter; +import haveno.core.util.validation.AltcoinValidator; +import haveno.core.util.validation.FiatPriceValidator; +import haveno.core.util.validation.InputValidator; +import haveno.desktop.main.offer.createoffer.CreateOfferDataModel; +import haveno.desktop.main.offer.createoffer.CreateOfferViewModel; import javafx.beans.property.SimpleIntegerProperty; import javafx.collections.FXCollections; @@ -56,7 +56,7 @@ import java.util.UUID; import org.junit.Before; import org.junit.Test; -import static bisq.desktop.maker.PreferenceMakers.empty; +import static haveno.desktop.maker.PreferenceMakers.empty; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; diff --git a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java b/desktop/src/test/java/haveno/desktop/main/offer/offerbook/OfferBookListItemMaker.java similarity index 93% rename from desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java rename to desktop/src/test/java/haveno/desktop/main/offer/offerbook/OfferBookListItemMaker.java index e77c5a26..b40ece7b 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java +++ b/desktop/src/test/java/haveno/desktop/main/offer/offerbook/OfferBookListItemMaker.java @@ -15,21 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.desktop.maker.OfferMaker; - -import bisq.core.offer.OfferDirection; +package haveno.desktop.main.offer.offerbook; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.MakeItEasy; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; +import haveno.core.offer.OfferDirection; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.maker.OfferMaker; -import static bisq.desktop.maker.OfferMaker.xmrUsdOffer; import static com.natpryce.makeiteasy.MakeItEasy.a; import static com.natpryce.makeiteasy.MakeItEasy.make; import static com.natpryce.makeiteasy.MakeItEasy.with; +import static haveno.desktop.maker.OfferMaker.xmrUsdOffer; public class OfferBookListItemMaker { diff --git a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java b/desktop/src/test/java/haveno/desktop/main/offer/offerbook/OfferBookViewModelTest.java similarity index 94% rename from desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java rename to desktop/src/test/java/haveno/desktop/main/offer/offerbook/OfferBookViewModelTest.java index dc8f38c3..43f7de9f 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/offer/offerbook/OfferBookViewModelTest.java @@ -15,39 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.offer.offerbook; - -import bisq.core.locale.Country; -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.offer.Offer; -import bisq.core.offer.OpenOfferManager; -import bisq.core.offer.OfferPayload; -import bisq.core.payment.AliPayAccount; -import bisq.core.payment.CountryBasedPaymentAccount; -import bisq.core.payment.CryptoCurrencyAccount; -import bisq.core.payment.NationalBankAccount; -import bisq.core.payment.PaymentAccount; -import bisq.core.payment.PaymentAccountUtil; -import bisq.core.payment.SameBankAccount; -import bisq.core.payment.SepaAccount; -import bisq.core.payment.SpecificBanksAccount; -import bisq.core.payment.payload.NationalBankAccountPayload; -import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.SameBankAccountPayload; -import bisq.core.payment.payload.SepaAccountPayload; -import bisq.core.payment.payload.SpecificBanksAccountPayload; -import bisq.core.provider.price.MarketPrice; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; -import bisq.core.user.User; -import bisq.core.util.PriceUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.ImmutableCoinFormatter; - -import bisq.common.config.Config; +package haveno.desktop.main.offer.offerbook; import javafx.beans.property.SimpleIntegerProperty; @@ -64,16 +32,49 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.natpryce.makeiteasy.Maker; - +import haveno.common.config.Config; +import haveno.core.locale.Country; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.offer.OpenOfferManager; +import haveno.core.payment.AliPayAccount; +import haveno.core.payment.CountryBasedPaymentAccount; +import haveno.core.payment.CryptoCurrencyAccount; +import haveno.core.payment.NationalBankAccount; +import haveno.core.payment.PaymentAccount; +import haveno.core.payment.PaymentAccountUtil; +import haveno.core.payment.SameBankAccount; +import haveno.core.payment.SepaAccount; +import haveno.core.payment.SpecificBanksAccount; +import haveno.core.payment.payload.NationalBankAccountPayload; +import haveno.core.payment.payload.PaymentMethod; +import haveno.core.payment.payload.SameBankAccountPayload; +import haveno.core.payment.payload.SepaAccountPayload; +import haveno.core.payment.payload.SpecificBanksAccountPayload; +import haveno.core.provider.price.MarketPrice; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.core.user.User; +import haveno.core.util.PriceUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.ImmutableCoinFormatter; +import haveno.desktop.main.offer.offerbook.BtcOfferBookViewModel; +import haveno.desktop.main.offer.offerbook.OfferBook; +import haveno.desktop.main.offer.offerbook.OfferBookListItem; +import haveno.desktop.main.offer.offerbook.OfferBookViewModel; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import static bisq.desktop.main.offer.offerbook.OfferBookListItemMaker.*; -import static bisq.desktop.maker.PreferenceMakers.empty; -import static bisq.desktop.maker.TradeCurrencyMakers.usd; import static com.natpryce.makeiteasy.MakeItEasy.make; import static com.natpryce.makeiteasy.MakeItEasy.with; +import static haveno.desktop.main.offer.offerbook.OfferBookListItemMaker.*; +import static haveno.desktop.maker.PreferenceMakers.empty; +import static haveno.desktop.maker.TradeCurrencyMakers.usd; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/desktop/src/test/java/bisq/desktop/main/overlays/OverlayTest.java b/desktop/src/test/java/haveno/desktop/main/overlays/OverlayTest.java similarity index 89% rename from desktop/src/test/java/bisq/desktop/main/overlays/OverlayTest.java rename to desktop/src/test/java/haveno/desktop/main/overlays/OverlayTest.java index c538cfcf..dbdf3fc7 100644 --- a/desktop/src/test/java/bisq/desktop/main/overlays/OverlayTest.java +++ b/desktop/src/test/java/haveno/desktop/main/overlays/OverlayTest.java @@ -15,8 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays; +package haveno.desktop.main.overlays; +import haveno.desktop.main.overlays.Overlay; +import haveno.desktop.main.overlays.TabbedOverlay; import org.junit.Test; public class OverlayTest { diff --git a/desktop/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstallerTest.java b/desktop/src/test/java/haveno/desktop/main/overlays/windows/downloadupdate/HavenoInstallerTest.java similarity index 73% rename from desktop/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstallerTest.java rename to desktop/src/test/java/haveno/desktop/main/overlays/windows/downloadupdate/HavenoInstallerTest.java index 4d47e64d..d157a27a 100644 --- a/desktop/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstallerTest.java +++ b/desktop/src/test/java/haveno/desktop/main/overlays/windows/downloadupdate/HavenoInstallerTest.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows.downloadupdate; - -import bisq.desktop.main.overlays.windows.downloadupdate.BisqInstaller.FileDescriptor; +package haveno.desktop.main.overlays.windows.downloadupdate; import com.google.common.collect.Lists; - +import haveno.desktop.main.overlays.windows.downloadupdate.HavenoInstaller; +import haveno.desktop.main.overlays.windows.downloadupdate.HavenoInstaller.FileDescriptor; import java.net.URL; import java.io.File; @@ -34,7 +33,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; @Slf4j -public class BisqInstallerTest { +public class HavenoInstallerTest { @Test public void call() throws Exception { } @@ -48,7 +47,7 @@ public class BisqInstallerTest { url = this.getClass().getResource("/downloadUpdate/F379A1C6.asc"); File pubKeyFile = new File(url.toURI().getPath()); - assertEquals(BisqInstaller.VerifyStatusEnum.OK, BisqInstaller.verifySignature(pubKeyFile, sigFile, dataFile)); + assertEquals(HavenoInstaller.VerifyStatusEnum.OK, HavenoInstaller.verifySignature(pubKeyFile, sigFile, dataFile)); url = this.getClass().getResource("/downloadUpdate/test_bad.txt"); dataFile = new File(url.toURI().getPath()); @@ -57,8 +56,8 @@ public class BisqInstallerTest { url = this.getClass().getResource("/downloadUpdate/F379A1C6.asc"); pubKeyFile = new File(url.toURI().getPath()); - BisqInstaller.verifySignature(pubKeyFile, sigFile, dataFile); - assertEquals(BisqInstaller.VerifyStatusEnum.FAIL, BisqInstaller.verifySignature(pubKeyFile, sigFile, dataFile)); + HavenoInstaller.verifySignature(pubKeyFile, sigFile, dataFile); + assertEquals(HavenoInstaller.VerifyStatusEnum.FAIL, HavenoInstaller.verifySignature(pubKeyFile, sigFile, dataFile)); } @Test @@ -75,13 +74,13 @@ public class BisqInstallerTest { @Test public void getSigFileDescriptors() throws Exception { - BisqInstaller bisqInstaller = new BisqInstaller(); + HavenoInstaller havenoInstaller = new HavenoInstaller(); FileDescriptor installerFileDescriptor = FileDescriptor.builder().fileName("filename.txt").id("filename").loadUrl("url://filename.txt").build(); FileDescriptor key1 = FileDescriptor.builder().fileName("key1").id("key1").loadUrl("").build(); FileDescriptor key2 = FileDescriptor.builder().fileName("key2").id("key2").loadUrl("").build(); - List sigFileDescriptors = bisqInstaller.getSigFileDescriptors(installerFileDescriptor, Lists.newArrayList(key1)); + List sigFileDescriptors = havenoInstaller.getSigFileDescriptors(installerFileDescriptor, Lists.newArrayList(key1)); assertEquals(1, sigFileDescriptors.size()); - sigFileDescriptors = bisqInstaller.getSigFileDescriptors(installerFileDescriptor, Lists.newArrayList(key1, key2)); + sigFileDescriptors = havenoInstaller.getSigFileDescriptors(installerFileDescriptor, Lists.newArrayList(key1, key2)); assertEquals(2, sigFileDescriptors.size()); log.info("test"); diff --git a/desktop/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/VerifyTaskTest.java b/desktop/src/test/java/haveno/desktop/main/overlays/windows/downloadupdate/VerifyTaskTest.java similarity index 92% rename from desktop/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/VerifyTaskTest.java rename to desktop/src/test/java/haveno/desktop/main/overlays/windows/downloadupdate/VerifyTaskTest.java index e29e8eb7..b2a54a3c 100644 --- a/desktop/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/VerifyTaskTest.java +++ b/desktop/src/test/java/haveno/desktop/main/overlays/windows/downloadupdate/VerifyTaskTest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.overlays.windows.downloadupdate; +package haveno.desktop.main.overlays.windows.downloadupdate; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/main/settings/preferences/PreferencesViewModelTest.java b/desktop/src/test/java/haveno/desktop/main/settings/preferences/PreferencesViewModelTest.java similarity index 90% rename from desktop/src/test/java/bisq/desktop/main/settings/preferences/PreferencesViewModelTest.java rename to desktop/src/test/java/haveno/desktop/main/settings/preferences/PreferencesViewModelTest.java index ce73f553..acbba62c 100644 --- a/desktop/src/test/java/bisq/desktop/main/settings/preferences/PreferencesViewModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/settings/preferences/PreferencesViewModelTest.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.main.settings.preferences; - -import bisq.desktop.maker.PreferenceMakers; - -import bisq.core.support.dispute.mediation.mediator.Mediator; -import bisq.core.support.dispute.mediation.mediator.MediatorManager; -import bisq.core.support.dispute.refund.refundagent.RefundAgent; -import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; -import bisq.core.user.Preferences; - -import bisq.network.p2p.NodeAddress; +package haveno.desktop.main.settings.preferences; +import haveno.core.support.dispute.mediation.mediator.Mediator; +import haveno.core.support.dispute.mediation.mediator.MediatorManager; +import haveno.core.support.dispute.refund.refundagent.RefundAgent; +import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; +import haveno.core.user.Preferences; +import haveno.desktop.main.settings.preferences.PreferencesViewModel; +import haveno.desktop.maker.PreferenceMakers; +import haveno.network.p2p.NodeAddress; import javafx.collections.FXCollections; import javafx.collections.ObservableMap; diff --git a/desktop/src/test/java/bisq/desktop/maker/CurrencyListItemMakers.java b/desktop/src/test/java/haveno/desktop/maker/CurrencyListItemMakers.java similarity index 80% rename from desktop/src/test/java/bisq/desktop/maker/CurrencyListItemMakers.java rename to desktop/src/test/java/haveno/desktop/maker/CurrencyListItemMakers.java index 9775c72c..98fbddee 100644 --- a/desktop/src/test/java/bisq/desktop/maker/CurrencyListItemMakers.java +++ b/desktop/src/test/java/haveno/desktop/maker/CurrencyListItemMakers.java @@ -15,24 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.desktop.maker; - -import bisq.desktop.util.CurrencyListItem; - -import bisq.core.locale.TradeCurrency; +package haveno.desktop.maker; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; +import haveno.core.locale.TradeCurrency; +import haveno.desktop.util.CurrencyListItem; -import static bisq.desktop.maker.TradeCurrencyMakers.monero; -import static bisq.desktop.maker.TradeCurrencyMakers.euro; import static com.natpryce.makeiteasy.MakeItEasy.a; import static com.natpryce.makeiteasy.MakeItEasy.with; +import static haveno.desktop.maker.TradeCurrencyMakers.euro; +import static haveno.desktop.maker.TradeCurrencyMakers.monero; public class CurrencyListItemMakers { - public static final Property tradeCurrency = new Property<>(); + public static final Property tradeCurrency = new Property<>(); public static final Property numberOfTrades = new Property<>(); public static final Instantiator CurrencyListItem = lookup -> diff --git a/desktop/src/test/java/bisq/desktop/maker/OfferMaker.java b/desktop/src/test/java/haveno/desktop/maker/OfferMaker.java similarity index 95% rename from desktop/src/test/java/bisq/desktop/maker/OfferMaker.java rename to desktop/src/test/java/haveno/desktop/maker/OfferMaker.java index 76cee466..438323ea 100644 --- a/desktop/src/test/java/bisq/desktop/maker/OfferMaker.java +++ b/desktop/src/test/java/haveno/desktop/maker/OfferMaker.java @@ -15,17 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.maker; - -import bisq.core.offer.Offer; -import bisq.core.offer.OfferDirection; -import bisq.core.offer.OfferPayload; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.crypto.Encryption; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.Sig; +package haveno.desktop.maker; import java.net.UnknownHostException; @@ -35,6 +25,13 @@ import java.util.List; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; +import haveno.common.crypto.Encryption; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.Sig; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferDirection; +import haveno.core.offer.OfferPayload; +import haveno.network.p2p.NodeAddress; import static com.natpryce.makeiteasy.MakeItEasy.a; import static com.natpryce.makeiteasy.MakeItEasy.with; diff --git a/desktop/src/test/java/bisq/desktop/maker/PreferenceMakers.java b/desktop/src/test/java/haveno/desktop/maker/PreferenceMakers.java similarity index 90% rename from desktop/src/test/java/bisq/desktop/maker/PreferenceMakers.java rename to desktop/src/test/java/haveno/desktop/maker/PreferenceMakers.java index 6d7a1453..6ea48cf8 100644 --- a/desktop/src/test/java/bisq/desktop/maker/PreferenceMakers.java +++ b/desktop/src/test/java/haveno/desktop/maker/PreferenceMakers.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.maker; - -import bisq.core.btc.nodes.LocalBitcoinNode; -import bisq.core.user.Preferences; - -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; +package haveno.desktop.maker; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Property; import com.natpryce.makeiteasy.SameValueDonor; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.core.btc.nodes.LocalBitcoinNode; +import haveno.core.user.Preferences; import static com.natpryce.makeiteasy.MakeItEasy.a; import static com.natpryce.makeiteasy.MakeItEasy.make; diff --git a/desktop/src/test/java/bisq/desktop/maker/PriceMaker.java b/desktop/src/test/java/haveno/desktop/maker/PriceMaker.java similarity index 93% rename from desktop/src/test/java/bisq/desktop/maker/PriceMaker.java rename to desktop/src/test/java/haveno/desktop/maker/PriceMaker.java index 4fefbb42..e7681d35 100644 --- a/desktop/src/test/java/bisq/desktop/maker/PriceMaker.java +++ b/desktop/src/test/java/haveno/desktop/maker/PriceMaker.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.maker; - -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Price; +package haveno.desktop.maker; import org.bitcoinj.utils.Fiat; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Price; import static com.natpryce.makeiteasy.MakeItEasy.a; diff --git a/desktop/src/test/java/bisq/desktop/maker/TradeCurrencyMakers.java b/desktop/src/test/java/haveno/desktop/maker/TradeCurrencyMakers.java similarity index 81% rename from desktop/src/test/java/bisq/desktop/maker/TradeCurrencyMakers.java rename to desktop/src/test/java/haveno/desktop/maker/TradeCurrencyMakers.java index 706a7ad7..8d81d46c 100644 --- a/desktop/src/test/java/bisq/desktop/maker/TradeCurrencyMakers.java +++ b/desktop/src/test/java/haveno/desktop/maker/TradeCurrencyMakers.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.maker; - -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; +package haveno.desktop.maker; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Property; +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; import static com.natpryce.makeiteasy.MakeItEasy.a; import static com.natpryce.makeiteasy.MakeItEasy.make; @@ -33,10 +32,10 @@ public class TradeCurrencyMakers { public static final Property currencyCode = new Property<>(); public static final Property currencyName = new Property<>(); - public static final Instantiator CryptoCurrency = lookup -> + public static final Instantiator CryptoCurrency = lookup -> new CryptoCurrency(lookup.valueOf(currencyCode, "XMR"), lookup.valueOf(currencyName, "Monero")); - public static final Instantiator FiatCurrency = lookup -> + public static final Instantiator FiatCurrency = lookup -> new FiatCurrency(lookup.valueOf(currencyCode, "EUR")); public static final CryptoCurrency monero = make(a(CryptoCurrency)); diff --git a/desktop/src/test/java/bisq/desktop/maker/VolumeMaker.java b/desktop/src/test/java/haveno/desktop/maker/VolumeMaker.java similarity index 93% rename from desktop/src/test/java/bisq/desktop/maker/VolumeMaker.java rename to desktop/src/test/java/haveno/desktop/maker/VolumeMaker.java index 06edb1a0..bb7b03e4 100644 --- a/desktop/src/test/java/bisq/desktop/maker/VolumeMaker.java +++ b/desktop/src/test/java/haveno/desktop/maker/VolumeMaker.java @@ -15,16 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.maker; - -import bisq.core.monetary.Altcoin; -import bisq.core.monetary.Volume; +package haveno.desktop.maker; import org.bitcoinj.utils.Fiat; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; +import haveno.core.monetary.Altcoin; +import haveno.core.monetary.Volume; import static com.natpryce.makeiteasy.MakeItEasy.a; diff --git a/desktop/src/test/java/bisq/desktop/util/CurrencyListTest.java b/desktop/src/test/java/haveno/desktop/util/CurrencyListTest.java similarity index 93% rename from desktop/src/test/java/bisq/desktop/util/CurrencyListTest.java rename to desktop/src/test/java/haveno/desktop/util/CurrencyListTest.java index 687650b8..c09111ba 100644 --- a/desktop/src/test/java/bisq/desktop/util/CurrencyListTest.java +++ b/desktop/src/test/java/haveno/desktop/util/CurrencyListTest.java @@ -15,15 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.core.locale.CryptoCurrency; -import bisq.core.locale.FiatCurrency; -import bisq.core.locale.TradeCurrency; -import bisq.core.user.Preferences; +package haveno.desktop.util; import com.google.common.collect.Lists; - +import haveno.core.locale.CryptoCurrency; +import haveno.core.locale.FiatCurrency; +import haveno.core.locale.TradeCurrency; +import haveno.core.user.Preferences; +import haveno.desktop.util.CurrencyList; +import haveno.desktop.util.CurrencyListItem; +import haveno.desktop.util.CurrencyPredicates; import java.util.ArrayList; import java.util.Currency; import java.util.List; diff --git a/desktop/src/test/java/bisq/desktop/util/DisplayUtilsTest.java b/desktop/src/test/java/haveno/desktop/util/DisplayUtilsTest.java similarity index 88% rename from desktop/src/test/java/bisq/desktop/util/DisplayUtilsTest.java rename to desktop/src/test/java/haveno/desktop/util/DisplayUtilsTest.java index 3a734dbd..500cdc3b 100644 --- a/desktop/src/test/java/bisq/desktop/util/DisplayUtilsTest.java +++ b/desktop/src/test/java/haveno/desktop/util/DisplayUtilsTest.java @@ -1,16 +1,15 @@ -package bisq.desktop.util; - -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.monetary.Volume; -import bisq.core.offer.Offer; -import bisq.core.offer.OfferPayload; -import bisq.core.util.VolumeUtil; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.ImmutableCoinFormatter; - -import bisq.common.config.Config; +package haveno.desktop.util; +import haveno.common.config.Config; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.monetary.Volume; +import haveno.core.offer.Offer; +import haveno.core.offer.OfferPayload; +import haveno.core.util.VolumeUtil; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.ImmutableCoinFormatter; +import haveno.desktop.util.DisplayUtils; import java.math.BigInteger; import java.util.Locale; import java.util.concurrent.TimeUnit; @@ -18,11 +17,11 @@ import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; -import static bisq.desktop.maker.OfferMaker.xmrUsdOffer; -import static bisq.desktop.maker.VolumeMaker.usdVolume; -import static bisq.desktop.maker.VolumeMaker.volumeString; import static com.natpryce.makeiteasy.MakeItEasy.make; import static com.natpryce.makeiteasy.MakeItEasy.with; +import static haveno.desktop.maker.OfferMaker.xmrUsdOffer; +import static haveno.desktop.maker.VolumeMaker.usdVolume; +import static haveno.desktop.maker.VolumeMaker.volumeString; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java b/desktop/src/test/java/haveno/desktop/util/GUIUtilTest.java similarity index 87% rename from desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java rename to desktop/src/test/java/haveno/desktop/util/GUIUtilTest.java index 4ddc370a..d79c3d8d 100644 --- a/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java +++ b/desktop/src/test/java/haveno/desktop/util/GUIUtilTest.java @@ -15,15 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.core.locale.GlobalSettings; -import bisq.core.locale.Res; -import bisq.core.locale.TradeCurrency; -import bisq.core.trade.HavenoUtils; -import bisq.core.user.DontShowAgainLookup; -import bisq.core.user.Preferences; - +package haveno.desktop.util; import javafx.util.StringConverter; @@ -35,12 +27,20 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import static bisq.desktop.maker.TradeCurrencyMakers.monero; -import static bisq.desktop.maker.TradeCurrencyMakers.euro; +import static haveno.desktop.maker.TradeCurrencyMakers.euro; +import static haveno.desktop.maker.TradeCurrencyMakers.monero; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import haveno.core.locale.GlobalSettings; +import haveno.core.locale.Res; +import haveno.core.locale.TradeCurrency; +import haveno.core.trade.HavenoUtils; +import haveno.core.user.DontShowAgainLookup; +import haveno.core.user.Preferences; +import haveno.desktop.util.GUIUtil; + public class GUIUtilTest { @@ -79,9 +79,9 @@ public class GUIUtilTest { /* PowerMockito.mockStatic(Utilities.class); ArgumentCaptor captor = ArgumentCaptor.forClass(URI.class); PowerMockito.doNothing().when(Utilities.class, "openURI", captor.capture()); - GUIUtil.openWebPage("https://bisq.network"); + GUIUtil.openWebPage("https://haveno.network"); - assertEquals("https://bisq.network?utm_source=desktop-client&utm_medium=in-app-link&utm_campaign=language_en", captor.getValue().toString()); + assertEquals("https://haveno.network?utm_source=desktop-client&utm_medium=in-app-link&utm_campaign=language_en", captor.getValue().toString()); GUIUtil.openWebPage("https://docs.bisq.network/trading-rules.html#f2f-trading"); diff --git a/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java b/desktop/src/test/java/haveno/desktop/util/ImmutableCoinFormatterTest.java similarity index 90% rename from desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java rename to desktop/src/test/java/haveno/desktop/util/ImmutableCoinFormatterTest.java index 49676f1a..802d57e5 100644 --- a/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java +++ b/desktop/src/test/java/haveno/desktop/util/ImmutableCoinFormatterTest.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; - -import bisq.core.locale.Res; -import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.ImmutableCoinFormatter; - -import bisq.common.config.Config; +package haveno.desktop.util; +import haveno.common.config.Config; +import haveno.core.locale.Res; +import haveno.core.util.coin.CoinFormatter; +import haveno.core.util.coin.ImmutableCoinFormatter; import org.bitcoinj.core.CoinMaker; import java.util.Locale; diff --git a/desktop/src/test/java/bisq/desktop/util/MovingAverageUtilsTest.java b/desktop/src/test/java/haveno/desktop/util/MovingAverageUtilsTest.java similarity index 98% rename from desktop/src/test/java/bisq/desktop/util/MovingAverageUtilsTest.java rename to desktop/src/test/java/haveno/desktop/util/MovingAverageUtilsTest.java index a96c4572..ca6c6768 100644 --- a/desktop/src/test/java/bisq/desktop/util/MovingAverageUtilsTest.java +++ b/desktop/src/test/java/haveno/desktop/util/MovingAverageUtilsTest.java @@ -15,8 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util; +package haveno.desktop.util; +import haveno.desktop.util.MovingAverageUtils; import java.util.Arrays; import java.util.stream.Stream; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/AccountNrValidatorTest.java similarity index 82% rename from desktop/src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/AccountNrValidatorTest.java index 638393d4..90e7e05c 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/AccountNrValidatorTest.java @@ -1,7 +1,5 @@ -package bisq.desktop.util.validation; +package haveno.desktop.util.validation; -import bisq.core.locale.Res; -import bisq.core.payment.validation.AccountNrValidator; import java.util.Locale; import org.junit.Before; @@ -9,6 +7,9 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; +import haveno.core.locale.Res; +import haveno.core.payment.validation.AccountNrValidator; + public class AccountNrValidatorTest { @Before diff --git a/desktop/src/test/java/bisq/desktop/util/validation/AdvancedCashValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/AdvancedCashValidatorTest.java similarity index 74% rename from desktop/src/test/java/bisq/desktop/util/validation/AdvancedCashValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/AdvancedCashValidatorTest.java index a3732510..a3eae607 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/AdvancedCashValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/AdvancedCashValidatorTest.java @@ -1,14 +1,12 @@ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.AdvancedCashValidator; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.util.validation.RegexValidator; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.AdvancedCashValidator; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.util.validation.RegexValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/BranchIdValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/BranchIdValidatorTest.java similarity index 83% rename from desktop/src/test/java/bisq/desktop/util/validation/BranchIdValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/BranchIdValidatorTest.java index 3e0a4f36..6364cfd1 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/BranchIdValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/BranchIdValidatorTest.java @@ -1,7 +1,5 @@ -package bisq.desktop.util.validation; +package haveno.desktop.util.validation; -import bisq.core.locale.Res; -import bisq.core.payment.validation.BranchIdValidator; import java.util.Locale; import org.junit.Before; @@ -10,6 +8,9 @@ import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import haveno.core.locale.Res; +import haveno.core.payment.validation.BranchIdValidator; + public class BranchIdValidatorTest { @Before diff --git a/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/CapitualValidatorTest.java similarity index 81% rename from desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/CapitualValidatorTest.java index 1d5e814a..0e15aef6 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/CapitualValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/CapitualValidatorTest.java @@ -1,13 +1,11 @@ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.CapitualValidator; -import bisq.core.util.validation.RegexValidator; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.CapitualValidator; +import haveno.core.util.validation.RegexValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/FiatVolumeValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/FiatVolumeValidatorTest.java similarity index 91% rename from desktop/src/test/java/bisq/desktop/util/validation/FiatVolumeValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/FiatVolumeValidatorTest.java index 13e468b5..df7eb775 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/FiatVolumeValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/FiatVolumeValidatorTest.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.FiatVolumeValidator; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.FiatVolumeValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/InteracETransferAnswerValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/InteracETransferAnswerValidatorTest.java similarity index 85% rename from desktop/src/test/java/bisq/desktop/util/validation/InteracETransferAnswerValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/InteracETransferAnswerValidatorTest.java index ba6022c5..6503883d 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/InteracETransferAnswerValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/InteracETransferAnswerValidatorTest.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.InteracETransferAnswerValidator; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.util.validation.RegexValidator; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.InteracETransferAnswerValidator; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.util.validation.RegexValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/InteracETransferQuestionValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/InteracETransferQuestionValidatorTest.java similarity index 85% rename from desktop/src/test/java/bisq/desktop/util/validation/InteracETransferQuestionValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/InteracETransferQuestionValidatorTest.java index 3ebe865f..b71ce4db 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/InteracETransferQuestionValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/InteracETransferQuestionValidatorTest.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.InteracETransferQuestionValidator; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.util.validation.RegexValidator; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.InteracETransferQuestionValidator; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.util.validation.RegexValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/InteracETransferValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/InteracETransferValidatorTest.java similarity index 82% rename from desktop/src/test/java/bisq/desktop/util/validation/InteracETransferValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/InteracETransferValidatorTest.java index 94f8a041..6f3fd055 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/InteracETransferValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/InteracETransferValidatorTest.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.EmailValidator; -import bisq.core.payment.validation.InteracETransferAnswerValidator; -import bisq.core.payment.validation.InteracETransferQuestionValidator; -import bisq.core.payment.validation.InteracETransferValidator; -import bisq.core.payment.validation.LengthValidator; -import bisq.core.util.validation.RegexValidator; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.EmailValidator; +import haveno.core.payment.validation.InteracETransferAnswerValidator; +import haveno.core.payment.validation.InteracETransferQuestionValidator; +import haveno.core.payment.validation.InteracETransferValidator; +import haveno.core.payment.validation.LengthValidator; +import haveno.core.util.validation.RegexValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/LengthValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/LengthValidatorTest.java similarity index 90% rename from desktop/src/test/java/bisq/desktop/util/validation/LengthValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/LengthValidatorTest.java index a4d74643..e8a94a5e 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/LengthValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/LengthValidatorTest.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.LengthValidator; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.LengthValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/NationalAccountIdValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/NationalAccountIdValidatorTest.java similarity index 86% rename from desktop/src/test/java/bisq/desktop/util/validation/NationalAccountIdValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/NationalAccountIdValidatorTest.java index 111c11bf..6823d83c 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/NationalAccountIdValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/NationalAccountIdValidatorTest.java @@ -1,7 +1,5 @@ -package bisq.desktop.util.validation; +package haveno.desktop.util.validation; -import bisq.core.locale.Res; -import bisq.core.payment.validation.NationalAccountIdValidator; import java.util.Locale; import org.junit.Before; @@ -11,6 +9,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import haveno.core.locale.Res; +import haveno.core.payment.validation.NationalAccountIdValidator; + public class NationalAccountIdValidatorTest { @Before public void setup() { diff --git a/desktop/src/test/java/bisq/desktop/util/validation/PhoneNumberValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/PhoneNumberValidatorTest.java similarity index 98% rename from desktop/src/test/java/bisq/desktop/util/validation/PhoneNumberValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/PhoneNumberValidatorTest.java index 5672830d..35005391 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/PhoneNumberValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/PhoneNumberValidatorTest.java @@ -1,8 +1,4 @@ -package bisq.desktop.util.validation; - -import bisq.core.locale.Res; -import bisq.core.payment.validation.PhoneNumberValidator; -import bisq.core.util.validation.InputValidator.ValidationResult; +package haveno.desktop.util.validation; import org.junit.Before; import org.junit.Test; @@ -12,6 +8,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import haveno.core.locale.Res; +import haveno.core.payment.validation.PhoneNumberValidator; +import haveno.core.util.validation.InputValidator.ValidationResult; + public class PhoneNumberValidatorTest { private PhoneNumberValidator validator; private ValidationResult validationResult; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/RegexValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/RegexValidatorTest.java similarity index 90% rename from desktop/src/test/java/bisq/desktop/util/validation/RegexValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/RegexValidatorTest.java index 23a5626e..7e223c51 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/RegexValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/RegexValidatorTest.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.util.validation.RegexValidator; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.util.validation.RegexValidator; import org.junit.Before; import org.junit.Test; diff --git a/desktop/src/test/java/bisq/desktop/util/validation/XmrValidatorTest.java b/desktop/src/test/java/haveno/desktop/util/validation/XmrValidatorTest.java similarity index 89% rename from desktop/src/test/java/bisq/desktop/util/validation/XmrValidatorTest.java rename to desktop/src/test/java/haveno/desktop/util/validation/XmrValidatorTest.java index 07d6c41f..281d5667 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/XmrValidatorTest.java +++ b/desktop/src/test/java/haveno/desktop/util/validation/XmrValidatorTest.java @@ -15,15 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.desktop.util.validation; - -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; -import bisq.core.payment.validation.XmrValidator; -import bisq.core.trade.HavenoUtils; +package haveno.desktop.util.validation; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; +import haveno.core.payment.validation.XmrValidator; +import haveno.core.trade.HavenoUtils; import org.junit.Before; import org.junit.Test; diff --git a/docs/README.md b/docs/README.md index 0102e8e0..44e3b0de 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,10 +4,10 @@ - [CONTRIBUTING.md](CONTRIBUTING.md) - Guidelines for contributors - [developer-guide.md](developer-guide.md) - Guide for developers - [bounties.md](bounties.md) - Rules and description of the bounty program -- [import-haveno.md](import-haveno.md) - Instructions for importing Haveno into Eclipse IDE or IntelliJ IDEA (from Bisq) +- [import-haveno.md](import-haveno.md) - Instructions for importing Haveno into Eclipse IDE or IntelliJ IDEA (from Haveno) - [trade-protocol.md](trade_protocol/trade-protocol.md) - Haveno's trade protocol -- [data-stores.md](data-stores.md) - Instructions for updating data stores (from Bisq) -- [tor-upgrade.md](tor-upgrade.md) - Instructions for upgrading the Tor dependencies used by Haveno (from Bisq) +- [data-stores.md](data-stores.md) - Instructions for updating data stores (from Haveno) +- [tor-upgrade.md](tor-upgrade.md) - Instructions for upgrading the Tor dependencies used by Haveno (from Haveno) - [README.md](README.md) - This file Documents outside of this folder: diff --git a/docs/data-stores.md b/docs/data-stores.md index 81bc09f4..323fdf1c 100644 --- a/docs/data-stores.md +++ b/docs/data-stores.md @@ -4,7 +4,7 @@ With every release we include the latest snapshot of Mainnet and Testnet data from the P2P network within the client. -* Start your Bisq client on Mainnet and Testnet and let it run until it is fully synced. +* Start your Haveno client on Mainnet and Testnet and let it run until it is fully synced. * Run [copy_dbs.sh](https://github.com/bisq-network/bisq/blob/master/desktop/package/macosx/copy_dbs.sh) to copy the required files into the [p2p resources directory](https://github.com/bisq-network/bisq/blob/master/p2p/src/main/resources). -* To add a new trade statistic snapshot just add it to the list of trade statistic snapshots in https://github.com/bisq-network/bisq/blob/0345c795e2c227d827a1f239a323dda1250f4e69/common/src/main/java/bisq/common/app/Version.java#L40 +* To add a new trade statistic snapshot just add it to the list of trade statistic snapshots in https://github.com/bisq-network/bisq/blob/0345c795e2c227d827a1f239a323dda1250f4e69/common/src/main/java/haveno/common/app/Version.java#L40 diff --git a/docs/developer-guide.md b/docs/developer-guide.md index b0ff5734..af5499cc 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -10,7 +10,7 @@ This document is a guide for Haveno development. Follow [instructions](https://github.com/haveno-dex/haveno-ts#run-in-a-browser) 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 Bisq's JFX application. +This proof of concept demonstrates using Haveno's gRPC server with a web frontend (react and typescript) instead of Haveno's JFX application. ## Importing Haveno into development environment @@ -26,7 +26,7 @@ Follow [instructions](https://github.com/haveno-dex/haveno-ts#run-tests) to run 2. Define the new service or message in Haveno's [protobuf definition](../proto/src/main/proto/grpc.proto). 3. Clean and build Haveno after modifying the protobuf definition: `make clean && make` 4. Implement the new service in Haveno's backend, following existing patterns.
- For example, the gRPC function to get offers is implemented by [`GrpcServer`](https://github.com/haveno-dex/haveno/blob/master/daemon/src/main/java/bisq/daemon/grpc/GrpcServer.java) > [`GrpcOffersService.getOffers(...)`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java#L104) > [`CoreApi.getOffers(...)`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/core/src/main/java/bisq/core/api/CoreApi.java#L128) > [`CoreOffersService.getOffers(...)`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/core/src/main/java/bisq/core/api/CoreOffersService.java#L126) > [`OfferBookService.getOffers()`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/core/src/main/java/bisq/core/offer/OfferBookService.java#L193). + For example, the gRPC function to get offers is implemented by [`GrpcServer`](https://github.com/haveno-dex/haveno/blob/master/daemon/src/main/java/haveno/daemon/grpc/GrpcServer.java) > [`GrpcOffersService.getOffers(...)`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/daemon/src/main/java/haveno/daemon/grpc/GrpcOffersService.java#L104) > [`CoreApi.getOffers(...)`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/core/src/main/java/haveno/core/api/CoreApi.java#L128) > [`CoreOffersService.getOffers(...)`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/core/src/main/java/haveno/core/api/CoreOffersService.java#L126) > [`OfferBookService.getOffers()`](https://github.com/haveno-dex/haveno/blob/b761dbfd378faf49d95090c126318b419af7926b/core/src/main/java/haveno/core/offer/OfferBookService.java#L193). 5. Build Haveno: `make` 6. Update the gRPC client in haveno-ts: `npm install` 7. Add the corresponding typescript method(s) to [haveno.ts](https://github.com/haveno-dex/haveno-ts/blob/master/src/haveno.ts) with clear and concise documentation. diff --git a/docs/import-haveno.md b/docs/import-haveno.md index 6b8b0cf9..b05e8925 100644 --- a/docs/import-haveno.md +++ b/docs/import-haveno.md @@ -28,14 +28,14 @@ You are now ready to make, run, and test changes to the Haveno project! ## Importing Haveno into IntelliJ IDEA -> Note: These instructions are outdated and for Bisq. +> Note: These instructions are outdated and for Haveno. -Most Bisq contributors use IDEA for development. The following instructions have been tested on IDEA 2021.1. +Most Haveno contributors use IDEA for development. The following instructions have been tested on IDEA 2021.1. -1. Follow the instructions in [build.md](build.md) to clone and build Bisq at the command line. +1. Follow the instructions in [build.md](build.md) to clone and build Haveno at the command line. 1. Open IDEA 1. Go to `File -> Settings -> Build, Execution, Deployment -> Compiler -> Annotation Processors` and check the `Enable annotation processing` option to enable processing of Lombok annotations (Lombok plugin installed by default since v2020.3) -1. Go to `File -> New -> Project from Existing Sources...` and then select the main Bisq folder to load automatically the related Gradle project +1. Go to `File -> New -> Project from Existing Sources...` and then select the main Haveno folder to load automatically the related Gradle project 1. If you did not yet setup JDK11 in IntelliJ, go to `File-> Project Structure -> Project` and under the `Project SDK` option locate your JDK11 folder 1. Select JDK 11 for Gradle as well. Go to `File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle` and select the JDK11 location for the Gradle JVM value 1. Go to `Build -> Build Project`. Everything should build cleanly @@ -43,9 +43,9 @@ Most Bisq contributors use IDEA for development. The following instructions have ![edit_configurations.png](edit_configurations.png) -9. Now you should be able to run Bisq by clicking on the _Play_ button or via `Run -> Run 'Bisq Desktop'` -10. If you want to debug the application and execute breakpoints, use `Run -> Debug 'Bisq Desktop'` +9. Now you should be able to run Haveno by clicking on the _Play_ button or via `Run -> Run 'Haveno Desktop'` +10. If you want to debug the application and execute breakpoints, use `Run -> Debug 'Haveno Desktop'` -> TIP: If you encounter compilation errors in IDEA related to the `protobuf.*` classes, it is probably because you didn't build Bisq at the command line as instructed above. You need to run the `generateProto` task in the `other` project. You can do this via the Gradle tool window in IDEA, or you can do it the command line with `./gradlew :other:generateProto`. Once you've done that, run `Build -> Build Project` again and you should have no errors. +> TIP: If you encounter compilation errors in IDEA related to the `protobuf.*` classes, it is probably because you didn't build Haveno at the command line as instructed above. You need to run the `generateProto` task in the `other` project. You can do this via the Gradle tool window in IDEA, or you can do it the command line with `./gradlew :other:generateProto`. Once you've done that, run `Build -> Build Project` again and you should have no errors. > > If this does not solve the issue, try to execute `./gradlew clean` and then rebuild the project again. \ No newline at end of file diff --git a/docs/tor-upgrade.md b/docs/tor-upgrade.md index 3e1da099..990cc5d1 100644 --- a/docs/tor-upgrade.md +++ b/docs/tor-upgrade.md @@ -1,10 +1,10 @@ -# Tor upgrade in Bisq +# Tor upgrade in Haveno -This guide describes the steps necessary to upgrade the tor dependencies used by Bisq. +This guide describes the steps necessary to upgrade the tor dependencies used by Haveno. ## Background -Bisq uses two libraries for tor: [netlayer][1] and [tor-binary][2]. +Haveno uses two libraries for tor: [netlayer][1] and [tor-binary][2]. As per the project's authors, `netlayer` is _"essentially a wrapper around the official Tor releases, pre-packaged for easy use and convenient integration into Kotlin/Java projects"_. @@ -12,7 +12,7 @@ easy use and convenient integration into Kotlin/Java projects"_. Similarly, `tor-binary` is _"[the] Tor binary packaged in a way that can be used for java projects"_. The project unpacks the tor browser binaries to extract and repackage the tor binaries themselves. -Therefore, upgrading tor in Bisq comes down to upgrading these two artefacts. +Therefore, upgrading tor in Haveno comes down to upgrading these two artefacts. ## Upgrade steps @@ -20,8 +20,8 @@ Therefore, upgrading tor in Bisq comes down to upgrading these two artefacts. ### 1. Decide if upgrade necessary - - Find out which tor version Bisq currently uses - - Find out the current `netlayer` version (see `netlayerVersion` in `bisq/build.gradle`) + - Find out which tor version Haveno currently uses + - Find out the current `netlayer` version (see `netlayerVersion` in `haveno/build.gradle`) - Find that release on the project's [releases page][3] - The release description says which tor version it includes - Find out the latest available tor release @@ -96,13 +96,13 @@ git push origin 0.7.0 ``` -### 4. Update dependency in Bisq +### 4. Update dependency in Haveno -Create a Bisq PR with the following changes: +Create a Haveno PR with the following changes: - - In `bisq/build.gradle` update `netlayerVersion` to the `netlayer` commit ID from above + - In `haveno/build.gradle` update `netlayerVersion` to the `netlayer` commit ID from above - Update the gradle dependency checksums - - See instructions in `bisq/gradle/witness/gradle-witness.gradle` + - See instructions in `haveno/gradle/witness/gradle-witness.gradle` diff --git a/inventory/src/main/java/bisq/inventory/InventoryMonitor.java b/inventory/src/main/java/haveno/inventory/InventoryMonitor.java similarity index 92% rename from inventory/src/main/java/bisq/inventory/InventoryMonitor.java rename to inventory/src/main/java/haveno/inventory/InventoryMonitor.java index 6b77c136..bc870280 100644 --- a/inventory/src/main/java/bisq/inventory/InventoryMonitor.java +++ b/inventory/src/main/java/haveno/inventory/InventoryMonitor.java @@ -15,29 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.inventory; +package haveno.inventory; -import bisq.core.app.TorSetup; -import bisq.core.network.p2p.inventory.GetInventoryRequestManager; -import bisq.core.network.p2p.inventory.model.Average; -import bisq.core.network.p2p.inventory.model.DeviationSeverity; -import bisq.core.network.p2p.inventory.model.InventoryItem; -import bisq.core.network.p2p.inventory.model.RequestInfo; -import bisq.core.network.p2p.seed.DefaultSeedNodeRepository; -import bisq.core.proto.network.CoreNetworkProtoResolver; -import bisq.core.util.JsonUtil; -import bisq.network.p2p.NetworkNodeProvider; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.SetupListener; - -import bisq.common.UserThread; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.file.JsonFileManager; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; - +import haveno.common.UserThread; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.file.JsonFileManager; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.core.app.TorSetup; +import haveno.core.network.p2p.inventory.GetInventoryRequestManager; +import haveno.core.network.p2p.inventory.model.Average; +import haveno.core.network.p2p.inventory.model.DeviationSeverity; +import haveno.core.network.p2p.inventory.model.InventoryItem; +import haveno.core.network.p2p.inventory.model.RequestInfo; +import haveno.core.network.p2p.seed.DefaultSeedNodeRepository; +import haveno.core.proto.network.CoreNetworkProtoResolver; +import haveno.core.util.JsonUtil; +import haveno.network.p2p.NetworkNodeProvider; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.SetupListener; import java.time.Clock; import java.io.File; diff --git a/inventory/src/main/java/bisq/inventory/InventoryMonitorMain.java b/inventory/src/main/java/haveno/inventory/InventoryMonitorMain.java similarity index 90% rename from inventory/src/main/java/bisq/inventory/InventoryMonitorMain.java rename to inventory/src/main/java/haveno/inventory/InventoryMonitorMain.java index 9c200590..130231e7 100644 --- a/inventory/src/main/java/bisq/inventory/InventoryMonitorMain.java +++ b/inventory/src/main/java/haveno/inventory/InventoryMonitorMain.java @@ -15,20 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.inventory; +package haveno.inventory; -import bisq.core.locale.Res; - -import bisq.common.UserThread; -import bisq.common.app.AsciiLogo; -import bisq.common.app.Log; -import bisq.common.app.Version; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.util.Utilities; - import com.google.common.util.concurrent.ThreadFactoryBuilder; - +import haveno.common.UserThread; +import haveno.common.app.AsciiLogo; +import haveno.common.app.Log; +import haveno.common.app.Version; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.util.Utilities; +import haveno.core.locale.Res; import java.nio.file.Paths; import java.io.File; @@ -72,7 +69,7 @@ public class InventoryMonitorMain { port = Integer.parseInt(args[3]); } - String appName = "bisq-inventory-monitor-" + network; + String appName = "haveno-inventory-monitor-" + network; File appDir = new File(Utilities.getUserDataDir(), appName); if (!appDir.exists() && !appDir.mkdir()) { log.warn("make appDir failed"); @@ -87,7 +84,7 @@ public class InventoryMonitorMain { } private static void setup(BaseCurrencyNetwork network, File appDir) { - String logPath = Paths.get(appDir.getPath(), "bisq").toString(); + String logPath = Paths.get(appDir.getPath(), "haveno").toString(); Log.setup(logPath); Log.setLevel(Level.INFO); AsciiLogo.showAsciiLogo(); diff --git a/inventory/src/main/java/bisq/inventory/InventoryWebServer.java b/inventory/src/main/java/haveno/inventory/InventoryWebServer.java similarity index 97% rename from inventory/src/main/java/bisq/inventory/InventoryWebServer.java rename to inventory/src/main/java/haveno/inventory/InventoryWebServer.java index 6e613a3e..c290c65b 100644 --- a/inventory/src/main/java/bisq/inventory/InventoryWebServer.java +++ b/inventory/src/main/java/haveno/inventory/InventoryWebServer.java @@ -15,23 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.inventory; - -import bisq.core.network.p2p.inventory.model.DeviationByIntegerDiff; -import bisq.core.network.p2p.inventory.model.DeviationByPercentage; -import bisq.core.network.p2p.inventory.model.DeviationSeverity; -import bisq.core.network.p2p.inventory.model.InventoryItem; -import bisq.core.network.p2p.inventory.model.RequestInfo; -import bisq.core.util.FormattingUtils; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.Version; -import bisq.common.util.MathUtils; -import bisq.common.util.Utilities; +package haveno.inventory; import com.google.common.base.Joiner; - +import haveno.common.app.Version; +import haveno.common.util.MathUtils; +import haveno.common.util.Utilities; +import haveno.core.network.p2p.inventory.model.DeviationByIntegerDiff; +import haveno.core.network.p2p.inventory.model.DeviationByPercentage; +import haveno.core.network.p2p.inventory.model.DeviationSeverity; +import haveno.core.network.p2p.inventory.model.InventoryItem; +import haveno.core.network.p2p.inventory.model.RequestInfo; +import haveno.core.util.FormattingUtils; +import haveno.network.p2p.NodeAddress; import java.io.BufferedReader; import java.util.ArrayList; diff --git a/inventory/src/main/resources/inv_btc_mainnet.seednodes b/inventory/src/main/resources/inv_btc_mainnet.seednodes index 1f811e92..4532714c 100644 --- a/inventory/src/main/resources/inv_btc_mainnet.seednodes +++ b/inventory/src/main/resources/inv_btc_mainnet.seednodes @@ -5,7 +5,7 @@ wizseed7ab2gi3x267xahrp2pkndyrovczezzb46jk6quvguciuyqrid.onion:8000 (@wiz) sn3emzy56u3mxzsr4geysc52feoq5qt7ja56km6gygwnszkshunn2sid.onion:8000 (@emzy) sn4emzywye3dhjouv7jig677qepg7fnusjidw74fbwneieruhmi7fuyd.onion:8000 (@emzy) sn5emzyvxuildv34n6jewfp2zeota4aq63fsl5yyilnvksezr3htveqd.onion:8000 (@emzy) -sn2bisqad7ncazupgbd3dcedqh5ptirgwofw63djwpdtftwhddo75oid.onion:8000 (@miker) +sn2havenoad7ncazupgbd3dcedqh5ptirgwofw63djwpdtftwhddo75oid.onion:8000 (@miker) sn3bsq3evqkpshdmc3sbdxafkhfnk7ctop44jsxbxyys5ridsaw5abyd.onion:8000 (@miker) sn4bsqpc7eb2ntvpsycxbzqt6fre72l4krp2fl5svphfh2eusrqtq3qd.onion:8000 (@miker) devinv3rhon24gqf5v6ondoqgyrbzyqihzyouzv7ptltsewhfmox2zqd.onion:8000 (@devinbileck) diff --git a/monitor/README.md b/monitor/README.md index b8125e6d..c0e84c50 100644 --- a/monitor/README.md +++ b/monitor/README.md @@ -1,13 +1,13 @@ -# Bisq Network Monitor Node +# Haveno Network Monitor Node -The Bisq monitor node collects a set of metrics which are of interest to developers and users alike. These metrics are then made available through reporters. +The Haveno monitor node collects a set of metrics which are of interest to developers and users alike. These metrics are then made available through reporters. The *Settled* release features these metrics: - Tor Startup Time: The time it takes to start Tor starting at a clean system, unpacking the shipped Tor binaries, firing up Tor until Tor is connected to the Tor network and ready to use. - Tor Roundtrip Time: Given a bootstrapped Tor, the roundtrip time of connecting to a hidden service is measured. - Tor Hidden Service Startup Time: Given a bootstrapped Tor, the time it takes to create and announce a freshly created hidden service. - P2P Round Trip Time: A metric hitchhiking the Ping/Pong messages of the Keep-Alive-Mechanism to determine the Round Trip Time when issuing a Ping to a seed node. -- P2P Seed Node Message Snapshot: Get absolute number and constellation of messages a fresh Bisq client will get on startup. Also reports diffs between seed nodes on a per-message-type basis. +- P2P Seed Node Message Snapshot: Get absolute number and constellation of messages a fresh Haveno client will get on startup. Also reports diffs between seed nodes on a per-message-type basis. - P2P Network Load: listens to the P2P network and its broadcast messages. Reports every X seconds. - P2P Market Statistics: a demonstration metric which extracts market information from broadcast messages. This demo implementation reports the number of open offers per market. @@ -18,12 +18,12 @@ The *Settled* release features these reporters: ## Configuration -The *Bisq Network Monitor Node* is to be configured via a Java properties file. There is a default configuration file shipped with the monitor which reports to the one monitoring service currently up and running. +The *Haveno Network Monitor Node* is to be configured via a Java properties file. There is a default configuration file shipped with the monitor which reports to the one monitoring service currently up and running. If you want to tweak the configuration, you can pass the location of the file as command line parameter: ``` -./bisq-monitor /path/to/your/config.properties +./haveno-monitor /path/to/your/config.properties ``` A sample configuration file looks like follows: @@ -108,27 +108,27 @@ GraphiteReporter.serviceUrl=k6evlhg44acpchtc.onion:2003 ## Run -The distribution ships with a systemd .service file. Validate/change the executable/config paths within the shipped `bisq-monitor.service` file and copy/move the file to your systemd directory (something along `/usr/lib/systemd/system/`). Now you can control your *Monitor Node* via the usual systemd start/stop commands +The distribution ships with a systemd .service file. Validate/change the executable/config paths within the shipped `haveno-monitor.service` file and copy/move the file to your systemd directory (something along `/usr/lib/systemd/system/`). Now you can control your *Monitor Node* via the usual systemd start/stop commands ``` -systemctl start bisq-monitor.service -systemctl stop bisq-monitor.service +systemctl start haveno-monitor.service +systemctl stop haveno-monitor.service ``` and ``` -systemctl enable bisq-monitor.service +systemctl enable haveno-monitor.service ``` You can reload the configuration without restarting the service by using ``` -systemctl reload bisq-monitor.service +systemctl reload haveno-monitor.service ``` Follow the logs created by the service by inspecting ``` -journalctl --unit bisq-monitor --follow +journalctl --unit haveno-monitor --follow ``` # Monitoring Service @@ -167,16 +167,16 @@ docker inspect graphite | grep -C 2 graphite/conf\", Edit `storage-schemas.conf` so that the frequency of your incoming data (configured in the monitor configs `interval`) is matched. For example, insert ``` -[bisq] -pattern = ^bisq.* +[haveno] +pattern = ^haveno.* retentions = 10s:1h,5m:31d,30m:2y,1h:5y ``` before the `[default...` blocks of the file. This basically says, that every incoming set of data reflects 5 minutes of the time series. Furthermore, every 30 minutes, the data is compressed and thus, takes less memory as it is kept for 2 years. Further, edit `storage-aggregation.conf` to configure how your data is compressed. For example, insert ``` -[bisq] -pattern=^bisq.* +[haveno] +pattern=^haveno.* xFilesFactor = 0 aggregationMethod = average ``` diff --git a/monitor/bisq-monitor.service b/monitor/haveno-monitor.service similarity index 57% rename from monitor/bisq-monitor.service rename to monitor/haveno-monitor.service index 892c69ae..8b8f50d0 100644 --- a/monitor/bisq-monitor.service +++ b/monitor/haveno-monitor.service @@ -1,16 +1,16 @@ [Unit] -Description=Bisq network monitor +Description=Haveno network monitor After=network.target [Service] WorkingDirectory=~ Environment="JAVA_OPTS='-Xmx500M'" -ExecStart=/home/bisq/bisq/bisq-monitor /home/bisq/monitor.properties +ExecStart=/home/haveno/haveno/haveno-monitor /home/haveno/monitor.properties ExecReload=/bin/kill -USR1 $MAINPID Restart=on-failure -User=bisq -Group=bisq +User=haveno +Group=haveno [Install] WantedBy=multi-user.target diff --git a/monitor/install_collectd_debian.sh b/monitor/install_collectd_debian.sh index 256721e9..81c7d977 100755 --- a/monitor/install_collectd_debian.sh +++ b/monitor/install_collectd_debian.sh @@ -1,11 +1,11 @@ #!/bin/bash set -e -echo "[*] Bisq Server Monitoring installation script" +echo "[*] Haveno Server Monitoring installation script" ##### change paths if necessary for your system -BISQ_REPO_URL=https://raw.githubusercontent.com/bisq-network/bisq -BISQ_REPO_TAG=master +HAVENO_REPO_URL=https://raw.githubusercontent.com/bisq-network/bisq +HAVENO_REPO_TAG=master ROOT_USER=root ROOT_GROUP=root ROOT_HOME=~root @@ -27,9 +27,9 @@ sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq echo "[*] Installing base packages" sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get install -qq -y ${ROOT_PKG[@]} -echo "[*] Preparing Bisq init script for monitoring" +echo "[*] Preparing Haveno init script for monitoring" # remove stuff it it is there already -for file in "${SYSTEMD_ENV_HOME}/bisq.env" "${SYSTEMD_ENV_HOME}/bisq-pricenode.env" +for file in "${SYSTEMD_ENV_HOME}/haveno.env" "${SYSTEMD_ENV_HOME}/haveno-pricenode.env" do if [ -f "$file" ];then sudo -H -i -u "${ROOT_USER}" sed -i -e 's/-Dcom.sun.management.jmxremote //g' -e 's/-Dcom.sun.management.jmxremote.local.only=true//g' -e 's/ -Dcom.sun.management.jmxremote.host=127.0.0.1//g' -e 's/ -Dcom.sun.management.jmxremote.port=6969//g' -e 's/ -Dcom.sun.management.jmxremote.rmi.port=6969//g' -e 's/ -Dcom.sun.management.jmxremote.ssl=false//g' -e 's/ -Dcom.sun.management.jmxremote.authenticate=false//g' "${file}" @@ -40,12 +40,12 @@ done echo "[*] Seeding entropy from /dev/urandom" sudo -H -i -u "${ROOT_USER}" /bin/sh -c "head -1500 /dev/urandom > ${ROOT_HOME}/.rnd" echo "[*] Installing Nginx config" -sudo -H -i -u "${ROOT_USER}" openssl req -x509 -nodes -newkey rsa:2048 -days 3000 -keyout /etc/nginx/cert.key -out /etc/nginx/cert.crt -subj="/O=Bisq/OU=Bisq Infrastructure/CN=$onionaddress" -curl -s "${BISQ_REPO_URL}/${BISQ_REPO_TAG}/monitor/nginx.conf" > /tmp/nginx.conf +sudo -H -i -u "${ROOT_USER}" openssl req -x509 -nodes -newkey rsa:2048 -days 3000 -keyout /etc/nginx/cert.key -out /etc/nginx/cert.crt -subj="/O=Haveno/OU=Haveno Infrastructure/CN=$onionaddress" +curl -s "${HAVENO_REPO_URL}/${HAVENO_REPO_TAG}/monitor/nginx.conf" > /tmp/nginx.conf sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 /tmp/nginx.conf /etc/nginx/nginx.conf echo "[*] Installing collectd config" -curl -s "${BISQ_REPO_URL}/${BISQ_REPO_TAG}/monitor/collectd.conf" > /tmp/collectd.conf +curl -s "${HAVENO_REPO_URL}/${HAVENO_REPO_TAG}/monitor/collectd.conf" > /tmp/collectd.conf sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 /tmp/collectd.conf /etc/collectd/collectd.conf sudo -H -i -u "${ROOT_USER}" sed -i -e "s/__ONION_ADDRESS__/$onionaddress/" /etc/collectd/collectd.conf @@ -56,10 +56,10 @@ sudo -H -i -u "${ROOT_USER}" systemctl enable collectd.service echo "[*] Restarting services" set +e -service bisq status >/dev/null 2>&1 -[ $? != 4 ] && sudo -H -i -u "${ROOT_USER}" systemctl restart bisq.service -service bisq-pricenode status >/dev/null 2>&1 -[ $? != 4 ] && sudo -H -i -u "${ROOT_USER}" systemctl restart bisq-pricenode.service +service haveno status >/dev/null 2>&1 +[ $? != 4 ] && sudo -H -i -u "${ROOT_USER}" systemctl restart haveno.service +service haveno-pricenode status >/dev/null 2>&1 +[ $? != 4 ] && sudo -H -i -u "${ROOT_USER}" systemctl restart haveno-pricenode.service sudo -H -i -u "${ROOT_USER}" systemctl restart nginx.service sudo -H -i -u "${ROOT_USER}" systemctl restart collectd.service diff --git a/monitor/nginx.conf b/monitor/nginx.conf index fc1a962f..1ce486a1 100644 --- a/monitor/nginx.conf +++ b/monitor/nginx.conf @@ -17,7 +17,7 @@ stream { server { listen 127.0.0.1:2003; - proxy_pass monitor.bisq.network:2002; + proxy_pass monitor.haveno.network:2002; proxy_ssl on; proxy_ssl_certificate /etc/nginx/cert.crt; diff --git a/monitor/src/main/java/bisq/monitor/AvailableTor.java b/monitor/src/main/java/haveno/monitor/AvailableTor.java similarity index 95% rename from monitor/src/main/java/bisq/monitor/AvailableTor.java rename to monitor/src/main/java/haveno/monitor/AvailableTor.java index a9c9a5d9..869b3571 100644 --- a/monitor/src/main/java/bisq/monitor/AvailableTor.java +++ b/monitor/src/main/java/haveno/monitor/AvailableTor.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.network.p2p.network.TorMode; +package haveno.monitor; import org.berndpruenster.netlayer.tor.Tor; - +import haveno.network.p2p.network.TorMode; import java.io.File; /** diff --git a/monitor/src/main/java/bisq/monitor/Configurable.java b/monitor/src/main/java/haveno/monitor/Configurable.java similarity index 99% rename from monitor/src/main/java/bisq/monitor/Configurable.java rename to monitor/src/main/java/haveno/monitor/Configurable.java index a955dbc7..1e3fb5dd 100644 --- a/monitor/src/main/java/bisq/monitor/Configurable.java +++ b/monitor/src/main/java/haveno/monitor/Configurable.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; +package haveno.monitor; import java.util.Properties; diff --git a/monitor/src/main/java/bisq/monitor/Metric.java b/monitor/src/main/java/haveno/monitor/Metric.java similarity index 96% rename from monitor/src/main/java/bisq/monitor/Metric.java rename to monitor/src/main/java/haveno/monitor/Metric.java index c60c28df..b2132393 100644 --- a/monitor/src/main/java/bisq/monitor/Metric.java +++ b/monitor/src/main/java/haveno/monitor/Metric.java @@ -15,11 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.monitor; +package haveno.monitor; -import bisq.common.app.Version; -import bisq.common.util.Utilities; +import static haveno.common.config.Config.BASE_CURRENCY_NETWORK; +import haveno.common.app.Version; +import haveno.common.util.Utilities; import java.util.Properties; import java.util.Random; import java.util.concurrent.ScheduledExecutorService; @@ -29,8 +30,6 @@ import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import static bisq.common.config.Config.BASE_CURRENCY_NETWORK; - /** * Starts a Metric (in its own {@link Thread}), manages its properties and shuts * it down gracefully. Furthermore, configuration updates and execution are done diff --git a/monitor/src/main/java/bisq/monitor/Monitor.java b/monitor/src/main/java/haveno/monitor/Monitor.java similarity index 89% rename from monitor/src/main/java/bisq/monitor/Monitor.java rename to monitor/src/main/java/haveno/monitor/Monitor.java index d45b788f..0bef83bc 100644 --- a/monitor/src/main/java/bisq/monitor/Monitor.java +++ b/monitor/src/main/java/haveno/monitor/Monitor.java @@ -15,23 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.metric.MarketStats; -import bisq.monitor.metric.P2PMarketStats; -import bisq.monitor.metric.P2PNetworkLoad; -import bisq.monitor.metric.P2PRoundTripTime; -import bisq.monitor.metric.P2PSeedNodeSnapshot; -import bisq.monitor.metric.PriceNodeStats; -import bisq.monitor.metric.TorHiddenServiceStartupTime; -import bisq.monitor.metric.TorRoundTripTime; -import bisq.monitor.metric.TorStartupTime; -import bisq.monitor.reporter.ConsoleReporter; -import bisq.monitor.reporter.GraphiteReporter; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; +package haveno.monitor; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.monitor.metric.MarketStats; +import haveno.monitor.metric.P2PMarketStats; +import haveno.monitor.metric.P2PNetworkLoad; +import haveno.monitor.metric.P2PRoundTripTime; +import haveno.monitor.metric.P2PSeedNodeSnapshot; +import haveno.monitor.metric.PriceNodeStats; +import haveno.monitor.metric.TorHiddenServiceStartupTime; +import haveno.monitor.metric.TorRoundTripTime; +import haveno.monitor.metric.TorStartupTime; +import haveno.monitor.reporter.ConsoleReporter; +import haveno.monitor.reporter.GraphiteReporter; import org.berndpruenster.netlayer.tor.NativeTor; import org.berndpruenster.netlayer.tor.Tor; @@ -51,7 +49,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import sun.misc.Signal; /** - * Monitor executable for the Bisq network. + * Monitor executable for the Haveno network. * * @author Florian Reimair */ diff --git a/monitor/src/main/java/bisq/monitor/OnionParser.java b/monitor/src/main/java/haveno/monitor/OnionParser.java similarity index 95% rename from monitor/src/main/java/bisq/monitor/OnionParser.java rename to monitor/src/main/java/haveno/monitor/OnionParser.java index b6f506e6..6060e067 100644 --- a/monitor/src/main/java/bisq/monitor/OnionParser.java +++ b/monitor/src/main/java/haveno/monitor/OnionParser.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.network.p2p.NodeAddress; +package haveno.monitor; +import haveno.network.p2p.NodeAddress; import java.net.MalformedURLException; import java.net.URL; diff --git a/monitor/src/main/java/bisq/monitor/Reporter.java b/monitor/src/main/java/haveno/monitor/Reporter.java similarity index 98% rename from monitor/src/main/java/bisq/monitor/Reporter.java rename to monitor/src/main/java/haveno/monitor/Reporter.java index 9beb64f2..e547df8b 100644 --- a/monitor/src/main/java/bisq/monitor/Reporter.java +++ b/monitor/src/main/java/haveno/monitor/Reporter.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; +package haveno.monitor; import java.util.Map; diff --git a/monitor/src/main/java/bisq/monitor/StatisticsHelper.java b/monitor/src/main/java/haveno/monitor/StatisticsHelper.java similarity index 99% rename from monitor/src/main/java/bisq/monitor/StatisticsHelper.java rename to monitor/src/main/java/haveno/monitor/StatisticsHelper.java index ffe84e21..c6dde577 100644 --- a/monitor/src/main/java/bisq/monitor/StatisticsHelper.java +++ b/monitor/src/main/java/haveno/monitor/StatisticsHelper.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; +package haveno.monitor; import java.util.ArrayList; import java.util.Collection; diff --git a/monitor/src/main/java/bisq/monitor/ThreadGate.java b/monitor/src/main/java/haveno/monitor/ThreadGate.java similarity index 98% rename from monitor/src/main/java/bisq/monitor/ThreadGate.java rename to monitor/src/main/java/haveno/monitor/ThreadGate.java index b13f74d4..12b2b6a2 100644 --- a/monitor/src/main/java/bisq/monitor/ThreadGate.java +++ b/monitor/src/main/java/haveno/monitor/ThreadGate.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; +package haveno.monitor; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/monitor/src/main/java/bisq/monitor/metric/MarketStats.java b/monitor/src/main/java/haveno/monitor/metric/MarketStats.java similarity index 92% rename from monitor/src/main/java/bisq/monitor/metric/MarketStats.java rename to monitor/src/main/java/haveno/monitor/metric/MarketStats.java index fbbda2d5..f27ca4ba 100644 --- a/monitor/src/main/java/bisq/monitor/metric/MarketStats.java +++ b/monitor/src/main/java/haveno/monitor/metric/MarketStats.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.Metric; -import bisq.monitor.Reporter; +package haveno.monitor.metric; import java.net.URL; import java.net.URLConnection; - +import haveno.monitor.Metric; +import haveno.monitor.Reporter; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -44,7 +42,7 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j public class MarketStats extends Metric { - private static final String MARKETS_BISQ_NETWORK = "https://markets.bisq.network"; + private static final String MARKETS_HAVENO_NETWORK = "https://markets.bisq.network"; // poor mans JSON parser private final Pattern marketPattern = Pattern.compile("\"market\" ?: ?\"([a-z_]+)\""); private final Pattern amountPattern = Pattern.compile("\"amount\" ?: ?\"([\\d\\.]+)\""); @@ -69,7 +67,7 @@ public class MarketStats extends Metric { lastRun = now; // thought about adding 1 second but what if a trade is done exactly in this one second? // connect - URLConnection connection = new URL(MARKETS_BISQ_NETWORK + query).openConnection(); + URLConnection connection = new URL(MARKETS_HAVENO_NETWORK + query).openConnection(); // prepare to receive data BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); diff --git a/monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java b/monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java similarity index 95% rename from monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java rename to monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java index 24b24cd9..ee931338 100644 --- a/monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java +++ b/monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java @@ -15,21 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.Reporter; - -import bisq.core.offer.OfferPayload; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.monitor.metric; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.offer.OfferPayload; +import haveno.monitor.Reporter; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java b/monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java similarity index 87% rename from monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java rename to monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java index f17aed0a..5aca3b65 100644 --- a/monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java +++ b/monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java @@ -15,35 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.AvailableTor; -import bisq.monitor.Metric; -import bisq.monitor.Monitor; -import bisq.monitor.Reporter; -import bisq.monitor.ThreadGate; - -import bisq.core.network.p2p.seed.DefaultSeedNodeRepository; -import bisq.core.proto.network.CoreNetworkProtoResolver; -import bisq.core.proto.persistable.CorePersistenceProtoResolver; - -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.SetupListener; -import bisq.network.p2p.network.TorNetworkNode; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.keepalive.KeepAliveManager; -import bisq.network.p2p.peers.peerexchange.PeerExchangeManager; -import bisq.network.p2p.storage.messages.BroadcastMessage; - -import bisq.common.ClockWatcher; -import bisq.common.config.Config; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.monitor.metric; +import haveno.common.ClockWatcher; +import haveno.common.config.Config; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.core.network.p2p.seed.DefaultSeedNodeRepository; +import haveno.core.proto.network.CoreNetworkProtoResolver; +import haveno.core.proto.persistable.CorePersistenceProtoResolver; +import haveno.monitor.AvailableTor; +import haveno.monitor.Metric; +import haveno.monitor.Monitor; +import haveno.monitor.Reporter; +import haveno.monitor.ThreadGate; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.SetupListener; +import haveno.network.p2p.network.TorNetworkNode; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.keepalive.KeepAliveManager; +import haveno.network.p2p.peers.peerexchange.PeerExchangeManager; +import haveno.network.p2p.storage.messages.BroadcastMessage; import java.time.Clock; import java.io.File; diff --git a/monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java b/monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java similarity index 87% rename from monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java rename to monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java index d6296a12..06dd2a0b 100644 --- a/monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java +++ b/monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java @@ -15,20 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.OnionParser; -import bisq.monitor.Reporter; -import bisq.monitor.StatisticsHelper; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.peers.keepalive.messages.Ping; -import bisq.network.p2p.peers.keepalive.messages.Pong; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.monitor.metric; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.monitor.OnionParser; +import haveno.monitor.Reporter; +import haveno.monitor.StatisticsHelper; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.peers.keepalive.messages.Ping; +import haveno.network.p2p.peers.keepalive.messages.Pong; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshot.java b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java similarity index 92% rename from monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshot.java rename to monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java index bb9193de..3f501368 100644 --- a/monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshot.java +++ b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java @@ -15,19 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.OnionParser; -import bisq.monitor.Reporter; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.monitor.metric; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.monitor.OnionParser; +import haveno.monitor.Reporter; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.net.MalformedURLException; import java.nio.ByteBuffer; diff --git a/monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshotBase.java b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java similarity index 90% rename from monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshotBase.java rename to monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java index c59bb358..ccf5f141 100644 --- a/monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshotBase.java +++ b/monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java @@ -15,37 +15,32 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.AvailableTor; -import bisq.monitor.Metric; -import bisq.monitor.Monitor; -import bisq.monitor.OnionParser; -import bisq.monitor.Reporter; -import bisq.monitor.ThreadGate; - -import bisq.core.account.witness.AccountAgeWitnessStore; -import bisq.core.proto.network.CoreNetworkProtoResolver; -import bisq.core.proto.persistable.CorePersistenceProtoResolver; -import bisq.core.trade.statistics.TradeStatistics3Store; - -import bisq.network.p2p.CloseConnectionMessage; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.TorNetworkNode; - -import bisq.common.app.Version; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.monitor.metric; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.app.Version; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.core.account.witness.AccountAgeWitnessStore; +import haveno.core.proto.network.CoreNetworkProtoResolver; +import haveno.core.proto.persistable.CorePersistenceProtoResolver; +import haveno.core.trade.statistics.TradeStatistics3Store; +import haveno.monitor.AvailableTor; +import haveno.monitor.Metric; +import haveno.monitor.Monitor; +import haveno.monitor.OnionParser; +import haveno.monitor.Reporter; +import haveno.monitor.ThreadGate; +import haveno.network.p2p.CloseConnectionMessage; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.TorNetworkNode; import java.time.Clock; import java.io.File; diff --git a/monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java b/monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java similarity index 96% rename from monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java rename to monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java index 60f9c7ac..c8a2f8f8 100644 --- a/monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java +++ b/monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java @@ -15,23 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.Metric; -import bisq.monitor.OnionParser; -import bisq.monitor.Reporter; - -import bisq.asset.Asset; -import bisq.asset.AssetRegistry; - -import bisq.network.p2p.NodeAddress; +package haveno.monitor.metric; import org.berndpruenster.netlayer.tor.Tor; import org.berndpruenster.netlayer.tor.TorCtlException; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; import com.runjva.sourceforge.jsocks.protocol.SocksSocket; - +import haveno.asset.Asset; +import haveno.asset.AssetRegistry; +import haveno.monitor.Metric; +import haveno.monitor.OnionParser; +import haveno.monitor.Reporter; +import haveno.network.p2p.NodeAddress; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; diff --git a/monitor/src/main/java/bisq/monitor/metric/TorHiddenServiceStartupTime.java b/monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java similarity index 94% rename from monitor/src/main/java/bisq/monitor/metric/TorHiddenServiceStartupTime.java rename to monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java index 32f21e3f..8384c060 100644 --- a/monitor/src/main/java/bisq/monitor/metric/TorHiddenServiceStartupTime.java +++ b/monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.Metric; -import bisq.monitor.Monitor; -import bisq.monitor.Reporter; -import bisq.monitor.ThreadGate; +package haveno.monitor.metric; import org.berndpruenster.netlayer.tor.HiddenServiceSocket; - +import haveno.monitor.Metric; +import haveno.monitor.Monitor; +import haveno.monitor.Reporter; +import haveno.monitor.ThreadGate; import java.io.File; import lombok.extern.slf4j.Slf4j; diff --git a/monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java b/monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java similarity index 90% rename from monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java rename to monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java index 62f50345..503daa46 100644 --- a/monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java +++ b/monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java @@ -15,21 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.Metric; -import bisq.monitor.OnionParser; -import bisq.monitor.Reporter; -import bisq.monitor.StatisticsHelper; - -import bisq.network.p2p.NodeAddress; +package haveno.monitor.metric; import org.berndpruenster.netlayer.tor.Tor; import org.berndpruenster.netlayer.tor.TorCtlException; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; import com.runjva.sourceforge.jsocks.protocol.SocksSocket; - +import haveno.monitor.Metric; +import haveno.monitor.OnionParser; +import haveno.monitor.Reporter; +import haveno.monitor.StatisticsHelper; +import haveno.network.p2p.NodeAddress; import java.io.IOException; import java.util.ArrayList; @@ -38,7 +35,7 @@ import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; /** - * A Metric to measure the round-trip time to the Bisq seed nodes via plain tor. + * A Metric to measure the round-trip time to the Haveno seed nodes via plain tor. * * @author Florian Reimair */ diff --git a/monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java b/monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java similarity index 96% rename from monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java rename to monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java index 4f6ef176..cf03c2ff 100644 --- a/monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java +++ b/monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.monitor.metric; - -import bisq.monitor.Metric; -import bisq.monitor.Reporter; +package haveno.monitor.metric; import org.berndpruenster.netlayer.tor.NativeTor; import org.berndpruenster.netlayer.tor.Tor; import org.berndpruenster.netlayer.tor.TorCtlException; import org.berndpruenster.netlayer.tor.Torrc; - +import haveno.monitor.Metric; +import haveno.monitor.Reporter; import java.io.File; import java.io.IOException; diff --git a/monitor/src/main/java/bisq/monitor/reporter/ConsoleReporter.java b/monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java similarity index 85% rename from monitor/src/main/java/bisq/monitor/reporter/ConsoleReporter.java rename to monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java index f1234fdc..36639845 100644 --- a/monitor/src/main/java/bisq/monitor/reporter/ConsoleReporter.java +++ b/monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.monitor.reporter; - -import bisq.monitor.Reporter; - -import bisq.common.app.Version; -import bisq.common.config.BaseCurrencyNetwork; +package haveno.monitor.reporter; +import haveno.common.app.Version; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.monitor.Reporter; import java.util.HashMap; import java.util.Map; @@ -57,7 +55,7 @@ public class ConsoleReporter extends Reporter { @Override public void report(String key, String value, String timestamp, String prefix) { - System.err.println("Report: bisq" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "") + System.err.println("Report: haveno" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "") + (prefix.isEmpty() ? "" : "." + prefix) + (key.isEmpty() ? "" : "." + key) + " " + value + " " + timestamp); diff --git a/monitor/src/main/java/bisq/monitor/reporter/GraphiteReporter.java b/monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java similarity index 88% rename from monitor/src/main/java/bisq/monitor/reporter/GraphiteReporter.java rename to monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java index 53c6fb5d..d9ca6865 100644 --- a/monitor/src/main/java/bisq/monitor/reporter/GraphiteReporter.java +++ b/monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java @@ -15,20 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.monitor.reporter; - -import bisq.monitor.OnionParser; -import bisq.monitor.Reporter; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.app.Version; -import bisq.common.config.BaseCurrencyNetwork; +package haveno.monitor.reporter; import org.berndpruenster.netlayer.tor.TorSocket; import com.google.common.base.Charsets; - +import haveno.common.app.Version; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.monitor.OnionParser; +import haveno.monitor.Reporter; +import haveno.network.p2p.NodeAddress; import java.net.Socket; import java.io.IOException; @@ -77,7 +73,7 @@ public class GraphiteReporter extends Reporter { @Override public void report(String key, String value, String timeInMilliseconds, String prefix) { // https://graphite.readthedocs.io/en/latest/feeding-carbon.html - String report = "bisq" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "") + String report = "haveno" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "") + (prefix.isEmpty() ? "" : "." + prefix) + (key.isEmpty() ? "" : "." + key) + " " + value + " " + Long.parseLong(timeInMilliseconds) / 1000 + "\n"; diff --git a/monitor/src/main/resources/metrics.properties b/monitor/src/main/resources/metrics.properties index c77087a2..d6f48116 100644 --- a/monitor/src/main/resources/metrics.properties +++ b/monitor/src/main/resources/metrics.properties @@ -47,7 +47,7 @@ P2PNetworkLoad.run.historySize=200 #P2PSeedNodeSnapshotBase Metric P2PSeedNodeSnapshot.enabled=true -P2PSeedNodeSnapshot.run.dbDir=bisq/p2p/build/resources/main/ +P2PSeedNodeSnapshot.run.dbDir=haveno/p2p/build/resources/main/ P2PSeedNodeSnapshot.run.interval=24 P2PSeedNodeSnapshot.run.hosts=3f3cu2yw7u457ztq.onion:8000, 723ljisnynbtdohi.onion:8000, fl3mmribyxgrv63c.onion:8000 P2PSeedNodeSnapshot.run.torProxyPort=9062 @@ -55,7 +55,7 @@ P2PSeedNodeSnapshot.run.torProxyPort=9062 #P2PMarketStats Metric P2PMarketStats.enabled=false P2PMarketStats.run.interval=37 -P2PMarketStats.run.dbDir=bisq/p2p/build/resources/main/ +P2PMarketStats.run.dbDir=haveno/p2p/build/resources/main/ P2PMarketStats.run.hosts=ef5qnzx6znifo3df.onion:8000 P2PMarketStats.run.torProxyPort=9063 diff --git a/monitor/src/test/java/bisq/monitor/MonitorInfrastructureTests.java b/monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java similarity index 97% rename from monitor/src/test/java/bisq/monitor/MonitorInfrastructureTests.java rename to monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java index d412007e..7af3ab54 100644 --- a/monitor/src/test/java/bisq/monitor/MonitorInfrastructureTests.java +++ b/monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.reporter.ConsoleReporter; +package haveno.monitor; +import haveno.monitor.Metric; +import haveno.monitor.reporter.ConsoleReporter; import java.util.HashMap; import java.util.Properties; import java.util.concurrent.ExecutionException; diff --git a/monitor/src/test/java/bisq/monitor/P2PNetworkLoadTests.java b/monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java similarity index 94% rename from monitor/src/test/java/bisq/monitor/P2PNetworkLoadTests.java rename to monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java index 4831e169..ad275636 100644 --- a/monitor/src/test/java/bisq/monitor/P2PNetworkLoadTests.java +++ b/monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java @@ -15,10 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.metric.P2PNetworkLoad; -import bisq.monitor.reporter.ConsoleReporter; +package haveno.monitor; import org.berndpruenster.netlayer.tor.NativeTor; import org.berndpruenster.netlayer.tor.Tor; @@ -35,6 +32,11 @@ import org.junit.jupiter.api.Test; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.monitor.Metric; +import haveno.monitor.Monitor; +import haveno.monitor.metric.P2PNetworkLoad; +import haveno.monitor.reporter.ConsoleReporter; + /** * Test the round trip time metric against the hidden service of tor project.org. * diff --git a/monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java b/monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java similarity index 95% rename from monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java rename to monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java index 3c63dbb6..886b4973 100644 --- a/monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java +++ b/monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java @@ -15,10 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.metric.P2PRoundTripTime; -import bisq.monitor.reporter.ConsoleReporter; +package haveno.monitor; import org.berndpruenster.netlayer.tor.NativeTor; import org.berndpruenster.netlayer.tor.Tor; @@ -36,6 +33,11 @@ import org.junit.jupiter.params.provider.ValueSource; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.monitor.Metric; +import haveno.monitor.Monitor; +import haveno.monitor.metric.P2PRoundTripTime; +import haveno.monitor.reporter.ConsoleReporter; + /** * Test the round trip time metric against the hidden service of tor project.org. * diff --git a/monitor/src/test/java/bisq/monitor/PriceNodeStatsTests.java b/monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java similarity index 95% rename from monitor/src/test/java/bisq/monitor/PriceNodeStatsTests.java rename to monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java index 08bfb718..db9a0a89 100644 --- a/monitor/src/test/java/bisq/monitor/PriceNodeStatsTests.java +++ b/monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.metric.PriceNodeStats; +package haveno.monitor; import org.berndpruenster.netlayer.tor.NativeTor; import org.berndpruenster.netlayer.tor.Tor; @@ -36,6 +34,10 @@ import org.junit.jupiter.api.Test; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.monitor.Metric; +import haveno.monitor.Reporter; +import haveno.monitor.metric.PriceNodeStats; + /** * @author Florian Reimair */ diff --git a/monitor/src/test/java/bisq/monitor/TorHiddenServiceStartupTimeTests.java b/monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java similarity index 95% rename from monitor/src/test/java/bisq/monitor/TorHiddenServiceStartupTimeTests.java rename to monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java index 627396df..2f2435f1 100644 --- a/monitor/src/test/java/bisq/monitor/TorHiddenServiceStartupTimeTests.java +++ b/monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.metric.TorHiddenServiceStartupTime; +package haveno.monitor; import org.berndpruenster.netlayer.tor.NativeTor; import org.berndpruenster.netlayer.tor.Tor; @@ -36,6 +34,10 @@ import org.junit.jupiter.api.Test; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.monitor.Metric; +import haveno.monitor.Reporter; +import haveno.monitor.metric.TorHiddenServiceStartupTime; + @Disabled // Ignore for normal test runs as the tests take lots of time public class TorHiddenServiceStartupTimeTests { diff --git a/monitor/src/test/java/bisq/monitor/TorRoundTripTimeTests.java b/monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java similarity index 97% rename from monitor/src/test/java/bisq/monitor/TorRoundTripTimeTests.java rename to monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java index 6bd8c40c..ebf6db10 100644 --- a/monitor/src/test/java/bisq/monitor/TorRoundTripTimeTests.java +++ b/monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.metric.TorRoundTripTime; +package haveno.monitor; import org.berndpruenster.netlayer.tor.NativeTor; import org.berndpruenster.netlayer.tor.Tor; @@ -37,6 +35,10 @@ import org.junit.jupiter.params.provider.ValueSource; import static com.google.common.base.Preconditions.checkNotNull; +import haveno.monitor.Metric; +import haveno.monitor.Reporter; +import haveno.monitor.metric.TorRoundTripTime; + /** * Test the round trip time metric against the hidden service of tor project.org. * diff --git a/monitor/src/test/java/bisq/monitor/TorStartupTimeTests.java b/monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java similarity index 95% rename from monitor/src/test/java/bisq/monitor/TorStartupTimeTests.java rename to monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java index 346f0e65..afb38c11 100644 --- a/monitor/src/test/java/bisq/monitor/TorStartupTimeTests.java +++ b/monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java @@ -15,10 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.monitor; - -import bisq.monitor.metric.TorStartupTime; +package haveno.monitor; +import haveno.monitor.Metric; +import haveno.monitor.Reporter; +import haveno.monitor.metric.TorStartupTime; import java.util.Map; import java.util.Properties; diff --git a/monitor/uninstall_collectd_debian.sh b/monitor/uninstall_collectd_debian.sh index dc63b4cc..a70d4d64 100755 --- a/monitor/uninstall_collectd_debian.sh +++ b/monitor/uninstall_collectd_debian.sh @@ -1,5 +1,5 @@ #!/bin/sh -echo "[*] Stopping Bisq Server monitoring utensils" +echo "[*] Stopping Haveno Server monitoring utensils" echo ' ' echo 'This script will not remove any configuration or binaries from the system. It just stops the services.' diff --git a/p2p/src/main/java/bisq/network/DnsLookupException.java b/p2p/src/main/java/haveno/network/DnsLookupException.java similarity index 97% rename from p2p/src/main/java/bisq/network/DnsLookupException.java rename to p2p/src/main/java/haveno/network/DnsLookupException.java index ae829ee9..367b90bf 100644 --- a/p2p/src/main/java/bisq/network/DnsLookupException.java +++ b/p2p/src/main/java/haveno/network/DnsLookupException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network; +package haveno.network; public class DnsLookupException extends Exception { public DnsLookupException(String message) { diff --git a/p2p/src/main/java/bisq/network/DnsLookupTor.java b/p2p/src/main/java/haveno/network/DnsLookupTor.java similarity index 98% rename from p2p/src/main/java/bisq/network/DnsLookupTor.java rename to p2p/src/main/java/haveno/network/DnsLookupTor.java index 60028f0f..8583c5ef 100644 --- a/p2p/src/main/java/bisq/network/DnsLookupTor.java +++ b/p2p/src/main/java/haveno/network/DnsLookupTor.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network; +package haveno.network; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; @@ -62,7 +62,7 @@ public class DnsLookupTor { public static InetAddress lookup(Socks5Proxy proxy, String host) throws DnsLookupException { try { // note: This is creating a new connection to our proxy, without any authentication. - // This works fine when connecting to bisq's internal Tor proxy, but + // This works fine when connecting to haveno's internal Tor proxy, but // would fail if user has configured an external proxy that requires auth. // It would be much better to use the already connected proxy socket, but when I // tried that I get weird errors and the lookup fails. diff --git a/p2p/src/main/java/bisq/network/Socks5DnsDiscovery.java b/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java similarity index 98% rename from p2p/src/main/java/bisq/network/Socks5DnsDiscovery.java rename to p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java index 1303fc6c..755682ba 100644 --- a/p2p/src/main/java/bisq/network/Socks5DnsDiscovery.java +++ b/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java @@ -15,9 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network; - -import bisq.common.util.Utilities; +package haveno.network; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.net.discovery.DnsDiscovery; @@ -28,7 +26,7 @@ import org.bitcoinj.utils.ContextPropagatingThreadFactory; import org.bitcoinj.utils.DaemonThreadFactory; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.common.util.Utilities; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/p2p/src/main/java/bisq/network/Socks5MultiDiscovery.java b/p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java similarity index 99% rename from p2p/src/main/java/bisq/network/Socks5MultiDiscovery.java rename to p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java index 2f4d227f..3561950e 100644 --- a/p2p/src/main/java/bisq/network/Socks5MultiDiscovery.java +++ b/p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network; +package haveno.network; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.net.discovery.PeerDiscovery; diff --git a/p2p/src/main/java/bisq/network/Socks5ProxyProvider.java b/p2p/src/main/java/haveno/network/Socks5ProxyProvider.java similarity index 90% rename from p2p/src/main/java/bisq/network/Socks5ProxyProvider.java rename to p2p/src/main/java/haveno/network/Socks5ProxyProvider.java index 3477c601..37a64c27 100644 --- a/p2p/src/main/java/bisq/network/Socks5ProxyProvider.java +++ b/p2p/src/main/java/haveno/network/Socks5ProxyProvider.java @@ -15,14 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network; +package haveno.network; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - -import bisq.network.p2p.network.NetworkNode; - -import bisq.common.config.Config; - +import haveno.common.config.Config; +import haveno.network.p2p.network.NetworkNode; import com.google.inject.Inject; import javax.inject.Named; @@ -37,7 +34,7 @@ import javax.annotation.Nullable; /** * Provides Socks5Proxies for the bitcoin network and http requests *

- * By default there is only used the bisq internal Tor proxy, which is used for the P2P network, Btc network + * By default there is only used the haveno internal Tor proxy, which is used for the P2P network, Btc network * (if Tor for btc is enabled) and http requests (if Tor for http requests is enabled). * If the user provides a socks5ProxyHttpAddress it will be used for http requests. * If the user provides a socks5ProxyBtcAddress, this will be used for the btc network. @@ -91,8 +88,8 @@ public class Socks5ProxyProvider { return socks5ProxyInternalFactory.getSocksProxy(); } - public void setSocks5ProxyInternal(@Nullable NetworkNode bisqSocks5ProxyFactory) { - this.socks5ProxyInternalFactory = bisqSocks5ProxyFactory; + public void setSocks5ProxyInternal(@Nullable NetworkNode havenoSocks5ProxyFactory) { + this.socks5ProxyInternalFactory = havenoSocks5ProxyFactory; } @Nullable diff --git a/p2p/src/main/java/bisq/network/Socks5SeedOnionDiscovery.java b/p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java similarity index 99% rename from p2p/src/main/java/bisq/network/Socks5SeedOnionDiscovery.java rename to p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java index 31e90524..50bff405 100644 --- a/p2p/src/main/java/bisq/network/Socks5SeedOnionDiscovery.java +++ b/p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network; +package haveno.network; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.net.discovery.PeerDiscovery; diff --git a/p2p/src/main/java/bisq/network/crypto/DecryptedDataTuple.java b/p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java similarity index 93% rename from p2p/src/main/java/bisq/network/crypto/DecryptedDataTuple.java rename to p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java index 2a5666c1..4c097a68 100644 --- a/p2p/src/main/java/bisq/network/crypto/DecryptedDataTuple.java +++ b/p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.crypto; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.crypto; +import haveno.common.proto.network.NetworkEnvelope; import java.security.PublicKey; import lombok.EqualsAndHashCode; diff --git a/p2p/src/main/java/bisq/network/crypto/EncryptionService.java b/p2p/src/main/java/haveno/network/crypto/EncryptionService.java similarity index 89% rename from p2p/src/main/java/bisq/network/crypto/EncryptionService.java rename to p2p/src/main/java/haveno/network/crypto/EncryptionService.java index c6a396a8..1b5c6f3a 100644 --- a/p2p/src/main/java/bisq/network/crypto/EncryptionService.java +++ b/p2p/src/main/java/haveno/network/crypto/EncryptionService.java @@ -15,23 +15,22 @@ * along with Haveno. If not, see . */ -package bisq.network.crypto; +package haveno.network.crypto; -import bisq.network.p2p.DecryptedMessageWithPubKey; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Encryption; -import bisq.common.crypto.Hash; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.SealedAndSigned; -import bisq.common.crypto.Sig; -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkProtoResolver; +import static haveno.common.crypto.Encryption.decryptSecretKey; import com.google.protobuf.InvalidProtocolBufferException; - +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Encryption; +import haveno.common.crypto.Hash; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.SealedAndSigned; +import haveno.common.crypto.Sig; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.DecryptedMessageWithPubKey; import javax.inject.Inject; import javax.crypto.SecretKey; @@ -42,8 +41,6 @@ import java.security.PublicKey; import lombok.extern.slf4j.Slf4j; -import static bisq.common.crypto.Encryption.decryptSecretKey; - @Slf4j public class EncryptionService { private final KeyRing keyRing; diff --git a/p2p/src/main/java/bisq/network/crypto/EncryptionServiceModule.java b/p2p/src/main/java/haveno/network/crypto/EncryptionServiceModule.java similarity index 90% rename from p2p/src/main/java/bisq/network/crypto/EncryptionServiceModule.java rename to p2p/src/main/java/haveno/network/crypto/EncryptionServiceModule.java index 37867321..7ed10448 100644 --- a/p2p/src/main/java/bisq/network/crypto/EncryptionServiceModule.java +++ b/p2p/src/main/java/haveno/network/crypto/EncryptionServiceModule.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.crypto; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.network.crypto; import com.google.inject.Singleton; +import haveno.common.app.AppModule; +import haveno.common.config.Config; public class EncryptionServiceModule extends AppModule { diff --git a/p2p/src/main/java/bisq/network/http/FakeDnsResolver.java b/p2p/src/main/java/haveno/network/http/FakeDnsResolver.java similarity index 97% rename from p2p/src/main/java/bisq/network/http/FakeDnsResolver.java rename to p2p/src/main/java/haveno/network/http/FakeDnsResolver.java index 68365eec..d2e232c5 100644 --- a/p2p/src/main/java/bisq/network/http/FakeDnsResolver.java +++ b/p2p/src/main/java/haveno/network/http/FakeDnsResolver.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.http; +package haveno.network.http; import org.apache.http.conn.DnsResolver; diff --git a/p2p/src/main/java/bisq/network/http/HttpClient.java b/p2p/src/main/java/haveno/network/http/HttpClient.java similarity index 97% rename from p2p/src/main/java/bisq/network/http/HttpClient.java rename to p2p/src/main/java/haveno/network/http/HttpClient.java index 3017ea0d..1e0e6d3a 100644 --- a/p2p/src/main/java/bisq/network/http/HttpClient.java +++ b/p2p/src/main/java/haveno/network/http/HttpClient.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.http; +package haveno.network.http; import java.io.IOException; diff --git a/p2p/src/main/java/bisq/network/http/HttpClientImpl.java b/p2p/src/main/java/haveno/network/http/HttpClientImpl.java similarity index 98% rename from p2p/src/main/java/bisq/network/http/HttpClientImpl.java rename to p2p/src/main/java/haveno/network/http/HttpClientImpl.java index 5c967c22..c574b5ff 100644 --- a/p2p/src/main/java/bisq/network/http/HttpClientImpl.java +++ b/p2p/src/main/java/haveno/network/http/HttpClientImpl.java @@ -15,12 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.http; - -import bisq.network.Socks5ProxyProvider; - -import bisq.common.app.Version; -import bisq.common.util.Utilities; +package haveno.network.http; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -38,7 +33,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContexts; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.common.app.Version; +import haveno.common.util.Utilities; +import haveno.network.Socks5ProxyProvider; import javax.inject.Inject; import java.net.HttpURLConnection; @@ -158,7 +155,7 @@ public class HttpClientImpl implements HttpClient { connection.setRequestMethod(httpMethod.name()); connection.setConnectTimeout((int) TimeUnit.SECONDS.toMillis(120)); connection.setReadTimeout((int) TimeUnit.SECONDS.toMillis(120)); - connection.setRequestProperty("User-Agent", "bisq/" + Version.VERSION); + connection.setRequestProperty("User-Agent", "haveno/" + Version.VERSION); if (headerKey != null && headerValue != null) { connection.setRequestProperty(headerKey, headerValue); } diff --git a/p2p/src/main/java/bisq/network/http/HttpException.java b/p2p/src/main/java/haveno/network/http/HttpException.java similarity index 97% rename from p2p/src/main/java/bisq/network/http/HttpException.java rename to p2p/src/main/java/haveno/network/http/HttpException.java index 7b9cd0f1..a920ddf4 100644 --- a/p2p/src/main/java/bisq/network/http/HttpException.java +++ b/p2p/src/main/java/haveno/network/http/HttpException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.http; +package haveno.network.http; import lombok.Getter; diff --git a/p2p/src/main/java/bisq/network/http/HttpMethod.java b/p2p/src/main/java/haveno/network/http/HttpMethod.java similarity index 96% rename from p2p/src/main/java/bisq/network/http/HttpMethod.java rename to p2p/src/main/java/haveno/network/http/HttpMethod.java index 22cc71da..e740d7d1 100644 --- a/p2p/src/main/java/bisq/network/http/HttpMethod.java +++ b/p2p/src/main/java/haveno/network/http/HttpMethod.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.http; +package haveno.network.http; public enum HttpMethod { GET, diff --git a/p2p/src/main/java/bisq/network/http/SocksConnectionSocketFactory.java b/p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java similarity index 98% rename from p2p/src/main/java/bisq/network/http/SocksConnectionSocketFactory.java rename to p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java index fe60ebd3..9a2c4b3a 100644 --- a/p2p/src/main/java/bisq/network/http/SocksConnectionSocketFactory.java +++ b/p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.http; +package haveno.network.http; import org.apache.http.HttpHost; import org.apache.http.conn.socket.PlainConnectionSocketFactory; diff --git a/p2p/src/main/java/bisq/network/http/SocksSSLConnectionSocketFactory.java b/p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java similarity index 98% rename from p2p/src/main/java/bisq/network/http/SocksSSLConnectionSocketFactory.java rename to p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java index c3849617..1796cd78 100644 --- a/p2p/src/main/java/bisq/network/http/SocksSSLConnectionSocketFactory.java +++ b/p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.http; +package haveno.network.http; import org.apache.http.HttpHost; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; diff --git a/p2p/src/main/java/bisq/network/p2p/AckMessage.java b/p2p/src/main/java/haveno/network/p2p/AckMessage.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/AckMessage.java rename to p2p/src/main/java/haveno/network/p2p/AckMessage.java index cf22c0a4..db3e9f04 100644 --- a/p2p/src/main/java/bisq/network/p2p/AckMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/AckMessage.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.p2p.mailbox.MailboxMessage; -import bisq.network.p2p.storage.payload.ExpirablePayload; - -import bisq.common.app.Version; -import bisq.common.proto.ProtoUtil; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p; +import haveno.common.app.Version; +import haveno.common.proto.ProtoUtil; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.network.p2p.mailbox.MailboxMessage; +import haveno.network.p2p.storage.payload.ExpirablePayload; import java.util.Optional; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/p2p/src/main/java/bisq/network/p2p/AckMessageSourceType.java b/p2p/src/main/java/haveno/network/p2p/AckMessageSourceType.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/AckMessageSourceType.java rename to p2p/src/main/java/haveno/network/p2p/AckMessageSourceType.java index 1d3dd477..33950272 100644 --- a/p2p/src/main/java/bisq/network/p2p/AckMessageSourceType.java +++ b/p2p/src/main/java/haveno/network/p2p/AckMessageSourceType.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public enum AckMessageSourceType { UNDEFINED, diff --git a/p2p/src/main/java/bisq/network/p2p/AnonymousMessage.java b/p2p/src/main/java/haveno/network/p2p/AnonymousMessage.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/AnonymousMessage.java rename to p2p/src/main/java/haveno/network/p2p/AnonymousMessage.java index e07fb545..a9f556f8 100644 --- a/p2p/src/main/java/bisq/network/p2p/AnonymousMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/AnonymousMessage.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public interface AnonymousMessage { } diff --git a/p2p/src/main/java/bisq/network/p2p/BootstrapListener.java b/p2p/src/main/java/haveno/network/p2p/BootstrapListener.java similarity index 97% rename from p2p/src/main/java/bisq/network/p2p/BootstrapListener.java rename to p2p/src/main/java/haveno/network/p2p/BootstrapListener.java index ab726c37..1b0c53f6 100644 --- a/p2p/src/main/java/bisq/network/p2p/BootstrapListener.java +++ b/p2p/src/main/java/haveno/network/p2p/BootstrapListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public abstract class BootstrapListener implements P2PServiceListener { diff --git a/p2p/src/main/java/bisq/network/p2p/BundleOfEnvelopes.java b/p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java similarity index 88% rename from p2p/src/main/java/bisq/network/p2p/BundleOfEnvelopes.java rename to p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java index 9cd27d16..7d92f74d 100644 --- a/p2p/src/main/java/bisq/network/p2p/BundleOfEnvelopes.java +++ b/p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.p2p.storage.messages.BroadcastMessage; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.app.Version; -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.app.Version; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.storage.messages.BroadcastMessage; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/p2p/src/main/java/bisq/network/p2p/CloseConnectionMessage.java b/p2p/src/main/java/haveno/network/p2p/CloseConnectionMessage.java similarity index 94% rename from p2p/src/main/java/bisq/network/p2p/CloseConnectionMessage.java rename to p2p/src/main/java/haveno/network/p2p/CloseConnectionMessage.java index 49fccbea..d01ef359 100644 --- a/p2p/src/main/java/bisq/network/p2p/CloseConnectionMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/CloseConnectionMessage.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/DecryptedDirectMessageListener.java b/p2p/src/main/java/haveno/network/p2p/DecryptedDirectMessageListener.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/DecryptedDirectMessageListener.java rename to p2p/src/main/java/haveno/network/p2p/DecryptedDirectMessageListener.java index f630df7a..09d49726 100644 --- a/p2p/src/main/java/bisq/network/p2p/DecryptedDirectMessageListener.java +++ b/p2p/src/main/java/haveno/network/p2p/DecryptedDirectMessageListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public interface DecryptedDirectMessageListener { diff --git a/p2p/src/main/java/bisq/network/p2p/DecryptedMessageWithPubKey.java b/p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java similarity index 89% rename from p2p/src/main/java/bisq/network/p2p/DecryptedMessageWithPubKey.java rename to p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java index 6955aeee..fb2bec76 100644 --- a/p2p/src/main/java/bisq/network/p2p/DecryptedMessageWithPubKey.java +++ b/p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.common.crypto.Sig; -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p; import com.google.protobuf.ByteString; - +import haveno.common.crypto.Sig; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistablePayload; import java.security.PublicKey; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/DirectMessage.java b/p2p/src/main/java/haveno/network/p2p/DirectMessage.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/DirectMessage.java rename to p2p/src/main/java/haveno/network/p2p/DirectMessage.java index f0f540c0..6821362e 100644 --- a/p2p/src/main/java/bisq/network/p2p/DirectMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/DirectMessage.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public interface DirectMessage { } diff --git a/p2p/src/main/java/bisq/network/p2p/ExtendedDataSizePermission.java b/p2p/src/main/java/haveno/network/p2p/ExtendedDataSizePermission.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/ExtendedDataSizePermission.java rename to p2p/src/main/java/haveno/network/p2p/ExtendedDataSizePermission.java index 9fa27e46..522e3ba9 100644 --- a/p2p/src/main/java/bisq/network/p2p/ExtendedDataSizePermission.java +++ b/p2p/src/main/java/haveno/network/p2p/ExtendedDataSizePermission.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; // Marker interface for messages with higher allowed data size public interface ExtendedDataSizePermission { diff --git a/p2p/src/main/java/bisq/network/p2p/InitialDataRequest.java b/p2p/src/main/java/haveno/network/p2p/InitialDataRequest.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/InitialDataRequest.java rename to p2p/src/main/java/haveno/network/p2p/InitialDataRequest.java index ffa7baaf..1ac3d06a 100644 --- a/p2p/src/main/java/bisq/network/p2p/InitialDataRequest.java +++ b/p2p/src/main/java/haveno/network/p2p/InitialDataRequest.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; // Marker interface for initial data request public interface InitialDataRequest { diff --git a/p2p/src/main/java/bisq/network/p2p/InitialDataResponse.java b/p2p/src/main/java/haveno/network/p2p/InitialDataResponse.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/InitialDataResponse.java rename to p2p/src/main/java/haveno/network/p2p/InitialDataResponse.java index 13139c6c..e00f0f21 100644 --- a/p2p/src/main/java/bisq/network/p2p/InitialDataResponse.java +++ b/p2p/src/main/java/haveno/network/p2p/InitialDataResponse.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; // Marker interface for initial data response public interface InitialDataResponse { diff --git a/p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java b/p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java similarity index 87% rename from p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java rename to p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java index cce95d0b..339b86b6 100644 --- a/p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java +++ b/p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java @@ -15,20 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.p2p.network.BridgeAddressProvider; -import bisq.network.p2p.network.LocalhostNetworkNode; -import bisq.network.p2p.network.NetworkFilter; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.NewTor; -import bisq.network.p2p.network.RunningTor; -import bisq.network.p2p.network.TorMode; -import bisq.network.p2p.network.TorNetworkNode; - -import bisq.common.config.Config; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p; +import haveno.common.config.Config; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.network.BridgeAddressProvider; +import haveno.network.p2p.network.LocalhostNetworkNode; +import haveno.network.p2p.network.NetworkFilter; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.NewTor; +import haveno.network.p2p.network.RunningTor; +import haveno.network.p2p.network.TorMode; +import haveno.network.p2p.network.TorNetworkNode; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/p2p/src/main/java/bisq/network/p2p/NetworkNotReadyException.java b/p2p/src/main/java/haveno/network/p2p/NetworkNotReadyException.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/NetworkNotReadyException.java rename to p2p/src/main/java/haveno/network/p2p/NetworkNotReadyException.java index da8a10ab..275442f0 100644 --- a/p2p/src/main/java/bisq/network/p2p/NetworkNotReadyException.java +++ b/p2p/src/main/java/haveno/network/p2p/NetworkNotReadyException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public class NetworkNotReadyException extends RuntimeException { diff --git a/p2p/src/main/java/bisq/network/p2p/NodeAddress.java b/p2p/src/main/java/haveno/network/p2p/NodeAddress.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/NodeAddress.java rename to p2p/src/main/java/haveno/network/p2p/NodeAddress.java index 5e0f7761..c0002c9d 100644 --- a/p2p/src/main/java/bisq/network/p2p/NodeAddress.java +++ b/p2p/src/main/java/haveno/network/p2p/NodeAddress.java @@ -15,13 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.common.consensus.UsedForTradeContractJson; -import bisq.common.crypto.Hash; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.JsonExclude; +package haveno.network.p2p; import java.util.regex.Pattern; @@ -31,6 +25,12 @@ import lombok.extern.slf4j.Slf4j; import static com.google.common.base.Preconditions.checkArgument; +import haveno.common.consensus.UsedForTradeContractJson; +import haveno.common.crypto.Hash; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.JsonExclude; + @Getter @EqualsAndHashCode @Slf4j diff --git a/p2p/src/main/java/bisq/network/p2p/P2PModule.java b/p2p/src/main/java/haveno/network/p2p/P2PModule.java similarity index 80% rename from p2p/src/main/java/bisq/network/p2p/P2PModule.java rename to p2p/src/main/java/haveno/network/p2p/P2PModule.java index c0e0e008..feaabe4b 100644 --- a/p2p/src/main/java/bisq/network/p2p/P2PModule.java +++ b/p2p/src/main/java/haveno/network/p2p/P2PModule.java @@ -15,38 +15,35 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.http.HttpClient; -import bisq.network.http.HttpClientImpl; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.Broadcaster; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.getdata.RequestDataManager; -import bisq.network.p2p.peers.keepalive.KeepAliveManager; -import bisq.network.p2p.peers.peerexchange.PeerExchangeManager; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; -import bisq.network.p2p.storage.persistence.ProtectedDataStoreService; -import bisq.network.p2p.storage.persistence.ResourceDataStoreService; - -import bisq.common.app.AppModule; -import bisq.common.config.Config; +package haveno.network.p2p; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; - +import haveno.common.app.AppModule; +import haveno.common.config.Config; +import haveno.network.Socks5ProxyProvider; +import haveno.network.http.HttpClient; +import haveno.network.http.HttpClientImpl; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.Broadcaster; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.getdata.RequestDataManager; +import haveno.network.p2p.peers.keepalive.KeepAliveManager; +import haveno.network.p2p.peers.peerexchange.PeerExchangeManager; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; +import haveno.network.p2p.storage.persistence.ProtectedDataStoreService; +import haveno.network.p2p.storage.persistence.ResourceDataStoreService; import java.time.Clock; import java.io.File; import java.util.List; -import static bisq.common.config.Config.*; import static com.google.inject.name.Names.named; import static com.google.inject.util.Providers.of; +import static haveno.common.config.Config.*; public class P2PModule extends AppModule { diff --git a/p2p/src/main/java/bisq/network/p2p/P2PService.java b/p2p/src/main/java/haveno/network/p2p/P2PService.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/P2PService.java rename to p2p/src/main/java/haveno/network/p2p/P2PService.java index 5df70695..cd178c52 100644 --- a/p2p/src/main/java/bisq/network/p2p/P2PService.java +++ b/p2p/src/main/java/haveno/network/p2p/P2PService.java @@ -15,40 +15,37 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.Socks5ProxyProvider; -import bisq.network.crypto.EncryptionService; -import bisq.network.p2p.mailbox.MailboxMessageService; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.SetupListener; -import bisq.network.p2p.peers.Broadcaster; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.getdata.RequestDataManager; -import bisq.network.p2p.peers.keepalive.KeepAliveManager; -import bisq.network.p2p.peers.peerexchange.PeerExchangeManager; -import bisq.network.p2p.storage.HashMapChangedListener; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.messages.RefreshOfferMessage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; -import bisq.network.utils.CapabilityUtils; - -import bisq.common.UserThread; -import bisq.common.app.Capabilities; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p; import com.google.inject.Inject; - +import haveno.common.UserThread; +import haveno.common.app.Capabilities; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.Socks5ProxyProvider; +import haveno.network.crypto.EncryptionService; +import haveno.network.p2p.mailbox.MailboxMessageService; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.SetupListener; +import haveno.network.p2p.peers.Broadcaster; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.getdata.RequestDataManager; +import haveno.network.p2p.peers.keepalive.KeepAliveManager; +import haveno.network.p2p.peers.peerexchange.PeerExchangeManager; +import haveno.network.p2p.storage.HashMapChangedListener; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.messages.RefreshOfferMessage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; +import haveno.network.utils.CapabilityUtils; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/p2p/src/main/java/bisq/network/p2p/P2PServiceListener.java b/p2p/src/main/java/haveno/network/p2p/P2PServiceListener.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/P2PServiceListener.java rename to p2p/src/main/java/haveno/network/p2p/P2PServiceListener.java index 7ba06ecb..da97654d 100644 --- a/p2p/src/main/java/bisq/network/p2p/P2PServiceListener.java +++ b/p2p/src/main/java/haveno/network/p2p/P2PServiceListener.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; -import bisq.network.p2p.network.SetupListener; +import haveno.network.p2p.network.SetupListener; public interface P2PServiceListener extends SetupListener { diff --git a/p2p/src/main/java/bisq/network/p2p/PrefixedSealedAndSignedMessage.java b/p2p/src/main/java/haveno/network/p2p/PrefixedSealedAndSignedMessage.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/PrefixedSealedAndSignedMessage.java rename to p2p/src/main/java/haveno/network/p2p/PrefixedSealedAndSignedMessage.java index d95c75d8..f5375913 100644 --- a/p2p/src/main/java/bisq/network/p2p/PrefixedSealedAndSignedMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/PrefixedSealedAndSignedMessage.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.p2p.mailbox.MailboxMessage; - -import bisq.common.app.Version; -import bisq.common.crypto.SealedAndSigned; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p; import com.google.protobuf.ByteString; - +import haveno.common.app.Version; +import haveno.common.crypto.SealedAndSigned; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.mailbox.MailboxMessage; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/p2p/src/main/java/bisq/network/p2p/SendDirectMessageListener.java b/p2p/src/main/java/haveno/network/p2p/SendDirectMessageListener.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/SendDirectMessageListener.java rename to p2p/src/main/java/haveno/network/p2p/SendDirectMessageListener.java index ce8f0ada..bf25c768 100644 --- a/p2p/src/main/java/bisq/network/p2p/SendDirectMessageListener.java +++ b/p2p/src/main/java/haveno/network/p2p/SendDirectMessageListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public interface SendDirectMessageListener { void onArrived(); diff --git a/p2p/src/main/java/bisq/network/p2p/SendMailboxMessageListener.java b/p2p/src/main/java/haveno/network/p2p/SendMailboxMessageListener.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/SendMailboxMessageListener.java rename to p2p/src/main/java/haveno/network/p2p/SendMailboxMessageListener.java index 98bc22cf..b73bf43e 100644 --- a/p2p/src/main/java/bisq/network/p2p/SendMailboxMessageListener.java +++ b/p2p/src/main/java/haveno/network/p2p/SendMailboxMessageListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public interface SendMailboxMessageListener { void onArrived(); diff --git a/p2p/src/main/java/bisq/network/p2p/SendersNodeAddressMessage.java b/p2p/src/main/java/haveno/network/p2p/SendersNodeAddressMessage.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/SendersNodeAddressMessage.java rename to p2p/src/main/java/haveno/network/p2p/SendersNodeAddressMessage.java index 7898fe1e..03ac17f8 100644 --- a/p2p/src/main/java/bisq/network/p2p/SendersNodeAddressMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/SendersNodeAddressMessage.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public interface SendersNodeAddressMessage { NodeAddress getSenderNodeAddress(); diff --git a/p2p/src/main/java/bisq/network/p2p/SupportedCapabilitiesMessage.java b/p2p/src/main/java/haveno/network/p2p/SupportedCapabilitiesMessage.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/SupportedCapabilitiesMessage.java rename to p2p/src/main/java/haveno/network/p2p/SupportedCapabilitiesMessage.java index bea0beb0..cc6cf912 100644 --- a/p2p/src/main/java/bisq/network/p2p/SupportedCapabilitiesMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/SupportedCapabilitiesMessage.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.common.app.Capabilities; +package haveno.network.p2p; +import haveno.common.app.Capabilities; import javax.annotation.Nullable; public interface SupportedCapabilitiesMessage { diff --git a/p2p/src/main/java/bisq/network/p2p/UidMessage.java b/p2p/src/main/java/haveno/network/p2p/UidMessage.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/UidMessage.java rename to p2p/src/main/java/haveno/network/p2p/UidMessage.java index 211fc88b..c88756fe 100644 --- a/p2p/src/main/java/bisq/network/p2p/UidMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/UidMessage.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; +package haveno.network.p2p; public interface UidMessage { diff --git a/p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxMap.java b/p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxMap.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxMap.java rename to p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxMap.java index d56b303f..86c4c114 100644 --- a/p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxMap.java +++ b/p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxMap.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mailbox; +package haveno.network.p2p.mailbox; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.util.CollectionUtils; - +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.util.CollectionUtils; import java.util.HashMap; import java.util.Map; diff --git a/p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxService.java b/p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxService.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxService.java rename to p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxService.java index 896e1266..00576df9 100644 --- a/p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxService.java +++ b/p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxService.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mailbox; - -import bisq.network.p2p.storage.payload.MailboxStoragePayload; - -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.network.p2p.mailbox; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxItem.java b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxItem.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/mailbox/MailboxItem.java rename to p2p/src/main/java/haveno/network/p2p/mailbox/MailboxItem.java index b834d135..f672a333 100644 --- a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxItem.java +++ b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxItem.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mailbox; - -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; - -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p.mailbox; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; import java.time.Clock; import java.util.Optional; diff --git a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessage.java b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessage.java similarity index 79% rename from p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessage.java rename to p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessage.java index c91d7730..0203cffa 100644 --- a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessage.java @@ -15,13 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mailbox; +package haveno.network.p2p.mailbox; -import bisq.network.p2p.DirectMessage; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.UidMessage; -import bisq.network.p2p.storage.payload.ExpirablePayload; +import haveno.network.p2p.DirectMessage; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.UidMessage; +import haveno.network.p2p.storage.payload.ExpirablePayload; public interface MailboxMessage extends DirectMessage, UidMessage, ExpirablePayload { NodeAddress getSenderNodeAddress(); diff --git a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageList.java b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageList.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageList.java rename to p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageList.java index d746d916..ba5ca59a 100644 --- a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageList.java +++ b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageList.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mailbox; - -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistableList; +package haveno.network.p2p.mailbox; import com.google.protobuf.Message; - +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistableList; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageService.java b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageService.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageService.java rename to p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageService.java index 23df559e..53497a4f 100644 --- a/p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageService.java +++ b/p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageService.java @@ -15,39 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mailbox; - -import bisq.network.crypto.EncryptionService; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NetworkNotReadyException; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.PrefixedSealedAndSignedMessage; -import bisq.network.p2p.SendMailboxMessageListener; -import bisq.network.p2p.messaging.DecryptedMailboxListener; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.BroadcastHandler; -import bisq.network.p2p.peers.Broadcaster; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.storage.HashMapChangedListener; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.messages.AddDataMessage; -import bisq.network.p2p.storage.payload.MailboxStoragePayload; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.utils.CapabilityUtils; - -import bisq.common.UserThread; -import bisq.common.config.Config; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.PubKeyRing; -import bisq.common.crypto.SealedAndSigned; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.persistable.PersistedDataHost; -import bisq.common.util.Utilities; +package haveno.network.p2p.mailbox; import javax.inject.Inject; import javax.inject.Named; @@ -60,7 +28,36 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.UserThread; +import haveno.common.config.Config; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.PubKeyRing; +import haveno.common.crypto.SealedAndSigned; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.common.util.Utilities; +import haveno.network.crypto.EncryptionService; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NetworkNotReadyException; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.PrefixedSealedAndSignedMessage; +import haveno.network.p2p.SendMailboxMessageListener; +import haveno.network.p2p.messaging.DecryptedMailboxListener; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.BroadcastHandler; +import haveno.network.p2p.peers.Broadcaster; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.storage.HashMapChangedListener; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.utils.CapabilityUtils; import java.security.PublicKey; import java.time.Clock; diff --git a/p2p/src/main/java/bisq/network/p2p/messaging/DecryptedMailboxListener.java b/p2p/src/main/java/haveno/network/p2p/messaging/DecryptedMailboxListener.java similarity index 87% rename from p2p/src/main/java/bisq/network/p2p/messaging/DecryptedMailboxListener.java rename to p2p/src/main/java/haveno/network/p2p/messaging/DecryptedMailboxListener.java index 4c5ddf4b..225468c8 100644 --- a/p2p/src/main/java/bisq/network/p2p/messaging/DecryptedMailboxListener.java +++ b/p2p/src/main/java/haveno/network/p2p/messaging/DecryptedMailboxListener.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.messaging; +package haveno.network.p2p.messaging; -import bisq.network.p2p.DecryptedMessageWithPubKey; -import bisq.network.p2p.NodeAddress; +import haveno.network.p2p.DecryptedMessageWithPubKey; +import haveno.network.p2p.NodeAddress; public interface DecryptedMailboxListener { diff --git a/p2p/src/main/java/bisq/network/p2p/network/BridgeAddressProvider.java b/p2p/src/main/java/haveno/network/p2p/network/BridgeAddressProvider.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/network/BridgeAddressProvider.java rename to p2p/src/main/java/haveno/network/p2p/network/BridgeAddressProvider.java index 0227c390..9c7ac649 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/BridgeAddressProvider.java +++ b/p2p/src/main/java/haveno/network/p2p/network/BridgeAddressProvider.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; import java.util.List; diff --git a/p2p/src/main/java/bisq/network/p2p/network/CloseConnectionReason.java b/p2p/src/main/java/haveno/network/p2p/network/CloseConnectionReason.java similarity index 98% rename from p2p/src/main/java/bisq/network/p2p/network/CloseConnectionReason.java rename to p2p/src/main/java/haveno/network/p2p/network/CloseConnectionReason.java index 5ae1ef07..3db04c29 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/CloseConnectionReason.java +++ b/p2p/src/main/java/haveno/network/p2p/network/CloseConnectionReason.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; public enum CloseConnectionReason { // First block are from different exceptions diff --git a/p2p/src/main/java/bisq/network/p2p/network/Connection.java b/p2p/src/main/java/haveno/network/p2p/network/Connection.java similarity index 97% rename from p2p/src/main/java/bisq/network/p2p/network/Connection.java rename to p2p/src/main/java/haveno/network/p2p/network/Connection.java index 4fd4ff77..9e724ddd 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/Connection.java +++ b/p2p/src/main/java/haveno/network/p2p/network/Connection.java @@ -15,36 +15,33 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.BundleOfEnvelopes; -import bisq.network.p2p.CloseConnectionMessage; -import bisq.network.p2p.ExtendedDataSizePermission; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendersNodeAddressMessage; -import bisq.network.p2p.SupportedCapabilitiesMessage; -import bisq.network.p2p.peers.keepalive.messages.KeepAliveMessage; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.messages.AddDataMessage; -import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.Proto; -import bisq.common.UserThread; -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.app.HasCapabilities; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.proto.ProtobufferException; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.util.Utilities; +package haveno.network.p2p.network; import com.google.protobuf.InvalidProtocolBufferException; - +import haveno.common.Proto; +import haveno.common.UserThread; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.app.HasCapabilities; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.proto.ProtobufferException; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.util.Utilities; +import haveno.network.p2p.BundleOfEnvelopes; +import haveno.network.p2p.CloseConnectionMessage; +import haveno.network.p2p.ExtendedDataSizePermission; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendersNodeAddressMessage; +import haveno.network.p2p.SupportedCapabilitiesMessage; +import haveno.network.p2p.peers.keepalive.messages.KeepAliveMessage; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import javax.inject.Inject; import com.google.common.util.concurrent.MoreExecutors; diff --git a/p2p/src/main/java/bisq/network/p2p/network/ConnectionListener.java b/p2p/src/main/java/haveno/network/p2p/network/ConnectionListener.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/network/ConnectionListener.java rename to p2p/src/main/java/haveno/network/p2p/network/ConnectionListener.java index 5b0bc56c..9f293c14 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/ConnectionListener.java +++ b/p2p/src/main/java/haveno/network/p2p/network/ConnectionListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; public interface ConnectionListener { void onConnection(Connection connection); diff --git a/p2p/src/main/java/bisq/network/p2p/network/ConnectionState.java b/p2p/src/main/java/haveno/network/p2p/network/ConnectionState.java similarity index 94% rename from p2p/src/main/java/bisq/network/p2p/network/ConnectionState.java rename to p2p/src/main/java/haveno/network/p2p/network/ConnectionState.java index 43ce40ff..8d0138b2 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/ConnectionState.java +++ b/p2p/src/main/java/haveno/network/p2p/network/ConnectionState.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.BundleOfEnvelopes; -import bisq.network.p2p.InitialDataRequest; -import bisq.network.p2p.InitialDataResponse; -import bisq.network.p2p.PrefixedSealedAndSignedMessage; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.network; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.BundleOfEnvelopes; +import haveno.network.p2p.InitialDataRequest; +import haveno.network.p2p.InitialDataResponse; +import haveno.network.p2p.PrefixedSealedAndSignedMessage; import java.util.concurrent.TimeUnit; import lombok.Getter; diff --git a/p2p/src/main/java/bisq/network/p2p/network/ConnectionStatistics.java b/p2p/src/main/java/haveno/network/p2p/network/ConnectionStatistics.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/network/ConnectionStatistics.java rename to p2p/src/main/java/haveno/network/p2p/network/ConnectionStatistics.java index 237d311f..b5aebe14 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/ConnectionStatistics.java +++ b/p2p/src/main/java/haveno/network/p2p/network/ConnectionStatistics.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.BundleOfEnvelopes; -import bisq.network.p2p.InitialDataRequest; -import bisq.network.p2p.InitialDataResponse; -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.util.Utilities; +package haveno.network.p2p.network; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.util.Utilities; +import haveno.network.p2p.BundleOfEnvelopes; +import haveno.network.p2p.InitialDataRequest; +import haveno.network.p2p.InitialDataResponse; +import haveno.network.p2p.NodeAddress; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; diff --git a/p2p/src/main/java/bisq/network/p2p/network/DefaultPluggableTransports.java b/p2p/src/main/java/haveno/network/p2p/network/DefaultPluggableTransports.java similarity index 99% rename from p2p/src/main/java/bisq/network/p2p/network/DefaultPluggableTransports.java rename to p2p/src/main/java/haveno/network/p2p/network/DefaultPluggableTransports.java index e66d7b5c..700ad017 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/DefaultPluggableTransports.java +++ b/p2p/src/main/java/haveno/network/p2p/network/DefaultPluggableTransports.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; import java.util.Arrays; import java.util.List; diff --git a/p2p/src/main/java/bisq/network/p2p/network/HavenoRuntimeException.java b/p2p/src/main/java/haveno/network/p2p/network/HavenoRuntimeException.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/network/HavenoRuntimeException.java rename to p2p/src/main/java/haveno/network/p2p/network/HavenoRuntimeException.java index c420a355..6225654b 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/HavenoRuntimeException.java +++ b/p2p/src/main/java/haveno/network/p2p/network/HavenoRuntimeException.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; class HavenoRuntimeException extends RuntimeException { HavenoRuntimeException(String message, Throwable cause) { diff --git a/p2p/src/main/java/bisq/network/p2p/network/InboundConnection.java b/p2p/src/main/java/haveno/network/p2p/network/InboundConnection.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/network/InboundConnection.java rename to p2p/src/main/java/haveno/network/p2p/network/InboundConnection.java index 2f83921f..abb90d10 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/InboundConnection.java +++ b/p2p/src/main/java/haveno/network/p2p/network/InboundConnection.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.network; +import haveno.common.proto.network.NetworkProtoResolver; import java.net.Socket; import org.jetbrains.annotations.Nullable; diff --git a/p2p/src/main/java/bisq/network/p2p/network/LocalhostNetworkNode.java b/p2p/src/main/java/haveno/network/p2p/network/LocalhostNetworkNode.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/network/LocalhostNetworkNode.java rename to p2p/src/main/java/haveno/network/p2p/network/LocalhostNetworkNode.java index f5173bfb..f49360a5 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/LocalhostNetworkNode.java +++ b/p2p/src/main/java/haveno/network/p2p/network/LocalhostNetworkNode.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.network; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.NodeAddress; import java.net.ServerSocket; import java.net.Socket; diff --git a/p2p/src/main/java/bisq/network/p2p/network/MessageListener.java b/p2p/src/main/java/haveno/network/p2p/network/MessageListener.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/network/MessageListener.java rename to p2p/src/main/java/haveno/network/p2p/network/MessageListener.java index 3c1168a2..07cda27d 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/MessageListener.java +++ b/p2p/src/main/java/haveno/network/p2p/network/MessageListener.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; -import bisq.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkEnvelope; public interface MessageListener { void onMessage(NetworkEnvelope networkEnvelope, Connection connection); diff --git a/p2p/src/main/java/bisq/network/p2p/network/NetworkFilter.java b/p2p/src/main/java/haveno/network/p2p/network/NetworkFilter.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/network/NetworkFilter.java rename to p2p/src/main/java/haveno/network/p2p/network/NetworkFilter.java index 4507e6da..b54ed006 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/NetworkFilter.java +++ b/p2p/src/main/java/haveno/network/p2p/network/NetworkFilter.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.NodeAddress; +package haveno.network.p2p.network; +import haveno.network.p2p.NodeAddress; import java.util.function.Function; public interface NetworkFilter { diff --git a/p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java b/p2p/src/main/java/haveno/network/p2p/network/NetworkNode.java similarity index 98% rename from p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java rename to p2p/src/main/java/haveno/network/p2p/network/NetworkNode.java index 062f45c0..7507c6a2 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java +++ b/p2p/src/main/java/haveno/network/p2p/network/NetworkNode.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Capabilities; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.util.Utilities; +package haveno.network.p2p.network; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Capabilities; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/p2p/src/main/java/bisq/network/p2p/network/NewTor.java b/p2p/src/main/java/haveno/network/p2p/network/NewTor.java similarity index 99% rename from p2p/src/main/java/bisq/network/p2p/network/NewTor.java rename to p2p/src/main/java/haveno/network/p2p/network/NewTor.java index 77625190..25f880b5 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/NewTor.java +++ b/p2p/src/main/java/haveno/network/p2p/network/NewTor.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; import java.io.File; import java.io.FileInputStream; diff --git a/p2p/src/main/java/bisq/network/p2p/network/OutboundConnection.java b/p2p/src/main/java/haveno/network/p2p/network/OutboundConnection.java similarity index 90% rename from p2p/src/main/java/bisq/network/p2p/network/OutboundConnection.java rename to p2p/src/main/java/haveno/network/p2p/network/OutboundConnection.java index 947347da..2750ec52 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/OutboundConnection.java +++ b/p2p/src/main/java/haveno/network/p2p/network/OutboundConnection.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.network; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.NodeAddress; import java.net.Socket; import org.jetbrains.annotations.Nullable; diff --git a/p2p/src/main/java/bisq/network/p2p/network/PeerType.java b/p2p/src/main/java/haveno/network/p2p/network/PeerType.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/network/PeerType.java rename to p2p/src/main/java/haveno/network/p2p/network/PeerType.java index d310c38f..7e693b55 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/PeerType.java +++ b/p2p/src/main/java/haveno/network/p2p/network/PeerType.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; public enum PeerType { // PEER is default type diff --git a/p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java b/p2p/src/main/java/haveno/network/p2p/network/ProtoOutputStream.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java rename to p2p/src/main/java/haveno/network/p2p/network/ProtoOutputStream.java index 757514fc..b4e269da 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java +++ b/p2p/src/main/java/haveno/network/p2p/network/ProtoOutputStream.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.peers.keepalive.messages.KeepAliveMessage; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.network; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.peers.keepalive.messages.KeepAliveMessage; import java.io.IOException; import java.io.OutputStream; diff --git a/p2p/src/main/java/bisq/network/p2p/network/RuleViolation.java b/p2p/src/main/java/haveno/network/p2p/network/RuleViolation.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/network/RuleViolation.java rename to p2p/src/main/java/haveno/network/p2p/network/RuleViolation.java index e1bacb19..1a767d0e 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/RuleViolation.java +++ b/p2p/src/main/java/haveno/network/p2p/network/RuleViolation.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; public enum RuleViolation { INVALID_DATA_TYPE(2), diff --git a/p2p/src/main/java/bisq/network/p2p/network/RunningTor.java b/p2p/src/main/java/haveno/network/p2p/network/RunningTor.java similarity index 98% rename from p2p/src/main/java/bisq/network/p2p/network/RunningTor.java rename to p2p/src/main/java/haveno/network/p2p/network/RunningTor.java index 338f90a2..877bd33e 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/RunningTor.java +++ b/p2p/src/main/java/haveno/network/p2p/network/RunningTor.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; import java.io.File; import java.io.IOException; diff --git a/p2p/src/main/java/bisq/network/p2p/network/Server.java b/p2p/src/main/java/haveno/network/p2p/network/Server.java similarity index 98% rename from p2p/src/main/java/bisq/network/p2p/network/Server.java rename to p2p/src/main/java/haveno/network/p2p/network/Server.java index 058d00f7..4165a2ef 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/Server.java +++ b/p2p/src/main/java/haveno/network/p2p/network/Server.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.network; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketException; - +import haveno.common.proto.network.NetworkProtoResolver; import java.io.IOException; import java.util.Set; diff --git a/p2p/src/main/java/bisq/network/p2p/network/SetupListener.java b/p2p/src/main/java/haveno/network/p2p/network/SetupListener.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/network/SetupListener.java rename to p2p/src/main/java/haveno/network/p2p/network/SetupListener.java index 239aa2a0..76e1528a 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/SetupListener.java +++ b/p2p/src/main/java/haveno/network/p2p/network/SetupListener.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; public interface SetupListener { void onTorNodeReady(); diff --git a/p2p/src/main/java/bisq/network/p2p/network/Statistic.java b/p2p/src/main/java/haveno/network/p2p/network/Statistic.java similarity index 98% rename from p2p/src/main/java/bisq/network/p2p/network/Statistic.java rename to p2p/src/main/java/haveno/network/p2p/network/Statistic.java index e0568098..3ebc195b 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/Statistic.java +++ b/p2p/src/main/java/haveno/network/p2p/network/Statistic.java @@ -15,11 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.util.Utilities; +package haveno.network.p2p.network; import javafx.beans.property.DoubleProperty; import javafx.beans.property.IntegerProperty; @@ -27,7 +23,9 @@ import javafx.beans.property.LongProperty; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleLongProperty; - +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.util.Utilities; import java.util.Date; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/p2p/src/main/java/bisq/network/p2p/network/SupportedCapabilitiesListener.java b/p2p/src/main/java/haveno/network/p2p/network/SupportedCapabilitiesListener.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/network/SupportedCapabilitiesListener.java rename to p2p/src/main/java/haveno/network/p2p/network/SupportedCapabilitiesListener.java index 385994b2..cd5ba14f 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/SupportedCapabilitiesListener.java +++ b/p2p/src/main/java/haveno/network/p2p/network/SupportedCapabilitiesListener.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; +package haveno.network.p2p.network; -import bisq.common.app.Capabilities; +import haveno.common.app.Capabilities; public interface SupportedCapabilitiesListener { void onChanged(Capabilities supportedCapabilities); diff --git a/p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java b/p2p/src/main/java/haveno/network/p2p/network/SynchronizedProtoOutputStream.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java rename to p2p/src/main/java/haveno/network/p2p/network/SynchronizedProtoOutputStream.java index 5d29268e..db686487 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java +++ b/p2p/src/main/java/haveno/network/p2p/network/SynchronizedProtoOutputStream.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.network; +import haveno.common.proto.network.NetworkEnvelope; import java.io.OutputStream; import java.util.concurrent.ExecutionException; diff --git a/p2p/src/main/java/bisq/network/p2p/network/TorMode.java b/p2p/src/main/java/haveno/network/p2p/network/TorMode.java similarity index 97% rename from p2p/src/main/java/bisq/network/p2p/network/TorMode.java rename to p2p/src/main/java/haveno/network/p2p/network/TorMode.java index b298a9eb..8d942806 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/TorMode.java +++ b/p2p/src/main/java/haveno/network/p2p/network/TorMode.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.common.file.FileUtil; +package haveno.network.p2p.network; import org.berndpruenster.netlayer.tor.Tor; import org.berndpruenster.netlayer.tor.TorCtlException; - +import haveno.common.file.FileUtil; import java.io.File; import java.io.IOException; diff --git a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java b/p2p/src/main/java/haveno/network/p2p/network/TorNetworkNode.java similarity index 98% rename from p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java rename to p2p/src/main/java/haveno/network/p2p/network/TorNetworkNode.java index f1ce31e5..47923fa5 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java +++ b/p2p/src/main/java/haveno/network/p2p/network/TorNetworkNode.java @@ -15,15 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.NodeAddress; -import bisq.network.utils.Utils; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.util.Utilities; +package haveno.network.p2p.network; import org.berndpruenster.netlayer.tor.HiddenServiceSocket; import org.berndpruenster.netlayer.tor.Tor; @@ -31,7 +23,12 @@ import org.berndpruenster.netlayer.tor.TorCtlException; import org.berndpruenster.netlayer.tor.TorSocket; import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; +import haveno.network.utils.Utils; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/BroadcastHandler.java b/p2p/src/main/java/haveno/network/p2p/peers/BroadcastHandler.java similarity index 97% rename from p2p/src/main/java/bisq/network/p2p/peers/BroadcastHandler.java rename to p2p/src/main/java/haveno/network/p2p/peers/BroadcastHandler.java index 6349d667..271941e6 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/BroadcastHandler.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/BroadcastHandler.java @@ -15,22 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers; - -import bisq.network.p2p.BundleOfEnvelopes; -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.storage.messages.BroadcastMessage; - -import bisq.common.Timer; -import bisq.common.UserThread; +package haveno.network.p2p.peers; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.network.p2p.BundleOfEnvelopes; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.storage.messages.BroadcastMessage; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/Broadcaster.java b/p2p/src/main/java/haveno/network/p2p/peers/Broadcaster.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/peers/Broadcaster.java rename to p2p/src/main/java/haveno/network/p2p/peers/Broadcaster.java index 45fc36cc..2ea0054e 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/Broadcaster.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/Broadcaster.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.storage.messages.BroadcastMessage; - -import bisq.common.Timer; -import bisq.common.UserThread; +package haveno.network.p2p.peers; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.storage.messages.BroadcastMessage; import javax.inject.Inject; import java.util.ArrayList; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java b/p2p/src/main/java/haveno/network/p2p/peers/PeerManager.java similarity index 97% rename from p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java rename to p2p/src/main/java/haveno/network/p2p/peers/PeerManager.java index f4ca2201..64d1c5d5 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/PeerManager.java @@ -15,34 +15,31 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.network.InboundConnection; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.PeerType; -import bisq.network.p2p.network.RuleViolation; -import bisq.network.p2p.peers.peerexchange.Peer; -import bisq.network.p2p.peers.peerexchange.PeerList; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.ClockWatcher; -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.config.Config; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.network.p2p.peers; import javax.inject.Inject; import javax.inject.Named; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.ClockWatcher; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.config.Config; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.network.InboundConnection; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.PeerType; +import haveno.network.p2p.network.RuleViolation; +import haveno.network.p2p.peers.peerexchange.Peer; +import haveno.network.p2p.peers.peerexchange.PeerList; +import haveno.network.p2p.seed.SeedNodeRepository; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java b/p2p/src/main/java/haveno/network/p2p/peers/getdata/GetDataRequestHandler.java similarity index 94% rename from p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java rename to p2p/src/main/java/haveno/network/p2p/peers/getdata/GetDataRequestHandler.java index 830ae8d0..d8bdd528 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/getdata/GetDataRequestHandler.java @@ -15,23 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.getdata; - -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.getdata.messages.GetDataRequest; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.Timer; -import bisq.common.UserThread; +package haveno.network.p2p.peers.getdata; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.getdata.messages.GetDataRequest; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.storage.P2PDataStorage; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataHandler.java b/p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataHandler.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataHandler.java rename to p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataHandler.java index ec61c342..018a9049 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataHandler.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataHandler.java @@ -15,32 +15,29 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.getdata; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.getdata.messages.GetDataRequest; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.network.p2p.peers.getdata; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.getdata.messages.GetDataRequest; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import java.util.HashMap; import java.util.Map; import java.util.Random; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java b/p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataManager.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java rename to p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataManager.java index 27eb8efa..0c065762 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataManager.java @@ -15,25 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.getdata; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.getdata.messages.GetDataRequest; -import bisq.network.p2p.peers.peerexchange.Peer; -import bisq.network.p2p.seed.SeedNodeRepository; -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.getdata; +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.getdata.messages.GetDataRequest; +import haveno.network.p2p.peers.peerexchange.Peer; +import haveno.network.p2p.seed.SeedNodeRepository; +import haveno.network.p2p.storage.P2PDataStorage; import javax.inject.Inject; import java.util.ArrayList; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataRequest.java b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataRequest.java similarity index 89% rename from p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataRequest.java rename to p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataRequest.java index a16d0ed4..678c298d 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataRequest.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataRequest.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.getdata.messages; - -import bisq.network.p2p.ExtendedDataSizePermission; -import bisq.network.p2p.InitialDataRequest; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.getdata.messages; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.ExtendedDataSizePermission; +import haveno.network.p2p.InitialDataRequest; import java.util.Set; import lombok.EqualsAndHashCode; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataResponse.java similarity index 89% rename from p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java rename to p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataResponse.java index 4a3a1238..be1fd38e 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataResponse.java @@ -15,22 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.getdata.messages; - -import bisq.network.p2p.ExtendedDataSizePermission; -import bisq.network.p2p.InitialDataRequest; -import bisq.network.p2p.InitialDataResponse; -import bisq.network.p2p.SupportedCapabilitiesMessage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.app.Capabilities; -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.util.Utilities; +package haveno.network.p2p.peers.getdata.messages; +import haveno.common.app.Capabilities; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.util.Utilities; +import haveno.network.p2p.ExtendedDataSizePermission; +import haveno.network.p2p.InitialDataRequest; +import haveno.network.p2p.InitialDataResponse; +import haveno.network.p2p.SupportedCapabilitiesMessage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import java.util.Set; import java.util.stream.Collectors; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java similarity index 94% rename from p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java rename to p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java index 4115fa51..a00f6951 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java @@ -15,18 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.getdata.messages; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendersNodeAddressMessage; - -import bisq.common.app.Version; -import bisq.common.proto.ProtoUtil; +package haveno.network.p2p.peers.getdata.messages; import protobuf.NetworkEnvelope; import com.google.protobuf.ByteString; - +import haveno.common.app.Version; +import haveno.common.proto.ProtoUtil; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendersNodeAddressMessage; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java rename to p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java index 98431bf0..b4f4c3b5 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.getdata.messages; - -import bisq.network.p2p.AnonymousMessage; -import bisq.network.p2p.SupportedCapabilitiesMessage; - -import bisq.common.app.Capabilities; -import bisq.common.app.Version; -import bisq.common.proto.ProtoUtil; +package haveno.network.p2p.peers.getdata.messages; import protobuf.NetworkEnvelope; import com.google.protobuf.ByteString; - +import haveno.common.app.Capabilities; +import haveno.common.app.Version; +import haveno.common.proto.ProtoUtil; +import haveno.network.p2p.AnonymousMessage; +import haveno.network.p2p.SupportedCapabilitiesMessage; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveHandler.java b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveHandler.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveHandler.java rename to p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveHandler.java index a2d1bfc9..507b0e5d 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveHandler.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveHandler.java @@ -15,24 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.keepalive; - -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.keepalive.messages.Ping; -import bisq.network.p2p.peers.keepalive.messages.Pong; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.keepalive; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.keepalive.messages.Ping; +import haveno.network.p2p.peers.keepalive.messages.Pong; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveManager.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java rename to p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveManager.java index c1dbe9d7..6fe18b9c 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveManager.java @@ -15,22 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.keepalive; - -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.OutboundConnection; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.keepalive.messages.Ping; -import bisq.network.p2p.peers.keepalive.messages.Pong; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.util.Utilities; +package haveno.network.p2p.peers.keepalive; import javax.inject.Inject; @@ -38,7 +23,19 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.util.Utilities; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.OutboundConnection; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.keepalive.messages.Ping; +import haveno.network.p2p.peers.keepalive.messages.Pong; import java.util.HashMap; import java.util.Map; import java.util.Random; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/KeepAliveMessage.java b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/KeepAliveMessage.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/KeepAliveMessage.java rename to p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/KeepAliveMessage.java index 60022e18..d675956c 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/KeepAliveMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/KeepAliveMessage.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.keepalive.messages; +package haveno.network.p2p.peers.keepalive.messages; public interface KeepAliveMessage { } diff --git a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Ping.java b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Ping.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Ping.java rename to p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Ping.java index 767e6191..233a4c1a 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Ping.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Ping.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.keepalive.messages; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.keepalive.messages; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Pong.java b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Pong.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Pong.java rename to p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Pong.java index 10591d24..73f0f5f8 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Pong.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Pong.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.keepalive.messages; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.keepalive.messages; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/GetPeersRequestHandler.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/GetPeersRequestHandler.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/GetPeersRequestHandler.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/GetPeersRequestHandler.java index b3afc355..00807a64 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/GetPeersRequestHandler.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/GetPeersRequestHandler.java @@ -15,23 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange; - -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest; -import bisq.network.p2p.peers.peerexchange.messages.GetPeersResponse; - -import bisq.common.Timer; -import bisq.common.UserThread; +package haveno.network.p2p.peers.peerexchange; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.peerexchange.messages.GetPeersRequest; +import haveno.network.p2p.peers.peerexchange.messages.GetPeersResponse; import java.util.HashSet; import java.util.concurrent.TimeUnit; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/Peer.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/Peer.java index cf3be4d3..b1dfa761 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/Peer.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.SupportedCapabilitiesListener; - -import bisq.common.app.Capabilities; -import bisq.common.app.HasCapabilities; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p.peers.peerexchange; +import haveno.common.app.Capabilities; +import haveno.common.app.HasCapabilities; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.SupportedCapabilitiesListener; import java.util.Date; import lombok.Getter; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeHandler.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeHandler.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeHandler.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeHandler.java index 5d447f74..2578b8d8 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeHandler.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeHandler.java @@ -15,26 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest; -import bisq.network.p2p.peers.peerexchange.messages.GetPeersResponse; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.peerexchange; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.peerexchange.messages.GetPeersRequest; +import haveno.network.p2p.peers.peerexchange.messages.GetPeersResponse; import java.util.HashSet; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeManager.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeManager.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeManager.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeManager.java index 21ab2fd1..23f0ded3 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeManager.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeManager.java @@ -15,26 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.peerexchange; import javax.inject.Inject; import com.google.common.base.Preconditions; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.peerexchange.messages.GetPeersRequest; +import haveno.network.p2p.seed.SeedNodeRepository; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerList.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerList.java similarity index 94% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerList.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerList.java index e4a8532e..716555c7 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerList.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerList.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange; - -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.network.p2p.peers.peerexchange; import com.google.protobuf.Message; - +import haveno.common.proto.persistable.PersistableEnvelope; import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersRequest.java similarity index 90% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersRequest.java index 86237285..b85064f2 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersRequest.java @@ -15,17 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange.messages; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SendersNodeAddressMessage; -import bisq.network.p2p.SupportedCapabilitiesMessage; -import bisq.network.p2p.peers.peerexchange.Peer; - -import bisq.common.app.Capabilities; -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.peerexchange.messages; +import haveno.common.app.Capabilities; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SendersNodeAddressMessage; +import haveno.network.p2p.SupportedCapabilitiesMessage; +import haveno.network.p2p.peers.peerexchange.Peer; import java.util.HashSet; import java.util.Optional; import java.util.Set; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersResponse.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersResponse.java index 4a1deefa..12b77859 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersResponse.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange.messages; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.SupportedCapabilitiesMessage; -import bisq.network.p2p.peers.peerexchange.Peer; - -import bisq.common.app.Capabilities; -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.peers.peerexchange.messages; +import haveno.common.app.Capabilities; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.SupportedCapabilitiesMessage; +import haveno.network.p2p.peers.peerexchange.Peer; import java.util.HashSet; import java.util.Optional; import java.util.Set; diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java rename to p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java index 451c4f71..c12704c8 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers.peerexchange.messages; +package haveno.network.p2p.peers.peerexchange.messages; public interface PeerExchangeMessage { } diff --git a/p2p/src/main/java/bisq/network/p2p/seed/SeedNodeRepository.java b/p2p/src/main/java/haveno/network/p2p/seed/SeedNodeRepository.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/seed/SeedNodeRepository.java rename to p2p/src/main/java/haveno/network/p2p/seed/SeedNodeRepository.java index 4a8ec3fa..875287f4 100644 --- a/p2p/src/main/java/bisq/network/p2p/seed/SeedNodeRepository.java +++ b/p2p/src/main/java/haveno/network/p2p/seed/SeedNodeRepository.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.seed; - -import bisq.network.p2p.NodeAddress; +package haveno.network.p2p.seed; +import haveno.network.p2p.NodeAddress; import java.util.Collection; public interface SeedNodeRepository { diff --git a/p2p/src/main/java/bisq/network/p2p/storage/HashMapChangedListener.java b/p2p/src/main/java/haveno/network/p2p/storage/HashMapChangedListener.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/storage/HashMapChangedListener.java rename to p2p/src/main/java/haveno/network/p2p/storage/HashMapChangedListener.java index aeabf137..68c10bc9 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/HashMapChangedListener.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/HashMapChangedListener.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; +package haveno.network.p2p.storage; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import java.util.Collection; public interface HashMapChangedListener { diff --git a/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java b/p2p/src/main/java/haveno/network/p2p/storage/P2PDataStorage.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java rename to p2p/src/main/java/haveno/network/p2p/storage/P2PDataStorage.java index 43f47845..691d4004 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/P2PDataStorage.java @@ -15,63 +15,60 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionListener; -import bisq.network.p2p.network.MessageListener; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.BroadcastHandler; -import bisq.network.p2p.peers.Broadcaster; -import bisq.network.p2p.peers.getdata.messages.GetDataRequest; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; -import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; -import bisq.network.p2p.storage.messages.AddDataMessage; -import bisq.network.p2p.storage.messages.AddOncePayload; -import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; -import bisq.network.p2p.storage.messages.BroadcastMessage; -import bisq.network.p2p.storage.messages.RefreshOfferMessage; -import bisq.network.p2p.storage.messages.RemoveDataMessage; -import bisq.network.p2p.storage.messages.RemoveMailboxDataMessage; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; -import bisq.network.p2p.storage.payload.DateSortedTruncatablePayload; -import bisq.network.p2p.storage.payload.DateTolerantPayload; -import bisq.network.p2p.storage.payload.MailboxStoragePayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; -import bisq.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreListener; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; -import bisq.network.p2p.storage.persistence.HistoricalDataStoreService; -import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore; -import bisq.network.p2p.storage.persistence.ProtectedDataStoreService; -import bisq.network.p2p.storage.persistence.RemovedPayloadsService; -import bisq.network.p2p.storage.persistence.ResourceDataStoreService; -import bisq.network.p2p.storage.persistence.SequenceNumberMap; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.Capabilities; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Hash; -import bisq.common.crypto.Sig; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.proto.persistable.PersistedDataHost; -import bisq.common.util.Hex; -import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; +package haveno.network.p2p.storage; import com.google.protobuf.ByteString; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.Capabilities; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Hash; +import haveno.common.crypto.Sig; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.common.util.Hex; +import haveno.common.util.Tuple2; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionListener; +import haveno.network.p2p.network.MessageListener; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.BroadcastHandler; +import haveno.network.p2p.peers.Broadcaster; +import haveno.network.p2p.peers.getdata.messages.GetDataRequest; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; +import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.messages.AddOncePayload; +import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; +import haveno.network.p2p.storage.messages.BroadcastMessage; +import haveno.network.p2p.storage.messages.RefreshOfferMessage; +import haveno.network.p2p.storage.messages.RemoveDataMessage; +import haveno.network.p2p.storage.messages.RemoveMailboxDataMessage; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; +import haveno.network.p2p.storage.payload.DateSortedTruncatablePayload; +import haveno.network.p2p.storage.payload.DateTolerantPayload; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; +import haveno.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreListener; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; +import haveno.network.p2p.storage.persistence.HistoricalDataStoreService; +import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore; +import haveno.network.p2p.storage.persistence.ProtectedDataStoreService; +import haveno.network.p2p.storage.persistence.RemovedPayloadsService; +import haveno.network.p2p.storage.persistence.ResourceDataStoreService; +import haveno.network.p2p.storage.persistence.SequenceNumberMap; import com.google.inject.name.Named; import javax.inject.Inject; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/messages/AddDataMessage.java b/p2p/src/main/java/haveno/network/p2p/storage/messages/AddDataMessage.java similarity index 90% rename from p2p/src/main/java/bisq/network/p2p/storage/messages/AddDataMessage.java rename to p2p/src/main/java/haveno/network/p2p/storage/messages/AddDataMessage.java index 22c761f4..efa56080 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/messages/AddDataMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/messages/AddDataMessage.java @@ -15,16 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; - -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.storage.messages; import com.google.protobuf.Message; - +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/messages/AddOncePayload.java b/p2p/src/main/java/haveno/network/p2p/storage/messages/AddOncePayload.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/messages/AddOncePayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/messages/AddOncePayload.java index d0d30bb3..35b371d5 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/messages/AddOncePayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/messages/AddOncePayload.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; +package haveno.network.p2p.storage.messages; /** * Marker interface for messages which must not be added again after a remove message has been received (e.g. MailboxMessages). diff --git a/p2p/src/main/java/bisq/network/p2p/storage/messages/AddPersistableNetworkPayloadMessage.java b/p2p/src/main/java/haveno/network/p2p/storage/messages/AddPersistableNetworkPayloadMessage.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/storage/messages/AddPersistableNetworkPayloadMessage.java rename to p2p/src/main/java/haveno/network/p2p/storage/messages/AddPersistableNetworkPayloadMessage.java index 4f984cac..50084807 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/messages/AddPersistableNetworkPayloadMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/messages/AddPersistableNetworkPayloadMessage.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; - -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.storage.messages; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/messages/BroadcastMessage.java b/p2p/src/main/java/haveno/network/p2p/storage/messages/BroadcastMessage.java similarity index 90% rename from p2p/src/main/java/bisq/network/p2p/storage/messages/BroadcastMessage.java rename to p2p/src/main/java/haveno/network/p2p/storage/messages/BroadcastMessage.java index f4d08975..fe689407 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/messages/BroadcastMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/messages/BroadcastMessage.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.storage.messages; +import haveno.common.proto.network.NetworkEnvelope; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) diff --git a/p2p/src/main/java/bisq/network/p2p/storage/messages/RefreshOfferMessage.java b/p2p/src/main/java/haveno/network/p2p/storage/messages/RefreshOfferMessage.java similarity index 97% rename from p2p/src/main/java/bisq/network/p2p/storage/messages/RefreshOfferMessage.java rename to p2p/src/main/java/haveno/network/p2p/storage/messages/RefreshOfferMessage.java index 10ff6d1c..c760183a 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/messages/RefreshOfferMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/messages/RefreshOfferMessage.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; - -import bisq.common.app.Version; +package haveno.network.p2p.storage.messages; import com.google.protobuf.ByteString; - +import haveno.common.app.Version; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveDataMessage.java b/p2p/src/main/java/haveno/network/p2p/storage/messages/RemoveDataMessage.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveDataMessage.java rename to p2p/src/main/java/haveno/network/p2p/storage/messages/RemoveDataMessage.java index 850c96c6..8e9b6ad7 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveDataMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/messages/RemoveDataMessage.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; - -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.storage.messages; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveMailboxDataMessage.java b/p2p/src/main/java/haveno/network/p2p/storage/messages/RemoveMailboxDataMessage.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveMailboxDataMessage.java rename to p2p/src/main/java/haveno/network/p2p/storage/messages/RemoveMailboxDataMessage.java index e6c3a488..4d8b1fe8 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/messages/RemoveMailboxDataMessage.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/messages/RemoveMailboxDataMessage.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; - -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.storage.messages; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/CapabilityRequiringPayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/CapabilityRequiringPayload.java similarity index 90% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/CapabilityRequiringPayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/CapabilityRequiringPayload.java index 7c491306..029b3870 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/CapabilityRequiringPayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/CapabilityRequiringPayload.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; -import bisq.common.app.Capabilities; -import bisq.common.proto.network.NetworkPayload; +import haveno.common.app.Capabilities; +import haveno.common.proto.network.NetworkPayload; /** * Used for payloads which requires certain capability. diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/DateSortedTruncatablePayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/DateSortedTruncatablePayload.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/DateSortedTruncatablePayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/DateSortedTruncatablePayload.java index ea51dd1f..2a879281 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/DateSortedTruncatablePayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/DateSortedTruncatablePayload.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; import java.util.Date; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/DateTolerantPayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/DateTolerantPayload.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/DateTolerantPayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/DateTolerantPayload.java index 6cb051a4..c428d09f 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/DateTolerantPayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/DateTolerantPayload.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; import java.time.Clock; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/ExpirablePayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/ExpirablePayload.java similarity index 91% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/ExpirablePayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/ExpirablePayload.java index 2554c156..01811827 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/ExpirablePayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/ExpirablePayload.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; -import bisq.common.proto.network.NetworkPayload; +import haveno.common.proto.network.NetworkPayload; /** * Messages which support a time to live diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/MailboxStoragePayload.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/MailboxStoragePayload.java index 43b85bd1..f77e78b5 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/MailboxStoragePayload.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; - -import bisq.network.p2p.PrefixedSealedAndSignedMessage; -import bisq.network.p2p.storage.messages.AddOncePayload; - -import bisq.common.crypto.Sig; -import bisq.common.util.CollectionUtils; -import bisq.common.util.ExtraDataMapValidator; +package haveno.network.p2p.storage.payload; import com.google.protobuf.ByteString; - +import haveno.common.crypto.Sig; +import haveno.common.util.CollectionUtils; +import haveno.common.util.ExtraDataMapValidator; +import haveno.network.p2p.PrefixedSealedAndSignedMessage; +import haveno.network.p2p.storage.messages.AddOncePayload; import java.security.PublicKey; import java.util.HashMap; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableNetworkPayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/PersistableNetworkPayload.java similarity index 89% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableNetworkPayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/PersistableNetworkPayload.java index cb3a0a67..63ff2ff7 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableNetworkPayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/PersistableNetworkPayload.java @@ -15,11 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; -import bisq.common.proto.ProtoResolver; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.persistable.PersistablePayload; +import haveno.common.proto.ProtoResolver; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.persistable.PersistablePayload; /** diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableProtectedPayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/PersistableProtectedPayload.java similarity index 87% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableProtectedPayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/PersistableProtectedPayload.java index 58121a01..2a405d68 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/PersistableProtectedPayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/PersistableProtectedPayload.java @@ -15,10 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistablePayload; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistablePayload; /** diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProcessOncePersistableNetworkPayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProcessOncePersistableNetworkPayload.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/ProcessOncePersistableNetworkPayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/ProcessOncePersistableNetworkPayload.java index eb71becd..f7dadb5a 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProcessOncePersistableNetworkPayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProcessOncePersistableNetworkPayload.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; -import bisq.common.Payload; +import haveno.common.Payload; /** * Marker interface for PersistableNetworkPayloads that are only added during the FIRST call to diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java similarity index 98% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java index 039a7f10..afaa7c83 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntry.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; - -import bisq.common.crypto.Sig; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.util.Utilities; +package haveno.network.p2p.storage.payload; import com.google.protobuf.ByteString; - +import haveno.common.crypto.Sig; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.util.Utilities; import java.security.PublicKey; import java.time.Clock; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStorageEntry.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedStorageEntry.java similarity index 96% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStorageEntry.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedStorageEntry.java index b1d4375f..25bf3885 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStorageEntry.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedStorageEntry.java @@ -15,20 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; - -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Sig; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistablePayload; -import bisq.common.util.Utilities; +package haveno.network.p2p.storage.payload; import com.google.protobuf.ByteString; import com.google.protobuf.Message; - +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Sig; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.common.util.Utilities; +import haveno.network.p2p.storage.P2PDataStorage; import com.google.common.base.Preconditions; import java.security.PublicKey; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStoragePayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedStoragePayload.java similarity index 88% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStoragePayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedStoragePayload.java index 5b051b8a..b5052a2b 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/ProtectedStoragePayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/ProtectedStoragePayload.java @@ -15,11 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; - -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.network.NetworkProtoResolver; +package haveno.network.p2p.storage.payload; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.network.NetworkProtoResolver; import java.security.PublicKey; import java.util.Map; @@ -30,9 +29,9 @@ import javax.annotation.Nullable; * Messages which support ownership protection (using signatures) and a time to live *

* Implementations: - * io.bisq.alert.Alert - * io.bisq.arbitration.Arbitrator - * io.bisq.trade.offer.OfferPayload + * io.haveno.alert.Alert + * io.haveno.arbitration.Arbitrator + * io.haveno.trade.offer.OfferPayload */ public interface ProtectedStoragePayload extends NetworkPayload { /** diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java b/p2p/src/main/java/haveno/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java similarity index 89% rename from p2p/src/main/java/bisq/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java rename to p2p/src/main/java/haveno/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java index 6fd371e4..11ff9d7c 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; +package haveno.network.p2p.storage.payload; -import bisq.network.p2p.NodeAddress; - -import bisq.common.proto.network.NetworkPayload; +import haveno.common.proto.network.NetworkPayload; +import haveno.network.p2p.NodeAddress; /** * Used for network_messages which require that the data owner is online. diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreListener.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/AppendOnlyDataStoreListener.java similarity index 87% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreListener.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/AppendOnlyDataStoreListener.java index fe9c8a96..5e76291a 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreListener.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/AppendOnlyDataStoreListener.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; +package haveno.network.p2p.storage.persistence; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; public interface AppendOnlyDataStoreListener { void onAdded(PersistableNetworkPayload payload); diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreService.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/AppendOnlyDataStoreService.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreService.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/AppendOnlyDataStoreService.java index 9ec5da39..02ae2746 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreService.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/AppendOnlyDataStoreService.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; +package haveno.network.p2p.storage.persistence; import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; - +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/HistoricalDataStoreService.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/HistoricalDataStoreService.java similarity index 97% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/HistoricalDataStoreService.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/HistoricalDataStoreService.java index dd3cd32a..b75067b6 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/HistoricalDataStoreService.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/HistoricalDataStoreService.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; - -import bisq.common.app.DevEnv; -import bisq.common.app.Version; -import bisq.common.persistence.PersistenceManager; +package haveno.network.p2p.storage.persistence; import com.google.common.collect.ImmutableMap; - +import haveno.common.app.DevEnv; +import haveno.common.app.Version; +import haveno.common.persistence.PersistenceManager; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; import java.io.File; import java.util.HashMap; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/MapStoreService.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/MapStoreService.java similarity index 89% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/MapStoreService.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/MapStoreService.java index ac2582d4..671d943b 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/MapStoreService.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/MapStoreService.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p.storage.persistence; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.network.p2p.storage.P2PDataStorage; import java.io.File; import java.util.Map; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/PersistableNetworkPayloadStore.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/PersistableNetworkPayloadStore.java similarity index 87% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/PersistableNetworkPayloadStore.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/PersistableNetworkPayloadStore.java index be8450b8..c0e9a06f 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/PersistableNetworkPayloadStore.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/PersistableNetworkPayloadStore.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; - -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.network.p2p.storage.persistence; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/ProtectedDataStoreService.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/ProtectedDataStoreService.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/ProtectedDataStoreService.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/ProtectedDataStoreService.java index e826a24a..b23e8575 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/ProtectedDataStoreService.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/ProtectedDataStoreService.java @@ -15,17 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.network.p2p.storage.persistence; import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/RemovedPayloadsMap.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/RemovedPayloadsMap.java similarity index 93% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/RemovedPayloadsMap.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/RemovedPayloadsMap.java index 2ebaa830..53e9f19a 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/RemovedPayloadsMap.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/RemovedPayloadsMap.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; +package haveno.network.p2p.storage.persistence; -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.util.Utilities; - +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.util.Utilities; +import haveno.network.p2p.storage.P2PDataStorage; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/RemovedPayloadsService.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/RemovedPayloadsService.java similarity index 92% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/RemovedPayloadsService.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/RemovedPayloadsService.java index a3b4c194..f95b84d3 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/RemovedPayloadsService.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/RemovedPayloadsService.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.MailboxStoragePayload; - -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistedDataHost; +package haveno.network.p2p.storage.persistence; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistedDataHost; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/ResourceDataStoreService.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/ResourceDataStoreService.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/ResourceDataStoreService.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/ResourceDataStoreService.java index d6539e18..1cdbe4a0 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/ResourceDataStoreService.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/ResourceDataStoreService.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.network.p2p.storage.persistence; import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.proto.persistable.PersistableEnvelope; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/SequenceNumberMap.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/SequenceNumberMap.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/SequenceNumberMap.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/SequenceNumberMap.java index 4303ac56..f03ac71b 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/SequenceNumberMap.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/SequenceNumberMap.java @@ -15,12 +15,10 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.network.p2p.storage.persistence; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.network.p2p.storage.P2PDataStorage; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/StoreService.java b/p2p/src/main/java/haveno/network/p2p/storage/persistence/StoreService.java similarity index 95% rename from p2p/src/main/java/bisq/network/p2p/storage/persistence/StoreService.java rename to p2p/src/main/java/haveno/network/p2p/storage/persistence/StoreService.java index 6e417b0a..6eaddffe 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/persistence/StoreService.java +++ b/p2p/src/main/java/haveno/network/p2p/storage/persistence/StoreService.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.persistence; - -import bisq.common.file.FileUtil; -import bisq.common.file.ResourceNotFoundException; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistableEnvelope; +package haveno.network.p2p.storage.persistence; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.file.FileUtil; +import haveno.common.file.ResourceNotFoundException; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistableEnvelope; import java.nio.file.Paths; import java.io.File; diff --git a/p2p/src/main/java/bisq/network/utils/CapabilityUtils.java b/p2p/src/main/java/haveno/network/utils/CapabilityUtils.java similarity index 88% rename from p2p/src/main/java/bisq/network/utils/CapabilityUtils.java rename to p2p/src/main/java/haveno/network/utils/CapabilityUtils.java index 285258e0..ecff42c9 100644 --- a/p2p/src/main/java/bisq/network/utils/CapabilityUtils.java +++ b/p2p/src/main/java/haveno/network/utils/CapabilityUtils.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.utils; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; - -import bisq.common.app.Capabilities; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.utils; +import haveno.common.app.Capabilities; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; import java.util.Optional; import lombok.extern.slf4j.Slf4j; diff --git a/p2p/src/main/java/bisq/network/utils/Utils.java b/p2p/src/main/java/haveno/network/utils/Utils.java similarity index 97% rename from p2p/src/main/java/bisq/network/utils/Utils.java rename to p2p/src/main/java/haveno/network/utils/Utils.java index 1bc875d0..dc0c17c5 100644 --- a/p2p/src/main/java/bisq/network/utils/Utils.java +++ b/p2p/src/main/java/haveno/network/utils/Utils.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.utils; +package haveno.network.utils; import java.net.ServerSocket; diff --git a/p2p/src/test/java/bisq/network/crypto/EncryptionServiceTests.java b/p2p/src/test/java/haveno/network/crypto/EncryptionServiceTests.java similarity index 94% rename from p2p/src/test/java/bisq/network/crypto/EncryptionServiceTests.java rename to p2p/src/test/java/haveno/network/crypto/EncryptionServiceTests.java index db3727e3..0abda3fe 100644 --- a/p2p/src/test/java/bisq/network/crypto/EncryptionServiceTests.java +++ b/p2p/src/test/java/haveno/network/crypto/EncryptionServiceTests.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.network.crypto; - -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.file.FileUtil; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.crypto; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; - +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.file.FileUtil; +import haveno.common.proto.network.NetworkEnvelope; import java.io.File; import java.io.IOException; @@ -64,7 +62,7 @@ public class EncryptionServiceTests { FileUtil.deleteDirectory(dir); } - //TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in io.bisq.common. + //TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in io.haveno.common. /* @Test public void testDecryptAndVerifyMessage() throws CryptoException { diff --git a/p2p/src/test/java/bisq/network/p2p/DummySeedNode.java b/p2p/src/test/java/haveno/network/p2p/DummySeedNode.java similarity index 96% rename from p2p/src/test/java/bisq/network/p2p/DummySeedNode.java rename to p2p/src/test/java/haveno/network/p2p/DummySeedNode.java index 793516a4..2c9c2253 100644 --- a/p2p/src/test/java/bisq/network/p2p/DummySeedNode.java +++ b/p2p/src/test/java/haveno/network/p2p/DummySeedNode.java @@ -15,16 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.common.UserThread; -import bisq.common.app.Log; -import bisq.common.app.Version; -import bisq.common.config.Config; -import bisq.common.util.Utilities; +package haveno.network.p2p; import com.google.common.annotations.VisibleForTesting; - +import haveno.common.UserThread; +import haveno.common.app.Log; +import haveno.common.app.Version; +import haveno.common.config.Config; +import haveno.common.util.Utilities; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.P2PServiceListener; import java.nio.file.Path; import java.nio.file.Paths; @@ -172,7 +173,7 @@ public class DummySeedNode { @Nullable Set progArgSeedNodes, @Nullable P2PServiceListener listener) { Path appPath = Paths.get(defaultUserDataDir, - "bisq_seed_node_" + String.valueOf(mySeedNodeAddress.getFullAddress().replace(":", "_"))); + "haveno_seed_node_" + String.valueOf(mySeedNodeAddress.getFullAddress().replace(":", "_"))); String logPath = Paths.get(appPath.toString(), "logs").toString(); Log.setup(logPath); diff --git a/p2p/src/test/java/bisq/network/p2p/MockNode.java b/p2p/src/test/java/haveno/network/p2p/MockNode.java similarity index 81% rename from p2p/src/test/java/bisq/network/p2p/MockNode.java rename to p2p/src/test/java/haveno/network/p2p/MockNode.java index 089152ca..41d6d790 100644 --- a/p2p/src/test/java/bisq/network/p2p/MockNode.java +++ b/p2p/src/test/java/haveno/network/p2p/MockNode.java @@ -15,27 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.ConnectionState; -import bisq.network.p2p.network.ConnectionStatistics; -import bisq.network.p2p.network.InboundConnection; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.network.OutboundConnection; -import bisq.network.p2p.network.PeerType; -import bisq.network.p2p.network.Statistic; -import bisq.network.p2p.peers.PeerManager; -import bisq.network.p2p.peers.peerexchange.PeerList; -import bisq.network.p2p.seed.SeedNodeRepository; - -import bisq.common.ClockWatcher; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.file.CorruptedStorageFileHandler; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistenceProtoResolver; +package haveno.network.p2p; +import haveno.common.ClockWatcher; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.file.CorruptedStorageFileHandler; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistenceProtoResolver; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.ConnectionState; +import haveno.network.p2p.network.ConnectionStatistics; +import haveno.network.p2p.network.InboundConnection; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.network.OutboundConnection; +import haveno.network.p2p.network.PeerType; +import haveno.network.p2p.network.Statistic; +import haveno.network.p2p.peers.PeerManager; +import haveno.network.p2p.peers.peerexchange.PeerList; +import haveno.network.p2p.seed.SeedNodeRepository; import java.nio.file.Files; import java.io.File; diff --git a/p2p/src/test/java/bisq/network/p2p/PeerServiceTest.java b/p2p/src/test/java/haveno/network/p2p/PeerServiceTest.java similarity index 98% rename from p2p/src/test/java/bisq/network/p2p/PeerServiceTest.java rename to p2p/src/test/java/haveno/network/p2p/PeerServiceTest.java index 8f70bd50..5d6736c5 100644 --- a/p2p/src/test/java/bisq/network/p2p/PeerServiceTest.java +++ b/p2p/src/test/java/haveno/network/p2p/PeerServiceTest.java @@ -15,10 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.network.p2p.network.LocalhostNetworkNode; +package haveno.network.p2p; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.P2PServiceListener; +import haveno.network.p2p.network.LocalhostNetworkNode; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/p2p/src/test/java/bisq/network/p2p/TestUtils.java b/p2p/src/test/java/haveno/network/p2p/TestUtils.java similarity index 94% rename from p2p/src/test/java/bisq/network/p2p/TestUtils.java rename to p2p/src/test/java/haveno/network/p2p/TestUtils.java index ad550e87..03b17876 100644 --- a/p2p/src/test/java/bisq/network/p2p/TestUtils.java +++ b/p2p/src/test/java/haveno/network/p2p/TestUtils.java @@ -15,14 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p; - -import bisq.common.Payload; -import bisq.common.proto.network.NetworkEnvelope; -import bisq.common.proto.network.NetworkPayload; -import bisq.common.proto.network.NetworkProtoResolver; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p; +import haveno.common.Payload; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.common.proto.network.NetworkPayload; +import haveno.common.proto.network.NetworkProtoResolver; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.P2PServiceListener; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; diff --git a/p2p/src/test/java/bisq/network/p2p/mocks/MockMailboxPayload.java b/p2p/src/test/java/haveno/network/p2p/mocks/MockMailboxPayload.java similarity index 88% rename from p2p/src/test/java/bisq/network/p2p/mocks/MockMailboxPayload.java rename to p2p/src/test/java/haveno/network/p2p/mocks/MockMailboxPayload.java index 00a7adb0..dc74a5f4 100644 --- a/p2p/src/test/java/bisq/network/p2p/mocks/MockMailboxPayload.java +++ b/p2p/src/test/java/haveno/network/p2p/mocks/MockMailboxPayload.java @@ -15,15 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mocks; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.mailbox.MailboxMessage; -import bisq.network.p2p.storage.payload.ExpirablePayload; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.mocks; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.mailbox.MailboxMessage; +import haveno.network.p2p.storage.payload.ExpirablePayload; import org.apache.commons.lang3.NotImplementedException; import java.util.UUID; diff --git a/p2p/src/test/java/bisq/network/p2p/mocks/MockPayload.java b/p2p/src/test/java/haveno/network/p2p/mocks/MockPayload.java similarity index 91% rename from p2p/src/test/java/bisq/network/p2p/mocks/MockPayload.java rename to p2p/src/test/java/haveno/network/p2p/mocks/MockPayload.java index 58206e97..c838639a 100644 --- a/p2p/src/test/java/bisq/network/p2p/mocks/MockPayload.java +++ b/p2p/src/test/java/haveno/network/p2p/mocks/MockPayload.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.mocks; - -import bisq.network.p2p.storage.payload.ExpirablePayload; - -import bisq.common.app.Version; -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.mocks; +import haveno.common.app.Version; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.storage.payload.ExpirablePayload; import org.apache.commons.lang3.NotImplementedException; @SuppressWarnings("ALL") diff --git a/p2p/src/test/java/bisq/network/p2p/network/LocalhostNetworkNodeTest.java b/p2p/src/test/java/haveno/network/p2p/network/LocalhostNetworkNodeTest.java similarity index 94% rename from p2p/src/test/java/bisq/network/p2p/network/LocalhostNetworkNodeTest.java rename to p2p/src/test/java/haveno/network/p2p/network/LocalhostNetworkNodeTest.java index f8ab45f4..768e58b5 100644 --- a/p2p/src/test/java/bisq/network/p2p/network/LocalhostNetworkNodeTest.java +++ b/p2p/src/test/java/haveno/network/p2p/network/LocalhostNetworkNodeTest.java @@ -15,10 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.TestUtils; +package haveno.network.p2p.network; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.network.LocalhostNetworkNode; +import haveno.network.p2p.network.SetupListener; import java.io.IOException; import java.util.concurrent.CountDownLatch; diff --git a/p2p/src/test/java/bisq/network/p2p/network/TorNetworkNodeTest.java b/p2p/src/test/java/haveno/network/p2p/network/TorNetworkNodeTest.java similarity index 95% rename from p2p/src/test/java/bisq/network/p2p/network/TorNetworkNodeTest.java rename to p2p/src/test/java/haveno/network/p2p/network/TorNetworkNodeTest.java index 25cd9773..748cb5ce 100644 --- a/p2p/src/test/java/bisq/network/p2p/network/TorNetworkNodeTest.java +++ b/p2p/src/test/java/haveno/network/p2p/network/TorNetworkNodeTest.java @@ -15,16 +15,18 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.network; - -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.mocks.MockPayload; +package haveno.network.p2p.network; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; - +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.mocks.MockPayload; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.NewTor; +import haveno.network.p2p.network.SetupListener; +import haveno.network.p2p.network.TorNetworkNode; import java.io.File; import java.io.IOException; diff --git a/p2p/src/test/java/bisq/network/p2p/peers/PeerManagerTest.java b/p2p/src/test/java/haveno/network/p2p/peers/PeerManagerTest.java similarity index 96% rename from p2p/src/test/java/bisq/network/p2p/peers/PeerManagerTest.java rename to p2p/src/test/java/haveno/network/p2p/peers/PeerManagerTest.java index 21e1b927..e4f7e442 100644 --- a/p2p/src/test/java/bisq/network/p2p/peers/PeerManagerTest.java +++ b/p2p/src/test/java/haveno/network/p2p/peers/PeerManagerTest.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.peers; - -import bisq.network.p2p.MockNode; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.network.InboundConnection; -import bisq.network.p2p.network.PeerType; +package haveno.network.p2p.peers; +import haveno.network.p2p.MockNode; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.network.InboundConnection; +import haveno.network.p2p.network.PeerType; import java.io.IOException; import java.util.Comparator; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java similarity index 96% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java index 814341fd..18b583ac 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java @@ -15,27 +15,25 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.getdata.messages.GetDataRequest; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; -import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; -import bisq.network.p2p.storage.mocks.PersistableNetworkPayloadStub; -import bisq.network.p2p.storage.payload.CapabilityRequiringPayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.crypto.Sig; +package haveno.network.p2p.storage; import com.google.protobuf.Message; - +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.crypto.Sig; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.getdata.messages.GetDataRequest; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; +import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub; +import haveno.network.p2p.storage.payload.CapabilityRequiringPayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageClientAPITest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageClientAPITest.java similarity index 94% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageClientAPITest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageClientAPITest.java index 854bf8cc..0b8de4b7 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageClientAPITest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageClientAPITest.java @@ -15,21 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.storage.messages.AddDataMessage; -import bisq.network.p2p.storage.messages.RefreshOfferMessage; -import bisq.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub; -import bisq.network.p2p.storage.payload.MailboxStoragePayload; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.Version; -import bisq.common.crypto.CryptoException; +package haveno.network.p2p.storage; +import haveno.common.app.Version; +import haveno.common.crypto.CryptoException; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.messages.RefreshOfferMessage; +import haveno.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; @@ -39,11 +37,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import static haveno.network.p2p.storage.TestState.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static bisq.network.p2p.storage.TestState.*; - /** * Tests of the P2PDataStore Client API entry points. * diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java similarity index 93% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java index 66ee6bb4..1a087ab7 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageGetDataIntegrationTest.java @@ -15,18 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.peers.getdata.messages.GetDataRequest; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub; -import bisq.network.p2p.storage.mocks.ProtectedStoragePayloadStub; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.Capabilities; +package haveno.network.p2p.storage; +import haveno.common.app.Capabilities; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.peers.getdata.messages.GetDataRequest; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub; +import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java similarity index 87% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java index bc151e37..7e41506b 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageOnMessageHandlerTest.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.mocks.MockPayload; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; -import bisq.network.p2p.storage.messages.BroadcastMessage; -import bisq.network.p2p.storage.mocks.PersistableNetworkPayloadStub; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; - -import bisq.common.proto.network.NetworkEnvelope; +package haveno.network.p2p.storage; +import haveno.common.proto.network.NetworkEnvelope; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.mocks.MockPayload; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; +import haveno.network.p2p.storage.messages.BroadcastMessage; +import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; import java.util.Optional; import org.junit.Before; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java similarity index 93% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java index 3393107c..b0758e46 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoragePersistableNetworkPayloadTest.java @@ -15,14 +15,13 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; -import bisq.network.p2p.storage.mocks.DateTolerantPayloadStub; -import bisq.network.p2p.storage.mocks.PersistableNetworkPayloadStub; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; +package haveno.network.p2p.storage; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; +import haveno.network.p2p.storage.mocks.DateTolerantPayloadStub; +import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -34,11 +33,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import static haveno.network.p2p.storage.TestState.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static bisq.network.p2p.storage.TestState.*; - /** * Tests of the P2PDataStore entry points that use the PersistableNetworkPayload type * diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java similarity index 95% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java index e6585e7c..e4f1d6e6 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProcessGetDataResponse.java @@ -15,18 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.peers.getdata.messages.GetDataResponse; -import bisq.network.p2p.storage.mocks.PersistableNetworkPayloadStub; -import bisq.network.p2p.storage.mocks.ProtectedStoragePayloadStub; -import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; +package haveno.network.p2p.storage; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.peers.getdata.messages.GetDataResponse; +import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub; +import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java similarity index 97% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java index f3585595..0f4d4074 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java @@ -15,24 +15,23 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.storage.messages.AddDataMessage; -import bisq.network.p2p.storage.messages.RefreshOfferMessage; -import bisq.network.p2p.storage.messages.RemoveDataMessage; -import bisq.network.p2p.storage.messages.RemoveMailboxDataMessage; -import bisq.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub; -import bisq.network.p2p.storage.mocks.ProtectedStoragePayloadStub; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.Version; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Sig; +package haveno.network.p2p.storage; +import haveno.common.app.Version; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Sig; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.messages.RefreshOfferMessage; +import haveno.network.p2p.storage.messages.RemoveDataMessage; +import haveno.network.p2p.storage.messages.RemoveMailboxDataMessage; +import haveno.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub; +import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; @@ -49,7 +48,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import static bisq.network.p2p.storage.TestState.SavedTestState; +import static haveno.network.p2p.storage.TestState.SavedTestState; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java similarity index 93% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java index cacd28e3..c4076459 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRemoveExpiredTest.java @@ -15,20 +15,21 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; +package haveno.network.p2p.storage; -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub; -import bisq.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub; -import bisq.network.p2p.storage.mocks.PersistableNetworkPayloadStub; -import bisq.network.p2p.storage.mocks.ProtectedStoragePayloadStub; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.Version; -import bisq.common.crypto.CryptoException; +import static haveno.network.p2p.storage.TestState.*; +import haveno.common.app.Version; +import haveno.common.crypto.CryptoException; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub; +import haveno.network.p2p.storage.mocks.PersistableExpirableProtectedStoragePayloadStub; +import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub; +import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; @@ -39,8 +40,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import static bisq.network.p2p.storage.TestState.*; - /** * Tests of the P2PDataStore behavior that expires old Entrys periodically. */ diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRequestDataTest.java similarity index 91% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRequestDataTest.java index 22c6d82a..64d08bd1 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStorageRequestDataTest.java @@ -15,21 +15,20 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; -import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; -import bisq.network.p2p.storage.mocks.PersistableNetworkPayloadStub; -import bisq.network.p2p.storage.mocks.ProtectedStoragePayloadStub; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; +package haveno.network.p2p.storage; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.peers.getdata.messages.GetUpdatedDataRequest; +import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.mocks.PersistableNetworkPayloadStub; +import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStoreDisconnectTest.java b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoreDisconnectTest.java similarity index 92% rename from p2p/src/test/java/bisq/network/p2p/storage/P2PDataStoreDisconnectTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoreDisconnectTest.java index a39d7b4d..c643152f 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStoreDisconnectTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/P2PDataStoreDisconnectTest.java @@ -15,18 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.network.CloseConnectionReason; -import bisq.network.p2p.network.Connection; -import bisq.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.crypto.CryptoException; +package haveno.network.p2p.storage; +import haveno.common.crypto.CryptoException; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.network.CloseConnectionReason; +import haveno.network.p2p.network.Connection; +import haveno.network.p2p.storage.mocks.ExpirableProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; @@ -37,11 +35,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import static haveno.network.p2p.storage.TestState.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static bisq.network.p2p.storage.TestState.*; - /** * Tests of the P2PDataStore ConnectionListener interface. */ diff --git a/p2p/src/test/java/bisq/network/p2p/storage/TestState.java b/p2p/src/test/java/haveno/network/p2p/storage/TestState.java similarity index 92% rename from p2p/src/test/java/bisq/network/p2p/storage/TestState.java rename to p2p/src/test/java/haveno/network/p2p/storage/TestState.java index 88b5a286..8fdf0857 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/TestState.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/TestState.java @@ -15,34 +15,34 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.network.NetworkNode; -import bisq.network.p2p.peers.Broadcaster; -import bisq.network.p2p.storage.messages.AddDataMessage; -import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; -import bisq.network.p2p.storage.messages.BroadcastMessage; -import bisq.network.p2p.storage.messages.RefreshOfferMessage; -import bisq.network.p2p.storage.messages.RemoveDataMessage; -import bisq.network.p2p.storage.messages.RemoveMailboxDataMessage; -import bisq.network.p2p.storage.mocks.AppendOnlyDataStoreServiceFake; -import bisq.network.p2p.storage.mocks.ClockFake; -import bisq.network.p2p.storage.mocks.MapStoreServiceFake; -import bisq.network.p2p.storage.payload.MailboxStoragePayload; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreListener; -import bisq.network.p2p.storage.persistence.ProtectedDataStoreService; -import bisq.network.p2p.storage.persistence.RemovedPayloadsService; -import bisq.network.p2p.storage.persistence.ResourceDataStoreService; -import bisq.network.p2p.storage.persistence.SequenceNumberMap; - -import bisq.common.crypto.Sig; -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p.storage; +import haveno.common.crypto.Sig; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.network.NetworkNode; +import haveno.network.p2p.peers.Broadcaster; +import haveno.network.p2p.storage.HashMapChangedListener; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage; +import haveno.network.p2p.storage.messages.BroadcastMessage; +import haveno.network.p2p.storage.messages.RefreshOfferMessage; +import haveno.network.p2p.storage.messages.RemoveDataMessage; +import haveno.network.p2p.storage.messages.RemoveMailboxDataMessage; +import haveno.network.p2p.storage.mocks.AppendOnlyDataStoreServiceFake; +import haveno.network.p2p.storage.mocks.ClockFake; +import haveno.network.p2p.storage.mocks.MapStoreServiceFake; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreListener; +import haveno.network.p2p.storage.persistence.ProtectedDataStoreService; +import haveno.network.p2p.storage.persistence.RemovedPayloadsService; +import haveno.network.p2p.storage.persistence.ResourceDataStoreService; +import haveno.network.p2p.storage.persistence.SequenceNumberMap; import java.security.PublicKey; import java.util.Collection; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/messages/AddDataMessageTest.java b/p2p/src/test/java/haveno/network/p2p/storage/messages/AddDataMessageTest.java similarity index 83% rename from p2p/src/test/java/bisq/network/p2p/storage/messages/AddDataMessageTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/messages/AddDataMessageTest.java index 22503a41..ff792cf7 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/messages/AddDataMessageTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/messages/AddDataMessageTest.java @@ -15,20 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.messages; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.PrefixedSealedAndSignedMessage; -import bisq.network.p2p.storage.payload.MailboxStoragePayload; -import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; - -import bisq.common.app.Version; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.KeyRing; -import bisq.common.crypto.KeyStorage; -import bisq.common.crypto.SealedAndSigned; +package haveno.network.p2p.storage.messages; +import haveno.common.app.Version; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.KeyRing; +import haveno.common.crypto.KeyStorage; +import haveno.common.crypto.SealedAndSigned; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.PrefixedSealedAndSignedMessage; +import haveno.network.p2p.storage.messages.AddDataMessage; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import org.apache.commons.lang3.RandomUtils; import java.security.InvalidKeyException; @@ -77,7 +76,7 @@ public class AddDataMessageTest { AddDataMessage dataMessage1 = new AddDataMessage(protectedStorageEntry); protobuf.NetworkEnvelope envelope = dataMessage1.toProtoNetworkEnvelope(); - //TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in io.bisq.common. + //TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in io.haveno.common. /* AddDataMessage dataMessage2 = (AddDataMessage) ProtoBufferUtilities.getAddDataMessage(envelope); assertTrue(dataMessage1.protectedStorageEntry.getStoragePayload().equals(dataMessage2.protectedStorageEntry.getStoragePayload())); diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java similarity index 86% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java index e6e73ee3..d27ed091 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java @@ -15,12 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; -import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; +package haveno.network.p2p.storage.mocks; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService; import java.util.Map; /** diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/ClockFake.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ClockFake.java similarity index 97% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/ClockFake.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/ClockFake.java index 8e06be6a..42d59dd7 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/ClockFake.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ClockFake.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; +package haveno.network.p2p.storage.mocks; import java.time.Clock; import java.time.Instant; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/DateTolerantPayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/DateTolerantPayloadStub.java similarity index 94% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/DateTolerantPayloadStub.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/DateTolerantPayloadStub.java index 62f7cd45..f4c4381a 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/DateTolerantPayloadStub.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/DateTolerantPayloadStub.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; - -import bisq.network.p2p.storage.payload.DateTolerantPayload; +package haveno.network.p2p.storage.mocks; +import haveno.network.p2p.storage.payload.DateTolerantPayload; import java.time.Clock; /** diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java similarity index 88% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java index ddf0872a..a1ff0250 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ExpirableProtectedStoragePayloadStub.java @@ -15,13 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; - -import bisq.network.p2p.NodeAddress; -import bisq.network.p2p.storage.TestState; -import bisq.network.p2p.storage.payload.ExpirablePayload; -import bisq.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; +package haveno.network.p2p.storage.mocks; +import haveno.network.p2p.NodeAddress; +import haveno.network.p2p.storage.TestState; +import haveno.network.p2p.storage.payload.ExpirablePayload; +import haveno.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; import java.security.PublicKey; import java.util.concurrent.TimeUnit; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/MapStoreServiceFake.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MapStoreServiceFake.java similarity index 82% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/MapStoreServiceFake.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/MapStoreServiceFake.java index 69fbc704..8e5f27df 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/MapStoreServiceFake.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MapStoreServiceFake.java @@ -15,16 +15,14 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; - -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.payload.ProtectedStorageEntry; -import bisq.network.p2p.storage.persistence.MapStoreService; - -import bisq.common.persistence.PersistenceManager; -import bisq.common.proto.persistable.PersistableEnvelope; -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p.storage.mocks; +import haveno.common.persistence.PersistenceManager; +import haveno.common.proto.persistable.PersistableEnvelope; +import haveno.common.proto.persistable.PersistablePayload; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.persistence.MapStoreService; import java.io.File; import java.util.HashMap; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/MockData.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MockData.java similarity index 92% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/MockData.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/MockData.java index e38f8c04..f978a126 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/MockData.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/MockData.java @@ -15,13 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; - -import bisq.network.p2p.storage.payload.ExpirablePayload; -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; +package haveno.network.p2p.storage.mocks; import org.apache.commons.lang3.NotImplementedException; - +import haveno.network.p2p.storage.payload.ExpirablePayload; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.PublicKey; import java.util.Map; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java similarity index 94% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java index 51fbf4d7..1957e7dd 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableExpirableProtectedStoragePayloadStub.java @@ -15,10 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; - -import bisq.common.proto.persistable.PersistablePayload; +package haveno.network.p2p.storage.mocks; +import haveno.common.proto.persistable.PersistablePayload; import java.security.PublicKey; /** * Stub implementation of a ProtectedStoragePayloadStub implementing the ExpirablePayload & RequiresOwnerIsOnlinePayload diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java similarity index 94% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java index 9cffc1c4..2f6c8ff0 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/PersistableNetworkPayloadStub.java @@ -15,9 +15,9 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; +package haveno.network.p2p.storage.mocks; -import bisq.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; /** * Stub implementation of a PersistableNetworkPayload that can be used in tests diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java similarity index 93% rename from p2p/src/test/java/bisq/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java rename to p2p/src/test/java/haveno/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java index 8bc0ddb0..58db8056 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/mocks/ProtectedStoragePayloadStub.java @@ -15,14 +15,11 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.mocks; - -import bisq.network.p2p.storage.payload.ProtectedStoragePayload; - -import bisq.common.crypto.Sig; +package haveno.network.p2p.storage.mocks; import com.google.protobuf.Message; - +import haveno.common.crypto.Sig; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.PublicKey; import java.util.Map; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java similarity index 95% rename from p2p/src/test/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java index aed66242..feaf29d8 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedMailboxStorageEntryTest.java @@ -15,16 +15,17 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; - -import bisq.network.p2p.PrefixedSealedAndSignedMessage; -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.storage.P2PDataStorage; - -import bisq.common.app.Version; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Sig; +package haveno.network.p2p.storage.payload; +import haveno.common.app.Version; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Sig; +import haveno.network.p2p.PrefixedSealedAndSignedMessage; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; diff --git a/p2p/src/test/java/bisq/network/p2p/storage/payload/ProtectedStorageEntryTest.java b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedStorageEntryTest.java similarity index 95% rename from p2p/src/test/java/bisq/network/p2p/storage/payload/ProtectedStorageEntryTest.java rename to p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedStorageEntryTest.java index a10d4324..47c1fba4 100644 --- a/p2p/src/test/java/bisq/network/p2p/storage/payload/ProtectedStorageEntryTest.java +++ b/p2p/src/test/java/haveno/network/p2p/storage/payload/ProtectedStorageEntryTest.java @@ -15,17 +15,19 @@ * along with Haveno. If not, see . */ -package bisq.network.p2p.storage.payload; - -import bisq.network.p2p.PrefixedSealedAndSignedMessage; -import bisq.network.p2p.TestUtils; -import bisq.network.p2p.storage.P2PDataStorage; -import bisq.network.p2p.storage.mocks.ProtectedStoragePayloadStub; - -import bisq.common.app.Version; -import bisq.common.crypto.CryptoException; -import bisq.common.crypto.Sig; +package haveno.network.p2p.storage.payload; +import haveno.common.app.Version; +import haveno.common.crypto.CryptoException; +import haveno.common.crypto.Sig; +import haveno.network.p2p.PrefixedSealedAndSignedMessage; +import haveno.network.p2p.TestUtils; +import haveno.network.p2p.storage.P2PDataStorage; +import haveno.network.p2p.storage.mocks.ProtectedStoragePayloadStub; +import haveno.network.p2p.storage.payload.MailboxStoragePayload; +import haveno.network.p2p.storage.payload.PersistableNetworkPayload; +import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +import haveno.network.p2p.storage.payload.ProtectedStoragePayload; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; diff --git a/p2p/src/test/java/bisq/network/utils/UtilsTest.java b/p2p/src/test/java/haveno/network/utils/UtilsTest.java similarity index 94% rename from p2p/src/test/java/bisq/network/utils/UtilsTest.java rename to p2p/src/test/java/haveno/network/utils/UtilsTest.java index 255eba77..240e76e2 100644 --- a/p2p/src/test/java/bisq/network/utils/UtilsTest.java +++ b/p2p/src/test/java/haveno/network/utils/UtilsTest.java @@ -15,13 +15,15 @@ * along with Haveno. If not, see . */ -package bisq.network.utils; +package haveno.network.utils; import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import haveno.network.utils.Utils; + public class UtilsTest { @Test diff --git a/proto/src/main/proto/grpc.proto b/proto/src/main/proto/grpc.proto index e0f52a10..94a9a3d3 100644 --- a/proto/src/main/proto/grpc.proto +++ b/proto/src/main/proto/grpc.proto @@ -16,11 +16,11 @@ */ syntax = "proto3"; -package io.bisq.protobuffer; +package io.haveno.protobuffer; import "pb.proto"; -option java_package = "bisq.proto.grpc"; +option java_package = "haveno.proto.grpc"; option java_multiple_files = true; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto index f6a07a3a..19712a8c 100644 --- a/proto/src/main/proto/pb.proto +++ b/proto/src/main/proto/pb.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package io.bisq.protobuffer; +package io.haveno.protobuffer; // // Protobuffer v3 definitions of network messages and persisted objects. diff --git a/relay/Procfile b/relay/Procfile index 04296964..d37ea6c3 100644 --- a/relay/Procfile +++ b/relay/Procfile @@ -1 +1 @@ -web: if [ "$HIDDEN" == true ]; then ./tor/bin/run_tor java -jar -Dserver.port=$PORT build/libs/bisq-relay.jar; else java -jar -Dserver.port=$PORT build/libs/bisq-relay.jar; fi +web: if [ "$HIDDEN" == true ]; then ./tor/bin/run_tor java -jar -Dserver.port=$PORT build/libs/haveno-relay.jar; else java -jar -Dserver.port=$PORT build/libs/haveno-relay.jar; fi diff --git a/relay/src/main/java/bisq/relay/RelayMain.java b/relay/src/main/java/haveno/relay/RelayMain.java similarity index 98% rename from relay/src/main/java/bisq/relay/RelayMain.java rename to relay/src/main/java/haveno/relay/RelayMain.java index e71c681d..ca7f26b0 100644 --- a/relay/src/main/java/bisq/relay/RelayMain.java +++ b/relay/src/main/java/haveno/relay/RelayMain.java @@ -15,10 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.relay; - -import bisq.common.app.Log; -import bisq.common.util.Utilities; +package haveno.relay; import org.apache.commons.codec.binary.Hex; @@ -30,6 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ch.qos.logback.classic.Level; +import haveno.common.app.Log; +import haveno.common.util.Utilities; import static spark.Spark.get; import static spark.Spark.port; diff --git a/relay/src/main/java/bisq/relay/RelayService.java b/relay/src/main/java/haveno/relay/RelayService.java similarity index 95% rename from relay/src/main/java/bisq/relay/RelayService.java rename to relay/src/main/java/haveno/relay/RelayService.java index 1db81654..a54c3fc5 100644 --- a/relay/src/main/java/bisq/relay/RelayService.java +++ b/relay/src/main/java/haveno/relay/RelayService.java @@ -15,7 +15,7 @@ * along with Haveno. If not, see . */ -package bisq.relay; +package haveno.relay; import java.io.File; import java.io.FileInputStream; @@ -47,8 +47,8 @@ import com.turo.pushy.apns.util.concurrent.PushNotificationFuture; class RelayService { private static final Logger log = LoggerFactory.getLogger(RelayMain.class); - private static final String ANDROID_DATABASE_URL = "https://bisqnotifications.firebaseio.com"; - // Used in Bisq app to check for success state. We won't want a code dependency just for that string so we keep it + private static final String ANDROID_DATABASE_URL = "https://havenonotifications.firebaseio.com"; + // Used in Haveno app to check for success state. We won't want a code dependency just for that string so we keep it // duplicated in core and here. Must not be changed. private static final String SUCCESS = "success"; @@ -101,7 +101,7 @@ class RelayService { ApnsPayloadBuilder payloadBuilder = new ApnsPayloadBuilder(); if (useSound) payloadBuilder.setSoundFileName("default"); - payloadBuilder.setAlertBody("Bisq notification"); + payloadBuilder.setAlertBody("Haveno notification"); payloadBuilder.setContentAvailable(isContentAvailable); payloadBuilder.addCustomProperty("encrypted", encryptedMessage); final String payload = payloadBuilder.buildWithDefaultMaximumLength(); @@ -136,7 +136,7 @@ class RelayService { String sendAndroidMessage(String apsTokenHex, String encryptedMessage, boolean useSound) { Message.Builder messageBuilder = Message.builder(); - Notification notification = new Notification("Bisq", "Notification"); + Notification notification = new Notification("Haveno", "Notification"); messageBuilder.setNotification(notification); messageBuilder.putData("encrypted", encryptedMessage); messageBuilder.setToken(apsTokenHex); diff --git a/relay/src/main/resources/logback.xml b/relay/src/main/resources/logback.xml index bb9c8209..7c43494c 100644 --- a/relay/src/main/resources/logback.xml +++ b/relay/src/main/resources/logback.xml @@ -10,6 +10,6 @@ - + diff --git a/scripts/install_java.bat b/scripts/install_java.bat index 184afbb5..b53b0879 100644 --- a/scripts/install_java.bat +++ b/scripts/install_java.bat @@ -1,4 +1,4 @@ -:: This script will download and install the appropriate JDK for use with Bisq development. +:: This script will download and install the appropriate JDK for use with Haveno development. :: It will also configure it as the default system JDK. :: If you need to change to another default JDK for another purpose later, you just need to :: change the JAVA_HOME environment variable. For example, use the following command: diff --git a/scripts/install_java.sh b/scripts/install_java.sh index 5b06dfe3..d14214b9 100755 --- a/scripts/install_java.sh +++ b/scripts/install_java.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# This script will download and install the appropriate JDK for use with Bisq development. +# This script will download and install the appropriate JDK for use with Haveno development. # It will also configure it as the default system JDK. # If you need to change to another default JDK for another purpose later, you can use the # following commands and select the default JDK: diff --git a/seednode/create_jaronly_archive.sh b/seednode/create_jaronly_archive.sh index 958fe8d2..798e60c7 100755 --- a/seednode/create_jaronly_archive.sh +++ b/seednode/create_jaronly_archive.sh @@ -3,13 +3,13 @@ set -x ./gradlew build -x test -tar zvcf bisq-seednode-jaronly.tgz \ +tar zvcf haveno-seednode-jaronly.tgz \ seednode/build/app/lib/assets.jar \ seednode/build/app/lib/common.jar \ seednode/build/app/lib/core.jar \ seednode/build/app/lib/p2p.jar \ seednode/build/app/lib/seednode.jar -ls -la bisq-seednode-jaronly.tgz +ls -la haveno-seednode-jaronly.tgz exit 0 diff --git a/seednode/bisq.env b/seednode/haveno.env similarity index 62% rename from seednode/bisq.env rename to seednode/haveno.env index bdcd4748..81184268 100644 --- a/seednode/bisq.env +++ b/seednode/haveno.env @@ -1,5 +1,5 @@ -# configuration for bisq service -# install in /etc/default/bisq.env +# configuration for haveno service +# install in /etc/default/haveno.env # java home, set to openjdk 10 JAVA_HOME=/usr/lib/jvm/openjdk-10.0.2 @@ -8,7 +8,7 @@ JAVA_HOME=/usr/lib/jvm/openjdk-10.0.2 JAVA_OPTS="-Xms4096M -Xmx4096M" # use external tor (change to -1 for internal tor binary) -BISQ_EXTERNAL_TOR_PORT=9051 +HAVENO_EXTERNAL_TOR_PORT=9051 # bitcoin rpc credentials BITCOIN_RPC_USER=__BITCOIN_RPC_USER__ @@ -24,13 +24,13 @@ BITCOIN_RPC_PORT=__BITCOIN_RPC_PORT__ BITCOIN_RPC_BLOCKNOTIFY_HOST=127.0.0.1 BITCOIN_RPC_BLOCKNOTIFY_PORT=5120 -# bisq pathnames -BISQ_HOME=__BISQ_HOME__ -BISQ_APP_NAME=bisq-seednode -BISQ_ENTRYPOINT=bisq-seednode -BISQ_BASE_CURRENCY=btc_mainnet +# haveno pathnames +HAVENO_HOME=__HAVENO_HOME__ +HAVENO_APP_NAME=haveno-seednode +HAVENO_ENTRYPOINT=haveno-seednode +HAVENO_BASE_CURRENCY=btc_mainnet -# bisq node settings -BISQ_NODE_PORT=8000 -BISQ_MAX_CONNECTIONS=20 -BISQ_MAX_MEMORY=4000 +# haveno node settings +HAVENO_NODE_PORT=8000 +HAVENO_MAX_CONNECTIONS=20 +HAVENO_MAX_MEMORY=4000 diff --git a/seednode/install_seednode_debian.sh b/seednode/install_seednode_debian.sh index c7d287f9..dafc9c5a 100755 --- a/seednode/install_seednode_debian.sh +++ b/seednode/install_seednode_debian.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -echo "[*] Bisq Seednode installation script" +echo "[*] Haveno Seednode installation script" ##### change paths if necessary for your system @@ -13,12 +13,12 @@ ROOT_HOME=/root SYSTEMD_SERVICE_HOME=/etc/systemd/system SYSTEMD_ENV_HOME=/etc/default -BISQ_REPO_URL=https://github.com/bisq-network/bisq -BISQ_REPO_NAME=bisq -BISQ_REPO_TAG=master -BISQ_LATEST_RELEASE=$(curl -s https://api.github.com/repos/bisq-network/bisq/releases/latest|grep tag_name|head -1|cut -d '"' -f4) -BISQ_HOME=/bisq -BISQ_USER=bisq +HAVENO_REPO_URL=https://github.com/bisq-network/bisq +HAVENO_REPO_NAME=haveno +HAVENO_REPO_TAG=master +HAVENO_LATEST_RELEASE=$(curl -s https://api.github.com/repos/bisq-network/bisq/releases/latest|grep tag_name|head -1|cut -d '"' -f4) +HAVENO_HOME=/haveno +HAVENO_USER=haveno # by default, this script will build and setup bitcoin fullnode # if you want to use an existing bitcoin fullnode, see next section @@ -64,9 +64,9 @@ echo "[*] Installing Git LFS" sudo -H -i -u "${ROOT_USER}" apt-get install git-lfs sudo -H -i -u "${ROOT_USER}" git lfs install -echo "[*] Cloning Bisq repo" +echo "[*] Cloning Haveno repo" sudo -H -i -u "${ROOT_USER}" git config --global advice.detachedHead false -sudo -H -i -u "${ROOT_USER}" git clone --branch "${BISQ_REPO_TAG}" "${BISQ_REPO_URL}" "${ROOT_HOME}/${BISQ_REPO_NAME}" +sudo -H -i -u "${ROOT_USER}" git clone --branch "${HAVENO_REPO_TAG}" "${HAVENO_REPO_URL}" "${ROOT_HOME}/${HAVENO_REPO_NAME}" echo "[*] Installing Tor" sudo -H -i -u "${ROOT_USER}" wget -qO- https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gp @@ -77,7 +77,7 @@ sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get update -q sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get install -qq -y ${TOR_PKG} echo "[*] Installing Tor configuration" -sudo -H -i -u "${ROOT_USER}" install -c -m 644 "${ROOT_HOME}/${BISQ_REPO_NAME}/seednode/torrc" "${TOR_HOME}/torrc" +sudo -H -i -u "${ROOT_USER}" install -c -m 644 "${ROOT_HOME}/${HAVENO_REPO_NAME}/seednode/torrc" "${TOR_HOME}/torrc" if [ "${BITCOIN_INSTALL}" = true ];then @@ -103,8 +103,8 @@ if [ "${BITCOIN_INSTALL}" = true ];then sudo -H -i -u "${ROOT_USER}" sh -c "cd ${BITCOIN_HOME}/${BITCOIN_REPO_NAME} && make install >/dev/null" echo "[*] Installing Bitcoin configuration" - sudo -H -i -u "${ROOT_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 644 "${ROOT_HOME}/${BISQ_REPO_NAME}/seednode/bitcoin.conf" "${BITCOIN_HOME}/bitcoin.conf" - sudo -H -i -u "${ROOT_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 755 "${ROOT_HOME}/${BISQ_REPO_NAME}/seednode/blocknotify.sh" "${BITCOIN_HOME}/blocknotify.sh" + sudo -H -i -u "${ROOT_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 644 "${ROOT_HOME}/${HAVENO_REPO_NAME}/seednode/bitcoin.conf" "${BITCOIN_HOME}/bitcoin.conf" + sudo -H -i -u "${ROOT_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 755 "${ROOT_HOME}/${HAVENO_REPO_NAME}/seednode/blocknotify.sh" "${BITCOIN_HOME}/blocknotify.sh" echo "[*] Generating Bitcoin RPC credentials" BITCOIN_RPC_USER=$(head -150 /dev/urandom | md5sum | awk '{print $1}') @@ -113,57 +113,57 @@ if [ "${BITCOIN_INSTALL}" = true ];then sudo sed -i -e "s/__BITCOIN_RPC_PASS__/${BITCOIN_RPC_PASS}/" "${BITCOIN_HOME}/bitcoin.conf" echo "[*] Installing Bitcoin init scripts" - sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${ROOT_HOME}/${BISQ_REPO_NAME}/seednode/bitcoin.service" "${SYSTEMD_SERVICE_HOME}" + sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${ROOT_HOME}/${HAVENO_REPO_NAME}/seednode/bitcoin.service" "${SYSTEMD_SERVICE_HOME}" fi -echo "[*] Creating Bisq user with Tor access" -sudo -H -i -u "${ROOT_USER}" useradd -d "${BISQ_HOME}" -G "${TOR_GROUP}" "${BISQ_USER}" +echo "[*] Creating Haveno user with Tor access" +sudo -H -i -u "${ROOT_USER}" useradd -d "${HAVENO_HOME}" -G "${TOR_GROUP}" "${HAVENO_USER}" -echo "[*] Creating Bisq homedir" -sudo -H -i -u "${ROOT_USER}" mkdir -p "${BISQ_HOME}" -sudo -H -i -u "${ROOT_USER}" chown "${BISQ_USER}":"${BISQ_GROUP}" ${BISQ_HOME} +echo "[*] Creating Haveno homedir" +sudo -H -i -u "${ROOT_USER}" mkdir -p "${HAVENO_HOME}" +sudo -H -i -u "${ROOT_USER}" chown "${HAVENO_USER}":"${HAVENO_GROUP}" ${HAVENO_HOME} -echo "[*] Moving Bisq repo" -sudo -H -i -u "${ROOT_USER}" mv "${ROOT_HOME}/${BISQ_REPO_NAME}" "${BISQ_HOME}/${BISQ_REPO_NAME}" -sudo -H -i -u "${ROOT_USER}" chown -R "${BISQ_USER}:${BISQ_GROUP}" "${BISQ_HOME}/${BISQ_REPO_NAME}" +echo "[*] Moving Haveno repo" +sudo -H -i -u "${ROOT_USER}" mv "${ROOT_HOME}/${HAVENO_REPO_NAME}" "${HAVENO_HOME}/${HAVENO_REPO_NAME}" +sudo -H -i -u "${ROOT_USER}" chown -R "${HAVENO_USER}:${HAVENO_GROUP}" "${HAVENO_HOME}/${HAVENO_REPO_NAME}" -echo "[*] Installing OpenJDK 10.0.2 from Bisq repo" -sudo -H -i -u "${ROOT_USER}" "${BISQ_HOME}/${BISQ_REPO_NAME}/scripts/install_java.sh" +echo "[*] Installing OpenJDK 10.0.2 from Haveno repo" +sudo -H -i -u "${ROOT_USER}" "${HAVENO_HOME}/${HAVENO_REPO_NAME}/scripts/install_java.sh" -echo "[*] Installing Bisq init script" -sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/bisq.service" "${SYSTEMD_SERVICE_HOME}/bisq.service" +echo "[*] Installing Haveno init script" +sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${HAVENO_HOME}/${HAVENO_REPO_NAME}/seednode/haveno.service" "${SYSTEMD_SERVICE_HOME}/haveno.service" if [ "${BITCOIN_INSTALL}" = true ];then - sudo sed -i -e "s/#Requires=bitcoin.service/Requires=bitcoin.service/" "${SYSTEMD_SERVICE_HOME}/bisq.service" - sudo sed -i -e "s/#BindsTo=bitcoin.service/BindsTo=bitcoin.service/" "${SYSTEMD_SERVICE_HOME}/bisq.service" + sudo sed -i -e "s/#Requires=bitcoin.service/Requires=bitcoin.service/" "${SYSTEMD_SERVICE_HOME}/haveno.service" + sudo sed -i -e "s/#BindsTo=bitcoin.service/BindsTo=bitcoin.service/" "${SYSTEMD_SERVICE_HOME}/haveno.service" fi -sudo sed -i -e "s/__BISQ_REPO_NAME__/${BISQ_REPO_NAME}/" "${SYSTEMD_SERVICE_HOME}/bisq.service" -sudo sed -i -e "s!__BISQ_HOME__!${BISQ_HOME}!" "${SYSTEMD_SERVICE_HOME}/bisq.service" +sudo sed -i -e "s/__HAVENO_REPO_NAME__/${HAVENO_REPO_NAME}/" "${SYSTEMD_SERVICE_HOME}/haveno.service" +sudo sed -i -e "s!__HAVENO_HOME__!${HAVENO_HOME}!" "${SYSTEMD_SERVICE_HOME}/haveno.service" -echo "[*] Installing Bisq environment file with Bitcoin RPC credentials" -sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/bisq.env" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s/__BITCOIN_P2P_HOST__/${BITCOIN_P2P_HOST}/" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s/__BITCOIN_P2P_PORT__/${BITCOIN_P2P_PORT}/" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s/__BITCOIN_RPC_HOST__/${BITCOIN_RPC_HOST}/" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s/__BITCOIN_RPC_PORT__/${BITCOIN_RPC_PORT}/" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s/__BITCOIN_RPC_USER__/${BITCOIN_RPC_USER}/" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s/__BITCOIN_RPC_PASS__/${BITCOIN_RPC_PASS}/" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s!__BISQ_APP_NAME__!${BISQ_APP_NAME}!" "${SYSTEMD_ENV_HOME}/bisq.env" -sudo sed -i -e "s!__BISQ_HOME__!${BISQ_HOME}!" "${SYSTEMD_ENV_HOME}/bisq.env" +echo "[*] Installing Haveno environment file with Bitcoin RPC credentials" +sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${HAVENO_HOME}/${HAVENO_REPO_NAME}/seednode/haveno.env" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s/__BITCOIN_P2P_HOST__/${BITCOIN_P2P_HOST}/" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s/__BITCOIN_P2P_PORT__/${BITCOIN_P2P_PORT}/" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s/__BITCOIN_RPC_HOST__/${BITCOIN_RPC_HOST}/" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s/__BITCOIN_RPC_PORT__/${BITCOIN_RPC_PORT}/" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s/__BITCOIN_RPC_USER__/${BITCOIN_RPC_USER}/" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s/__BITCOIN_RPC_PASS__/${BITCOIN_RPC_PASS}/" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s!__HAVENO_APP_NAME__!${HAVENO_APP_NAME}!" "${SYSTEMD_ENV_HOME}/haveno.env" +sudo sed -i -e "s!__HAVENO_HOME__!${HAVENO_HOME}!" "${SYSTEMD_ENV_HOME}/haveno.env" -echo "[*] Checking out Bisq ${BISQ_LATEST_RELEASE}" -sudo -H -i -u "${BISQ_USER}" sh -c "cd ${BISQ_HOME}/${BISQ_REPO_NAME} && git checkout ${BISQ_LATEST_RELEASE}" +echo "[*] Checking out Haveno ${HAVENO_LATEST_RELEASE}" +sudo -H -i -u "${HAVENO_USER}" sh -c "cd ${HAVENO_HOME}/${HAVENO_REPO_NAME} && git checkout ${HAVENO_LATEST_RELEASE}" echo "[*] Performing Git LFS pull" -sudo -H -i -u "${BISQ_USER}" sh -c "cd ${BISQ_HOME}/${BISQ_REPO_NAME} && git lfs pull" +sudo -H -i -u "${HAVENO_USER}" sh -c "cd ${HAVENO_HOME}/${HAVENO_REPO_NAME} && git lfs pull" -echo "[*] Building Bisq from source" -sudo -H -i -u "${BISQ_USER}" sh -c "cd ${BISQ_HOME}/${BISQ_REPO_NAME} && ./gradlew build -x test < /dev/null" # redirect from /dev/null is necessary to workaround gradlew non-interactive shell hanging issue +echo "[*] Building Haveno from source" +sudo -H -i -u "${HAVENO_USER}" sh -c "cd ${HAVENO_HOME}/${HAVENO_REPO_NAME} && ./gradlew build -x test < /dev/null" # redirect from /dev/null is necessary to workaround gradlew non-interactive shell hanging issue echo "[*] Updating systemd daemon configuration" sudo -H -i -u "${ROOT_USER}" systemctl daemon-reload sudo -H -i -u "${ROOT_USER}" systemctl enable tor.service -sudo -H -i -u "${ROOT_USER}" systemctl enable bisq.service +sudo -H -i -u "${ROOT_USER}" systemctl enable haveno.service if [ "${BITCOIN_INSTALL}" = true ];then sudo -H -i -u "${ROOT_USER}" systemctl enable bitcoin.service fi @@ -184,14 +184,14 @@ fi echo "[*] Adding notes to motd" sudo -H -i -u "${ROOT_USER}" sh -c 'echo " " >> /etc/motd' -sudo -H -i -u "${ROOT_USER}" sh -c 'echo "Bisq Seednode instructions:" >> /etc/motd' +sudo -H -i -u "${ROOT_USER}" sh -c 'echo "Haveno Seednode instructions:" >> /etc/motd' sudo -H -i -u "${ROOT_USER}" sh -c 'echo "https://github.com/bisq-network/bisq/tree/master/seednode" >> /etc/motd' sudo -H -i -u "${ROOT_USER}" sh -c 'echo " " >> /etc/motd' -sudo -H -i -u "${ROOT_USER}" sh -c 'echo "How to check logs for Bisq-Seednode service:" >> /etc/motd' -sudo -H -i -u "${ROOT_USER}" sh -c 'echo "sudo journalctl --no-pager --unit bisq" >> /etc/motd' +sudo -H -i -u "${ROOT_USER}" sh -c 'echo "How to check logs for Haveno-Seednode service:" >> /etc/motd' +sudo -H -i -u "${ROOT_USER}" sh -c 'echo "sudo journalctl --no-pager --unit haveno" >> /etc/motd' sudo -H -i -u "${ROOT_USER}" sh -c 'echo " " >> /etc/motd' -sudo -H -i -u "${ROOT_USER}" sh -c 'echo "How to restart Bisq-Seednode service:" >> /etc/motd' -sudo -H -i -u "${ROOT_USER}" sh -c 'echo "sudo service bisq restart" >> /etc/motd' +sudo -H -i -u "${ROOT_USER}" sh -c 'echo "How to restart Haveno-Seednode service:" >> /etc/motd' +sudo -H -i -u "${ROOT_USER}" sh -c 'echo "sudo service haveno restart" >> /etc/motd' echo '[*] Done!' diff --git a/seednode/src/main/java/bisq/seednode/SeedNode.java b/seednode/src/main/java/haveno/seednode/SeedNode.java similarity index 87% rename from seednode/src/main/java/bisq/seednode/SeedNode.java rename to seednode/src/main/java/haveno/seednode/SeedNode.java index 59e336bc..8aa28dc3 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNode.java +++ b/seednode/src/main/java/haveno/seednode/SeedNode.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.seednode; - -import bisq.core.app.misc.AppSetup; -import bisq.core.app.misc.AppSetupWithP2PAndDAO; -import bisq.core.network.p2p.inventory.GetInventoryRequestHandler; +package haveno.seednode; import com.google.inject.Injector; - +import haveno.core.app.misc.AppSetup; +import haveno.core.app.misc.AppSetupWithP2PAndDAO; +import haveno.core.network.p2p.inventory.GetInventoryRequestHandler; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/haveno/seednode/SeedNodeMain.java similarity index 87% rename from seednode/src/main/java/bisq/seednode/SeedNodeMain.java rename to seednode/src/main/java/haveno/seednode/SeedNodeMain.java index 3fc79fc1..0afde526 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/haveno/seednode/SeedNodeMain.java @@ -15,31 +15,27 @@ * along with Haveno. If not, see . */ -package bisq.seednode; - -import bisq.core.app.TorSetup; -import bisq.core.app.misc.ExecutableForAppWithP2p; -import bisq.core.app.misc.ModuleForAppWithP2p; -import bisq.core.user.Cookie; -import bisq.core.user.CookieKey; -import bisq.core.user.User; - -import bisq.network.p2p.P2PService; -import bisq.network.p2p.P2PServiceListener; -import bisq.network.p2p.peers.PeerManager; - -import bisq.common.Timer; -import bisq.common.UserThread; -import bisq.common.app.AppModule; -import bisq.common.app.Capabilities; -import bisq.common.app.Capability; -import bisq.common.config.BaseCurrencyNetwork; -import bisq.common.config.Config; -import bisq.common.handlers.ResultHandler; +package haveno.seednode; import com.google.inject.Key; import com.google.inject.name.Names; - +import haveno.common.Timer; +import haveno.common.UserThread; +import haveno.common.app.AppModule; +import haveno.common.app.Capabilities; +import haveno.common.app.Capability; +import haveno.common.config.BaseCurrencyNetwork; +import haveno.common.config.Config; +import haveno.common.handlers.ResultHandler; +import haveno.core.app.TorSetup; +import haveno.core.app.misc.ExecutableForAppWithP2p; +import haveno.core.app.misc.ModuleForAppWithP2p; +import haveno.core.user.Cookie; +import haveno.core.user.CookieKey; +import haveno.core.user.User; +import haveno.network.p2p.P2PService; +import haveno.network.p2p.P2PServiceListener; +import haveno.network.p2p.peers.PeerManager; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -50,7 +46,7 @@ public class SeedNodeMain extends ExecutableForAppWithP2p { private Timer checkConnectionLossTime; public SeedNodeMain() { - super("Bisq Seednode", "bisq-seednode", "bisq_seednode", VERSION); + super("Haveno Seednode", "haveno-seednode", "haveno_seednode", VERSION); } public static void main(String[] args) { diff --git a/seednode/src/test/java/bisq/seednode/GuiceSetupTest.java b/seednode/src/test/java/haveno/seednode/GuiceSetupTest.java similarity index 59% rename from seednode/src/test/java/bisq/seednode/GuiceSetupTest.java rename to seednode/src/test/java/haveno/seednode/GuiceSetupTest.java index d3d947cd..f251385f 100644 --- a/seednode/src/test/java/bisq/seednode/GuiceSetupTest.java +++ b/seednode/src/test/java/haveno/seednode/GuiceSetupTest.java @@ -1,14 +1,11 @@ -package bisq.seednode; - -import bisq.core.app.misc.AppSetupWithP2PAndDAO; -import bisq.core.app.misc.ModuleForAppWithP2p; -import bisq.core.locale.CurrencyUtil; -import bisq.core.locale.Res; - -import bisq.common.config.Config; +package haveno.seednode; import com.google.inject.Guice; - +import haveno.common.config.Config; +import haveno.core.app.misc.AppSetupWithP2PAndDAO; +import haveno.core.app.misc.ModuleForAppWithP2p; +import haveno.core.locale.CurrencyUtil; +import haveno.core.locale.Res; import org.junit.Test; public class GuiceSetupTest { diff --git a/seednode/uninstall_seednode_debian.sh b/seednode/uninstall_seednode_debian.sh index 9ca5ff3f..ea9ff721 100755 --- a/seednode/uninstall_seednode_debian.sh +++ b/seednode/uninstall_seednode_debian.sh @@ -1,11 +1,11 @@ #!/bin/sh -echo "[*] Uninstalling Bitcoin and Bisq, will delete all data!!" +echo "[*] Uninstalling Bitcoin and Haveno, will delete all data!!" sleep 10 -sudo rm -rf /root/bisq +sudo rm -rf /root/haveno sudo systemctl stop bitcoin -sudo systemctl stop bisq +sudo systemctl stop haveno sudo systemctl disable bitcoin -sudo systemctl disable bisq -sudo userdel -f -r bisq +sudo systemctl disable haveno +sudo userdel -f -r haveno sudo userdel -f -r bitcoin echo "[*] Done!" diff --git a/statsnode/src/main/java/bisq/statistics/Statistics.java b/statsnode/src/main/java/haveno/statistics/Statistics.java similarity index 86% rename from statsnode/src/main/java/bisq/statistics/Statistics.java rename to statsnode/src/main/java/haveno/statistics/Statistics.java index 9c35066b..5ae5ca24 100644 --- a/statsnode/src/main/java/bisq/statistics/Statistics.java +++ b/statsnode/src/main/java/haveno/statistics/Statistics.java @@ -15,19 +15,16 @@ * along with Haveno. If not, see . */ -package bisq.statistics; - -import bisq.core.app.misc.AppSetup; -import bisq.core.app.misc.AppSetupWithP2PAndDAO; -import bisq.core.offer.OfferBookService; -import bisq.core.provider.price.PriceFeedService; -import bisq.core.trade.statistics.TradeStatisticsManager; - -import bisq.network.p2p.BootstrapListener; -import bisq.network.p2p.P2PService; +package haveno.statistics; import com.google.inject.Injector; - +import haveno.core.app.misc.AppSetup; +import haveno.core.app.misc.AppSetupWithP2PAndDAO; +import haveno.core.offer.OfferBookService; +import haveno.core.provider.price.PriceFeedService; +import haveno.core.trade.statistics.TradeStatisticsManager; +import haveno.network.p2p.BootstrapListener; +import haveno.network.p2p.P2PService; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/statsnode/src/main/java/bisq/statistics/StatisticsMain.java b/statsnode/src/main/java/haveno/statistics/StatisticsMain.java similarity index 89% rename from statsnode/src/main/java/bisq/statistics/StatisticsMain.java rename to statsnode/src/main/java/haveno/statistics/StatisticsMain.java index f0e4af3c..0fa19fbf 100644 --- a/statsnode/src/main/java/bisq/statistics/StatisticsMain.java +++ b/statsnode/src/main/java/haveno/statistics/StatisticsMain.java @@ -15,14 +15,12 @@ * along with Haveno. If not, see . */ -package bisq.statistics; - -import bisq.core.app.misc.ExecutableForAppWithP2p; -import bisq.core.app.misc.ModuleForAppWithP2p; - -import bisq.common.UserThread; -import bisq.common.app.AppModule; +package haveno.statistics; +import haveno.common.UserThread; +import haveno.common.app.AppModule; +import haveno.core.app.misc.ExecutableForAppWithP2p; +import haveno.core.app.misc.ModuleForAppWithP2p; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -31,7 +29,7 @@ public class StatisticsMain extends ExecutableForAppWithP2p { private Statistics statistics; public StatisticsMain() { - super("Bisq Statsnode", "bisq-statistics", "bisq_statistics", VERSION); + super("Haveno Statsnode", "haveno-statistics", "haveno_statistics", VERSION); } public static void main(String[] args) {