Commit graph

2633 commits

Author SHA1 Message Date
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
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
Chris Beams
b3d20b5b5f
Remove Utilities.removeCryptographyRestrictions
This code is no longer necessary after the recent move to JDK10, and
removing it entirely avoids spending unnecessary cycles and eliminates
the confusing "Cryptography restrictions removal not needed" message in
console output.
2018-11-23 06:09:59 +01:00
Christoph Atteneder
57763a2607
Enable locales for Thai and Vietnamese 2018-11-22 13:11:08 +01:00
Christoph Atteneder
4c95d030e8
Adapt layout of popup windows 2018-11-21 15:31:49 +01:00
Christoph Atteneder
48b4c3ce9c
Increase first line padding 2018-11-21 11:49:57 +01:00
Manfred Karrer
2564ae93f4
Remove comment 2018-11-18 12:13:34 -05:00
Manfred Karrer
89b092b7ea
Small fixes
- Use Array list for PB list as PB lists are unmodifyable
- Rename method to contain the unspent property
- fix row index in view
2018-11-18 11:07:30 -05:00
sqrrm
e815c4b105
Use lockup txid to track confiscation
1. Every bond is defined by its lockup transaction. To make it easy to
track which bonds are confiscated it's easier to track them by only one
txid instead of using a map with a mix of lockup txoutputs and unlock
txoutputs.

To check if a txoutput has been confiscated it has to be checked against
the originiating lockup txid.

2. Minor fixes of naming lockedup -> lockup and comments.
2018-11-17 23:13:13 +01:00
sqrrm
aa27d443a4
Display confiscated bond value 2018-11-17 23:13:13 +01:00
sqrrm
0c855f8dd0
Clearer param change validation 2018-11-17 23:13:13 +01:00
sqrrm
e577d0c4a9
Fix resource name 2018-11-17 23:13:13 +01:00
Manfred Karrer
aa05651ff4
Merge branch 'master' into release-candidate-0.9.0 2018-11-17 15:22:58 -05:00
Manfred Karrer
e37813c658
Merge pull request #1935 from freimair/externalTor
Bisq can now use an external Tor service
2018-11-17 14:02:11 -05:00
Manfred Karrer
c8416019f3
Merge pull request #1933 from ManfredKarrer/fix-temp-file-issue
Don't use a temp file for the sound file
2018-11-17 13:50:51 -05:00
Manfred Karrer
3157e86f8b
Persist last selected payment account at take offer
The last selected payment account gets persisted so that at the next
take offer attempt that same account is selected in the combo box in
case there are multiple accounts for that currency.
2018-11-17 13:29:52 -05:00
Manfred Karrer
5f766b4cd5
Convert long dash to short dash for minus values
Fixes https://github.com/bisq-network/bisq/issues/1925
2018-11-17 12:32:42 -05:00
Manfred Karrer
43ace0b659
Don't use a temp file for the sound file
We play a silent sound to prevent app nap and network disconnections.
Instead of a temp file which got deleted on exit and recreated each
startup we store it once in the data directory root.
Fixes https://github.com/bisq-network/bisq/issues/1931
2018-11-17 12:06:59 -05:00
Florian Reimair
64c6e3d783 Connect with CookieAuthentication 2018-11-17 18:03:10 +01:00
Florian Reimair
139ec518fc Connect with PasswordAuthentication 2018-11-17 18:03:10 +01:00
Florian Reimair
63f8bbf8c5 Connect to external Tor with NullAuthentication 2018-11-17 18:03:10 +01:00
Manfred Karrer
ca78453e04
Merge pull request #1930 from ManfredKarrer/small-fixes
Cleanup
2018-11-16 20:33:40 -05:00
Manfred Karrer
ac7ed15bcc
Merge branch 'release-candidate-0.9.0' of https://github.com/bisq-network/bisq into release-candidate-0.9.0 2018-11-16 20:30:30 -05:00
Manfred Karrer
f3851145f0
Merge branch 'master' into release-candidate-0.9.0 2018-11-16 20:29:56 -05:00
Manfred Karrer
0c2c68e146
Put Blockstream explorer as first item in the list
Put Blockstream explorer as first item in the list so it will be
taken as default explorer.
2018-11-16 20:29:39 -05:00
Manfred Karrer
4bec5b3830
Cleanup 2018-11-16 20:18:47 -05:00
Christoph Atteneder
dc69cac87e
Show error text without truncation 2018-11-14 17:07:17 +01:00
Christoph Atteneder
3d0aec5a92
Adapt Password, Wallet and Restore views 2018-11-14 11:51:04 +01:00
Manfred Karrer
dd638bf6bc
Add util method for setting isDaoActivated 2018-11-13 21:16:11 -05:00
Manfred Karrer
13ebca9949
Update testnet seednode and genesis tx 2018-11-13 20:20:19 -05:00
Manfred Karrer
3152a075e3
Set new testnet genesis tx, Change arbitr. activ. date 2018-11-13 19:23:57 -05:00
Yash Bhutwala
e4a3dd972c feature: add blockstream.info mainnet and testnet explorers (both non-tor and tor versions) 2018-11-13 15:59:11 -05:00
Manfred Karrer
e098caf35c
Merge branch 'release-candidate-0.9.0' into small-fixes 2018-11-13 14:01:53 -05:00
Manfred Karrer
12e875240d
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	core/src/main/java/bisq/core/payment/AccountAgeWitnessService.java
2018-11-13 14:00:54 -05:00
Manfred Karrer
a607852d36
Fix wording 2018-11-13 12:54:59 -05:00
Christoph Atteneder
7c774b9c7b
Improve layouting of balance to prevent truncation issues 2018-11-13 17:04:05 +01:00
Christoph Atteneder
0ac911bbdf
Adapt Arbitrator registration window 2018-11-13 15:58:50 +01:00
Christoph Atteneder
21aa91f41d
Adapt trade charts styles 2018-11-13 15:47:02 +01:00
Christoph Atteneder
17a9d794fb
Merge pull request #1905 from ManfredKarrer/optimize-initial-data-load
Optimize initial data load
2018-11-13 13:19:50 +01:00
Manfred Karrer
b852a6b94a
Merge branch 'master' into release-candidate-0.9.0 2018-11-12 20:36:47 -05:00
Manfred Karrer
630090bb17
Merge remote-tracking branch 'origin/add-proof-of-burn-feature' into add-proof-of-burn-feature 2018-11-12 20:24:21 -05:00
Manfred Karrer
a65f1df5c8
Improve method name, add comment 2018-11-12 20:16:55 -05:00
sqrrm
7e342990c0
Fix text
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-11-12 20:10:36 -05:00
Manfred Karrer
9f9349c835
Fix issues with wrong base currency
From the changes in isCryptoCurrency which return true in case of BTC
there have been some bugs. We changed the check to distinguish between
altcoin and fiat to check for BTC as base currency now.
That area would require a bigger refactoring...
2018-11-11 18:00:43 -05:00
Manfred Karrer
87efe89662
Add proof of burn feature to dao 2018-11-11 12:56:54 -05:00