Commit Graph

2269 Commits

Author SHA1 Message Date
chimp1984
608166ce64
When a refund agent closes a case we have checked that the trade protocol is the same between offer and refund agent.
This would fail once we update trade protocol version when we release segwit. So this fixes that as it only checks if the version is not the old version (1) where refund agents have not been part of the system.
Also checks for legacy arbitrator that it only can be used for version 1 cases. Not tested and not assumed that this code will be executed as old arbitrators would use the old app in case they need to still work on a old case.
2020-10-10 15:55:19 -05:00
chimp1984
39c8ade5ef
Cleanups: Remove outdated TODOs, fix typos 2020-10-08 22:00:57 -05:00
chimp1984
66740b7dc1
Remove unused variable 2020-10-08 19:02:51 -05:00
chimp1984
58d2f1bda9
Apply codacy suggestions
@ripcurl: The complaint about private constructors (using guice this is legit) should be removed IMO.
2020-10-08 18:49:15 -05:00
chimp1984
fa374b99fb
Do conversion in a thread to not block UI thread. takes about 4 seconds on my machine.
Add shutdown method to TradeStatisticsConverter and call it via TradeStatisticsManager. Now as we have a reference to TradeStatisticsConverter in we don't need the hack anymore in applyInjector.
Set log level for com.neemre.btcdcli4j.core.client.ClientConfigurator to error as there is an expected warn log because of the outdated version.
2020-10-08 18:49:14 -05:00
chimp1984
0e70a99c42
Adjust tests, remove tests which do not make sense anymore 2020-10-08 18:49:13 -05:00
chimp1984
52be126667
Apply TradeStatistics3 to client classes 2020-10-08 18:49:13 -05:00
chimp1984
a522d0ade9
Refactor: Rename class 2020-10-08 18:48:17 -05:00
chimp1984
b75aa6771f
Refactor: Move class 2020-10-08 18:48:17 -05:00
chimp1984
406bcfb064
Remove PublishTradeStatistics from buyer protocol
We let seller publish trade stats to avoid those issues with duplicated entries as trade date is different.
We could fix that to use the same trade date,  but it seems to be not needed that both traders are publishing and the
risk if a trade stat does not get successfully published does not cause real problems.
There is guarantee anyway that the data is broadcast even if both do it.

In case we still want to do it from both sides we need to use the sellers trade date which is exchanged early in the trade
protocol but yet not further used beside for account age check.
2020-10-08 18:48:17 -05:00
Oscar Guindzberg
f9f5d92941
Add segwit/legacy checbox for address creation 2020-10-08 16:33:52 -03:00
Christoph Atteneder
5294820eb6
Bump version number for v1.4.0 2020-10-08 09:39:01 +02:00
chimp1984
2d99ae7d09
Remove isDisputed checks 2020-10-06 11:04:20 -05:00
chimp1984
b4bd1df27f
Refactor: Move method 2020-10-06 10:45:19 -05:00
chimp1984
4a0fe3e62e
Move checks to enable confirm to Trade
Use it in view to disable button
2020-10-06 10:40:39 -05:00
chimp1984
f0606f9266
Refactor: Remove commented out code and comments 2020-10-06 10:26:11 -05:00
Christoph Atteneder
454b3a97d5
Merge pull request #4587 from wiz/update-tac-for-price-indices
Update text/URL in Terms and Conditions window for Bisq Price Indices
2020-10-06 10:10:21 +02:00
chimp1984
be204c457d
Setting jvm option -Djdk.module.illegalAccess=deny avoids the warning logs at startup
Not sure how to add it to gradle so its set at normal compilation as well...

User get confused by the warning as it sounds somehow alerting.

`WARNING: An illegal reflective access operation has occurred
 WARNING: Illegal reflective access by com.google.inject.internal.cglib.core.$ReflectUtils$1 (file:/Users/dev/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/6dacbe18e5eaa7f6c9c36db33b42e7985e94ce77/guice-4.2.2.jar) to method java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
 WARNING: Please consider reporting this to the maintainers of com.google.inject.internal.cglib.core.$ReflectUtils$1
 WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
 WARNING: All illegal access operations will be denied in a future release`
2020-10-06 00:19:50 -05:00
chimp1984
e9db7c6808
Rename Priority to Source. This should make it more clear what is the intention of the usage.
Rename:
LOW to NETWORK
MID to PRIVATE_LOW_PRIO
HIGH to PRIVATE

Change delay of MID/PRIVATE_LOW_PRIO from 30 min to 2 hours (we had different datastores before using it, now its only real low prio stores)

Add comment to each enum
2020-10-03 12:48:23 -05:00
chimp1984
137b5e81d1
Enforce that clients set the priority. Remove the initialize methods which did not have priority as a param.
Make initializePersistenceManager in StorageService abstract to enforce in concrete class to define priority.

Change priorities for future renaming to a different meaning. instead of priority we want to describe the category: private data, public data,.... will come in next commit
2020-10-03 12:48:22 -05:00
chimp1984
32238f2050
Rename getClosedTradables and getFailedTrades to getObservableList 2020-10-03 12:48:22 -05:00
chimp1984
e242c54dab
Refactor: Rename getTradesAsObservableList to getObservableList 2020-10-03 12:48:22 -05:00
chimp1984
ccfda5b043
Cleanups, add generics, add final, remove unused code/comments/todos, 2020-10-03 12:48:21 -05:00
chimp1984
fa0d261397
Fix remaining issues, cleanups, add persit calls, remove unused code,...
Sorry too tired to create another 20 commits...
2020-10-03 12:48:21 -05:00
chimp1984
b901f358a7
Add missing persist calls. Add generics. Remove persist method. Add final. 2020-10-03 12:48:21 -05:00
chimp1984
486e6f4985
Use PersistenceManager 2020-10-03 12:48:20 -05:00
chimp1984
e825613f5c
Use PersistenceManager 2020-10-03 12:48:20 -05:00
chimp1984
d4f460b4b0
Use PersistenceManager 2020-10-03 12:48:19 -05:00
chimp1984
4f3ded6acf
Use PersistenceManager instead of Storage for import/export 2020-10-03 12:48:15 -05:00
chimp1984
802dcad2fb
Refactor: Rename CorruptedDatabaseFilesHandler 2020-10-03 12:48:14 -05:00
chimp1984
23507102dd
Refactor: Move CorruptedDatabaseFilesHandler 2020-10-03 12:48:14 -05:00
chimp1984
8aff1f8665
Refactor: Move FileUtil 2020-10-03 12:48:14 -05:00
wiz
4dc27d9c2a
Remove extra "is" word in TaC text 2020-10-02 22:03:51 +09:00
wiz
1a80da2bb7
Update text/URL in Terms and Conditions window for Bisq Price Indices
Since this is a legal agreement, the goal is to limit the liability of
the facilitators of the service, not to explain how we calculate the
price indicies - users can find that information on the "about" page.

