Commit Graph

2635 Commits

Author SHA1 Message Date
Manfred Karrer
2ba21f0277
Update display string 2018-12-02 14:24:37 +01:00
Manfred Karrer
fe458bce12
Don't use tor for BitcoinJ if testnet 2018-12-02 13:36:47 +01:00
Manfred Karrer
5b3d521e36
Imprve text and actiavte chainSyncIndicator when not synced 2018-12-02 01:18:58 +01:00
Manfred Karrer
86f44c7a64
Use en_US if default locale has no country defined.
On some systems there is not country defined, in that case we use en_US
2018-12-01 01:15:17 +01:00
Manfred Karrer
d929128652
Merge branch 'master' into release-candidate-0.9.0 2018-11-30 23:08:52 +01:00
Manfred Karrer
289b263d84
Fix log path
Resolving the property from the bisqEnvironment via getProperty returns
the default value instead of the program argument value. Not sure why,
seems to be related to recent changes in the property handling.
2018-11-30 21:50:32 +01:00
Manfred Karrer
ddc2385829
Update testnet seed nodes 2018-11-30 21:12:58 +01:00
Manfred Karrer
54b6590ded
Fix new testnet genesis tx 2018-11-30 18:06:03 +01:00
Manfred Karrer
3c6342f4d6
Merge branch 'release-candidate-0.9.0' into bug-fixes-dao 2018-11-30 17:36:30 +01:00
Manfred Karrer
1ff5a55b27
Add new testnet genesis tx 2018-11-30 17:35:24 +01:00
Manfred Karrer
d8c553ca4e
Add phases for testnet 2018-11-30 17:03:12 +01:00
Manfred Karrer
9ced987c3d
Use a min. trial period of 30 days for asset listings 2018-11-30 16:49:16 +01:00
Manfred Karrer
7fefa1e5e7
Only check if data adn txType is valid in getAllValidBallots
Rename getValidAndConfirmedBallots to getAllValidBallots.
We cannot do a phase and cycle check as we are interested in
historical ballots as well.

