Commit graph

2535 commits

Author SHA1 Message Date
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
87efe89662
Add proof of burn feature to dao 2018-11-11 12:56:54 -05:00
Manfred Karrer
82884d5332
Merge branch 'release-candidate-0.9.0' into add-proof-of-burn-feature 2018-11-10 13:29:53 -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
sqrrm
fbfdf94dca
Update btc node ip 2018-11-10 14:56:08 +01:00
Manfred Karrer
9678516c2a
Replace containsKey with putIfAbsent call. Remove log. 2018-11-09 20:35:58 -05:00
Manfred Karrer
d8bae356ff
Complete asset listing fee feature 2018-11-09 20:24:17 -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
33f671ed8b
Cleanup 2018-11-08 20:22:40 -05:00
Manfred Karrer
5a9ff12669
Merge branch 'release-candidate-0.9.0' 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-08 16:59:36 -05:00
Manfred Karrer
6861e76d61
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	desktop/src/main/java/bisq/desktop/util/GUIUtil.java
#	desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
#	gradle/witness/gradle-witness.gradle
2018-11-08 16:55:03 -05:00
Manfred Karrer
ca4a4a47ce
Add asset listing fee and proof of burn domain and views (WIP) 2018-11-08 16:44:58 -05:00
Manfred Karrer
e8ead2dfbd
Merge pull request #1893 from freimair/torrc
Torrc
2018-11-08 11:44:07 -05:00
Christoph Atteneder
d843e73b7f
Adapt dispute flow to match new design 2018-11-08 17:08:51 +01:00
Florian Reimair
7b98445eb9 use program arguments instead of system properties 2018-11-08 14:56:44 +01:00
Christoph Atteneder
e7ea6c7c3a
Improve layout of About and Preferences 2018-11-08 10:40:12 +01:00
Christoph Atteneder
c046239338
Adapt tor network settings popup 2018-11-08 10:31:24 +01:00
Manfred Karrer
cfb88ebf29
cleanup 2018-11-07 20:56:42 -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
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
Christoph Atteneder
1082340701
Adapt user avatar info popup 2018-11-07 19:54:19 +01:00
Christoph Atteneder
78e01f92da
Clean up TradeDetailsWindow 2018-11-07 16:48:32 +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
729eacd6d0
Adapt trade process to new design 2018-11-07 14:43:00 +01: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
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
b6361b5ed2
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	gradle/witness/gradle-witness.gradle
2018-11-06 12:34:57 -05:00
Manfred Karrer
c5630eec0f
Add support for confiscation of bonds 2018-11-06 00:42:17 -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
Christoph Atteneder
4ed6989217
Adapt arbitrator registration view 2018-11-05 09:35:28 +01:00
Chris Beams
0f5e9b794c
Pull up remaining core config to root 2018-11-04 17:18:46 +01:00
Chris Beams
51d9f00d44
Inline $jmockitVersion core/desktop build.gradle 2018-11-04 16:37:39 +01:00