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

9018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
68436f5f85
Merge branch 'master' into rc_v1.0.0 
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVotePayload.java
 2019-04-10 09:39:15 -05:00
Christoph Atteneder
bbfe663f52
Darken background less, to feel less dark. 2019-04-10 16:38:25 +02:00
Christoph Atteneder
94c1cf3499
Updated translations based on https://github.com/bisq-network/bisq/pull/2688#issuecomment-481709119 2019-04-10 16:31:57 +02:00
Manfred Karrer
6aca2cd64c
Merge pull request #2690 from ripcurlx/align-hyperlinks 
Remove unnecessary negative left padding
 2019-04-10 09:22:04 -05:00
Christoph Atteneder
3a3a11ed26
Make blurred background even darker based on #2337. 2019-04-10 16:15:03 +02:00
Christoph Atteneder
33fc7daf84
Remove unnecessary negative left padding 2019-04-10 16:03:12 +02:00
Christoph Atteneder
bc3aed4aeb
Adapt update popup to general information popup and darken blurred background for regular popups 2019-04-10 15:52:45 +02:00
Christoph Atteneder
17d5f2ac4a
Add DAO launch popup 2019-04-10 12:29:51 +02:00
Christoph Atteneder
83770dbfd4
Add votes as shared translation 2019-04-10 12:29:51 +02:00
Christoph Atteneder
ce731564a3
Add proposal as shared translation 2019-04-10 12:29:51 +02:00
Manfred Karrer
2945150e7e
Merge pull request #2674 from ManfredKarrer/add-more-info-to-dao-monitor 
Handle dao state conflicts better
 2019-04-09 12:19:41 -05:00
Manfred Karrer
a1be8a4ee7
Make base class protected and remove Inject annotation 2019-04-09 12:10:03 -05:00
Manfred Karrer
44cf1dced7
Fix wrong order or arguments 2019-04-09 12:08:10 -05:00
Harry MacFinned
5aa22cef93
Update CurrencyUtil.java 
add BURST+STEEM to the list of removed assets
 2019-04-09 07:27:39 +00:00
M4hdi1995
10ca0acaca List ParsiCoin (PARS) 2019-04-09 03:02:58 +02:00
Manfred Karrer
8e82fa6654
Handle dao state conflicts better 
- Check if conflicting node is seed node or not. Show info in list entry
and only show resync button and red color in text if conflict is with
seed node.
- At resync move all p2p network data to a dedicated directory so they
will be reloaded from the seeds.
 2019-04-08 16:39:13 -05:00
Christoph Atteneder
ee7864bc34
Revert to SNAPSHOT versions 2019-04-08 12:12:01 +02:00
Christoph Atteneder
f9a0dd1502
Bump version number 2019-04-08 12:10:59 +02:00
Christoph Atteneder
27a2772875
Update DBs 2019-04-08 11:11:00 +02:00
Christoph Atteneder
4bec31583e
Update translations 2019-04-08 11:05:58 +02:00
Christoph Atteneder
f4c65c4d6e
Merge pull request #2665 from ManfredKarrer/use-crypt-hash-at-role 
Use cryptographic hash from protobuffer serialized data instead of hashCode
 2019-04-08 10:44:30 +02:00
Christoph Atteneder
2846b1881b
Merge pull request #2667 from ManfredKarrer/protect-against-late-blind-vote-publishing 
Protect against late blind vote publishing
 2019-04-08 10:43:48 +02:00
Christoph Atteneder
33a04bba57
Merge pull request #2669 from ManfredKarrer/close-printwriter-before-rename-temp-file 
Close printWriter before renaming temp file
 2019-04-08 10:42:37 +02:00
Christoph Atteneder
2f3dd40623
Merge pull request #2670 from ManfredKarrer/add-new-filter-option 
Add filter for min required version for DAO
 2019-04-08 10:42:09 +02:00
Manfred Karrer
ef3081e89c
Fix incorrect equality check 2019-04-07 20:49:53 -05:00
Manfred Karrer
d916101564
Fix missing argument in test 2019-04-07 20:31:53 -05:00
Manfred Karrer
38a6d58254
Add filter for min required version for DAO 2019-04-07 18:58:17 -05:00
Manfred Karrer
ffb50b6406
Change lock time fro bonds from 75 days to 110 days. 
See https://github.com/bisq-network/proposals/issues/53#issuecomment-480641730
 2019-04-07 18:27:57 -05:00