Also updates URL for Dispute Resolution to the new wiki article.

Fixes #4571
2020-10-02 08:48:37 +09:00
chimp1984
ff1380481d
Merge branch 'master_upstream' into improve-startup-routines
# Conflicts:
#	core/src/main/java/bisq/core/app/BisqSetup.java
2020-10-01 10:34:43 -05:00
chimp1984
fb41a1984b
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues
# Conflicts:
#	core/src/main/java/bisq/core/trade/TradeManager.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
2020-10-01 09:24:46 -05:00
Christoph Atteneder
a1778ed701
Merge pull request #4578 from chimp1984/show-if-maker-has-xmr-autoconf-enabled
Show if maker has xmr autoconf enabled
2020-10-01 09:11:45 +02:00
chimp1984
c3e1ae691b
Remove cryptoSetupFailedHandler 2020-09-30 22:39:13 -05:00
chimp1984
bb99eef059
Refactor: Move AvoidStandbyModeService from BisqApp to BisqExecutable.setupAvoidStandbyMode 2020-09-30 22:26:42 -05:00
chimp1984
4f9a6ea436
Refactor: Move periodic printSystemLoad to commonSetup 2020-09-30 22:17:36 -05:00
chimp1984
aa7315b32d
Refactor: Rename onUiReadyHandler to onApplicationStartedHandler 2020-09-30 22:16:32 -05:00
chimp1984
9d12bf7d52
Refactor: Move sig int handlers to CommonSetup 2020-09-30 22:10:44 -05:00
chimp1984
9232a5765b
Improve handling of UncaughtExceptionHandler 2020-09-30 22:06:51 -05:00
chimp1984
7ea3676c55
Refactor: Rename setup to setupUncaughtExceptionHandler
rename setupErrorHandler to checkCryptoPolicySetup
move UncaughtExceptionHandler code to setupUncaughtExceptionHandler
2020-09-30 21:55:50 -05:00
Christoph Atteneder
4d7e26d87d
Merge pull request #4576 from chimp1984/fix-filter-bug
Fix bug with missing remove of old filter when new filter is added.
2020-09-30 16:30:48 +02:00
chimp1984
137d9185e3
Only add a row if xmr offer 2020-09-30 00:56:40 -05:00
chimp1984
5d41574931
Refactor: Rename TradeDataValidation.validatePayoutTx to TradeDataValidation.validateDelayedPayoutTx 2020-09-29 23:46:38 -05:00
chimp1984
18c1fc1410
Fix bug with missing remove of old filter when new filter is added.
- Add handling for removing invalid filters

