Commit graph

7058 commits

Author SHA1 Message Date
Manfred Karrer
cfb88ebf29
cleanup 2018-11-07 20:56:42 -05:00
Manfred Karrer
f0c435a6bb
Merge 2018-11-07 20:56:35 -05:00
Manfred Karrer
53e127f556
Add asset listing params 2018-11-07 20:56:22 -05:00
Manfred Karrer
e8df2b533e
Merge branch 'cbeams-delist-untraded-assets' into add-asset-listing-fee
# Conflicts:
#	core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-11-07 19:35:47 -05:00
Manfred Karrer
b69f5cac23
Merge branch 'support-removed-assets' into add-asset-listing-fee
# Conflicts:
#	desktop/src/main/java/bisq/desktop/util/GUIUtil.java
#	desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
2018-11-07 19:32:00 -05:00
Manfred Karrer
2bd819a463
Remove commented out print code 2018-11-07 19:30:02 -05: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
ab14e69a6c
Merge branch 'delist-untraded-assets' of https://github.com/cbeams/bisq into cbeams-delist-untraded-assets 2018-11-07 14:06:33 -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
95ba95d822
Merge branch 'master' into release-candidate-0.9.0 2018-11-07 12:36:23 -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
Christoph Atteneder
3887d4b49c
Merge pull request #1892 from ripcurlx/adapt-trade-process
Redesign: Adapt trade process
2018-11-07 16:11:45 +01:00
Christoph Atteneder
d59793eae0
Fix validation display error when switching between payment methods 2018-11-07 14:54:56 +01:00
Christoph Atteneder
055fc9ee12
Fix bottom padding 2018-11-07 14:45:46 +01:00
Christoph Atteneder
729eacd6d0
Adapt trade process to new design 2018-11-07 14:43:00 +01: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
Christoph Atteneder
f5825f674a
Merge pull request #1889 from ManfredKarrer/complete-bonded-roles-impl
Complete bond domain and views
2018-11-07 09:17:31 +01:00
Devin Bileck
0625b1c037
Trim whitespace from version variable 2018-11-06 23:43:03 -08:00
Manfred Karrer
2b1405ecab
Change style for menu buttons in dao views 2018-11-07 00:11:14 -05:00
Manfred Karrer
3a03deb83a
Cleanup translation string for bond domain 2018-11-06 22:46:27 -05:00
Manfred Karrer
1c8df357f4
Add length validation for salt 2018-11-06 22:32:40 -05:00
Manfred Karrer
698d01d4be
Cleanup bond views 2018-11-06 22:24:25 -05:00
Manfred Karrer
ceee3562af
Remove onTxMalleability methods 2018-11-06 19:56:11 -05: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
Manfred Karrer
bee2d1ebd3
Cleanup bond domain 2018-11-06 14:58:12 -05:00
Manfred Karrer
edc1a35b15
Merge branch 'release-candidate-0.9.0' into complete-bonded-roles-impl 2018-11-06 12:40:50 -05:00
Manfred Karrer
bb83cecd18
Add dependency for jfoenix (JavaFX UI components)
- Used for material design support
- com.jfoenix:jfoenix:9.0.6
2018-11-06 12:39:32 -05:00
Manfred Karrer
b6361b5ed2
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	gradle/witness/gradle-witness.gradle
2018-11-06 12:34:57 -05:00
Chris Beams
c22ec40b87
Merge pull request #1862 from cbeams/refactor-build
Refactor Gradle build
2018-11-06 15:18:35 +01:00
Christoph Atteneder
c58d1caa64
Clean up generics and comparators 2018-11-06 14:19:35 +01:00
Manfred Karrer
c5630eec0f
Add support for confiscation of bonds 2018-11-06 00:42:17 -05:00
Manfred Karrer
aefcc9fbbf
Merge pull request #1886 from ripcurlx/adapt-take-and-edit-offer
Redesign: Adapt edit and take offer screens
2018-11-06 00:26:56 -05:00
Manfred Karrer
8e3864589a
Complete bonds view 2018-11-05 21:26:00 -05:00
Manfred Karrer
6218da0623
Support state update for unconfirmed reputation bond txs. 2018-11-05 20:22:57 -05:00
Manfred Karrer
7bf5c819cd
Implements bonded reputation
Still WIP with many areas...
2018-11-05 18:35:30 -05:00
Christoph Atteneder
d7f72c158b
Adapt TakeOffer to new design 2018-11-05 18:51:17 +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
Christoph Atteneder
d274262c44
Fix edit offer view 2018-11-05 09:51:23 +01:00
Christoph Atteneder
4ed6989217
Adapt arbitrator registration view 2018-11-05 09:35:28 +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