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
Christoph Atteneder
8b751d095c
Merge pull request #4573 from chimp1984/remove-debug-logs
...
Cleanup debug logs
2020-09-30 16:09:37 +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
cfed832acd
Cleanups
2020-09-29 13:49:22 -05:00
chimp1984
3242d86321
Apply code inspection suggestions
2020-09-29 13:08:55 -05:00
chimp1984
11eb24bb53
Simplify statements
2020-09-29 13:04:12 -05:00
chimp1984
87272ad3a5
Use final
2020-09-29 13:02:44 -05:00
chimp1984
4c7f6147e9
Remove not needed stream()
2020-09-29 13:02:32 -05:00
chimp1984
94bc2359ed
Delete unused class
2020-09-29 13:00:33 -05:00
chimp1984
3926a36c3a
Use params for trace logs.
2020-09-29 12:55:23 -05:00
chimp1984
a3c69d5be6
Remove isDebugEnabled if not needed.
...
Cleanup logs.
isDebugEnabled() is not recommended if params are used. It caused more performance costs and adds boilerplate code.
See:
http://logging.apache.org/log4j/1.2/manual.html
"This will not incur the cost of parameter construction if debugging is disabled. On the other hand, if the logger is debug-enabled, it will incur twice the cost of evaluating whether the logger is enabled or not: once in debugEnabled and once in debug. This is an insignificant overhead because evaluating a logger takes about 1% of the time it takes to actually log."
2020-09-29 12:47:19 -05:00
chimp1984
5a2a1d72f6
Remove toProtoNetworkEnvelope call.
...
'protobuf.NetworkEnvelope proto' was only used for debug logs and is expensive serialisation at each message send.
2020-09-29 12:18:08 -05:00
Christoph Atteneder
468a16f2c9
Merge pull request #4567 from oscarguindzberg/remove-unused
...
Remove unused WalletService.freshKey()
2020-09-29 09:57:51 +02: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
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
sqrrm
a408dd5a89
Merge pull request #4552 from oscarguindzberg/WalletConfigCleanup
...
Wallet config cleanup
2020-09-27 14:40:51 +02:00