When adding a new filter invalid filters get removed if they have been created with the same priv key.
2020-09-29 23:25:22 -05:00
chimp1984
f46e132195
Add rocket icon to xmr offers which have enabled autoconf
Add info to tooltip and to offer window
Add center css to actions column. It looks weird that title is left aligned and button is centered.
only "last-column", "avatar-column" worked, making an new style e.g. center-column did not succeed... css is not my friend....
Shorten "Time since signing" to "Signed since" header to avoid truncation
2020-09-29 00:45:31 -05:00
chimp1984
e8ab4c7222
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues 2020-09-28 20:46:34 -05:00
sqrrm
37ce52ba8c
Merge pull request #4555 from jmacxx/fix_security_deposit_display
Display the calculated security deposit at order entry
2020-09-27 14:42:48 +02:00
chimp1984
b31f5b7b23
Another stupid codacy enforcement 2020-09-27 02:16:27 -05:00
chimp1984
d08591551b
Add state listeners to warn icon columns to get correct state updates 2020-09-27 01:26:48 -05:00
chimp1984
84a4982732
Remove TradeProtocol from Trade
We keep the TradeProtocol now in TradeManager in a hashmap.
As TradeProtocol constructors get called now earlier we need to add an onInitialized method which signals that the TradeProtocol is ready.
The processModel needs to get set the transient fields after construction.
2020-09-26 21:34:28 -05:00
chimp1984
f0a30221ab
Fix bug with showing popup once arbitration has been started 2020-09-26 19:11:54 -05:00
chimp1984
5309f04b40
DO not deactivate move to failed trades button. Use different text in popup if all txs are valid.
Fix icon style issues.
2020-09-26 18:33:25 -05:00
chimp1984
a9ad72d0e4
Remove offer at close to avoid that button stays active when taking the offer
Cleanups
2020-09-26 16:21:19 -05:00
chimp1984
74317636b0
Apply code inspection suggestions 2020-09-26 16:00:03 -05:00
chimp1984
27ac2d8e57
Remove never read field 2020-09-26 15:52:31 -05:00
chimp1984
c39a9b074f
Remove onPaymentReceived delegate method in seller trade 2020-09-26 12:56:42 -05:00
chimp1984
a661ce6ed5
Remove onPaymentStarted delegate method in buyer trade 2020-09-26 12:55:23 -05:00
chimp1984
456f16ddf4
Remove handleTakeOfferRequest delegate method in maker trade 2020-09-26 12:51:43 -05:00
chimp1984
0c4af92f86
Refactor: rename methods 2020-09-26 12:28:38 -05:00
chimp1984
191b031f38
Refactor: Rename MediationProtocol to DisputeProtocol 2020-09-25 23:56:58 -05:00
chimp1984
561abd7a49
Refactor: Move publishDelayedPayoutTx from TradeManager to MediationProtocol 2020-09-25 23:07:16 -05:00
chimp1984
9f3fe7ad6d
Refactor: Move getAddressEntriesForAvailableBalanceStream to btcWalletService
Rename WithdrawalView.walletService to btcWalletService
2020-09-25 22:56:00 -05:00
chimp1984
35b758431d
Refactor: Move methods, rename methods 2020-09-25 22:50:42 -05:00
chimp1984
246d1e3ddf
Refactor: Remove onCancelAvailabilityRequest method 2020-09-25 22:31:08 -05:00
chimp1984
346d793d87
Refactor: Remove onOfferRemovedFromRemoteOfferBook method 2020-09-25 22:29:52 -05:00
chimp1984
86569b1b2d
Apply fluent protocol to MediationProtocol
Rename acceptMediationResult to onAcceptMediationResult
2020-09-25 21:58:32 -05:00
chimp1984
6af9cb3dfe
Refactor: rename getTradableList to getTradesAsObservableList 2020-09-25 21:38:49 -05:00
chimp1984
7023b2acf5
Remove onPaymentReceived method from TradeManager 2020-09-25 21:35:34 -05:00
chimp1984
a002fb33a5
Rename onFiatPaymentStarted to onPaymentStarted 2020-09-25 21:33:53 -05:00
chimp1984
612ecd3a6a
Rename onFiatPaymentReceived to onPaymentReceived 2020-09-25 21:32:27 -05:00
chimp1984
3cc633f39f
Add check if trade was already taken in the past. If so show a popup at take offer screen.
We could deactivate such offers as well but as it is only for exceptional cases I think this way is good enough (would be more effort otherwise).
2020-09-25 21:30:19 -05:00
chimp1984
3987f9cd5a
Fix incorrect getDepositTx calls 2020-09-25 18:16:50 -05:00
chimp1984
95cb3b2710
Fix deposit tx setters 2020-09-25 17:06:13 -05:00
chimp1984
568dcdaad4
Update tasks in debugview 2020-09-25 15:32:49 -05:00
chimp1984
10bedee803
Merge branch 'dispute-agent-branch' into fix-delayed-payout-tx-issues
# Conflicts:
#	core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java
2020-09-25 15:03:28 -05:00
chimp1984
25c4b4d0fc
Merge branch 'master_upstream' into dispute-agent-branch
# Conflicts:
#	core/src/main/java/bisq/core/trade/DelayedPayoutTxValidation.java
2020-09-25 14:53:20 -05:00
chimp1984
f1df52790b
improve trade details window 2020-09-25 00:20:17 -05:00
chimp1984
7167e2a8bd
Add check if trade has been paid out for button disable state 2020-09-24 21:10:02 -05:00
chimp1984
b494434623
Add warn icon next to trash icon. Show popup with info about the problem and instructions.
Set trash button disabled if the tx chain is valid to avoid that users move to failed while trade is valid to be completed.

Contract: Add isMyRoleMaker method
Trade: Add hasErrorMessage and isTxChainInvalid methods
2020-09-24 21:07:40 -05:00
chimp1984
f6eefef1ae
Remove handling of failed trades. If a trade is in an invalid state (tx missing) or has an error message set we show in the pending trades view a red trash icon for moving the trade to failed trades.
The info icon next to the trade ID is then a warning icon (should be red but css is not my best friend) and if opening trade details window we also color the missing txs red with a warn icon and tooltip.
When clicking the trash button a popup is displayed with detail info.
At failed trades there is a "undo" icon for reverting the trade back to pending (if user wants to open mediation, etc).

All the automatic handling of the failed trades and popups are removed as it never worked well and just confused users...

In next commits we will add more instructions what a user should/can do for diff. error cases.

TradeManger:
- Remove all the failed checks at initPendingTrade.
- Remove tradesWithoutDepositTx
- Remove tradesForStatistics as it was never read
- Remove cleanUpAddressEntries
- Rename addTradeToClosedTrades to onTradeCompleted

