Commit graph

7509 commits

Author SHA1 Message Date
Christoph Atteneder
b0683a461f
Update tray icons for macos 2018-11-26 11:46:33 +01:00
Christoph Atteneder
da8b5fcf9d
Merge pull request #1967 from ManfredKarrer/remove_not-traded-assets
Remove not traded assets
2018-11-26 11:30:39 +01:00
Christoph Atteneder
c7c20fb2ad
Merge pull request #1958 from ManfredKarrer/improve-backward-compatibility-with-new-arb-selection
Improve backward compatibility with new arb selection
2018-11-26 11:25:26 +01:00
Christoph Atteneder
502d99f51b
Merge pull request #1938 from ManfredKarrer/persist-selected-account-at-takeoffer
Persist selected account at takeoffer
2018-11-26 11:24:06 +01:00
Manfred Karrer
fe2f5e15d1
Remove not traded coin 2018-11-26 03:28:26 +01:00
Manfred Karrer
7889015f1f
Remove testclasses 2018-11-26 02:40:19 +01:00
Manfred Karrer
0ba936ec9f
Remove not traded assets 2018-11-26 02:31:25 +01:00
Manfred Karrer
1f81acb4b8
Increase minTradeAmount to 0.01 btc, remove 0.7 coins from warmup phase 2018-11-26 02:31:06 +01:00
Manfred Karrer
48620d406c
Add comment for ICO tokens 2018-11-26 02:19:39 +01:00
Manfred Karrer
71162dddc3
Fix missing currency check at create offer
At create offer the last selected currency was applied without checking
if the currency matches. So when browsing an altcoin you got the last
fiat account selected in case u had multiple fiat accounts and selected
one in the past.
2018-11-26 00:53:28 +01:00
Manfred Karrer
735e4588ce
Merge branch 'release-candidate-0.9.0' into improve-backward-compatibility-with-new-arb-selection 2018-11-25 23:55:01 +01:00
Manfred Karrer
83190fb237
Merge branch 'release-candidate-0.9.0' into persist-selected-account-at-takeoffer 2018-11-25 23:54:23 +01:00
Manfred Karrer
0e64a7193d
Merge branch 'master' into release-candidate-0.9.0 2018-11-25 23:52:51 +01:00
Manfred Karrer
1859511fe9
Merge pull request #1966 from freimair/externalTorRollingBackup
Rolling backup for external Tor feature
2018-11-25 21:59:19 +01:00
Florian Reimair
e4568a3b3b Use lombok log API 2018-11-25 16:58:19 +01:00
Manfred Karrer
f8b633d8eb
Merge pull request #1963 from devinbileck/resolve-BisqHelpFormatterTest-failure-on-Windows
Resolve BisqHelpFormatterTest failure on Windows
2018-11-25 13:38:14 +01:00
Manfred Karrer
61deb05a0d
Merge pull request #1964 from devinbileck/remove-nix-scripts
Remove *nix scripts on Windows
2018-11-25 13:35:50 +01:00
Florian Reimair
3a44b36118 Rolling backup for external Tor 2018-11-25 10:40:18 +01:00
Florian Reimair
6eeda23f31 Refactored TorMode classes 2018-11-25 10:40:18 +01:00
Florian Reimair
18cfc1a138 Corrected JavaDoc 2018-11-25 10:39:44 +01:00
Florian Reimair
f3f7625fa4 Corrected log message 2018-11-25 10:04:17 +01:00
Devin Bileck
8cede5c25d
Remove *nix scripts on Windows
Related to https://github.com/bisq-network/bisq/pull/1959 which
removed .bat files on a non-Windows OS to prevent a cluttered root
directory, this change will delete *nix scripts on a Windows OS.
2018-11-25 00:35:04 -08:00
Devin Bileck
054f293622
Resolve BisqHelpFormatterTest failure on Windows
The expected content for the CLI help output needs different path
separators on Windows.
2018-11-24 23:45:43 -08:00
Manfred Karrer
4930c1297e
Add getActivePaymentMethods for filtered payment methods 2018-11-25 03:21:12 +01:00
Manfred Karrer
065a3de4ea
Set visible state for isTradeFeeVisible in model
Because visible property of tradeFeeDescriptionLabel is bound we cannot
set it with tradeFeeDescriptionLabel.setVisible(false) in the activate()
method. We use the property in the model instead.
2018-11-25 03:04:02 +01:00
Manfred Karrer
edd7bbee62
Set oracle jdk as JAVA_HOME when building app
Open jdk does not has the java packager.
2018-11-25 03:01:38 +01:00
Manfred Karrer
feb6e64b75
Merge pull request #1960 from rex4539/http-to-https
http -> https
2018-11-24 22:44:49 +01:00
Manfred Karrer
086fe32e8f
Merge pull request #1961 from cbeams/redesign-cli-help
Redesign CLI help output
2018-11-24 22:43:57 +01:00
Dimitris Apostolou
4de530e5af
http -> https 2018-11-24 14:28:43 +02:00
Chris Beams
931f369fb6
Include executable name and version in help output 2018-11-24 13:24:03 +01:00
Chris Beams
83e1dd37f9
Refactor option parsing configuration
This change eliminates the BisqExecutable.description method and
replaces it with proper use of the `describedAs` and `defaultsTo`
methods in the JOptSimple API. This removes the concern of formatting
option argument descriptions and default values from the BisqExecutable
class, and delegates it to the new BisqHelpFormatter (see previous
commit), which is designed for the purpose.

