Code

Add DAO code#1627

Code

Merged

ManfredKarrer merged 235 commits intobisq-network:masterbisq-network/bisq:masterfrom ManfredKarrer:merged-votingCopy head branch name to clipboardAug 15, 2018

+6,423-3,736

Commits

Commits on Apr 5, 2018

• Improvements for blind vote publishing

  Show description for bfb5a39
  ManfredKarrer

  committed
  bfb5a39

• Refactor move Phase to Cycles

  sqrrm

  committed
  2848e75

• Use new TxBroadcaster class for better error handling

  ManfredKarrer

  committed
  2fa19b0

• Replace Broadcaster with TxBroadcaster

  Show description for 4d217e6
  ManfredKarrer

  committed
  4d217e6

• Fix phase calculation

  sqrrm

  committed
  3a553b1

Commits on Apr 6, 2018

• Improve UI, logging and error handling

  Show description for 316a305
  ManfredKarrer

  committed
  316a305

Commits on Apr 7, 2018

• Refactor Phase back to PeriodService

  sqrrm

  committed
  405a074

• Rename StartBlock to FirstBlock, EndBlock to LastBlock

  sqrrm

  committed
  c5b01a0

• Extract reusable code to baseService. Add more validation

  ManfredKarrer

  committed
  3003964

• Use BaseService for BlindVoteService. Fix checks with current cycle

  ManfredKarrer

  committed
  7c03980

Commits on Apr 8, 2018

• Pass chainHeight to period service.

  ManfredKarrer

  committed
  2e5d5d2

• Add isTxInCorrectCycle checks with correct chainHeight

  ManfredKarrer

  committed
  819f8e4

• Rename package result to voteresult

  ManfredKarrer

  committed
  585478f

• Renaming

  Show description for d06b067
  ManfredKarrer

  committed
  d06b067

• Move vote classes one level down

  ManfredKarrer

  committed
  1a08030

• Refactor and improve Issuance domain. Add issued amount to UI

  Show description for 8022172
  ManfredKarrer

  committed
  8022172

• Merge remote-tracking branch 'manfred/voting' into periodservice-rework

  sqrrm

  committed
  e515138

Commits on Apr 9, 2018

• Merge pull request #1 from sqrrm/periodservice-cycles

  Show description for 7cf9935
  ManfredKarrer

  authored
  7cf9935

• Revert "Periodservice cycles"

  ManfredKarrer

  authored
  89f3841

• Merge pull request #2 from ManfredKarrer/revert-1-periodservice-cycles

  Show description for a5a22b1
  ManfredKarrer

  authored
  a5a22b1

Commits on Apr 11, 2018

• Refactor proposal domain and make it more thread safe

  Show description for c07822d
  ManfredKarrer

  committed
  c07822d

• Merge branch 'master_origin' into voting

  Show description for 9b32ec8
  ManfredKarrer

  committed
  9b32ec8

• Merge branch 'master_origin' into voting

  Show description for de3e161
  ManfredKarrer

  committed
  de3e161

• Refactor BsqBlockChain (WIP)

  Show description for 89bee8a
  ManfredKarrer

  committed
  89bee8a

Commits on Apr 12, 2018

• Make blockchain data immutable (WIP)

  Show description for 1556e27
  ManfredKarrer

  committed
  1556e27

• Rename ChainState to State

  ManfredKarrer

  committed
  b6d3b9b

Commits on Apr 13, 2018

• Refactoring: Move package blockchain to bisq.core.dao.state.blockchain

  ManfredKarrer

  committed
  7f1b0eb

• Refactoring: move vo one level up

  Show description for 21fe0a0
  ManfredKarrer

  committed
  21fe0a0

• Rename BsqBlock to TxBlock

  ManfredKarrer

  committed
  e90bc0b

• Refactor handling of blocks in state class.

  Show description for 29149eb
  ManfredKarrer

  committed
  29149eb

• Refactor: move bisq.core.dao.param to bisq.core.dao.vote.param

  ManfredKarrer

  committed
  df259d8

• Refactor: move param lasses to other package.

  Show description for 18b05a1
  ManfredKarrer

  committed
  18b05a1

• Remame DaoParam to Param and DaoParamService to ParamService

  ManfredKarrer

  committed
  9cbdcee