TxIdTextField accepts a null for tx ID and shows then red colored N/A and a warning icon.
HyperlinkWithIcon exposed the icon to be accessible for style change.
DebugWindow was updated for one variation of the trade protocol (other is missing still).
Trade detail window show now always all 4 mandatory txs.
Beside that this commit has some cleanups and null pointer fixes (when testing error scenarios i got those NP).
2020-09-24 19:47:12 -05:00
chimp1984
0fa45650b6
Merge branch 'dispute-agent-branch' into wip-merge-tradeprot
# Conflicts:
#	core/src/main/java/bisq/core/trade/DelayedPayoutTxValidation.java
#	core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerVerifiesFinalDelayedPayoutTx.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
2020-09-23 08:27:09 -05:00
chimp1984
6fa2225b65
Use fluent interface for checking state and conditions 2020-09-23 01:48:02 -05:00
chimp1984
1abe6adac6
Remove empty tasks. 2020-09-22 19:40:15 -05:00
chimp1984
8ce5ebadea
Refactoring: rename, cleanups 2020-09-22 19:35:24 -05:00
Oscar Guindzberg
59124e3e33
Replace deprecated bitcoinj methods
Replace output.getAddressFromP2PKHScript() and
output.getAddressFromP2SH() with
output.getScriptPubKey().getToAddress()
2020-09-22 14:55:47 -03:00
jmacxx
3e22b6e98d
Do not persist offer security deposit in user settings
Fixes #4426
Always calculate the suggested security deposit based on asset price
volatility rather than using a persisted value as the minimum.
2020-09-22 11:39:02 -05:00
Christoph Atteneder
44bf29b67e
Merge pull request #4546 from oscarguindzberg/code-cleanup
Minor code cleanup changes
2020-09-22 16:23:31 +02:00
Christoph Atteneder
64d4b9b136
Merge pull request #4544 from oscarguindzberg/removeListeners
Remove unnecessary listeners in TransactionsView
2020-09-22 16:22:37 +02:00
Christoph Atteneder
69d533d9ea
Merge pull request #4520 from cd2357/show-qubes-info-popup
Show info popup if Bisq started under Qubes OS
2020-09-22 16:21:03 +02:00
chimp1984
527f1537a9
Add listener on BuyerSendCounterCurrencyTransferStartedMessage to resend msg case it has not arrived
Add signed witness to PayoutTxPublishedMessage
Remove usage of RefreshTradeStateRequest but leave it for backward compatibility
Move removeMailboxMessageAfterProcessing calls in finally branch
Rename methods
2020-09-22 00:32:28 -05:00
chimp1984
690104e6ea
Show popup on MissingDelayedPayoutTxException. Update display string of popup 2020-09-21 18:56:58 -05:00
chimp1984
66a26893f0
Always show deposit and delayed payout tx in trade details window. If null it shows N/A 2020-09-21 18:55:49 -05:00
Oscar Guindzberg
6cf7a9977a
Code cleanup 2020-09-21 17:32:47 -03:00
Oscar Guindzberg
992441b9b5
Remove unnecessary listeners 2020-09-21 16:52:16 -03:00
Christoph Atteneder
6af2a46e49
Merge pull request #4542 from chimp1984/refactor-regexvalidator
Refactor regexvalidator
2020-09-21 20:16:53 +02:00
Oscar Guindzberg
93f9f83136
Make codacy happy 2020-09-21 12:40:53 -03:00
Oscar Guindzberg
e8c82549a8
Use Address.fromString() for btc addresses
Use Address.fromString() instead of LegacyAddress.fromBase58() for btc addresses.
Trade protocol addresses not migrated yet.
2020-09-21 12:40:52 -03:00
Oscar Guindzberg
8a3d403bfc
Rename WalletService.emptyWallet() to emtyBtcWallet() 2020-09-21 12:40:52 -03:00
chimp1984
81bea14af2
Show popup to peer who accepted mediators suggestion once locktime is over 2020-09-21 01:16:47 -05:00
chimp1984
a9f10624c2
Move validation after adding dispute to list 2020-09-21 00:20:12 -05:00
chimp1984
c7a3f95925
Rename filterString to filterTerm 2020-09-20 23:15:20 -05:00
chimp1984
baa915f5de
Add validateNodeAddress at onOpenNewDisputeMessage
- Cleanups
2020-09-20 22:32:53 -05:00
chimp1984
9c0b40a3b9
Refactor: Move Regex test methods from GUIUtilTest to RegexValidatorTest in core 2020-09-20 22:16:22 -05:00
chimp1984
c6f2732062
Refactor: Move RegexValidator factory methods to RegexValidatorFactory in core 2020-09-20 22:14:14 -05:00
chimp1984
3675e76194
Refactor: Move egexValidator from desktop to core 2020-09-20 22:13:18 -05:00
chimp1984
987bf4953a
Add node address validation 2020-09-20 22:10:48 -05:00
chimp1984
3206c62151
Refactor: Move RegexValidator from bisq.desktop.util.validation to bisq.core.util.validation
Add RegexValidatorFactory
Move regex tests from GUIUtilTest to new RegexValidatorTest class
2020-09-20 21:58:32 -05:00
chimp1984
30e9add4dc
Refactor: rename DelayedPayoutTxValidation to TradeDataValidation 2020-09-20 21:40:21 -05:00
chimp1984
72dca0b55a
Add cylce index 2020-09-20 21:25:12 -05:00
chimp1984
c6778d6b2d
Add copy to csv data button to report screen 2020-09-20 20:20:39 -05:00
chimp1984
d31deff9c4
Remove dev log 2020-09-20 14:50:02 -05:00
chimp1984
c1850cb47b
Merge branch 'master_upstream' into dispute-agent-branch
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
2020-09-20 13:23:13 -05:00
chimp1984
48a3f7443e
Merge branch 'master_upstream' into fix-trade-protocol-issues
# Conflicts:
#	core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
2020-09-19 10:23:40 -05:00
Oscar Guindzberg
fc70c11573
ok codacy, you win 2020-09-18 18:29:40 -03:00
Oscar Guindzberg
f1738f0b19
Code polishing to make Codacy happier 2020-09-18 18:29:38 -03:00
Oscar Guindzberg
f342c89c8e
Code polishing to make Codacy happy 2020-09-18 18:29:37 -03:00
Oscar Guindzberg
08cc836bab
bitcoinj 0.15: Fix TransactionAwareTradeTest 2020-09-18 18:29:34 -03:00
Oscar Guindzberg
9a9b067d70
bitcoinj 0.15: Replace deprecated Transaction.getHashAsString with Transaction.getTxId().toString(). 2020-09-18 18:29:33 -03:00
Oscar Guindzberg
87481cdbf5
bitcoinj 0.15: Replace usage of bitcoinj's removed methods with new ones. 2020-09-18 18:29:30 -03:00
Oscar Guindzberg
7356b64f59
bitcoinj 0.15: Use LegacyAddress.fromBase58() instead of Address.fromBase58(). 2020-09-18 18:29:30 -03:00
Oscar Guindzberg
46f2ba6ee0
bitcoinj 0.15: WalletEventListener was replaced by more granular listeners. 2020-09-18 18:29:29 -03:00
Oscar Guindzberg
d4ac45da21
bitcoinj 0.15: bitcoinj moved from spongycastle to bouncycastle. 2020-09-18 18:29:28 -03:00
Oscar Guindzberg
423ffa84e1
bitcoinj 0.15: Futures.addCallback() in guava 28 requires an executor. 2020-09-18 18:29:27 -03:00
chimp1984
b2a9262b93
Merge branch 'verify-donation-address-for-refund-agent' into dispute-agent-branch
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/DisputeManager.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
2020-09-17 19:09:26 -05:00
chimp1984
45cee2a272
Add check for disputes with duplicated trade ID or payout tx ids 2020-09-17 19:05:55 -05:00
chimp1984
3d4427cdfd
Add result of filter match. Add more filter data (tx ids, json) 2020-09-17 13:54:45 -05:00
chimp1984
48a14ee8a7
Merge branch 'master_upstream' into fix-trade-protocol-issues 2020-09-16 20:45:17 -05:00
chimp1984
1c0bef787a
Merge branch 'master_upstream' into verify-donation-address-for-refund-agent 2020-09-16 20:40:08 -05:00
chimp1984
b0b4334345
Merge branch 'master_upstream' into dispute-agents-sign-summary 2020-09-16 20:38:45 -05:00
Christoph Atteneder
81df879881
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2020-09-16 16:52:54 +02:00
Christoph Atteneder
95dd561d91
Revert to SNAPSHOT version 2020-09-16 16:49:48 +02:00
Christoph Atteneder
06ac7a7605
Bump version number for v1.3.9 2020-09-16 15:58:58 +02:00
chimp1984
601de7890d
Add try/catch at setSuggestedSecurityDeposit code 2020-09-16 15:56:13 +02:00
Christoph Atteneder
8cb4b5016c
Merge pull request #4529 from chimp1984/make-moving-average-code-more-safe
Make moving average code more safe
2020-09-16 15:51:14 +02:00
Christoph Atteneder
98b03937d8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
2020-09-15 13:24:06 +02:00
Christoph Atteneder
5f957f0a64
Revert to SNAPSHOT version 2020-09-15 09:26:08 +02:00
chimp1984
71d57298b0
Add try/catch at setSuggestedSecurityDeposit code 2020-09-14 16:05:47 -05:00
chimp1984
352e661bac
update devmode price 2020-09-13 15:35:39 -05:00
cd2357
8d793e9a83
Show info popup if Bisq started under Qubes OS
Show popup informing the user about the OS-specific setup guide.
2020-09-13 13:23:12 +02:00
chimp1984
966b22a69d
Fix line breaks 2020-09-12 20:24:32 -05:00
chimp1984
de4fb17a19
Improve summary notes 2020-09-12 20:18:04 -05:00
chimp1984
0c46e7dd52
Add more data to summary msg 2020-09-12 16:19:42 -05:00
chimp1984
48066ae124
Remove setting of pubKey as it is not needed 2020-09-12 00:49:27 -05:00
chimp1984
559028e500
Remove unused var 2020-09-12 00:46:52 -05:00
chimp1984
7ac6e715d3
Dispute agent sign summary. Add tool for verification 2020-09-12 00:35:58 -05:00
chimp1984
05e1039423
Call validatePayoutTx only after trades are initialized 2020-09-11 20:28:23 -05:00
chimp1984
08fb596629
Call validatePayoutTx only after trades are initialized 2020-09-11 20:25:48 -05:00
chimp1984
677211badf
Allow close dispute for refund agent without payout 2020-09-11 20:24:31 -05:00
chimp1984
d82631f52c
Fix some issues found during testing
Refactorings
2020-09-11 19:41:08 -05:00
chimp1984
c48abbf575
Improve address validation code 2020-09-11 17:37:03 -05:00
chimp1984
2b0433870c
Dont allow opening refudn agent dispute if delayed payout tx is invalid. 2020-09-11 17:00:24 -05:00
chimp1984
4f1cbbd00e
Add check for refund agent if donation address is valid 2020-09-11 15:35:47 -05:00
chimp1984
6821c582e9
Add check for open offers and remove them if present at restore from seed 2020-09-09 14:12:03 -05:00
wiz
8cde8ce16a
Fix codacy complaining about missing space character 2020-09-09 15:16:38 +02:00
wiz
cc7e6559ff
Use lots of regex to add http or https for XMR explorer API endpoint
* If Tor *.onion hostname, use HTTP with Tor proxy
* If 127.0.0.1 or localhost, use HTTP without Tor proxy
* If LAN address or *.local FQDN, use HTTP without Tor proxy
* If any other FQDN hostname, use HTTPS with Tor proxy
2020-09-09 15:12:09 +02:00
chimp1984
54fdb5267f
Instead of renaming the AddressEntryList to a backup file we keep it
at restore from seed and create a backup copy.
I don't know what was the motivation of removing the original file
(probably the use case that the seeds are different and thus there
is no match of existing entries with the new addresses) as
that breaks the internal association of addresses with trades/offers and
the reserved balances display.

