Commit graph

6902 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
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
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
d31fb45ae6
Merge pull request #1945 from devinbileck/limit-initial-window-size
Limit initial window size on application launch
2018-11-22 07:18:14 -05:00
Chris Beams
cd616ffaf3
Merge pull request #1944 from henryBTR/list-bitcoinrhodium-asset
List Bitcoin Rhodium (XRC)
2018-11-20 14:29:44 +01:00
Chris Beams
956e77710e
Update core/src/test/java/bisq/core/user/PreferencesTest.java
Co-Authored-By: henryBTR <42034896+henryBTR@users.noreply.github.com>
2018-11-20 14:22:36 +01:00
Chris Beams
e7f2fd4104
Update core/src/main/java/bisq/core/locale/CurrencyUtil.java
Co-Authored-By: henryBTR <42034896+henryBTR@users.noreply.github.com>
2018-11-20 14:22:23 +01:00
Chris Beams
666a888ad1
Merge pull request #1927 from devinbileck/add-gitattributes
Add gitattributes
2018-11-20 14:20:47 +01:00
Chris Beams
9f4f5c48e1
Preserve CRLF line endings in .bat files
This is specifically for the gradlew.bat file generated by the `gradle
wrapper` command. Typically, this file should never be edited, but just
in case it is, this configuration will preserve its original CRLF line
endings.
2018-11-20 14:18:30 +01:00
henryBTR
9fd26676af List Bitcoin Rhodium (XRC) 2018-11-19 19:32:49 +01:00
Devin Bileck
27c41a080c
Limit initial window size on application launch
When launching the application, prevent the initial window size from
exceeding the maximum available bounds.
2018-11-18 22:35:35 -08: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
108ce1d72c
Merge pull request #1936 from ManfredKarrer/fix-formatting-issue
Convert long dash to short dash for minus values
2018-11-17 13:48:09 -05:00
Florian Reimair
717796103d Fixed tests as in: commit of shame 2018-11-17 18:44:10 +01:00
Florian Reimair
f0bfb3825a Declutter TorNetworkNode some more 2018-11-17 18:42:18 +01: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
Florian Reimair
f493b5f619 Added hashes and Netlayer release 0.6 2018-11-17 18:14:18 +01: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
Florian Reimair
aa584acb92 Declutter TorNetworkNode 2018-11-17 18:03:10 +01:00
Florian Reimair
68d813fc0c Refactored TorNetworkNode 2018-11-17 18:02:49 +01:00
Manfred Karrer
136c268dbb
Merge pull request #1928 from freimair/tor8.0.3
Use tor binaries from TorBrowser 8.0.3
2018-11-16 21:07:14 -05:00
Manfred Karrer
95554441e5
Merge pull request #1825 from MUEDEV/list-monetaryunit
List MonetaryUnit (MUE)
2018-11-16 20:38:46 -05:00
Manfred Karrer
5714ce5b70
Merge pull request #1818 from Actinium-project/update-asset-actinium
Update: Actinium (ACM) - Support p2sh-SegWit Addresses
2018-11-16 20:38:29 -05:00
Manfred Karrer
78e78f6b79
Merge pull request #1798 from alfredmox/list-mox-project
List MoX (MOX)
2018-11-16 20:37: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
887ab1dc9f
Merge pull request #1924 from cbeams/revise-docs
Revise contributor / developer docs
2018-11-16 20:26:25 -05:00
Florian Reimair
21a56cc127 worked around jitpack issue 2018-11-16 13:31:37 +01:00
Florian Reimair
3e25ee2cdd Use tor binaries from TorBrowser 8.0.3 2018-11-16 12:28:34 +01:00
Devin Bileck
fa5c402af5
Normalize line endings 2018-11-15 22:42:21 -08:00
Devin Bileck
15c83aa592
Add .gitattributes file 2018-11-15 22:34:05 -08:00
Chris Beams
44c326729b
Merge pull request #1901 from devinbileck/update-gradle-witness.jar
Update gradle-witness.jar
2018-11-15 11:41:25 +01:00
Devin Bileck
286dd51b13
Update gradle-witness.jar
Built from commit
44b0391006

md5 hash ae4796f320ef3200515183fa9d3f4759
2018-11-15 11:40:46 +01:00
Chris Beams
7985ff7e05
Apply review feedback 2018-11-15 11:25:45 +01:00
Chris Beams
e0e2da618e
Overhaul CONTRIBUTING.md 2018-11-14 18:20:53 +01:00
Chris Beams
d2050bc304
Revise dao-setup.md
- Reword headings for clarity and consistency
 - Polish Markdown syntax
2018-11-14 18:20:53 +01:00
Chris Beams
0322dbae1a
Revise dev-setup.md
- Reword headings for consistency
 - Polish Markdown syntax
 - Link to correct docs in Prerequisites section

There are no significant substantive changes in the instructions here,
just reworking of the existing content.
2018-11-14 18:20:53 +01:00
Chris Beams
5612889720
Clean up dao-setup.zip contents
- Remove __MACOSX dir and .DS_Store files
 - Rename Bisq_DAO_regtest_setup/ => dao-setup/ for consistency
2018-11-14 18:20:53 +01:00
Chris Beams
804efd6c0a
Rename Bisq_DAO_regtest_setup.zip => dao-setup.zip
For concision, idiomatic naming and to sort well with dao-setup.md.
2018-11-14 18:20:52 +01:00
Chris Beams
ff6a155470
Extract dao-setup.md from dev-setup.md
Prior to this change, DAO setup instructions and information were
interspersed within dev-setup.md, making it confusing to the uninitiated
reader what they need to do in order to get up and running with a basic
local dev environment. All the DAO setup stuff is essentially optional,
so separating it out into its own doc makes sense.

Now, dev-setup.md is dedicated to the task of getting set up with a
self-contained local development environment, and readers can follow the
DAO setup instructions separately if and when they need to.

Both docs need to be further revised and cleaned up, but that will come
in subsequent commits.
2018-11-14 18:20:52 +01:00
Chris Beams
017a1802eb
Rename DEV_SETUP.md => dev-setup.md 2018-11-14 18:20:52 +01:00
Chris Beams
23a41b632c
Extract separate docs from main README.md
- Simplify "What is Bisq?" description
 - Extract docs/build.md
 - Extract docs/idea-import.md
 - Introduce docs/README.md index
2018-11-14 18:20:52 +01:00
Chris Beams
8dccf04af8
Move docs/CONTRIBUTING.md => CONTRIBUTING.md
The CONTRIBUTING.md file must be located in the root directory of a
project (or within a .github directory) in order to be recognized by
GitHub and presented to users during the process of filing an issue
or pull request. It doesn't do any good within the docs/ directory.
2018-11-14 18:20:52 +01:00
Chris Beams
08d351f272
Remove scripts/run_bisq_via_vps.md
This doc was originally transcribed from #511, then moved to the wiki,
then moved here. Removing it now as (a) it's not clear this is of value to
anyone other than the original author and (b) this approach is not
necessarily something we want to advertise or promote.
2018-11-14 18:20:52 +01:00
Chris Beams
e84de6da91
Remove scripts/install_on_unix.sh 2018-11-14 18:20:51 +01:00
Chris Beams
7de30b1f7c
Remove scripts/bisq-sn.cron.sh 2018-11-14 18:20:51 +01:00