Use warn level for logs in case data is missing and requested to
give more weight to those exceptional cases.
2018-11-30 16:04:16 +01:00
Manfred Karrer
44c62716d6
Add validation for ballots used for vote result 2018-11-30 15:20:10 +01:00
Manfred Karrer
a0cbfe4d58
Merge pull request #2002 from ripcurlx/ui-improvements
Redesign: UI improvements/fixes during release testing
2018-11-29 22:20:28 +01:00
Manfred Karrer
459893db88
Merge branch 'release-candidate-0.9.0' into bug-fixes-dao 2018-11-29 18:08:37 +01:00
Manfred Karrer
0c8b00e4bd
Merge branch 'master' into release-candidate-0.9.0 2018-11-29 18:07:52 +01:00
Christoph Atteneder
32fb8010cf
Add additional space 2018-11-29 17:01:00 +01:00
Christoph Atteneder
f380e8124b
Add additional space 2018-11-29 16:47:44 +01:00
Christoph Atteneder
c5d9bac8a6
Fix wrong resource key 2018-11-29 16:33:28 +01:00
Manfred Karrer
1b47e891ee
DAO bugfixes
- Only show active bonds in make proposal screen
- Check if ballot exists for evaluated proposals in result view
- Use available amount instead of genesis issuance at market cap
- Fix but with button handler for removing a proposal
- Cleanups
2018-11-29 13:40:48 +01:00
Christoph Atteneder
f26d9866d4
Add reference to tab instead of button. Fixes #1997. 2018-11-29 10:45:01 +01:00
The Blur Network
bf283dce10 Blur: Add instructions for GUI Wallet in pop-up
* Clarify existing instructions for CLI Wallet
* Provide instruction to retrieve information from GUI Wallet
* Ensure responsibilities are non-ambiguous with regard to burden of responsibility.
* Fix formatting with newlines
2018-11-28 18:00:20 -05:00
Manfred Karrer
eedc00f87a
Use rocketchat instead of slack as role 2018-11-28 21:43:43 +01:00
Manfred Karrer
0ef2ccd4e4
Add BSQ as default active assets 2018-11-28 21:43:21 +01:00
Manfred Karrer
91004065c9
Fix wrong text 2018-11-28 21:15:50 +01:00
Christoph Atteneder
eb876576d7
Get rid of hard coded strings in account payloads 2018-11-28 17:39:14 +01:00
Christoph Atteneder
5c804018ab
Align offer count in trade currency combobox 2018-11-28 16:37:01 +01:00
Christoph Atteneder
21e8fe4ac4
Merge pull request #1984 from ManfredKarrer/remove-not-used-classes
Remove block explorer request classes
2018-11-27 15:20:20 +01:00
Manfred Karrer
9ad211369b
Remove block explorer request classes
Those have never been used. They were in place or requesting non-wallet
transactions like the trade fee tx of the peer.
2018-11-27 14:53:46 +01:00
Manfred Karrer
f59914f160
Send mobile notification msg in a thread.
The http request can take a few seconds to return so we use a thread to
send it and return the result in a handler.
2018-11-27 14:32:51 +01:00
Manfred Karrer
d142ad8844
Merge pull request #1982 from ManfredKarrer/remove-ico-tokens-and-btc2
Remove ico tokens and btc2
2018-11-27 13:15:06 +01:00
Manfred Karrer
1e11d47ccb
Remove assets 2018-11-27 01:10:48 +01:00
Manfred Karrer
1f4643dfbc
Fix display string 2018-11-26 23:52:34 +01:00
Manfred Karrer
a51d337c25
Merge branch 'release-candidate-0.9.0' into bug-fixes 2018-11-26 15:32:49 +01:00
Christoph Atteneder
da8b5fcf9d
Merge pull request #1967 from ManfredKarrer/remove_not-traded-assets
Remove not traded assets
2018-11-26 11:30:39 +01:00
Christoph Atteneder
c7c20fb2ad
Merge pull request #1958 from ManfredKarrer/improve-backward-compatibility-with-new-arb-selection
Improve backward compatibility with new arb selection
2018-11-26 11:25:26 +01:00
Manfred Karrer
1f81acb4b8
Increase minTradeAmount to 0.01 btc, remove 0.7 coins from warmup phase 2018-11-26 02:31:06 +01:00
Manfred Karrer
735e4588ce
Merge branch 'release-candidate-0.9.0' into improve-backward-compatibility-with-new-arb-selection 2018-11-25 23:55:01 +01:00
Manfred Karrer
83190fb237
Merge branch 'release-candidate-0.9.0' into persist-selected-account-at-takeoffer 2018-11-25 23:54:23 +01:00
Manfred Karrer
0e64a7193d
Merge branch 'master' into release-candidate-0.9.0 2018-11-25 23:52:51 +01:00
Devin Bileck
054f293622
Resolve BisqHelpFormatterTest failure on Windows
The expected content for the CLI help output needs different path
separators on Windows.
2018-11-24 23:45:43 -08:00
Manfred Karrer
4930c1297e
Add getActivePaymentMethods for filtered payment methods 2018-11-25 03:21:12 +01:00
Chris Beams
931f369fb6
Include executable name and version in help output 2018-11-24 13:24:03 +01:00
Chris Beams
83e1dd37f9
Refactor option parsing configuration
This change eliminates the BisqExecutable.description method and
replaces it with proper use of the `describedAs` and `defaultsTo`
methods in the JOptSimple API. This removes the concern of formatting
option argument descriptions and default values from the BisqExecutable
class, and delegates it to the new BisqHelpFormatter (see previous
commit), which is designed for the purpose.

For example, prior to this commit, the help text for the --banList
option read as follows:

    --banList=<value>
            Nodes to exclude from network connections. (default: )

Now it reads as follows:

    --banList=<host:port[,...]>
            Nodes to exclude from network connections.

