Commit Graph

6962 Commits

Author SHA1 Message Date
Manfred Karrer
7bf5c819cd
Implements bonded reputation
Still WIP with many areas...
2018-11-05 18:35:30 -05:00
Manfred Karrer
15b8f02c67
Work on bonded reputation (WIP) 2018-11-02 19:31:31 -05:00
Manfred Karrer
e7daaae9ee
Rename lockupViews to ReputationView
- To avoid that we handle lockup/unlock 2 times in the view we will
remove the generic options (upcoming commits...)
2018-11-02 16:11:56 -05:00
Manfred Karrer
8ce8813e89
Complete handling of bonds for roles.
- Add BondedRoleState to reflect all diff. states.
- Show in UI correct state and button state for lockup/revoke
- Rename ProposalService classes to ProposalFactory
2018-11-02 16:09:53 -05:00
Manfred Karrer
10b14a69cc
Moving classes
That was a big commit with restructuring the packages and classes.
Motivation was to isolate the daoState value objects so it is more clear
which data are help in the daoState. As it was hard to keep an overview
and easy to add mutable data I think that makes it more safe overall.
I am aware that the downside to take out domain models from the domain
packages is not so nice.
Also moved blockchain models to parser and full node packages.
2018-11-02 11:41:54 -05:00
Manfred Karrer
f55fde05b6
Moving classes
That was a big commit with restructuring the packages and classes.
Motivation was to isolate the daoState value objects so it is more clear
which data are help in the daoState. As it was hard to keep an overview
and easy to add mutable data I think that makes it more safe overall.
I am aware that the downside to take out domain models from the domain
packages is not so nice.
Also moved blockchain models to parser and full node packages.
2018-11-01 17:12:39 -05:00
Manfred Karrer
a3e01759b0
Moving classes
That was a big commit with restructuring the packages and classes.
Motivation was to isolate the daoState value objects so it is more clear
which data are help in the daoState. As it was hard to keep an overview
and easy to add mutable data I think that makes it more safe overall.
I am aware that the downside to take out domain models from the domain
packages is not so nice.
Also moved blockchain models to parser and full node packages.
2018-11-01 17:11:40 -05:00
Manfred Karrer
8dabd555c8
Move service classes out of daostate package
- we want to have only those classes in the daoState package which are
stored in the daoState and immutable
2018-11-01 16:13:24 -05:00
Manfred Karrer
bf1ae98a6d
Add ImmutableDaoStateVo interface to all objects used in daoState 2018-11-01 16:10:29 -05:00
Manfred Karrer
ee83a896ed
Add ImmutableDaoStateVo interface
Add ImmutableDaoStateVo interface to mark the objects used in the
daoState as immutable.
2018-11-01 15:37:22 -05:00
Manfred Karrer
2575a0aa90
Rename BondedRoleProposal and service 2018-11-01 15:29:07 -05:00
Manfred Karrer
111df6e679
Rename BondedRoleState to BondedRole 2018-11-01 15:24:06 -05:00
Manfred Karrer
8b3c06fb81
Rename BondedRole to Role
This is the first of a series of renaming commits. We want to use role
for  the immutable class and BondedRole for the wrapper which contains
role and the mutable state.
2018-11-01 15:22:50 -05:00
Manfred Karrer
e41be44e9c
Remove mutable data from BondedRole
Use BondedRoleState to hold the mutable data. Store the BondedRoleState
in a local map.
2018-11-01 15:20:35 -05:00
Manfred Karrer
dbddb46bf6
Remove BondedRoleList
- We store the bonded roles in the evaluated proposals in the dao state.
From there we can get the bonded role object as it is part of the
bonded role proposal. Though we need to take that data immutable
(next commit will handle that)
2018-11-01 13:58:49 -05:00
Manfred Karrer
4094ff99a8
Add equals and hashCode methods to classes which use enums as fields
Enums must not be used directly for hashCode or equals as it delivers
the Object.hashCode (internal address)!
The equals and hashCode methods cannot be overwritten in Enums.
It was only applied to classed which are used as value objects and
potentially are used in Sets or other context which involve usage of
equals or hashCode
2018-11-01 13:40:07 -05:00
Manfred Karrer
753e279ff8
Merge branch 'release-candidate-0.9.0' into complete-bonded-roles-impl 2018-11-01 12:50:13 -05:00
Manfred Karrer
bc82974996
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:49:49 -05:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -05:00
Manfred Karrer
6ef9ba00db
Add printStackTrace if resource not found 2018-11-01 12:48:41 -05:00
Manfred Karrer
0d481ac084
Fix wrong linebreaks 2018-11-01 12:48:21 -05:00
Manfred Karrer
b3b080cfb2
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:04:23 -05:00
Manfred Karrer
c4862cdded
Merge pull request #1851 from ManfredKarrer/merged-sq-bonded-reputation
Bonded reputation
2018-11-01 12:03:26 -05:00
Manfred Karrer
b55ba273a1
Merge pull request #1829 from arunasurya/2018-10-04-fix-grammar
Improve grammar of Background Info
2018-11-01 12:03:07 -05:00
Manfred Karrer
48fa15ee89
Merge pull request #1852 from ManfredKarrer/add-dev-setup-guide
Add dev setup guide
2018-11-01 11:57:37 -05:00
Manfred Karrer
93b9dab8c1
Improve text 2018-11-01 11:56:45 -05:00
Manfred Karrer
cda97b7a5b
Fix typos, move files, remove file 2018-11-01 11:52:39 -05:00
Chris Beams
7f1da8a344
Fix typo in 'Running Bisq' section of README 2018-11-01 12:20:24 +01:00
Aruna Surya
6dd193b0f0
Improve grammar of Background Info 2018-11-01 08:16:38 +01:00
Manfred Karrer
60df87cb5c
Move DAO notes to contributing file 2018-10-31 22:11:25 -05:00
Manfred Karrer
bafe6f1842
Remove data dir locations 2018-10-31 22:10:07 -05:00
Manfred Karrer
8dab0d6347
Update wording and formatting 2018-10-31 22:08:48 -05:00
Manfred Karrer
12bfd21d8d
Update wording and formatting 2018-10-31 21:59:10 -05:00
Manfred Karrer
b5765647f3
Add dao section 2018-10-31 21:54:35 -05:00
Manfred Karrer
ebb9feeb2e
Fix wrong links 2018-10-31 21:48:03 -05:00
Manfred Karrer
c1b1b44b41
Add dev setup guide
- Move outdated and not highly relevant files to sub directories
2018-10-31 21:38:51 -05:00
Manfred Karrer
3c5a1dabe0
WIP bonded roles 2018-10-31 18:23:45 -05:00
Manfred Karrer
bdbcc5e7fd
Add dev values for lock time and proposal phase 2018-10-31 14:30:54 -05:00
Manfred Karrer
d92e0dd5bd
Add translation strings for roles 2018-10-31 14:30:14 -05:00
Manfred Karrer
f45517a237
Update to changed getter 2018-10-31 13:52:39 -05:00
Manfred Karrer
80066bda8c
Merge branch 'release-candidate-0.9.0' into sqrrm-bonded-reputation
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java
2018-10-31 13:51:15 -05:00
Manfred Karrer
ad8a77d98d
Cleanup 2018-10-31 13:48:54 -05:00
Manfred Karrer
e14508055c
Fix merge errors 2018-10-31 13:23:38 -05:00
Manfred Karrer
c1768592a6
Merge pull request #1850 from ManfredKarrer/add-more-bonded-roles
Add more bonded roles
2018-10-31 13:18:24 -05:00
Manfred Karrer
a8b833c285
Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java
#	core/src/main/java/bisq/core/dao/DaoFacade.java
#	core/src/main/java/bisq/core/dao/governance/role/BondedRole.java
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java
2018-10-31 13:17:57 -05:00
Manfred Karrer
590fa427e7
Merge pull request #1849 from ripcurlx/minor-ui-fixes
Redesign: Adapt Funds section
2018-10-31 13:00:16 -05:00
Manfred Karrer
3e81c6008b
Add more bonded roles 2018-10-31 12:59:08 -05:00
Christoph Atteneder
1b4891eb1c
Fix vertical alignment in table views 2018-10-31 11:34:01 +01:00
Christoph Atteneder
1540a2ee50
Clean up funds section 2018-10-31 11:18:11 +01:00
Christoph Atteneder
1057739f7a
Remove colons in network settings 2018-10-31 09:37:11 +01:00