mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,305 Commits 4 Branches 148 Tags 4.3 GiB
b90fd3968d
Commit Graph

4725 Commits

Author SHA1 Message Date
chimp1984
431debe05e
Unrelated to PR topic fix: Only log warnings if banned object is not isEmpty 2020-10-01 14:59:27 -05:00
chimp1984
240f0b903c
Use PersistableNetworkPayloadStore as base class for stores which had a map with PersistableNetworkPayloads 2020-10-01 14:57:48 -05:00
chimp1984
d84122259b
Fix merge conflicts 2020-10-01 10:35:30 -05: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
a8a881ea3e
Fix wrong printSystemLoad calls 2020-10-01 09:56:26 -05:00
chimp1984
9fce06832d
Rename baseCurrencyNetworkParameters to networkParameters 2020-10-01 09:46:11 -05:00
chimp1984
8a3cacd867
Revert renaming from InputsForDepositTxRequest to TakeOfferRequest 
Prefer to keep it in sync with protobuf entry.
 2020-10-01 09:45:19 -05:00
chimp1984
0af9e133a4
Cleanups 2020-10-01 09:42:33 -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
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
1b1888673c
Refactor: Move handler code to domain classes 2020-09-30 23:12:06 -05:00
chimp1984
11383b9e84
Refactor: Rename startAppSetup to runBisqSetup 2020-09-30 22:45:11 -05:00
chimp1984
346ad517a1
Refactor: Move osUserDataDir method to Utilities, rename to getUserDataDir 2020-09-30 22:43:11 -05:00
chimp1984
c3e1ae691b
Remove cryptoSetupFailedHandler 2020-09-30 22:39:13 -05:00
chimp1984
a38f59a88a
Refactor: Move common bases setup code to CommonSetup 2020-09-30 22:36:18 -05:00
chimp1984
fe577b3651
Remove checkCryptoSetup as not needed anymore 2020-09-30 22:30:40 -05:00
chimp1984
907fd66dc2
Remove empty loop 2020-09-30 22:27:09 -05:00
chimp1984
bb99eef059
Refactor: Move AvoidStandbyModeService from BisqApp to BisqExecutable.setupAvoidStandbyMode 2020-09-30 22:26:42 -05:00
chimp1984
b927f9719e
Refactor: Move DevEnv setup to CommonSetup 2020-09-30 22:11:29 -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
chimp1984
b6e97e371e
Refactor: add new setup method to CommonSetup with config (WIP) and call it at doExecute. Move AsciiLogo to CommonSetup 2020-09-30 21:53:29 -05:00
chimp1984
b73fff0aad
Refactor: Move AsciiLogo to common 2020-09-30 21:50:47 -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