This should be tested well though with the related use cases
(diff. offer and trade states, wallet restore with same seed of with
foreign seed -> in that case we need to recreated the AddressEntryList
but that should be handled in the related domain)

- Add copyFile method
2020-09-08 19:14:38 -05:00
chimp1984
fa0224550c
Refactoring
- Add SharedPresentation class for methods in GUIUtil which are no
utility methods.
- Move restoreSeedWords to SharedPresentation
2020-09-08 19:00:16 -05:00
wiz
245027bff4
Fix codacy complaining about missing space character 2020-09-08 20:20:30 +09:00
wiz
a2c6f279a6
Merge remote-tracking branch 'bisq/master' into use-https-for-xmr-explorer-api 2020-09-08 20:19:20 +09:00
chimp1984
062c52dd55
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:57:51 +02:00
chimp1984
35cd7ac56b
Add check if trade have been dispute to protocol classes 2020-09-08 11:53:29 +02:00
chimp1984
cdf2698e29
Add comment to empty method 2020-09-08 11:53:20 +02:00
chimp1984
5ecbbf601f
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:53:04 +02:00
chimp1984
a7b5cdbd03
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:49:33 +02:00
m52go
67fc398f9b
Add note to SetXmrTxKeyWindow
To convey what it's about, and that it's optional.
2020-09-08 11:36:39 +02:00
m52go
2265d8f9e1
Add note to SetXmrTxKeyWindow
To convey what it's about, and that it's optional.
2020-09-07 11:36:32 -04:00
wiz
0869f9a016
Use lots of regex to add http or https for XMR explorer API endpoint
* If Tor *.onion hostname, use HTTP with Tor proxy
* If 127.0.0.1 or localhost, use HTTP without Tor proxy
* If LAN address or *.local FQDN, use HTTP without Tor proxy
* If any other FQDN hostname, use HTTPS with Tor proxy
2020-09-08 00:26:56 +09:00
Christoph Atteneder
b81e804bb1
Merge pull request #4491 from chimp1984/bugfix-xmr-tool
Bug fixes
2020-09-07 09:56:44 +02:00
chimp1984
e704d02801
Bug fixes
- useXmrTxProof was set at active but used in addContent which was
called before activate.
- Fix bug with using currencyName instead of currencyCode
- Refactor: Use methods in base class instead of repeated code
2020-09-07 09:56:13 +02:00
jmacxx
05cc29d854
Minor bug fixes for XMR tx proof feature
Fix missing CSS color code xmr-orange, was missing from dark mode.