• Make ProposalPayload immutable. Remove transaction from Proposal.

  ManfredKarrer

  committed
  3b4b9eb

• Pass Transaction at creating proposal instead of lookup in wallet

  ManfredKarrer

  committed
  b307cad

Commits on Apr 14, 2018

• Refactor BlindVoteService to be executed on parser thread only

  ManfredKarrer

  committed
  c279bee

• FIx threading and persistence issue

  Show description for a0c2341
  ManfredKarrer

  committed
  a0c2341

• Merge branch 'master_origin'

  ManfredKarrer

  committed
  d6337dc

• Merge branch 'master_origin' into voting

  ManfredKarrer

  committed
  2dad464

• Merge branch 'master' into voting

  ManfredKarrer

  committed
  1db7c87

Commits on Apr 15, 2018

• Use params for period service

  Show description for 52c9a18
  ManfredKarrer

  committed
  52c9a18

Commits on Apr 16, 2018

• Refactor periodService

  Show description for 11f5135
  ManfredKarrer

  committed
  11f5135

Commits on Apr 17, 2018

• Refactor state

  Show description for eae31ef
  ManfredKarrer

  committed
  eae31ef

• Move package bisq.core.dao.vote.period to bisq.core.dao.period

  ManfredKarrer

  committed
  c1862ac

Commits on Apr 19, 2018

• Moving packages and rename classes

  Show description for 9e4a30e
  ManfredKarrer

  committed
  9e4a30e

• Move Payload classes to bisq.core.dao.consensus.state.events.payloads

  ManfredKarrer

  committed
  945663b

• Rename Proposal to Ballot and ProposalPayload to Proposal

  ManfredKarrer

  committed
  27ac78f

• Move classes to other packages

  ManfredKarrer

  committed
  3e6f125

Commits on Apr 20, 2018

• Rename classed with term CompensationRequest to Compensation

  ManfredKarrer

  committed
  68d854a

• Deactivate removeAsset, generic adn changeParam domains.

  Show description for 8cf2b6c
  ManfredKarrer

  committed
  8cf2b6c

• Split Proposal into Proposal and ProposalPayload

  ManfredKarrer

  committed
  20b2957

• Merge branch 'master' into voting

  Show description for ab0ac64
  ManfredKarrer

  committed
  ab0ac64

• Merge branch 'master' into voting

  Show description for 006e682
  ManfredKarrer

  committed
  006e682

• Add option key daoActivated to enable all dao features for dev

  ManfredKarrer

  committed
  41b6155

• Move code for writing to periodState to mutator class.

  Show description for 4460882
  ManfredKarrer

  committed
  4460882

• Remove BlockListener from StateService

  Show description for 01f4731
  ManfredKarrer

  committed
  01f4731

• Move bisq.core.dao.consensus.vote.myvote package to bisq.core.dao

  ManfredKarrer

  committed
  5bdef18

• Add BlockListener

  Show description for 2e95971
  ManfredKarrer

  committed
  2e95971

• Rename ISSUANCE to VOTE_RESULT and openBallotList to ballotList

  ManfredKarrer

  committed
  8fcab9b

• Refactoring

  Show description for 75f84a0
  ManfredKarrer

  committed
  75f84a0

• Move packages level up

  ManfredKarrer

  committed
  9becb6d

• Move ballot classed to own package

  ManfredKarrer

  committed
  0389fb0

• Remove proposalService from views

  ManfredKarrer

  committed
  ca1ab3d

Commits on Apr 21, 2018

• Change ballot list services to user thread services

  ManfredKarrer

  committed
  46a440d

• Apply separation of thread access to myVote domain

  ManfredKarrer

  committed
  4fd2955

• Separate blindVoteService

  ManfredKarrer

  committed
  30b4e56

• Rename package bisq.core.dao.presentation.proposal to ballot

  ManfredKarrer

  committed
  c9a4d54

Commits on Apr 22, 2018

• Remove usage of PeriodServiceFacade and ThreadAwareListener

  ManfredKarrer

  committed
  7e207d3

• Remove StateServiceFacade

  ManfredKarrer

  committed
  6551ad2

• Move ballot classed from bisq.core.dao.presentation to consensus

  ManfredKarrer

  committed
  faa15f3

• Remove presentation package and classes

  ManfredKarrer

  committed
  53b5b7b

