Commit graph

2151 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
c2cb0e2965
Merge pull request #1902 from aejontargaryen/update-altcoin-account-popups
Update altcoin accounts info popups
2018-11-10 13:27:38 -05:00
Manfred Karrer
5dbdfbfc29
Update displayStrings.properties 2018-11-10 13:27:00 -05:00
Manfred Karrer
9678516c2a
Replace containsKey with putIfAbsent call. Remove log. 2018-11-09 20:35:58 -05:00
Manfred Karrer
fa911e96ed
Merge pull request #1903 from freimair/torrc
engage commandline argument parser
2018-11-09 10:25:17 -05:00
Florian Reimair
90f3ccd5a6 activate commandline argument parser 2018-11-09 15:40:45 +01:00
aejontargaryen
dd6fd3a76e update altcoin info popups 2018-11-09 08:41:43 +00:00
Manfred Karrer
e8ead2dfbd
Merge pull request #1893 from freimair/torrc
Torrc
2018-11-08 11:44:07 -05:00
Florian Reimair
7b98445eb9 use program arguments instead of system properties 2018-11-08 14:56:44 +01:00
Manfred Karrer
36df44db33
Add comment 2018-11-07 17:35:21 -05:00
Manfred Karrer
f59bbefe21
Move asset trade activity code to new class 2018-11-07 17:32:54 -05:00
Manfred Karrer
64c4522e88
Decrease required trade volume. Add better log for not traded assets 2018-11-07 17:25:22 -05:00
Manfred Karrer
4fd86c64e3
Fix tests and improve the isCryptoCurrency method.
- We return true at isCryptoCurrency in those cases:
- The code is BTC
- The code is found in assetRegistry
- If not found we check if we have a fiat currency for that code,
if not we treat it as crypto (case of a removed asset)
2018-11-07 16:31:32 -05:00
Manfred Karrer
8982f108cb
Support handling of removed assets.
- cross check the isCryptoCurrency method if the symbol matches any
fiat currency and of both not match consider it still a CC. In case of
a removed asset it was returning false before which caused an issue in
the trade currency pair showing both sides as BTC.
- Show N/A for name in case the asset is not available.

The code mostly operates with the ticker symbol which gets stored in
the offer, so even an asset is removed traders who have that asset in
their account list can trade without problems.
Tested create offer, take offer and executing a trade.
2018-11-07 14:01:58 -05:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -05:00
Manfred Karrer
b55ba273a1
Merge pull request #1829 from arunasurya/2018-10-04-fix-grammar
Improve grammar of Background Info
2018-11-01 12:03:07 -05:00
Aruna Surya
6dd193b0f0
Improve grammar of Background Info 2018-11-01 08:16:38 +01:00
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation 2018-10-30 21:53:32 +07:00
Christoph Atteneder
55133ef117
Merge pull request #1822 from ManfredKarrer/add-cash-depoist-warning
Add warning popup for cash deposit
2018-10-29 10:59:30 +01:00
Manfred Karrer
1350413050
Add filter for not adding null entries 2018-10-28 12:45:10 -05:00
Alexey Zagarin
0b8f6c17e2 Add PromptPay (Thailand)
Closes https://github.com/bisq-network/payment-methods/issues/6.
2018-10-28 20:25:37 +07:00
Manfred Karrer
cc446fb707
Add warning popup for cash deposit 2018-10-26 21:48:41 -05:00
sqrrm
7be08fee9c
FIx typo
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:33 -05:00
sqrrm
c463768856
Add comment
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:08 -05:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00
Manfred Karrer
bccecc1f16
FIx missing arguments in test 2018-10-23 12:42:05 -05:00
Manfred Karrer
501050de6f
Add getUnusedBsqAddressAsString method 2018-10-23 11:56:11 -05:00
Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
2018-10-19 23:43:07 -05:00
Manfred Karrer
75e0daefbf
Merge branch 'master' into DAO-UI-hide-details 2018-10-19 21:01:53 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements
Persitence of DAO state
2018-10-18 16:15:28 -05:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
15177e6537
Add comment 2018-10-17 14:21:31 -05:00
Manfred Karrer
dbe5cf6f85
Replace double quote with single
Double quotes are only needed when a placeholder ({0}) is used in the text. Otherwise it would show 2 quotes.
2018-10-17 11:02:34 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04:00