Fix log message spelling/typo errors.

Removed 2 fixes from SellerStep3View so that chimp1984 can make
changes.

Remove address validator from XMR service address settings because
it does not support https prefix.
2020-09-07 09:55:05 +02:00
Christoph Atteneder
38cff29d97
Merge pull request #4490 from jmacxx/origin/add-xmr-tx-key-service-fix
Minor bug fixes for XMR tx proof feature
2020-09-07 09:54:38 +02:00
chimp1984
b1b3136969
Improve handling of nullable assetTxProof fields 2020-09-07 09:39:11 +02:00
chimp1984
9eb7900d51
Fix handling of username/accountId
We apply userName to accountId if it is not set (e.g. new account
created with new version). We do not use that for display or for
account signing in case both fields are the same but we need to use
accountId in case the user trades with a not updated user who expects
accountId as only field.
I improved a bit the display of account data in the trade screens.
In case accountId was set with the phone number (updated account with
phone nr used for account signing) we show both userName and phone nr.

- Show phone number if accountId was set by old account. Otherwise
show only userName
- For old users they will see the user name as phone number displayed
if they trade with new users if the new user has created a new account.
If he has updated an existing account the accountId (phone number) is
used, so it displays the phone number.
- At step 2 changed display of own account data to show account name
- Add 'Recipients' prefix to account data of peer at step 2

Step 3: Buyers account data can be
- Phone number if peer is using old version
- User name if peer is updated user with new account (we apply userName
to accountId)
- Phone number if user is on old version and peer is updated user with
updated account (we keep accountId as phone number)
- User name/Phone number if peer is updated user with updated account
2020-09-07 09:39:02 +02:00
chimp1984
a4f6d2af2e
Add check if xmrTxProof is used to avoid null pointer exception 2020-09-07 09:38:44 +02:00
chimp1984
e080b06736
Remove unused method 2020-09-07 09:34:57 +02:00
chimp1984
9cc614a790
Add alert icon to list entries
Support agent can mark a suspicious dispute as resolved so it does not
show the alert icon anymore. In the full report a [ACK] got added to
that dispute.
2020-09-07 09:34:47 +02:00
chimp1984
cc2d258915
Scan disputes for accounts where same user used diff. real names.
Might be fraudulent traders.
2020-09-07 09:34:31 +02:00
chimp1984
38d33ceab3
Remove offer from takers offerbook after take offer is completed.
We do not wait until the offer got removed by a network remove message but remove it
directly from the offer book. The broadcast gets now bundled and has 2 sec. delay so the
removal from the network is a bit slower as it has been before. To avoid that the taker gets
confused to see the same offer still in the offerbook we remove it manually. This removal has
only local effect. Other trader might see the offer for a few seconds
still (but cannot take it).
2020-09-07 09:30:44 +02:00
jmacxx
f49aa0f674
Minor bug fixes for XMR tx proof feature
Fix missing CSS color code xmr-orange, was missing from dark mode.

Fix log message spelling/typo errors.

Removed 2 fixes from SellerStep3View so that chimp1984 can make
changes.

Remove address validator from XMR service address settings because
it does not support https prefix.
2020-09-07 00:06:50 -05:00
chimp1984
c40bcfedfc
Fix merge mistake 2020-09-06 23:51:24 -05:00
chimp1984
f3c96bbb62
Merge branch 'master_upstream' into deactive-confirm-buttons-once-mediation-started
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
2020-09-06 23:13:43 -05:00
chimp1984
087dde0e9d
Add check if trade have been dispute to protocol classes 2020-09-06 23:09:45 -05:00
chimp1984
1419f05152
Add comment to empty method 2020-09-06 23:06:27 -05:00
chimp1984
f3a3b6e9a8
Bug fixes
- useXmrTxProof was set at active but used in addContent which was
called before activate.
- Fix bug with using currencyName instead of currencyCode
- Refactor: Use methods in base class instead of repeated code
2020-09-06 21:37:25 -05:00
sqrrm
7389bf898c
Merge pull request #4480 from chimp1984/add-support-for-monero-address-prefix
Remove 'monero:' prefix when adding a XMR account
2020-09-06 23:24:40 +02:00
sqrrm
236e9e6d4b
Merge pull request #4487 from chimp1984/remove-offer-from-offer-list-for-taker
Remove offer from takers offerbook after take offer is completed.
2020-09-06 23:23:19 +02:00
sqrrm
c188284d0b
Merge pull request #4484 from chimp1984/detect-accounts-with-diff-real-names
Scan disputes for accounts where same user used diff. real names.
2020-09-06 23:17:32 +02:00
chimp1984
ec31ecbf43
Improve handling of nullable assetTxProof fields 2020-09-06 12:05:39 -05:00
chimp1984
7fff461669
Remove offer from takers offerbook after take offer is completed.
We do not wait until the offer got removed by a network remove message but remove it
directly from the offer book. The broadcast gets now bundled and has 2 sec. delay so the
removal from the network is a bit slower as it has been before. To avoid that the taker gets
confused to see the same offer still in the offerbook we remove it manually. This removal has
only local effect. Other trader might see the offer for a few seconds
still (but cannot take it).
2020-09-05 19:45:00 -05:00
chimp1984
9908bcf33a
Rename method 2020-09-05 19:19:49 -05:00
chimp1984
55e55d4f19
Deactivate confirm payment or payment received buttons once a dispute
is opened.
2020-09-05 19:18:33 -05:00
chimp1984
959009d6d6
Remove unused method 2020-09-05 17:54:32 -05:00
chimp1984
4a4bd7cd12
Add alert icon to list entries
Support agent can mark a suspicious dispute as resolved so it does not
show the alert icon anymore. In the full report a [ACK] got added to
that dispute.
2020-09-05 17:39:22 -05:00
chimp1984
7c78e98192
Scan disputes for accounts where same user used diff. real names.
Might be fraudulent traders.
2020-09-05 01:40:35 -05:00
chimp1984
97d3383dbb
Fix handling of username/accountId
We apply userName to accountId if it is not set (e.g. new account
created with new version). We do not use that for display or for
account signing in case both fields are the same but we need to use
accountId in case the user trades with a not updated user who expects
accountId as only field.
I improved a bit the display of account data in the trade screens.
In case accountId was set with the phone number (updated account with
phone nr used for account signing) we show both userName and phone nr.