• Merge branch 'rpc_thread' into voting

  ManfredKarrer

  committed
  930573a

• Cleanup

  ManfredKarrer

  committed
  8a3e8c7

Commits on Apr 23, 2018

• Improve proposal and ballot domain

  Show description for aa6a922
  ManfredKarrer

  committed
  aa6a922

• Move classes out of consensus package

  ManfredKarrer

  committed
  dc2db74

• Add DaoFacade to provide a reduced API for clients (UI)

  ManfredKarrer

  committed
  3d99e92

• Move ValidationException to bisq.core.dao.exceptions

  ManfredKarrer

  committed
  6ed7005

Commits on Apr 24, 2018

• Move voting related classes to voting package

  ManfredKarrer

  committed
  15ff5fa

• Refactor handling of cycles

  Show description for bf8629d
  ManfredKarrer

  committed
  bf8629d

• Remove chainHeightListeners from PeriodService

  Show description for 81c57cf
  ManfredKarrer

  committed
  81c57cf

• Remove Meta data from block.

  Show description for 55ee4a1
  ManfredKarrer

  committed
  55ee4a1

• Refactor ParamChange domain

  ManfredKarrer

  committed
  62da432

• Rename VOTE_RESULT to RESULT

  ManfredKarrer

  committed
  8381ce6

Commits on Apr 25, 2018

• Move ValidationException to voting package

  ManfredKarrer

  committed
  a66b62e

• Move proposal and vote package into ballot package

  ManfredKarrer

  committed
  99e9943

• Move period package into state package

  ManfredKarrer

  committed
  85328e4

• Store only proposal TxId + vote instead of whole ballot in BlindVote

  Show description for b996e94
  ManfredKarrer

  committed
  b996e94

Commits on Apr 26, 2018

• Merge branch 'master' into voting

  ManfredKarrer

  committed
  54cc34b

Commits on Apr 27, 2018

• Merge branch 'storage-provider' into voting

  ManfredKarrer

  committed
  7951fc5

Commits on Apr 30, 2018

• Let proposal domain handle all its relevant use cases

  Show description for 2705e68
  ManfredKarrer

  committed
  2705e68

• Move propsal package one level up

  ManfredKarrer

  committed
  7b6a8fd

• Use Proposal instead of Ballot. Cleanup

  ManfredKarrer

  committed
  390d799

• Fix missing txId at proposal creation

  Show description for 554c11f
  ManfredKarrer

  committed
  554c11f

• Rename "Cancel vote" to "Remove my vote"

  ManfredKarrer

  committed
  040fec6

• Add voting tab

  ManfredKarrer

  committed
  57f6129

• Add superclasses for ProposalListItem and ActiveProposalView

  ManfredKarrer

  committed
  b274a4a

• Add support for BallotListItem

  ManfredKarrer

  committed
  df9af40

Commits on May 1, 2018

• Further refactoring of Views

  ManfredKarrer

  committed
  a4ad4d3

• Separated voting view from proposals view by activeBallotsView

  ManfredKarrer

  committed
  c3f2ff2

• Add MyProposalListService to CorePers.DataHost

  ManfredKarrer

  committed
  ab1bcd3

• Merge branch 'master' into voting

  ManfredKarrer

  committed
  f59aca9

Commits on May 6, 2018

• Use BlockHash and data for append-only store

  Show description for 90e3102
  ManfredKarrer

  committed
  90e3102

Commits on May 7, 2018

• Add vote button to proposal view

  ManfredKarrer

  committed
  0139d54

Commits on May 8, 2018

• Change DashboardView

  ManfredKarrer

  committed
  2142070

Commits on May 14, 2018

• Merge master

  ManfredKarrer

  committed
  e452a51

Commits on May 27, 2018

• Merge branch 'master' into voting

  ManfredKarrer

  committed
  805ca18

• Merge branch 'master' into voting

  ManfredKarrer

  committed
  a634c63

Commits on May 30, 2018

• Update idea files, update gradle

  ManfredKarrer

  committed
  07cf5db

• Add support for BisqHttpApi to DesktopMain

  Show description for 8ddcd93
  ManfredKarrer

  committed
  8ddcd93

• Cleanup

  ManfredKarrer

  committed
  ef58b17

Commits on May 31, 2018

