Commit Graph

6847 Commits

Author SHA1 Message Date
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
a762a6cc7c
Merge pull request #1922 from devinbileck/update-shadow-plugin
Update to latest shadow plugin version 4.0.2
2018-11-14 08:34:23 +01:00
Devin Bileck
0b794b4e92
Update to latest shadow plugin version 4.0.2
Updating to the latest shadow plugin version will resolve the following
deprecation warning:

> Task :desktop:shadowJar UP-TO-DATE
Registering invalid inputs and outputs via TaskInputs and TaskOutputs
methods has been deprecated. This is scheduled to be removed in Gradle
5.0. A problem was found with the configuration of task
':desktop:shadowJar'.

See: https://github.com/johnrengelman/shadow/issues/336
2018-11-13 22:55:21 -08:00
Manfred Karrer
e5176ec83d
Merge pull request #1919 from yashbhutwala/add-blockstream-explorer
feature: add blockstream.info mainnet and testnet explorers
2018-11-13 17:30:36 -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
98a1d3bef6
Merge pull request #1917 from freimair/fixNetlayerDependencies
Fixed netlayer and tor binary dependency issues
2018-11-13 13:59:10 -05:00
Florian Reimair
9e88e6eed1 Fixed netlayer and tor binary dependency issues 2018-11-13 19:51:11 +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
fd6e7c8130
Merge pull request #1913 from ManfredKarrer/fix-currency-bug
Fix issues with wrong base currency
2018-11-12 20:20:20 -05:00
Manfred Karrer
16e4b72d4d
Fix tests 2018-11-12 00:25:25 -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
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
27dea71bfd
Optimize processing of initial trade statistics and witness data
We changed the earlier behaviour with delayed execution of chunks of the list as it caused
worse results as if it is processed in one go.
Main reason is probably that listeners trigger more code and if that is called early at
startup we have better chances that the user has not already navigated to a screen where the
trade statistics are used for UI rendering.
We need to take care that the update period between releases stay short as with the current
situation before 0.9 release we receive 4000 objects with a newly installed client, which
causes the application to stay stuck for quite a while at startup.
2018-11-09 20:43:07 -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
62dde9b117
Merge branch 'cbeams-delist-untraded-assets' 2018-11-08 16:48:39 -05:00
Manfred Karrer
c9e95013c3
Merge branch 'delist-untraded-assets' of https://github.com/cbeams/bisq into cbeams-delist-untraded-assets
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
#	core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-11-08 16:48:22 -05:00
Manfred Karrer
e8ead2dfbd
Merge pull request #1893 from freimair/torrc
Torrc
2018-11-08 11:44:07 -05:00
Manfred Karrer
ac6d8121a2
Merge pull request #1895 from ManfredKarrer/support-removed-assets
Support handling of removed assets.
2018-11-08 09:02:58 -05:00
Florian Reimair
7b98445eb9 use program arguments instead of system properties 2018-11-08 14:56:44 +01:00
Florian Reimair
5ab801cad2 readability 2018-11-08 10:13:29 +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
Florian Reimair
3d53c2584a comply to coding conventions 2018-11-07 19:44:17 +01:00
Manfred Karrer
dc9762b7b3
Merge pull request #1891 from diablax/list-mask-project
List Mask (MASK)
2018-11-07 13:10:38 -05:00
Chris Beams
53948f372a
Merge pull request #1894 from cbeams/fix-dependency-resolution
Resolve project dependencies from Maven Central vs JCenter
2018-11-07 18:32:38 +01:00
Chris Beams
36b884e3d8
Resolve project dependencies from Maven Central vs JCenter
This change avoids the as-yet unexplained resolution errors we've been
seeing out of JCenter today, which look like the following:

    Could not resolve all files for configuration ':monitor:compileClass
    > Could not resolve net.gpedro.integrations.slack:slack-webhook:1.1.
      Required by:
          project :monitor
       > Could not resolve net.gpedro.integrations.slack:slack-webhook:1
          > Could not get resource 'http://jcenter.bintray.com/net/gpedr
             > Could not HEAD 'http://jcenter.bintray.com/net/gpedro/int
                > sun.security.validator.ValidatorException: PKIX path b

For full context, see the Travis CI build failure at
https://travis-ci.org/bisq-network/bisq/builds/451786384#L678-L679.

It is assumed this is an issue on the JCenter side, e.g. something to do
with the interaction of JCenter servers and their SSL implementation
when accessed under OpenJDK 10 and its TrustStore implementation. This
specific failure does not occur under Oracle JDK 11, but other
dependencies do fail in a similar but non-deterministic fashion. In any
case, resolving project dependencies from Maven Central solves the
problem in the meantime.

See also https://github.com/gradle/gradle/issues/6630.
2018-11-07 18:12:42 +01:00
Florian Reimair
03683a7ecd got rid of magic strings 2018-11-07 17:13:51 +01:00
Florian Reimair
7b07a1585b custom override of torrc 2018-11-07 17:13:51 +01:00
Florian Reimair
a46328fa41 custom torrc file available 2018-11-07 17:13:51 +01:00
Florian Reimair
73fc35413b bumped netlayer to 0.4.7 2018-11-07 17:13:51 +01:00
diablax
8aca297edf List Mask (MASK) 2018-11-07 03:28:34 -08:00
Chris Beams
d910ca62d1
Merge pull request #1890 from devinbileck/Fix-pricenode-gradle-build
Fix pricenode gradle build
2018-11-07 10:17:40 +01:00
Devin Bileck
0625b1c037
Trim whitespace from version variable 2018-11-06 23:43:03 -08:00
Chris Beams
247f383c2d
Remove untraded assets 2018-11-06 21:08:24 +01:00
Chris Beams
34a82ba890
Deprecate insufficiently traded assets
- Remove assets from META-INF/services/bisq.asset.Asset
 - Preserve asset types but mark as @Deprecated
 - @Ignore asset tests

Preserving the types is important from a compatibility perspective.
Users who have traded these assets in the past, however few there may
be, need to be able to classload the asset type(s) in order to avoid
errors when browsing through their trade portfolio history.
2018-11-06 21:08:24 +01:00
Chris Beams
85caf029b3
Add newly listed assets to TradeStatisticsManager#isWarmingUp 2018-11-06 21:08:24 +01:00
Chris Beams
c22ec40b87
Merge pull request #1862 from cbeams/refactor-build
Refactor Gradle build
2018-11-06 15:18:35 +01:00
Chris Beams
978fd2d4ab
Use $springVersion variable consistently
Per review feedback at
https://github.com/bisq-network/bisq/pull/1862#discussion_r230651226.
2018-11-05 11:08:21 +01:00
Chris Beams
f8ec6beedf
Remove unused $junitVersion
Per review comments at
https://github.com/bisq-network/bisq/pull/1862#discussion_r230646331.
2018-11-05 11:02:16 +01:00
Chris Beams
35559350d3
Merge pull request #1865 from cbeams/fix-codeowners
Fix syntax error in CODEOWNERS
2018-11-05 08:20:49 +01:00
Chris Beams
ce5bf55bdd
Fix syntax error in CODEOWNERS
Owners are space-separated, not comma-separated. It is presumed that
this syntax error is why reviews have not been being suggested for
assignment as expected.
2018-11-05 08:05:10 +01:00