- Show phone number if accountId was set by old account. Otherwise
show only userName
- For old users they will see the user name as phone number displayed
if they trade with new users if the new user has created a new account.
If he has updated an existing account the accountId (phone number) is
used, so it displays the phone number.
- At step 2 changed display of own account data to show account name
- Add 'Recipients' prefix to account data of peer at step 2

Step 3: Buyers account data can be
- Phone number if peer is using old version
- User name if peer is updated user with new account (we apply userName
to accountId)
- Phone number if user is on old version and peer is updated user with
updated account (we keep accountId as phone number)
- User name/Phone number if peer is updated user with updated account
2020-09-04 18:30:08 -05:00
chimp1984
c87899c662
Add check if xmrTxProof is used to avoid null pointer exception 2020-09-04 14:51:34 -05:00
chimp1984
9a57525a46
Remove 'monero:' prefix when adding a XMR account
Some wallets copy the address with a 'monero:' prefix. If user pastes
that directly into the form he gets a validation error. We remove now
that prefix so the input is automatically adjusted to the address only.
2020-09-04 14:33:30 -05:00
chimp1984
3e933c31a5
Fix bug with all mobile notifications for disputes are sent at startup. 2020-09-04 10:21:29 +02:00
Christoph Atteneder
57bed13cf8
Merge pull request #4475 from chimp1984/fix-mobile-notification-bug
Fix bug with all mobile notifications for disputes are sent at startup.
2020-09-04 10:20:43 +02:00
chimp1984
2400014db6
Change hex color code to lower case 2020-09-04 10:18:20 +02:00
chimp1984
63444b1f77
Add null check. Improve text 2020-09-04 10:18:07 +02:00
chimp1984
044d23f933
Adjust auto-conf css for badge
- make it xmr orange
- make with dynamic with 10 px padding left/right
- fix 1 px vertical offset
2020-09-04 10:18:00 +02:00
chimp1984
fa9893cdd4
Show tx confidence indicator for XMR blocks. Show info icon 2020-09-04 10:17:53 +02:00
chimp1984
33c8728fde
Add monero orange color code for tx confidence indicator 2020-09-04 10:17:45 +02:00
chimp1984
e01ebdf6e8
Change min required confirmations from 0 to 1.
If users accept visible in mempool only txs its their own risk and they
can manually confirm anyway. We should not support 0 conf txs.
2020-09-04 10:17:39 +02:00
chimp1984
11827a42c6
Set default services based on localhost check not on devMode check 2020-09-04 10:17:31 +02:00
chimp1984
05296af47e
Add check if dispute is open
If a mediation or arbitration dispute has been opened we do not use the
auto-confirm feature.
2020-09-04 10:16:49 +02:00
chimp1984
2da08a5620
Refactor dependency structure to enable adding dispute managers
If we would add DisputeManager to previous structure it would cause a
circular dependency error from guice. We change dependency structure so
that TradeManager does not know XmrTxProofService but XmrTxProofService
gets an instance of TradeManager. It makes code cleaner in total as well
as responsibility is better defined.

Next commit will contain the DisputeManager addition.
2020-09-04 10:16:37 +02:00
Christoph Atteneder
d33b40128e
Merge pull request #4474 from chimp1984/stop-xmr-proof-service-at-dispute
Stop xmr proof service at dispute
2020-09-04 10:16:00 +02:00
chimp1984
688bef885a
Rmove short cut info for removed key handlers 2020-09-04 10:14:50 +02:00
Christoph Atteneder
2c39ded714
Merge pull request #4472 from chimp1984/update-about-view
Remove short cut info for removed key handlers
2020-09-04 10:12:53 +02:00
Christoph Atteneder
766d04588f
Merge pull request #4471 from chimp1984/add-setup-info-to-app-header
Add flags to header to signal which dev setup is used
2020-09-04 10:12:14 +02:00
chimp1984
6d37bedbbe
Fix bug with all mobile notifications for disputes are sent at startup. 2020-09-03 23:50:28 -05:00
chimp1984
a7e10155b1
Change hex color code to lower case 2020-09-03 21:22:54 -05:00
chimp1984
1016c73b35
Add null check. Improve text 2020-09-03 21:14:06 -05:00
chimp1984
6ab679c479
Adjust auto-conf css for badge
- make it xmr orange
- make with dynamic with 10 px padding left/right
- fix 1 px vertical offset
2020-09-03 21:02:16 -05:00
chimp1984
4e27b93acf
Show tx confidence indicator for XMR blocks. Show info icon 2020-09-03 20:51:19 -05:00
chimp1984
7cc021d7d6
Add monero orange color code for tx confidence indicator 2020-09-03 20:50:46 -05:00
chimp1984
023eb97f04
Change min required confirmations from 0 to 1.
If users accept visible in mempool only txs its their own risk and they
can manually confirm anyway. We should not support 0 conf txs.
2020-09-03 20:33:49 -05:00
chimp1984
b80082005c
Set default services based on localhost check not on devMode check 2020-09-03 19:15:42 -05:00
chimp1984
e74edc254a
Add check if dispute is open
If a mediation or arbitration dispute has been opened we do not use the
auto-confirm feature.
2020-09-03 15:38:47 -05:00
chimp1984
0434ba52b6
Refactor dependency structure to enable adding dispute managers
If we would add DisputeManager to previous structure it would cause a
circular dependency error from guice. We change dependency structure so
that TradeManager does not know XmrTxProofService but XmrTxProofService
gets an instance of TradeManager. It makes code cleaner in total as well
as responsibility is better defined.

