mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity
12271 commits 3 branches 150 tags 4.1 GiB
Commit graph

4703 commits

Author SHA1 Message Date
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
sqrrm
0b1894a939
Merge pull request #4554 from ghubstan/create-offer 
Change 'createoffer' api method return type
 2020-10-01 14:48:38 +02:00
Christoph Atteneder
0a88ee6bd3
Merge pull request #4581 from oscarguindzberg/fixHostnameSerialization 
Use bitcoinj 0.15.8 (commit 44ddbdc)
 2020-10-01 09:15:47 +02: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
a44ba62c77
Merge branch 'fix-delayed-payout-tx-issues' of https://github.com/chimp1984/bisq into fix-delayed-payout-tx-issues 2020-10-01 00:06:03 -05:00
chimp1984
7e847cd95b
Only check pubKey for trade messages. Before we got it called for instance when the mediator sent the dispute-opened-by-peer msg, causing an error as its mediators key not peers key. 
We need to check first for the message type and then apply the check.
 2020-09-30 13:45:27 -05:00
chimp1984
24e1155eea
Set peers pubkey at constructor instead of onInitialized 2020-09-30 13:44:15 -05:00
Oscar Guindzberg
5db273010f
Use bitcoinj 0.15.8 (commit 44ddbdc) 2020-09-30 13:10:05 -03: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
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
3926a36c3a
Use params for trace logs. 2020-09-29 12:55:23 -05:00
chimp1984
e9d7e53882
Merge branch 'fix-delayed-payout-tx-issues' of https://github.com/chimp1984/bisq into fix-delayed-payout-tx-issues 2020-09-29 01:07:42 -05:00
chimp1984
25e64cd6b5
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:44 -05:00
chimp1984
e071d5e025
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:28 -05:00
chimp1984
9cf368c449
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:09 -05:00
chimp1984
c3d3e5230e
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:46 -05:00
chimp1984
6c114b44e8
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:21 -05:00
chimp1984
77ae1bddfa
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:45 -05:00
chimp1984
92902102ec
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:27 -05:00
chimp1984
4e2ccf249b
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:17 -05:00
chimp1984
1fef02e6f1
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:04 -05:00
chimp1984
dc15c7dfa7
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:53 -05:00
chimp1984
e3cc62ed60
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:41 -05:00
chimp1984
126f99668d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:30 -05:00
chimp1984
08e2a2e0b0
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:18 -05:00
chimp1984
c448b1b58d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:01 -05:00
chimp1984
285003743d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:49 -05:00
chimp1984
6be21fa86c
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:11 -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
7280fb822d
Add new extraMap entry for offer. 
If maker is seller and is a xmr offer and has autoConf enabled we set a flag ("1")
 2020-09-28 23:26:29 -05:00
chimp1984
e8ab4c7222
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues 2020-09-28 20:46:34 -05:00
chimp1984
0258205211
Fix typos 2020-09-28 18:10:42 -05:00
chimp1984
eec13cd276
Refactor: Return early if not valid 2020-09-28 18:08:07 -05:00
chimp1984
ad83183cba
Revert copyright text from un-intended change 2020-09-28 18:05:09 -05:00
Oscar Guindzberg
1e65af51ea
Remove unused WalletService.freshKey() 2020-09-28 18:37:53 -03:00
sqrrm
20135a1662
Merge pull request #4561 from oscarguindzberg/codeCleanup 
Remove unnecessary WalletService.removeSignatures()
 2020-09-27 14:44:43 +02:00
sqrrm
a408dd5a89
Merge pull request #4552 from oscarguindzberg/WalletConfigCleanup 
Wallet config cleanup
 2020-09-27 14:40:51 +02:00
sqrrm
3174778018
Merge pull request #4560 from jmacxx/fix_xmr_amount_check 
XMR autoconf should get amount from trade not offer
 2020-09-27 14:40:23 +02:00
chimp1984
2191693946
Apply stupid Codacy rule 
https://stackoverflow.com/questions/1750435/comparing-java-enum-members-or-equals

```
enum Color { BLACK, WHITE };

Color nothing = null;
if (nothing == Color.BLACK);      // runs fine
if (nothing.equals(Color.BLACK)); // throws NullPointerException
```
```
enum Color { BLACK, WHITE };
enum Chiral { LEFT, RIGHT };

if (Color.BLACK.equals(Chiral.LEFT)); // compiles fine
if (Color.BLACK == Chiral.LEFT);      // DOESN'T COMPILE!!! Incompatible types!
```

"To summarize, the arguments for using == on enum are:

     It works.
     It's faster.
     It's safer at run-time.
     It's safer at compile-time.
"
 2020-09-27 02:13:39 -05:00
chimp1984
28a85c1ce5
Fix display strings 2020-09-27 02:04:35 -05:00
chimp1984
ab30e546b0
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues 2020-09-27 01:28:51 -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
6deeecb846
Move handling of mailbox messages from TradeManager to TradeProtocol 
Make removal of mailbox messages automated in TradeProtocol
 2020-09-26 23:38:01 -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
cabc5af2c6
Make processModel in Trade final and pass in constructor instead of in init method 2020-09-26 19:36:07 -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
6c6332d68d
Allow also Trade.Phase.PAYOUT_PUBLISHED in onPaymentReceived to support in failure situations to resend the msg 2020-09-26 17:37:34 -05:00
chimp1984
07bcf6c38f
Refactor: improve logs 2020-09-26 17:36:57 -05:00
chimp1984
3ce1ac9285
Refactor: improve logs 2020-09-26 17:36:41 -05:00