Likewise, previous to this commit, the --logLevel option read as
follows:

    --logLevel=<value>
            Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]
            (default: INFO)

And now it reads like this:

    --logLevel=<OFF|ALL|ERROR|WARN|INFO|DEBUG|TRACE> (default: INFO)
            Log level

There are a number of further improvements that can and should be made
to the description text of the various options, the types specified for
their arguments, etc, but these will be handled in subsequent commits.
This commit is strictly about refactoring existing parser configuration
to take advantage of the new BisqHelpFormatter.
2018-11-24 13:24:03 +01:00
Chris Beams
2a537a601b
Introduce BisqHelpFormatter
Prior to this commit, help output for Bisq executables, e.g. Bisq
Desktop itself used JOptSimple's default HelpFormatter implementation,
which creates a quite cramped and hard-to-read output.

This commit introduces a custom HelpFormatter implementation modeled
after bitcoind's own help output. It maximizes readability while making
full use of an 80-character width.
2018-11-24 13:19:56 +01:00
Manfred Karrer
880a8412fc
Merge pull request #1957 from j3ko/release-candidate-0.9.0
Add advanced cash payment method
2018-11-24 12:09:04 +01:00
Jeffrey Ko
dd3abd2996
make advanced cash payment method more consistent ok pay payment method 2018-11-24 13:26:12 +07:00
Manfred Karrer
d7fe1dbeb3
Handle edge cases with removed arbitrators 2018-11-24 00:44:56 +01:00
Manfred Karrer
319c043e43
Handle backward compatibility with new arbitr. selection
- Remove activationDate
- Refactor ProcessOfferAvailabilityResponse and handle offers from
old versions in case the available arbitrators has changed.
- Remove MakerVerifyMediatorSelection and TakerSelectArbitrator