Next commit will contain the DisputeManager addition.
2020-09-03 14:36:28 -05:00
chimp1984
d61aad66df
Add flags to header to signal which dev setup is used
Add to app header a post fix with info if Regtest or testnet,
LOCALHOST or DEV MODE is used.
At Mainnet without devmode nothing is added
2020-09-03 13:02:10 -05:00
chimp1984
7e17b181c9
Rmove short cut info for removed key handlers 2020-09-03 12:20:22 -05:00
chimp1984
ab2ac1712a
Add dontShowAgain button in osxKeyLoggerWarning window 2020-09-03 18:00:46 +02:00
chimp1984
341c5193ce
Add dontShowAgain button in osxKeyLoggerWarning window 2020-09-03 10:54:43 -05:00
Christoph Atteneder
ca88bc9b4f
Bump version number for v1.3.8 2020-09-03 17:34:34 +02:00
chimp1984
b3d48deb39
Add getShowAccountUpdatesNotification which got deleted unintentionally
at merge.

We keep daoPresentation and accountPresentation support even it is
not used atm. But if we add a new feature and add a badge again it
will be needed.
2020-09-03 10:26:51 -05:00
Christoph Atteneder
77c7629478
Merge branch 'master' of github.com:bisq-network/bisq into add-xmr-tx-key-service-3
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/MainView.java
#	desktop/src/main/java/bisq/desktop/main/MainViewModel.java
2020-09-03 17:10:05 +02:00
Christoph Atteneder
3df94288b5
Merge pull request #4464 from chimp1984/show-popup-for-osx-key-logger-warning
Show popup about key-logger warning if OSX version is >= 10.14
2020-09-03 16:49:58 +02:00
Christoph Atteneder
5812103579
Merge pull request #4467 from chimp1984/remove-double-username-tf-in-revolut
Fix wrong label for account name when displaying revolut account
2020-09-03 16:48:58 +02:00
chimp1984
e496637b4b
Remove NewTradeProtocolLaunchWindow and badges for dao and account
Those have been added for 1.2 and are not new anymore.
2020-09-02 22:44:49 -05:00
chimp1984
59725f8a5f
Fix wrong label for account name when displaying revolut account 2020-09-02 22:10:03 -05:00
chimp1984
b17ee93b6f
Add listeners for filter change for shutdown all requests and
disable settings UI if auto-conf is disabled in filter.
2020-09-02 21:27:13 -05:00
chimp1984
842eeebe56
Show popup about key-logger warning if OSX version is >= 10.14
Tell user about the issue and instruct him how to change OS settings.
2020-09-02 10:26:33 -05:00
sqrrm
604dabbb46
Merge pull request #4461 from ghubstan/1-singleton-coreapi
Make CoreApi a singleton
2020-09-02 14:44:23 +02:00
Christoph Atteneder
095c8b5bdb
Merge pull request #4415 from sqrrm/dev-css
Add option to use different css for dev mode
2020-09-02 14:20:57 +02:00
Christoph Atteneder
a691eed223
Merge pull request #4455 from sqrrm/simplify-witness-signing
Simplify witness signing
2020-09-02 14:19:46 +02:00
chimp1984
a9e61e409e
Replace ObjectProperty<AssetTxProofResult> with IntegerProperty
// ObjectProperty with AssetTxProofResult does not notify changeListeners. Probably because AssetTxProofResult is
// an enum and enum does not support EqualsAndHashCode. Alternatively we could add a addListener and removeListener
// method and a listener interface, but the IntegerProperty seems to be less boilerplate.
2020-09-02 00:25:35 -05:00
chimp1984
a8968da23f
Add listener on autoConfirmSettings changes and terminate all services
if feature got disabled in setting.
2020-09-02 00:00:23 -05:00
chimp1984
320179f5ec
Improve handling of invalid/empty tx hash/tx key 2020-09-01 22:29:17 -05:00
chimp1984
7240bd62d1
Read numRequiredConfirmations from autoConfirmSettings just in time.
This allows the user to change required confirmation and it has impact
on open requests. Will be read at parsing the result.

Changed also the text field to not listen on text change but on focus
out so that the values are only updated once the user has left the
field and the value is valid. Otherwise small numbers like 1 might be
written during typing. The other values are only read at request start
and changes will have no impact on already started requests.

Also applies previous value in case the user added an invalid value at
focus out.

- Made display text shorter and added a tooltip.
- Allow very high numbers in devmode as max conf value
2020-09-01 21:22:16 -05:00
chimp1984
7c0d24c567
Refactoring: Rename package
bisq.core.trade.autoconf to bisq.core.trade.txproof
2020-09-01 19:56:48 -05:00
chimp1984
039860935d
Merge master
- fix tests
2020-09-01 19:53:23 -05:00
chimp1984
28c8150b6b
Refactoring
This is another larger refactoring, sorry ;-)

But the structure was just not correct before. We had handled multiple
trades with multiple results and that is error prone. Now each class
has much more clear responsibilities. Also the result enums are not
changes so that they are better separated between result based and
service bases states.

All different states are still hard to test. We should set up some mock
service to simulate confirmations counting up and error scenarios.
2020-09-01 19:10:43 -05:00
sqrrm
6e77ef08f0
Fix legit codacy complaints 2020-09-02 00:44:19 +02:00