• Move BtcAddressValidator to core

  ManfredKarrer

  committed
  a22b24b

• Add dependencies of http-api

  ManfredKarrer

  committed
  3602d4e

Commits on Jun 6, 2018

• Merge branch 'refactoring-mainviewmodel' into api-integration

  Show description for bf46320
  ManfredKarrer

  committed
  bf46320

• Complete API refactoring.

  Show description for f5c9209
  ManfredKarrer

  committed
  f5c9209

Commits on Jun 7, 2018

• Merge branch 'master' into voting

  ManfredKarrer

  committed
  de9ced0

Commits on Jun 8, 2018

• Remove protectedDataStore at blindVote

  Show description for b2aaed9
  ManfredKarrer

  committed
  b2aaed9

• Add mavenLocal, updatte hashes

  ManfredKarrer

  committed
  15baead

Commits on Jun 16, 2018

• Add mavenLocal to repositories

  ManfredKarrer

  committed
  ac17955

• Use verbosity in getBlock rpc call to get all txs

  Show description for 9c3865a
  ManfredKarrer

  committed
  9c3865a

• Merge branch 'api-integration' into voting

  Show description for ba011d4
  ManfredKarrer

  committed
  ba011d4

• Merge branch 'api-integration' into voting

  Show description for a21fed6
  ManfredKarrer

  committed
  a21fed6

• Merge branch 'voting' into merit

  ManfredKarrer

  committed
  aab1f57

Commits on Jun 19, 2018

• Add merit implementation

  ManfredKarrer

  committed
  a4debc7

• Merge branch 'merit' into voting

  ManfredKarrer

  committed
  61b8b5f

Commits on Jun 25, 2018

• Add basic UI for bond lockup

  sqrrm

  committed
  56f4caf

• Add actual lockup functionality

  sqrrm

  committed
  3ac0d22

• Add unlock functionality

  sqrrm

  committed
  d5d7ea8

• Fix rebase issues

  sqrrm

  committed
  a637d94

• Display locked amount

  sqrrm

  committed
  6475aaa

• Don't show unlocked bonds in unlockview

  sqrrm

  committed
  ce36a91

Commits on Jun 28, 2018

• Merge pull request #3 from sqrrm/bonding

  Show description for c9b65fc
  ManfredKarrer

  authored
  c9b65fc

• Renaming, cleanup, small fixes

  ManfredKarrer

  committed
  60e58f7

• Add bonding dashboard

  sqrrm

  committed
  9029720

• Rename package Lock to lockup

  sqrrm

  committed
  8e59837

• Remove http-api

  ManfredKarrer

  committed
  3eb187a

• Remove http-api

  ManfredKarrer

  committed
  4136ed7

• Merge pull request #4 from sqrrm/cleanup-bonding

  Show description for c34643a
  ManfredKarrer

  authored
  c34643a

• Merged master

  ManfredKarrer

  committed
  2e83a36

• Merged master

  ManfredKarrer

  committed
  a78180e

Commits on Jun 29, 2018

• Update gradle files

  Show description for 15ad8f8
  ManfredKarrer

  committed
  15ad8f8

• Refactor mutable data handling in State

  Show description for d9ce3cf
  ManfredKarrer

  committed
  d9ce3cf

Commits on Jul 7, 2018

• Apply fixes to stateService

  ManfredKarrer

  committed
  0d39aad

• Set TxOutputType at TxOutputProcessor

  ManfredKarrer

  committed
  a7ddd27

• Fix wrong equals check at litenode. Cleanups

  ManfredKarrer

  committed
  bdb40cd

Commits on Jul 8, 2018

• Improve logs, cleanup

  ManfredKarrer

  committed
  387078b

Commits on Jul 9, 2018

• Add param request

  ManfredKarrer

  committed
  052c46f

• Rename

  ManfredKarrer

  committed
  0f1a23a

• Change param map in state

  ManfredKarrer

  committed
  70d37d3

• Move Param class

  ManfredKarrer

  committed
  e0ed19c

Commits on Jul 11, 2018

• Merge branch 'master' into voting

  Show description for 4ec69f0
  ManfredKarrer

  committed
  4ec69f0

• Exclude spending of locked BSQ in pending balance

  sqrrm

  committed
  41ad793

• Merge pull request #6 from sqrrm/dao-cleanup

  Show description for e394828
  ManfredKarrer

  authored
  e394828

