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

2068 commits

Author SHA1 Message Date
Manfred Karrer
b1182e9784
Use GenesisTxInfo instead of option key for genesis block height 2018-09-25 22:43:27 -05:00
Manfred Karrer
cd8ff29aa5
Add testnet genesis tx 2018-09-25 22:42:34 -05:00
Manfred Karrer
70f6a712f7
Don't use default genesis tx if regtest or testnet 2018-09-25 22:20:22 -05:00
Manfred Karrer
a85bc097a2
Enable DAO if testnet or regtest 2018-09-25 22:06:05 -05:00
Manfred Karrer
f8feec2948
Change testnet seed node to o5qw2hy6l7jsf654 2018-09-25 21:45:30 -05:00
Manfred Karrer
b03aab24b7
Change label for network selector 2018-09-25 21:03:02 -05:00
Manfred Karrer
5b70d71580
Add isTestNet method 2018-09-25 20:52:08 -05:00
Manfred Karrer
401418e963
Add GenesisTxInfo to param in test class 2018-09-25 20:01:29 -05:00
Manfred Karrer
3689e4cbf1
Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	core/src/main/java/bisq/core/dao/state/SnapshotManager.java
 2018-09-25 19:58:15 -05:00
Manfred Karrer
0bcb96b724
Add checks for snapshot 2018-09-25 19:55:41 -05:00
Manfred Karrer
a8d04d3acc
Add more testnet seed nodes 2018-09-25 19:55:22 -05:00
Christoph Atteneder
5d46a991a8
Merge pull request #1720 from ManfredKarrer/handle-xmr-popup-text 
Adjust trade popup text for XMR
 2018-09-25 17:27:59 +02:00
Manfred Karrer
b6a4e028c6
Merge pull request #1721 from ManfredKarrer/update-json-for-bsq-explorer 
Update json for bsq explorer
 2018-09-25 09:50:15 -05:00
Manfred Karrer
2be68a76fc
Fix issue with not filtered ballots 
- When creating the ballot list we used all ballots of all cycles.
We added a new method to get the ballots of the current cycle.

- Add check if optionalTx.isPresent() in isTxInPhaseAndCycle
 2018-09-24 21:23:03 -05:00
Manfred Karrer
ff796b3e6c
Add toString methods, add better logging 2018-09-24 19:15:19 -05:00
Manfred Karrer
d9cada9ec0
Fix issue with wrong merit 
- We need to ignore the compensationProposal from the current cycle
when creating the merit list
 2018-09-24 19:14:44 -05:00
Manfred Karrer
ee1317c64a
Fix issue causing invalid vote reveal tx 
- Set PHASE_VOTE_REVEAL duration to 2 blocks as 1 block would cause an
invalid state (confirmation block is one block after phase)
- Rename getStateBuilder to getBsqStateBuilder
 2018-09-24 18:30:05 -05:00
Manfred Karrer
835db24e53
Fix threading issues with ExportJsonFilesService 
- Rename JsonBlockChainExporter to ExportJsonFilesService
- Remove getBlocksFromState method
- Add ExportJsonFilesService to DaoSetup and implement DaoSetupService
- Add json dir for all json sub dirs
- Move access to bsqStateService out from thread in ExportJsonFilesService
- Only do write to disk in thread
- Sync model files
 2018-09-24 17:39:23 -05:00
Manfred Karrer
aefa986467
Fix threading issues with ExportJsonFilesService 
- Rename JsonBlockChainExporter to ExportJsonFilesService
- Remove getBlocksFromState method
- Add ExportJsonFilesService to DaoSetup and implement DaoSetupService
- Add json dir for all json sub dirs
- Move access to bsqStateService out from thread in ExportJsonFilesService
- Only do write to disk in thread
 2018-09-24 14:03:10 -05:00
Manfred Karrer
86086c1e09
Adjust trade popup text for XMR 
Fixes https://github.com/bisq-network/bisq/issues/1555
 2018-09-24 13:01:33 -05:00
Manfred Karrer
e47c160a27
Merge branch 'master' into fix-multiple-btc-peers 2018-09-24 12:11:58 -05:00
Christoph Atteneder
95f42fed21
Merge pull request #1716 from ManfredKarrer/small-improvements 
Small improvements
 2018-09-24 06:31:57 +02:00