For example, prior to this commit, the help text for the --banList
option read as follows:

    --banList=<value>
            Nodes to exclude from network connections. (default: )

Now it reads as follows:

    --banList=<host:port[,...]>
            Nodes to exclude from network connections.

Likewise, previous to this commit, the --logLevel option read as
follows:

    --logLevel=<value>
            Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]
            (default: INFO)

And now it reads like this:

    --logLevel=<OFF|ALL|ERROR|WARN|INFO|DEBUG|TRACE> (default: INFO)
            Log level

There are a number of further improvements that can and should be made
to the description text of the various options, the types specified for
their arguments, etc, but these will be handled in subsequent commits.
This commit is strictly about refactoring existing parser configuration
to take advantage of the new BisqHelpFormatter.
2018-11-24 13:24:03 +01:00
Chris Beams
2a537a601b
Introduce BisqHelpFormatter
Prior to this commit, help output for Bisq executables, e.g. Bisq
Desktop itself used JOptSimple's default HelpFormatter implementation,
which creates a quite cramped and hard-to-read output.

This commit introduces a custom HelpFormatter implementation modeled
after bitcoind's own help output. It maximizes readability while making
full use of an 80-character width.
2018-11-24 13:19:56 +01:00
Manfred Karrer
def47b6a48
Merge pull request #1959 from cbeams/remove-bat-scripts
Remove .bat scripts unless user OS is Windows
2018-11-24 12:09:53 +01:00
Manfred Karrer
880a8412fc
Merge pull request #1957 from j3ko/release-candidate-0.9.0
Add advanced cash payment method
2018-11-24 12:09:04 +01:00
Chris Beams
46ee12dd62
Remove .bat scripts unless user OS is Windows
Previously, start scripts were generated for both *nix and Windows
platforms, resulting in an unnecessarily cluttered root directory.

With this change, both types of script are still generated, but Windows
.bat scripts are deleted immediately afterward if the user is running a
non-Windows OS (unfortunately, there was no clean way to suppress the
generation of these scripts in the Gradle StartScripts API).

See #1956
2018-11-24 10:12:23 +01:00
Jeffrey Ko
dd3abd2996
make advanced cash payment method more consistent ok pay payment method 2018-11-24 13:26:12 +07:00
Manfred Karrer
d7fe1dbeb3
Handle edge cases with removed arbitrators 2018-11-24 00:44:56 +01:00
Manfred Karrer
319c043e43
Handle backward compatibility with new arbitr. selection
- Remove activationDate
- Refactor ProcessOfferAvailabilityResponse and handle offers from
old versions in case the available arbitrators has changed.
- Remove MakerVerifyMediatorSelection and TakerSelectArbitrator

The mediator handling should be removed as it is not used and not
intended anymore to be used with the current trade protocol, but we
leave that as it is a bit tricky to ensure backward compatibility.
Also the setting of the arbitrator in trade should be further refactored
but as it is also easy to break backward compatibility here we leave
that for now. As we work on the new trade protocol that domain will
become deprecated anyway in the next months...
2018-11-24 00:23:46 +01:00
Manfred Karrer
1ba0402dfb
Handle backward compatibility with new arbitration selection model. 2018-11-23 22:14:31 +01:00
Manfred Karrer
d98f3c12cf
Add default genesis tx info for regtest 2018-11-23 20:48:52 +01:00
Manfred Karrer
d372a9e4b3
Merge pull request #1956 from cbeams/root-scripts
Generate scripts for Bisq executables in root dir
2018-11-23 20:04:07 +01:00
Chris Beams
fc0491d8da
Generate scripts for Bisq executables in root dir
This change configures the Gradle build to generate "start scripts" for
each Bisq executable (e.g. Bisq Desktop, Bisq Seednode, etc) in the root
project directory, such that after invoking `./gradle build`, the
following executable scripts become available:

    ~/Work/bisq-network/bisq
    $ ls -1 | egrep '(bisq*|lib)'
    bisq-desktop
    bisq-desktop.bat
    bisq-monitor
    bisq-monitor.bat
    bisq-relay
    bisq-relay.bat
    bisq-seednode
    bisq-seednode.bat
    bisq-statsnode
    bisq-statsnode.bat
    lib