Commits on Jul 12, 2018

• Add BSQ emergency wallet tool and show BTC balance

  ManfredKarrer

  committed
  2d264b0

• Add display of non-BSQ satoshi

  ManfredKarrer

  committed
  84173fd

• Use scroll pane in all DAO views

  ManfredKarrer

  committed
  cb6de8c

• Show bond info, cleanups, handle non-BSQ funds

  ManfredKarrer

  committed
  4e5126c

• Remove getValueLockedUpInBond

  sqrrm

  committed
  d4a0287

Commits on Jul 13, 2018

• Merge pull request #7 from sqrrm/dao-cleaning2

  Show description for 83fac41
  ManfredKarrer

  authored
  83fac41

• Use daoFacade from outside of core

  Show description for 5011d4f
  sqrrm

  committed
  5011d4f

• Rename locked to lockup

  Show description for 069802b
  sqrrm

  committed
  069802b

• Merge pull request #8 from sqrrm/dao

  Show description for 333133a
  ManfredKarrer

  authored
  333133a

• Add TODOs

  ManfredKarrer

  committed
  b7f131f

• Remove unneeded model

  ManfredKarrer

  committed
  f307b1e

• Handle case if multiple param proposals got voted ok

  ManfredKarrer

  committed
  dfcda39

Commits on Jul 15, 2018

• Add voteResult view

  ManfredKarrer

  committed
  9f01e9e

• Remove direct references to stateService in desktop

  sqrrm

  committed
  09b6202

• Remove check for already handled InsufficientMoneyException

  sqrrm

  committed
  d0cfd61

Commits on Jul 16, 2018

• Merge pull request #9 from sqrrm/dao

  Show description for 198afcd
  ManfredKarrer

  authored
  198afcd

• Don't use recursive parser. UI improvements

  Show description for e677c1a
  ManfredKarrer

  committed
  e677c1a

Commits on Jul 17, 2018

• Fix UI bug with dashboard view

  ManfredKarrer

  committed
  eeb9006

• Improve UI

  ManfredKarrer

  committed
  29d95c2

Commits on Jul 18, 2018

• Refactor state listeners

  ManfredKarrer

  committed
  513350f

• Rename StateService to BsqStateService

  ManfredKarrer

  committed
  18163b7

• Apply code analysis, cleanups

  ManfredKarrer

  committed
  547fb2f

• Fix confirmations list view

  ManfredKarrer

  committed
  bcc1b88

• Add proposalFee text field

  ManfredKarrer

  committed
  cf9b51a

• Fix wrong removal of listener

  ManfredKarrer

  committed
  7dd28e9

• Update proposal view on height change

  ManfredKarrer

  committed
  288f4a7

• Rename classes

  ManfredKarrer

  committed
  f27a746

Commits on Jul 19, 2018

• Add vote result view

  ManfredKarrer

  committed
  e1f23be

• Fix wrong values for vote and issuance

  ManfredKarrer

  committed
  5e07a94

Commits on Jul 21, 2018

• Change dummy dev account to AliPayAccount

  ManfredKarrer

  committed
  c1a1608

• Add display of all params

  ManfredKarrer

  committed
  caff652

• Add popup or vote result per proposal

  ManfredKarrer

  committed
  771a489

• Add burn bond proposal

  sqrrm

  committed
  c40072e

• Burn bonds when proposal is accepted

  Show description for 71e3aed
  sqrrm

  committed
  71e3aed

• Rename burn bond to confiscate bond

  sqrrm

  committed
  369ed5b

• Merge pull request #13 from sqrrm/dao

  Show description for 86c3f24
  ManfredKarrer

  authored
  86c3f24

• Changes from review of bond confiscation PR

  ManfredKarrer

  committed
  68e2389

Commits on Jul 22, 2018

• Add bonds for selecting bond id

  ManfredKarrer

  committed
  6077cca

Commits on Jul 23, 2018

• Add BondedRoles proposal and views

  ManfredKarrer

  committed
  ccd3e9c

• Merge branch 'master' into voting

  ManfredKarrer

  committed
  ee4d8dc

• Improve bonded roles table

  ManfredKarrer

  committed
  39a6859

• Add EqualsAndHashCode to PersistableLists

  Show description for 4ad66b6
  ManfredKarrer

  committed
  4ad66b6