The mediator handling should be removed as it is not used and not
intended anymore to be used with the current trade protocol, but we
leave that as it is a bit tricky to ensure backward compatibility.
Also the setting of the arbitrator in trade should be further refactored
but as it is also easy to break backward compatibility here we leave
that for now. As we work on the new trade protocol that domain will
become deprecated anyway in the next months...
2018-11-24 00:23:46 +01:00
Manfred Karrer
1ba0402dfb
Handle backward compatibility with new arbitration selection model. 2018-11-23 22:14:31 +01:00
Manfred Karrer
d98f3c12cf
Add default genesis tx info for regtest 2018-11-23 20:48:52 +01:00
Jeffrey Ko
4cd2ac8d40
Add advanced cash payment method 2018-11-23 20:50:03 +07:00
Chris Beams
a57a4a71c0
Remove unused Utilities import
This change should have been included in 63cec4252 (#1955).
2018-11-23 11:28:58 +01:00
Manfred Karrer
15c776874e
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	.editorconfig
2018-11-23 11:24:07 +01:00
Manfred Karrer
63cec42523
Merge pull request #1955 from cbeams/quell-help-on-error
Quell help output on option parsing error
2018-11-23 11:21:56 +01:00
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
Chris Beams
2b883c838a
Quell help output on option parsing error
This change suppresses help output when option parsing fails, e.g. due
to an unrecognized option being specified. This is in keeping with *nix
utility idioms; for example, notice what happens when running `git
--bogus` or `ls --bogus`: they output an error message, and in some
cases a usage message, but they do not print complete help text.
This approach is especially important in the case of an application like
Bisq, where there are many options and the help text is longer than a
typical screen, making it easy to miss the error message altogether, as
it is printed at the top of the screen.

This change also prints the error message to stderr vs stdout, which is
again in keeping with *nix utility idoms.
2018-11-23 09:11:35 +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
Christoph Atteneder
57763a2607
Enable locales for Thai and Vietnamese 2018-11-22 13:11:08 +01:00
Christoph Atteneder
4c95d030e8
Adapt layout of popup windows 2018-11-21 15:31:49 +01:00
Christoph Atteneder
48b4c3ce9c
Increase first line padding 2018-11-21 11:49:57 +01:00
Manfred Karrer
2564ae93f4
Remove comment 2018-11-18 12:13:34 -05:00
Manfred Karrer
89b092b7ea
Small fixes
- Use Array list for PB list as PB lists are unmodifyable
- Rename method to contain the unspent property
- fix row index in view
2018-11-18 11:07:30 -05:00
sqrrm
e815c4b105
Use lockup txid to track confiscation
1. Every bond is defined by its lockup transaction. To make it easy to
track which bonds are confiscated it's easier to track them by only one
txid instead of using a map with a mix of lockup txoutputs and unlock
txoutputs.

To check if a txoutput has been confiscated it has to be checked against
the originiating lockup txid.

2. Minor fixes of naming lockedup -> lockup and comments.
2018-11-17 23:13:13 +01:00
sqrrm
aa27d443a4
Display confiscated bond value 2018-11-17 23:13:13 +01:00
sqrrm
0c855f8dd0
Clearer param change validation 2018-11-17 23:13:13 +01:00
sqrrm
e577d0c4a9
Fix resource name 2018-11-17 23:13:13 +01:00
Manfred Karrer
aa05651ff4
Merge branch 'master' into release-candidate-0.9.0 2018-11-17 15:22:58 -05: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
3157e86f8b
Persist last selected payment account at take offer
The last selected payment account gets persisted so that at the next
take offer attempt that same account is selected in the combo box in
case there are multiple accounts for that currency.
2018-11-17 13:29:52 -05: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
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
Manfred Karrer
ca78453e04
Merge pull request #1930 from ManfredKarrer/small-fixes
Cleanup
2018-11-16 20:33:40 -05:00
Manfred Karrer
ac7ed15bcc
Merge branch 'release-candidate-0.9.0' of https://github.com/bisq-network/bisq into release-candidate-0.9.0 2018-11-16 20:30:30 -05:00
Manfred Karrer
f3851145f0
Merge branch 'master' into release-candidate-0.9.0 2018-11-16 20:29: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
4bec5b3830
Cleanup 2018-11-16 20:18:47 -05:00
Christoph Atteneder
dc69cac87e
Show error text without truncation 2018-11-14 17:07:17 +01:00
Christoph Atteneder
3d0aec5a92
Adapt Password, Wallet and Restore views 2018-11-14 11:51:04 +01:00
Manfred Karrer
dd638bf6bc
Add util method for setting isDaoActivated 2018-11-13 21:16:11 -05:00
Manfred Karrer
13ebca9949
Update testnet seednode and genesis tx 2018-11-13 20:20:19 -05:00
Manfred Karrer
3152a075e3
Set new testnet genesis tx, Change arbitr. activ. date 2018-11-13 19:23:57 -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
e098caf35c
Merge branch 'release-candidate-0.9.0' into small-fixes 2018-11-13 14:01:53 -05:00
Manfred Karrer
12e875240d
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	core/src/main/java/bisq/core/payment/AccountAgeWitnessService.java
2018-11-13 14:00:54 -05:00
Manfred Karrer
a607852d36
Fix wording 2018-11-13 12:54:59 -05:00
Christoph Atteneder
7c774b9c7b
Improve layouting of balance to prevent truncation issues 2018-11-13 17:04:05 +01:00
Christoph Atteneder
0ac911bbdf
Adapt Arbitrator registration window 2018-11-13 15:58:50 +01:00
Christoph Atteneder
21aa91f41d
Adapt trade charts styles 2018-11-13 15:47:02 +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
b852a6b94a
Merge branch 'master' into release-candidate-0.9.0 2018-11-12 20:36:47 -05:00
Manfred Karrer
630090bb17
Merge remote-tracking branch 'origin/add-proof-of-burn-feature' into add-proof-of-burn-feature 2018-11-12 20:24:21 -05:00
Manfred Karrer
a65f1df5c8
Improve method name, add comment 2018-11-12 20:16:55 -05:00
sqrrm
7e342990c0
Fix text
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-11-12 20:10:36 -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
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
Chris Beams
1cdb39ab60
Pull up JesusMcCloud repo to root
Not all subprojects need it, but most do.
2018-11-04 14:28:14 +01:00
Chris Beams
f6a68f8aef
Pull up common JavaCompile config to root 2018-11-04 14:20:55 +01:00
Chris Beams
4e1fa914a2
Pull up common repositories to root build.gradle 2018-11-04 14:20:55 +01:00
Chris Beams
95c8b8ddfa
Pull up application and configuration of java plugin 2018-11-04 14:20:55 +01:00
Chris Beams
3c1c402d40
Remove use of maven plugin
It is no longer necessary to publish Maven metadata about common, core
and other submodules as they are no longer managed as separate libraries
in separate repositories. The only way these modules should be getting
referenced is from within applications in this repository such as
desktop, statsnode, etc. Essentially, we're no longer publishing our
libraries for public consumption.
2018-11-04 13:19:06 +01:00
Manfred Karrer
15b8f02c67
Work on bonded reputation (WIP) 2018-11-02 19:31:31 -05:00
Manfred Karrer
8ce8813e89
Complete handling of bonds for roles.
- Add BondedRoleState to reflect all diff. states.
- Show in UI correct state and button state for lockup/revoke
- Rename ProposalService classes to ProposalFactory
2018-11-02 16:09:53 -05:00
Manfred Karrer
10b14a69cc
Moving classes
That was a big commit with restructuring the packages and classes.
Motivation was to isolate the daoState value objects so it is more clear
which data are help in the daoState. As it was hard to keep an overview
and easy to add mutable data I think that makes it more safe overall.
I am aware that the downside to take out domain models from the domain
packages is not so nice.
Also moved blockchain models to parser and full node packages.
2018-11-02 11:41:54 -05:00
Manfred Karrer
32f709c2c9
Merge pull request #1858 from ripcurlx/create-offer-adaptions
Redesign: Create Offer flow adaptions
2018-11-02 11:40:19 -05:00
Christoph Atteneder
3167195f85
Different clean up tasks in the create offer process 2018-11-02 16:30:42 +01:00
Manfred Karrer
f55fde05b6
Moving classes
That was a big commit with restructuring the packages and classes.
Motivation was to isolate the daoState value objects so it is more clear
which data are help in the daoState. As it was hard to keep an overview
and easy to add mutable data I think that makes it more safe overall.
I am aware that the downside to take out domain models from the domain
packages is not so nice.
Also moved blockchain models to parser and full node packages.
2018-11-01 17:12:39 -05:00
Manfred Karrer
a3e01759b0
Moving classes
That was a big commit with restructuring the packages and classes.
Motivation was to isolate the daoState value objects so it is more clear
which data are help in the daoState. As it was hard to keep an overview
and easy to add mutable data I think that makes it more safe overall.
I am aware that the downside to take out domain models from the domain
packages is not so nice.
Also moved blockchain models to parser and full node packages.
2018-11-01 17:11:40 -05:00
Manfred Karrer
8dabd555c8
Move service classes out of daostate package
- we want to have only those classes in the daoState package which are
stored in the daoState and immutable
2018-11-01 16:13:24 -05:00
Manfred Karrer
bf1ae98a6d
Add ImmutableDaoStateVo interface to all objects used in daoState 2018-11-01 16:10:29 -05:00
Manfred Karrer
ee83a896ed
Add ImmutableDaoStateVo interface
Add ImmutableDaoStateVo interface to mark the objects used in the
daoState as immutable.
2018-11-01 15:37:22 -05:00
Manfred Karrer
2575a0aa90
Rename BondedRoleProposal and service 2018-11-01 15:29:07 -05:00
Manfred Karrer
111df6e679
Rename BondedRoleState to BondedRole 2018-11-01 15:24:06 -05:00
Manfred Karrer
8b3c06fb81
Rename BondedRole to Role
This is the first of a series of renaming commits. We want to use role
for  the immutable class and BondedRole for the wrapper which contains
role and the mutable state.
2018-11-01 15:22:50 -05:00
Manfred Karrer
e41be44e9c
Remove mutable data from BondedRole
Use BondedRoleState to hold the mutable data. Store the BondedRoleState
in a local map.
2018-11-01 15:20:35 -05:00
Manfred Karrer
dbddb46bf6
Remove BondedRoleList
- We store the bonded roles in the evaluated proposals in the dao state.
From there we can get the bonded role object as it is part of the
bonded role proposal. Though we need to take that data immutable
(next commit will handle that)
2018-11-01 13:58:49 -05:00
Manfred Karrer
4094ff99a8
Add equals and hashCode methods to classes which use enums as fields
Enums must not be used directly for hashCode or equals as it delivers
the Object.hashCode (internal address)!
The equals and hashCode methods cannot be overwritten in Enums.
It was only applied to classed which are used as value objects and
potentially are used in Sets or other context which involve usage of
equals or hashCode
2018-11-01 13:40:07 -05:00
Manfred Karrer
bc82974996
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:49:49 -05:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -05:00
Manfred Karrer
6ef9ba00db
Add printStackTrace if resource not found 2018-11-01 12:48:41 -05:00
Manfred Karrer
0d481ac084
Fix wrong linebreaks 2018-11-01 12:48:21 -05:00
Manfred Karrer
b3b080cfb2
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:04:23 -05:00
Manfred Karrer
b55ba273a1
Merge pull request #1829 from arunasurya/2018-10-04-fix-grammar
Improve grammar of Background Info
2018-11-01 12:03:07 -05:00
Aruna Surya
6dd193b0f0
Improve grammar of Background Info 2018-11-01 08:16:38 +01:00
Manfred Karrer
3c5a1dabe0
WIP bonded roles 2018-10-31 18:23:45 -05:00
Manfred Karrer
bdbcc5e7fd
Add dev values for lock time and proposal phase 2018-10-31 14:30:54 -05:00
Manfred Karrer
d92e0dd5bd
Add translation strings for roles 2018-10-31 14:30:14 -05:00
Manfred Karrer
80066bda8c
Merge branch 'release-candidate-0.9.0' into sqrrm-bonded-reputation
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java
2018-10-31 13:51:15 -05:00
Manfred Karrer
ad8a77d98d
Cleanup 2018-10-31 13:48:54 -05:00
Manfred Karrer
e14508055c
Fix merge errors 2018-10-31 13:23:38 -05:00
Manfred Karrer
c1768592a6
Merge pull request #1850 from ManfredKarrer/add-more-bonded-roles
Add more bonded roles
2018-10-31 13:18:24 -05:00
Manfred Karrer
a8b833c285
Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java
#	core/src/main/java/bisq/core/dao/DaoFacade.java
#	core/src/main/java/bisq/core/dao/governance/role/BondedRole.java
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java
2018-10-31 13:17:57 -05:00
Manfred Karrer
3e81c6008b
Add more bonded roles 2018-10-31 12:59:08 -05:00
Christoph Atteneder
454ed6714a
Adapt OfferDetailsWindow to match design template 2018-10-31 17:35:21 +01:00
Christoph Atteneder
5221d766aa
Reintroduce more detailed tooltip for price provider 2018-10-31 15:17:35 +01:00
Christoph Atteneder
1540a2ee50
Clean up funds section 2018-10-31 11:18:11 +01:00
Christoph Atteneder
1057739f7a
Remove colons in network settings 2018-10-31 09:37:11 +01:00
Manfred Karrer
2d3269a07a
Add getBsqPrice method to PriceFeedService 2018-10-30 20:46:26 -05:00
Manfred Karrer
0c9a1ad1a7
Fix layout 2018-10-30 20:27:34 -05:00
Manfred Karrer
5ced4e8927
Use param type for switch cases 2018-10-30 20:27:21 -05:00
Manfred Karrer
8049588bc1
Use param type for switch cases
- Add maxDecrease and maxIncrease properties to param
2018-10-30 20:27:04 -05:00
Manfred Karrer
944acc9e93
Fix layout for governance screens 2018-10-30 18:49:04 -05:00
Manfred Karrer
090199c0c2
Fix layout for wallet screens 2018-10-30 17:28:11 -05:00
Manfred Karrer
526a9f5442
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
2018-10-30 14:03:12 -05:00
Manfred Karrer
423ac38bd4
Merge pull request #1842 from ManfredKarrer/fix-dao-layout-issues
Adjust layout with new design
2018-10-30 13:32:11 -05:00
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation 2018-10-30 21:53:32 +07:00
Manfred Karrer
8566765996
Adjust layout with new design (WIP)
- on css there are some changes marked with MK. @Christoph - please
check if those are ok for you, otherwise lets discuss...
- in Formbuilder there is removed the automatic setting of the column
span and index
- Add support for columnIndex as parameter
- setMouseTransparent for addTopLabelTextField is removed (we want that
user can copy text)
- Adjustments in the DAO code are WIP and can be ignored by @Christoph
2018-10-30 01:06:59 -05:00
Manfred Karrer
2ba68a13b8
Fix missing param in test class 2018-10-29 21:47:57 -05:00
Manfred Karrer
dbbbf1717b
Merge branch 'release-candidate-0.9.0' into make-param-value-string 2018-10-29 21:43:11 -05:00
Manfred Karrer
ea33899123
Add BTC recipient address to params
- Change type of param value from long to string for more flexibility
- Add BTC recipient address param
- Add validation, refactor param value formatter and param value parser
2018-10-29 21:32:16 -05:00
Christoph Atteneder
7d5e795714
Merge branch 'master' of github.com:bisq-network/bisq into merge-master-into-release-branch
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
2018-10-29 11:14:07 +01:00
Christoph Atteneder
55133ef117
Merge pull request #1822 from ManfredKarrer/add-cash-depoist-warning
Add warning popup for cash deposit
2018-10-29 10:59:30 +01:00
Manfred Karrer
509c3d1e10
Add trade fee display to take offer screen
As take offer screen is WIP the fee display is also just a raw draft.
For the DAO state we should add a new group for the fee selection as
it is a bit lost in between the other fields...
2018-10-28 17:01:44 -05:00
Manfred Karrer
ac11888ec0
Add non-DAO version for fee display 2018-10-28 15:29:49 -05:00
Manfred Karrer
b5568b8f1c
Move fee toggle outside of box 2018-10-28 14:48:09 -05:00
Manfred Karrer
1350413050
Add filter for not adding null entries 2018-10-28 12:45:10 -05:00
Alexey Zagarin
0b8f6c17e2 Add PromptPay (Thailand)
Closes https://github.com/bisq-network/payment-methods/issues/6.
2018-10-28 20:25:37 +07:00
Manfred Karrer
3884607114
Add fee toggle in create offer screen
Implementation is not complete yet. It is missing the handling for the
not BSQ enabled case and applying to to the take offer screen.
2018-10-27 17:52:50 -05:00
Manfred Karrer
187f539907
Adjust BSQ fee to current BTC price
We assumed a BTC price of 10 000 USD and a BSQ rice of 1 USD to get a
90% discount if the user choose the BSQ fee. As BTC price is more in
the 6000 USD range we adjust the BSQ fee to stick with the 90% discount.
2018-10-27 13:53:32 -05:00
Manfred Karrer
cc446fb707
Add warning popup for cash deposit 2018-10-26 21:48:41 -05:00
Manfred Karrer
235e2fa9f1
Add fiat amount to trade fees at maker 2018-10-26 17:29:39 -05:00
Manfred Karrer
1175320ed1
Add comment 2018-10-25 21:58:02 -05:00
Manfred Karrer
4f52f227d6
Small UI improvements
- Remove arrow for show all and edit list
- Remove colons
- Remove progressbar style in dao phases
2018-10-25 21:52:41 -05:00
Manfred Karrer
80cb50a717
Remove colons, remove progressbar style in dao phases 2018-10-25 21:16:21 -05:00
Manfred Karrer
7969374a4a
Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
2018-10-25 19:59:00 -05:00
Christoph Atteneder
e99d860f16
Clean up CashDeposit Form and all changes related 2018-10-25 12:11:10 +02:00
Christoph Atteneder
d0ed219484
Comment out unused code block 2018-10-25 10:50:26 +02:00
sqrrm
7be08fee9c
FIx typo
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:33 -05:00
sqrrm
c463768856
Add comment
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:08 -05:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00
Christoph Atteneder
45060575bd
Merge branch 'master' of github.com:bisq-network/bisq into redesign
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
2018-10-24 13:52:49 +02:00
Manfred Karrer
bccecc1f16
FIx missing arguments in test 2018-10-23 12:42:05 -05:00
Manfred Karrer
501050de6f
Add getUnusedBsqAddressAsString method 2018-10-23 11:56:11 -05:00
Manfred Karrer
7228228dc7
Merge branch 'master' into DAO-UI-hide-details 2018-10-23 11:52:44 -05:00
Christoph Atteneder
0c01093614
Style main state of account sub views to match design template and refactor GUI stuff on the way 2018-10-23 17:46:56 +02:00
Christoph Atteneder
cdaba9d15d
Merge branch 'master' of github.com:bisq-network/bisq into redesign
# Conflicts:
#	desktop/build.gradle
2018-10-23 09:22:31 +02:00
Manfred Karrer
d80af564ed
Move javafx dependencies to common
For the upcoming API work we use java fx classes also in common (PR
is pending), so that is one reason to move that. But there was also an
issue on Linux (travis) as the platform property was not set in the
core gradle build file, but it is already defined in common.
2018-10-22 16:01:02 -05:00
Manfred Karrer
871e776509
Move javafx dependencies to core
We use some javafx (Properties,...) classes in core as well, so we need
to have the dependency resolved there already.
2018-10-22 13:17:06 -05:00
Christoph Atteneder
db2cda1355
Merge branch 'master' of github.com:bisq-network/bisq into redesign
# Conflicts:
#	desktop/build.gradle
2018-10-22 19:27:31 +02:00
Christoph Atteneder
01cf2a46cb
Adapt preference view to match design template 2018-10-22 17:47:01 +02:00
Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
2018-10-19 23:43:07 -05:00
Manfred Karrer
75e0daefbf
Merge branch 'master' into DAO-UI-hide-details 2018-10-19 21:01:53 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Christoph Atteneder
9740a97bbf
Add missing translations for market provider info 2018-10-19 16:51:50 +02:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements
Persitence of DAO state
2018-10-18 16:15:28 -05:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
15177e6537
Add comment 2018-10-17 14:21:31 -05:00
Manfred Karrer
dbe5cf6f85
Replace double quote with single
Double quotes are only needed when a placeholder ({0}) is used in the text. Otherwise it would show 2 quotes.
2018-10-17 11:02:34 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04:00
Manfred Karrer
6d18a9ea78
Rename BsqState to DaoState 2018-10-17 00:13:42 -05:00
Manfred Karrer
a308469ac6
Support for persisted bsqState as resource file
- Move DecryptedBallotsWithMerits list and EvaluatedProposal list to
BsqState

- Use StoreService for handling persistence of snapshots
2018-10-16 23:21:11 -05:00
Manfred Karrer
8e46b1760f
Add new storage type to p2p library
- We introduce a new basic storage type for reading from a resource file
if available and reading initial db file if available. That is required
for the snapshots of the DaoState which will be shipped with the source
code.

- We separate the support for maps to MapStoreService
2018-10-16 23:16:52 -05:00
Manfred Karrer
d33298d087
Add more tests 2018-10-16 13:53:58 -05:00
Christoph Atteneder
95fa81361e
Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-16 19:45:50 +02:00