This makes it possible for users (developers) to easily discover and use
these scripts in an idiomatic and platform-agnostic way as opposed to
the previous situation where we would advise users to run e.g.

    java -jar desktop/build/libs/desktop-0.8.0-SNAPSHOT-all.jar

This approach works, but is cumbersome and focuses unnecessarily on the
Java-based nature of the project. Now, with the changes in this commit,
the user would simply run:

    ./bisq-desktop

The 'lib' directory shown above contains all the jar files necessary to
construct classpaths for these various scripts. The 'cleanInstallDist'
task deletes the 'bisq-*' files and the 'lib' directory, and the default
'clean' task has been configured to depend on the 'cleanInstallDist'
task to ensure this cleanup happens automatically when most users would
expect it.

In the future, these same scripts can be used when installing Bisq
executables properly on users' systems via package managers like Brew
and Apt. The goal is to have the user experience around running
`bisq-desktop` (and more importantly, the forthcoming `bisqd`) be
similar in every way to installing and using `bitcoind`, `lnd` and other
idiomatic *nix-style utilities, be they Bitcoin-related or not.

See the changes in docs/build.md and docs/dev-setup.md for a further
sense of the how this change impacts the developer experience.
2018-11-23 15:00:47 +01:00
Jeffrey Ko
4cd2ac8d40
Add advanced cash payment method 2018-11-23 20:50:03 +07:00
Chris Beams
a57a4a71c0
Remove unused Utilities import
This change should have been included in 63cec4252 (#1955).
2018-11-23 11:28:58 +01:00
Manfred Karrer
15c776874e
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	.editorconfig
2018-11-23 11:24:07 +01:00
Manfred Karrer
63cec42523
Merge pull request #1955 from cbeams/quell-help-on-error
Quell help output on option parsing error
2018-11-23 11:21:56 +01:00
Manfred Karrer
13aacc3c38
Merge pull request #1954 from cbeams/remove-core-logback-config
Remove Logback config xml from core module
2018-11-23 11:20:50 +01:00
Manfred Karrer
c0729f1f0e
Merge pull request #1953 from cbeams/remove-crypto-restrictions
Remove Utilities.removeCryptographyRestrictions
2018-11-23 10:54:36 +01:00
Chris Beams
2b883c838a
Quell help output on option parsing error
This change suppresses help output when option parsing fails, e.g. due
to an unrecognized option being specified. This is in keeping with *nix
utility idioms; for example, notice what happens when running `git
--bogus` or `ls --bogus`: they output an error message, and in some
cases a usage message, but they do not print complete help text.
This approach is especially important in the case of an application like
Bisq, where there are many options and the help text is longer than a
typical screen, making it easy to miss the error message altogether, as
it is printed at the top of the screen.

This change also prints the error message to stderr vs stdout, which is
again in keeping with *nix utility idoms.
2018-11-23 09:11:35 +01:00
Chris Beams
b864a843ce
Remove Logback config xml from core module
Usually Bisq is run from its 'shadow jar', i.e. the executable fat jar
that collapses all dependencies and resources into a single file. In that
scenario, only a single 'logback.xml' is included in the fat jar and all
is well.

However, when Bisq is run with a normal external classpath, e.g. from
within IDEA, when using `gradle :desktop:run` or when running one of the
Gradle-generated shell scripts under desktop/build/scripts, multiple
'logback.xml' files are present on the classpath, which causes Logback
to complain with messages like the following:

    Found resource [logback.xml] at [file:.../desktop/build/resources/main/logback.xml]
    Resource [logback.xml] occurs multiple times on the classpath.
    Resource [logback.xml] occurs at [file:.../desktop/build/resources/main/logback.xml]
    Resource [logback.xml] occurs at [jar:file:.../core/build/libs/core.jar!/logback.xml]

Note the last line above. The presence of 'logback.xml' in the bisq-core
jar is the 'duplicate'. This is Logback's way of warning the user that
it doesn't know which file should be considered canonical. The only way
to avoid this error message (and the many other lines that get output
along with it) is to remove the offending duplicate file.

This commit removes logback.xml from core to solve the problem described
above. The file is unnecessary in the context of running bisq-desktop,
bisq-seednode, etc, and the only context in which it would actually be
used is when running BisqHeadlessAppMain in core. With that said, the
configuration in the core logback.xml file is identical to the default
Logback configuration, so removing the file has no effect on the logging
output from BisqHeadlessAppMain, and furthermore, it appears that
BisqHeadlessAppMain is not actually in use anywhere right now (it was
added some months ago in anticipation of integrating the new HTTP API,
but this has yet to occur).

In a future change, we should probably return the core module to being a
pure library, without any main methods, and introduce a different
module, e.g. 'daemon' that contains the equivalent of
BisqHeadlessAppMain and whatever logback.xml configuration is
appropriate for it. Doing things this way will avoid the 'duplicate'
errors shown above, because desktop, seednode, etc will not depend on
core module, but will not depend on the daemon module.
2018-11-23 06:42:02 +01:00