mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity
4986 commits 3 branches 150 tags 4.1 GiB
Commit graph

4986 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
410959d389
Use lombok getter/setter for WalletConfig.minBroadcastConnections. 2018-01-19 20:33:23 -05:00
Manfred Karrer
b47a40db4d
Add onion address to Bitcoin node btc.jochen-hoenicke.de 2018-01-14 17:32:22 +01:00
Manfred Karrer
775e687fe5
Merge branch 'master' into TradePeriodStartsAfterConfirmation 2018-01-12 22:43:31 +01:00
Manfred Karrer
6fccaca340
Fix getBlockDateForTx method 2018-01-12 22:41:48 +01:00
Manfred Karrer
b8448eb7fb
ix getBlockDateForTx method 2018-01-12 22:40:34 +01:00
Manfred Karrer
27d1083380
Use 60 days for TTL for alert. Cleanups. 2018-01-10 22:21:32 +01:00
Manfred Karrer
5d87e5e9c7
Fix merge error 2018-01-10 21:46:28 +01:00
Manfred Karrer
f71ce6b237
Update PersistableNetworkPayloadMap_BTC_MAINNET 2018-01-10 21:45:52 +01:00
Manfred Karrer
7753586ea6
Merge branch 'FixWrongFeeCalculationForTaker' 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
 2018-01-10 20:56:04 +01:00
Manfred Karrer
dc310d9a50
Commit tx after timout triggers. Refactor: Move static broadcast method to Broadcaster class. 2018-01-10 20:54:00 +01:00
Manfred Karrer
382e2ccf86
Remove blockexplorer.com 2018-01-10 20:16:05 +01:00
Manfred Karrer
846aa494ca
Add check for min peers connected for broadcast 2018-01-10 19:41:26 +01:00
Christoph Fröschl
934d50d473 Merge branch 'Development' of https://github.com/bisq-network/exchange into Development 2018-01-10 19:25:10 +01:00
Manfred Karrer
c1d04cd435
Cleanup. Add comment 2018-01-10 18:59:33 +01:00
Manfred Karrer
67a1633ec9
Fix wrong dust check. Fix wrong balance check. Improve logs. Add comments. 2018-01-10 18:54:43 +01:00
Manfred Karrer
c01d87db89
Use average of taker fee and deposit tx for tx fee calculation 2018-01-10 18:06:11 +01:00
Manfred Karrer
077c2d68ed
Fix wrong default tx size for taker 2018-01-10 14:09:04 +01:00
Manfred Karrer
43cc5598ca
Fix wrong fee estimation for taker. Improve logs. 2018-01-10 13:57:07 +01:00
Manfred Karrer
391844e41e
Don't delete tor files at startup. Cleanup 2018-01-10 00:54:00 +01:00
Manfred Karrer
5f10b16e94
Increase timeout for showing Tor network settings window 2018-01-10 00:53:31 +01:00
Manfred Karrer
9988a7e4f6
Increase retry for monitor to 5. Adjust logs. Cleanup. 2018-01-09 23:55:15 +01:00
Manfred Karrer
aeec075c91
Prepare v0.6.3 2018-01-09 23:36:49 +01:00
Manfred Karrer
79e16a4b7a
Add support for start trade period timer after deposit tx has been confirmed. Not working yet. 2018-01-09 23:30:29 +01:00
Manfred Karrer
71a0fc5240
Revert removal of WalletDir optionkey 2018-01-09 22:32:46 +01:00
Manfred Karrer
c3e648dc6b
Disable dev mode 2018-01-09 22:13:55 +01:00
Manfred Karrer
f50242a4fa
Merge branch 'dhingra-UI_issue_1084' into Development 2018-01-09 22:09:00 +01:00
Manfred Karrer
e6d55591a6
Reformat, add bracket 2018-01-09 22:08:33 +01:00
Manfred Karrer
ac65414418
Merge branch 'UI_issue_1084' of https://github.com/dhingra/exchange into dhingra-UI_issue_1084 2018-01-09 22:00:42 +01:00
Manfred Karrer
5814bbaa9e
Merge branch 'dhingra-UI_issue_1123' into Development 2018-01-09 21:58:44 +01:00
Manfred Karrer
7d2879b8ae
Merge branch 'UI_issue_1123' of https://github.com/dhingra/exchange into dhingra-UI_issue_1123 2018-01-09 21:49:50 +01:00
Manfred Karrer
5d217aa347
Merge branch 'deeponion-master' into Development 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
 2018-01-09 21:44:06 +01:00
Manfred Karrer
d19580b32b
Reformat 2018-01-09 21:42:14 +01:00
Manfred Karrer
c0b44165de
Merge branch 'master' of https://github.com/deeponion/exchange into deeponion-master 2018-01-09 21:40:40 +01:00
Manfred Karrer
e2896e3e4f
Merge branch 'master' of https://github.com/madcoin-project/exchange into madcoin-project-master 2018-01-09 21:38:09 +01:00
Manfred Karrer
532f351b6e
Add WILD token 2018-01-09 21:36:51 +01:00
Manfred Karrer
516d130a5c
Merge branch 'Development' of https://github.com/WildCryptoICO/exchange into WildCryptoICO-Development 2018-01-09 21:34:18 +01:00
Manfred Karrer
4b9788c0bc
Change popup text for Zcoin 2018-01-09 21:30:26 +01:00
Manfred Karrer
7f0e871007
Delay callback of tx broadcaster 2018-01-09 21:15:58 +01:00
Manfred Karrer
1b7db08e68
Add timeout to tx broadcast to call onSuccess at callback in case we don't get the broadcaster completed in time 2018-01-09 20:54:37 +01:00
Manfred Karrer
2df6a1bd8a
Remove unneeded setter 2018-01-09 20:22:20 +01:00
Manfred Karrer
cdc1061571
Remove WALLET_DIR. Use APP_DATA_DIR_KEY instead. 2018-01-09 20:18:43 +01:00
Manfred Karrer
e8fbd7a3bc
Delete tor directory (excluding hidden service folder) at startup 2018-01-09 20:18:19 +01:00
Manfred Karrer
9fb59c89d5
Use bitcoinj 0.14.4.5 with adjusted broadcast behavior 2018-01-09 19:37:36 +01:00
Manfred Karrer
1635e414fa
Add logs for expired storage data 2018-01-09 19:07:41 +01:00
Manfred Karrer
f1df5af69e
Disconnect from seed nodes at maxConnections (revert earlier change with disconnect at 6 connections to avoid risk for partitioning of seed nodes) 2018-01-09 18:37:33 +01:00
Manfred Karrer
bef49998f7
Use libdoj 95a33100 with bitcoinj 0.14.4.4 2018-01-09 15:06:12 +01:00
Manfred Karrer
c8b216a890
Merge branch 'master' into Development 2018-01-09 13:56:01 +01:00
Manfred Karrer
8bec17a823
Move persisted data to resource dir. Improve logging 2018-01-09 13:54:47 +01:00
Chris Beams
64d9d2e094
Merge pull request #1160 from maskoficarus-master 2018-01-08 12:13:33 +01:00
Chris Beams
66d4b2c162
Remove trailing whitespace and use expression lambda 2018-01-08 10:27:20 +01:00