Commit Graph

6827 Commits

Author SHA1 Message Date
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
Chris Beams
3913988f66
Remove unnecessary application of 'java-base' plugin
This was needed at the root level for a while when first porting the
build back to the monorepo, but is no longer necessary now.
2018-11-04 19:01:55 +01:00
Chris Beams
743a7692b7
Remove unnecessary seednode resources config
This looks to have been a copy and paste error when originally setting
up the seednode build.
2018-11-04 19:00:44 +01:00
Chris Beams
adb3e9e3c6
Remove unnecessary :desktop:test javaagent config 2018-11-04 19:00:04 +01:00
Chris Beams
22b92f7057
Use two blank lines between configure blocks
To increase readability
2018-11-04 18:43:20 +01:00
Chris Beams
5cdacbe336
Extract variables for duplicate dependency versions 2018-11-04 18:41:56 +01:00
Chris Beams
cb4f6edd9a
Minimize common subproject javafx dependencies 2018-11-04 18:16:07 +01:00
Chris Beams
3cd467cc9f
Pull up remaining statsnode config to root 2018-11-04 18:00:56 +01:00
Chris Beams
b0886dd02d
Pull up remaining seednode config to root 2018-11-04 18:00:10 +01:00
Chris Beams
9c82b3076a
Pull up remaining relay config to root 2018-11-04 17:58:37 +01:00
Chris Beams
15b81df32f
Pull up remaining pricenode config to root 2018-11-04 17:57:28 +01:00
Chris Beams
2f7c5f1150
Pull up remaining p2p config to root 2018-11-04 17:46:03 +01:00
Chris Beams
e97625cfc3
Pull up remaining monitor config to root 2018-11-04 17:41:37 +01:00
Chris Beams
3c54be2d4f
Pull up remaining desktop config to root
And also relocate gradle-witness jar and config (back) to root-level
gradle/witness dir.
2018-11-04 17:37:32 +01:00
Chris Beams
0f5e9b794c
Pull up remaining core config to root 2018-11-04 17:18:46 +01:00
Chris Beams
d4edb81d87
Pull up remaining common config to root 2018-11-04 16:55:33 +01:00
Chris Beams
c8956567e4
Pull up remaining assets config to root 2018-11-04 16:45:00 +01:00
Chris Beams
cdff12ad9f
Fix incorrect name in pricenode jar and manifest 2018-11-04 16:39:50 +01:00
Chris Beams
51d9f00d44
Inline $jmockitVersion core/desktop build.gradle 2018-11-04 16:37:39 +01:00
Chris Beams
83118b6640
Remove assets Javadoc jar
Previously, when assets was managed as a separate library and
repository, its Javadoc was published via Jitpack and linked to from the
documentation at https://bisq.network. This is no longer the case, and
therefore building the Javadoc jar is no longer necessary.
2018-11-04 16:28:43 +01:00
Chris Beams
bd1e7e273f
Pull up application plugin config to root 2018-11-04 16:27:52 +01:00