Manfred Karrer
4227fcab85
Add package info and comment 2018-09-23 15:36:57 -05:00
Manfred Karrer
bb20264473
Move classes 2018-09-23 15:35:06 -05:00
Manfred Karrer
6f03624fd2
Add comment 2018-09-23 15:34:43 -05:00
Manfred Karrer
920ad2e1b5
Rename network package to nodes 2018-09-23 15:29:09 -05:00
Manfred Karrer
8d0f6b7556
Rename BitcoinNodes to BtcNodes 2018-09-23 15:22:20 -05:00
Manfred Karrer
361605d4e3
Rename PeerAddressesRepository to BtcNodesRepository 2018-09-23 15:21:41 -05:00
Manfred Karrer
6e90554f84
Rename WalletNetworkConfig to BtcNetworkConfig 2018-09-23 15:20:41 -05:00
Manfred Karrer
06d0a4a80a
Rename WalletSetupPreferences to BtcNodesSetupPreferences 2018-09-23 15:19:57 -05:00
Manfred Karrer
5f56d08d33
Fix package structure in tests 2018-09-23 15:18:22 -05:00
Manfred Karrer
f7d8b35b32
Add model package and move classes 2018-09-23 15:13:42 -05:00
Manfred Karrer
0d86176f4e
Further refactorings: move classes to other packages 2018-09-23 15:09:22 -05:00
Manfred Karrer
16fac73b6d
Further refactorings move classes to other packages 2018-09-23 14:56:46 -05:00
Manfred Karrer
6c7bf96fee
Move exception classes to exception package 2018-09-23 14:50:32 -05:00
Manfred Karrer
9b9d56c79c
Add missing import 2018-09-23 14:47:41 -05:00
Manfred Karrer
f3f719a632
Move btc setup classes to setup package 2018-09-23 14:46:58 -05:00
Manfred Karrer
f0471bccfd
Warn user when closing with open offers 
Fixes https://github.com/bisq-network/bisq/issues/1663
 2018-09-23 13:48:01 -05:00
Manfred Karrer
38e910c366
Add contact info for seller in case of aa F2F trade 
Fixes: https://github.com/bisq-network/bisq/issues/1707#issuecomment-423724283
 2018-09-22 18:59:15 -05:00
Christoph Atteneder
97fb1b8ec1
Merge pull request #1712 from ManfredKarrer/PreventAppNap 
Play silent sound to avoid standby mode
 2018-09-22 06:52:50 +02:00
Manfred Karrer
416d9ba8f3
Play silent sound to avoid standby mode 
Apple disabled options do avoid App Nap in recent OSX versions.
Playing an inaudible sound marks the application for preventing to get
set to standby mode as well as App Nap mode.
The alternative to that "hack" would be to add OSX native code, but
even then it is likely only possible to prevent App Nap but not
sleep mode.
If Bisq is in App Nap mode offers cannot be taken as well the user loses
network connection and offers.
See: https://github.com/bisq-network/bisq/issues/1701
 2018-09-21 14:50:03 -05:00
Manfred Karrer
56c657c400
Add printAllCurrencyStats method 2018-09-21 12:52:03 -05:00
Manfred Karrer
705025fea9
Add info for Faster Payment that the receivers name is not required 
See:
https://github.com/bisq-network/bisq/issues/1693
 2018-09-18 17:34:58 -05:00
Manfred Karrer
61caac07c2
Merge pull request #1688 from ManfredKarrer/master 
Add Citibank to supported Zelle banks, update DAO rpc doc
 2018-09-18 17:00:05 -05:00
Christoph Atteneder
db179914ad
Remove not thrown exceptions 2018-09-18 20:50:01 +02:00
Christoph Atteneder
f7e4e5ae14
Add missing result handler execution 2018-09-18 20:29:10 +02:00
Manfred Karrer
824d231a69
Add Citibank to supported Zelle banks 
See: https://github.com/bisq-network/payment-methods/issues/10
 2018-09-15 09:54:14 -05:00
Christoph Atteneder
40eadcc6e9
Merge branch 'master' into java10-support 2018-09-14 16:05:16 +02:00
Christoph Atteneder
4c068af7b3
Use default security provider instead of Bouncy Castle 2018-09-14 16:02:58 +02:00
Aruna Surya
cd5c5eda65
Improve grammar of Welcome text 2018-09-13 20:01:10 +02:00