• Add nullable, cleanup

  ManfredKarrer

  committed
  577633f

Commits on Jul 24, 2018

• Improve UI for results

  ManfredKarrer

  committed
  1ab7868

• Fix missing confidence icon, show genesis tx in tx view

  ManfredKarrer

  committed
  1c71b7c

• Rename result views

  ManfredKarrer

  committed
  0586174

Commits on Jul 25, 2018

• Remvoe title and description from Proposal

  ManfredKarrer

  committed
  4dad493

• Merge branch 'refact-generics' into voting

  Show description for 8466400
  ManfredKarrer

  committed
  8466400

• Add types for addLabelComboBox

  ManfredKarrer

  committed
  149c5a2

• Add combined proposal vote view (WIP)

  ManfredKarrer

  committed
  af614df

Commits on Jul 26, 2018

• Add combined proposal vote view

  ManfredKarrer

  committed
  5f8185a

Commits on Aug 2, 2018

• Fix screen update

  ManfredKarrer

  committed
  d28205d

Commits on Aug 4, 2018

• Improve proposal and voting views

  ManfredKarrer

  committed
  608e809

• Merged

  ManfredKarrer

  committed
  1b4572a

Commits on Aug 5, 2018

• Remove views

  ManfredKarrer

  committed
  242fe68

• Add result view and show merit

  ManfredKarrer

  committed
  bd80e9d

• Cleanup

  ManfredKarrer

  committed
  85973ff

• Renaming, cleanups

  ManfredKarrer

  committed
  d897d5a

Commits on Aug 6, 2018

• Remove grpc from build

  ManfredKarrer

  committed
  7bd22d1

• Add a default impl. for BsqStateListener.onEmptyBlockAdded

  ManfredKarrer

  committed
  468d5e0

• Refactor TxOutput and Block classes

  Show description for 975d739
  ManfredKarrer

  committed
  975d739

Commits on Aug 7, 2018

• Refactoring

  Show description for 6d9572c
  ManfredKarrer

  committed
  6d9572c

• Refactoring

  Show description for 47c2977
  ManfredKarrer

  committed
  47c2977

• Refactoring

  Show description for fc74167
  ManfredKarrer

  committed
  fc74167

• Refactor ProposalService classes

  ManfredKarrer

  committed
  a88667f

• Refactoring

  Show description for 1df3dfe
  ManfredKarrer

  committed
  1df3dfe

• Improve vote result view

  ManfredKarrer

  committed
  697e7ae

Commits on Aug 8, 2018

• Use DevEnv.logErrorAndThrowIfDevMode

  ManfredKarrer

  committed
  1d10de9

• Cleanup proposal domain

  ManfredKarrer

  committed
  dde3ba0

• Remove uid from Proposal

  Show description for 5844bd1
  ManfredKarrer

  committed
  5844bd1

• Cleanup proposal domain

  ManfredKarrer

  committed
  4fddc5d

• Cleanup ballot domain

  ManfredKarrer

  committed
  185eee2

• Remove BooleanVote and LongVote.

  Show description for c180f87
  ManfredKarrer

  committed
  c180f87

Commits on Aug 9, 2018

• Change version from -SNAPSHOT to 0.9.0

  ManfredKarrer

  committed
  24991d7

Commits on Aug 11, 2018

• Cleanup blind vote domain

  ManfredKarrer

  committed
  21be6be

Commits on Aug 14, 2018

• Merge branch 'master' into voting

  Show description for f77eb43
  ManfredKarrer

  committed
  f77eb43

• Merge branch 'master' into voting

  Show description for 87305eb
  ManfredKarrer

  committed
  87305eb

• Merge branch 'voting'

  ManfredKarrer

  committed
  7eba9f6

• Merge branch 'master' into voting

  Show description for 76cc2c8
  ManfredKarrer

  committed
  76cc2c8

Commits on Aug 15, 2018

• Merged

  ManfredKarrer

  committed
  814ade4

• Merge branch 'master' into merged-voting

  ManfredKarrer

  committed
  7cdda97

• Merge branch 'master' of https://github.com/bisq-network/bisq-desktop

  ManfredKarrer

  committed
  67e99a1

• Merge branch 'master' into merged-voting

  ManfredKarrer

  committed
  59b5b13