Manfred Karrer
2e5055cf56
Remove outdated db files 2019-04-07 18:03:30 -05:00
Manfred Karrer
bd7358ffe4
Add date to BlindVote 2019-04-07 18:01:11 -05:00
Manfred Karrer
7d562013f7
Fixes https://github.com/bisq-network/bisq/issues/2660 2019-04-07 14:47:46 -05:00
Manfred Karrer
5d2dcb3539
Refactoring: Rename isInCorrectPhase to notInVoteRevealPhase 2019-04-07 14:21:05 -05:00
Manfred Karrer
6e9edc7b53
Merge pull request #2657 from ManfredKarrer/reduce-timeout 
Reduce tx broadcast timeout
 2019-04-07 09:12:46 -05:00
Manfred Karrer
d81498dc01
Remove date and DateTolerantPayload interface from BlindVotePayload 2019-04-06 21:49:18 -05:00
Manfred Karrer
e93284292c
Rename DaoStateStore3 db file to DaoStateStore 2019-04-06 21:46:40 -05:00
Manfred Karrer
ed3ab79044
Cleanup TODOs 2019-04-06 21:46:11 -05:00
Manfred Karrer
a6a0c6ec70
Remove DAO testing feedback window 2019-04-06 21:39:42 -05:00
Manfred Karrer
eadc72c453
Check if not in voteReveal phase when receiving blindVotes 
We do not accept blindVotePayloads when we are in the voteReveal phase
to protect against late publishing attacks.
 2019-04-06 21:20:16 -05:00
Manfred Karrer
abebd76627
Remove republishing of blind votes at vote reveal 
As we do not accept blind votes from the network during hte vote reveal
phase the republishing does not make sense.
 2019-04-06 19:52:52 -05:00
Manfred Karrer
6b416ca278
Add TODO for removing the date from BlindVotePayload at mainnet launch 
We don't want to break consensus and persisted data at current
dao_regtest by removing the date now. It is not used anywhere so it is
irrelevant but would break things as the hash would be different and
persisted data would not be readable anymore. So we delay that change
to the mainnet launch.
 2019-04-06 19:46:58 -05:00
Manfred Karrer
419da79232
Republish only outside of voteReveal phase 2019-04-06 19:36:41 -05:00
Manfred Karrer
1df485a4fa
Remove DateTolerantPayload interface 
The date check would not add real protection as the attacker could just
use a new date and we do not cross check the date with the tx date.
We could do that but it would add complexity and we have another
strategy which does not require that.
 2019-04-06 19:29:31 -05:00
Manfred Karrer
2b15bd20af
Use cryptographic hash from protobuffer serialized data instead of hashcode 
Fixes https://github.com/bisq-network/bisq/issues/2662
 2019-04-06 19:16:19 -05:00
Manfred Karrer
5cfa2c77ac
Refactor: Rename method and parameter 2019-04-05 20:16:12 -05:00
Manfred Karrer
939c01f0fb
Reduce tx broadcast timeout 
Currently there is a bug in BitcoinJ causing the timeout at all BSQ
transactions.
It is because BitcoinJ does not handle confidence object correctly in
case as tx got altered after the
Wallet.complete() method is called which is the case for all BSQ txs.
We will work on a fix for that but that
will take more time. In the meantime we reduce the timeout to 5
seconds to avoid that the trade protocol runs
into a timeout when using BSQ for trade fee.
 2019-04-05 15:07:45 -05:00
Christoph Atteneder
400fbbd080
Merge pull request #2655 from ripcurlx/improve-tx-display-for-btc-withdrawal-from-bsq-wallet 
Improve tx display for BTC withdrawal from BSQ wallet
 2019-04-05 17:52:34 +02:00
Christoph Atteneder
63994ff13c
Merge pull request #2656 from m52go/proposal-popup-text 
Reword text in proposal fee pop-up
 2019-04-05 17:45:20 +02:00
Christoph Atteneder
e5d28b67c1
Prevent transaction already when there is a zero BTC output 2019-04-05 17:44:00 +02:00
Christoph Atteneder
dda54f8b64
Show zero BSQ transferred for BTC withdrawal form BSQ wallet 2019-04-05 17:41:32 +02:00
Steve Jain
eda85bf2e9
Reword text in proposal fee pop-up 2019-04-05 11:10:00 -04:00