5930 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	0b1abc312f	Refactorings and error handling in Vote domain: ... - Rename VoteService to BlindVoteService - Add VoteRevealService - Add VoteConsensusCritical to BlindVoteList - Remove getBlindVoteStakeTxOutputs - Rename getLockedForVoteTxOutputs to getBlindVoteStakeTxOutputs - Add publishAndCommitBsqTx to walletsManager to avoid code duplication - Add completePreparedBsqTxWithBtcFee to avoid code duplication - Move getClonedTransaction to WalletService - Add VoteRevealException	2018-03-30 16:24:40 -05:00
Manfred Karrer	713b0c59d3	Refactorings ... - Remove ChangeBelowDustException - Add addInputsForTx method to avoid code duplication - Avoid potential dust output in addInputsForTx - Remove unused BtcCompensationRequestFeeCoinSelector - Add signAllBtcInputs method to avoid code duplication - Add addInputsForMinerFee method to avoid code duplication - Split VoteRevealConsensus with BlindVoteConsensus	2018-03-30 13:44:14 -05:00
Manfred Karrer	4ea7a88f32	Refactorings ... - Rename getChangeExcludingFee to getChange and make it general purpose not fee specific. - Remove Restrictions.isAboveDust method with extra parameter for fee - Add Restrictions.isDust method	2018-03-30 12:08:54 -05:00
Manfred Karrer	5aee2c2789	Merge remote-tracking branch 'origin/master' into voting	2018-03-30 11:19:04 -05:00
Manfred Karrer	f0b90600aa	Merge pull request #1486 from ManfredKarrer/voting ... Fix bugs in issuance process and tx view	2018-03-30 11:11:28 -05:00
Manfred Karrer	b39e14e3e5	Rename address column. Change log level	2018-03-29 20:57:52 -05:00
Manfred Karrer	6cca1f2742	Fix BSQ Tx view	2018-03-29 19:30:12 -05:00
Chris Beams	86947c976c	Revert to 4-space indentation in build.gradle ... Recent changes to dependencyVerification got committed with 8-space indentation, causing a diff for the whole block. This reverts it to 4-space, which is what is generated by `gradle -q calculateChecksums`.	2018-03-29 19:44:35 +02:00
Manfred Karrer	f72a796b08	Merge branch 'master' into voting	2018-03-29 12:41:40 -05:00
Manfred Karrer	11446d27f4	Add checksum for org.bouncycastle:bcpg-jdk15on	2018-03-29 12:36:08 -05:00
Manfred Karrer	a05ab5ae17	Update checksum hashes of dependencies	2018-03-29 12:34:39 -05:00
Manfred Karrer	8dd94c5a5f	Merge remote-tracking branch 'origin/master' into voting	2018-03-29 11:37:36 -05:00
Manfred Karrer	5068a4e12a	Merge pull request #1483 from ManfredKarrer/voting ... Refactor verification controllers. Remove fee from vote reveal tx	2018-03-29 11:32:11 -05:00
Christoph Atteneder	5796c1797b	Merge pull request #1485 from ripcurlx/ignore-test-to-fix-linux-build-issue ... Ignore test for now as it causes issues during linux build	2018-03-29 14:07:54 +02:00
Christoph Atteneder	f452336cdb	Ignore test for now as it causes issues during linux build	2018-03-29 13:54:32 +02:00
Manfred Karrer	f7a4137559	Merge remote-tracking branch 'origin/master' into voting	2018-03-29 00:27:43 -05:00
Manfred Karrer	b7db52759d	Refactorings, cleanup ... - Rename getIssuedAmount to getIssuedAmountAtGenesis - Fix variable name missed in earlier refactoring - Add comments	2018-03-28 21:50:04 -05:00
Manfred Karrer	fb6a5301b8	Refactor: Rename TxType.VOTE to TxType.BLIND_VOTE	2018-03-28 21:19:54 -05:00
Manfred Karrer	06a40c0b27	Refactor BSQ verification and state change code. ... - Add preliminary opReturn type to make case detection easier - Set txType at the BsqTxController after iteration - Move apply state code to BsqTxController - Add more warning logs and checks - Add stakeSpendingOutput to verify reveal tx more strictly	2018-03-28 20:02:12 -05:00
Manfred Karrer	57d657b6bf	Merge pull request #1482 from ripcurlx/add-info-tooltips-for-offer-table ... Add info icons to prices in offer table	2018-03-28 08:35:03 -05:00
Christoph Atteneder	dbc9f5cfa6	Add info tooltips in offer table	2018-03-28 15:21:37 +02:00
Christoph Atteneder	e4aca5e979	Add missing copyright notice.	2018-03-28 15:21:11 +02:00
Christoph Atteneder	49765f6c77	Merge pull request #1481 from ripcurlx/fix-wrong-row-span ... Fix wrong row span so group is closed after offer table	2018-03-28 09:47:30 +02:00
Christoph Atteneder	deee136d4e	Merge pull request #1480 from ripcurlx/fix-style-issue-with-deactivated-offers ... Fix wrong style scope	2018-03-28 09:47:14 +02:00
Christoph Atteneder	3eaeeb2ce4	Fix wrong row span so group is closed after offer table	2018-03-28 09:42:36 +02:00
Christoph Atteneder	55665cbabb	Fix wrong style scope	2018-03-28 09:28:54 +02:00
Manfred Karrer	c777600dfa	Merge pull request #1478 from ManfredKarrer/voting ... Voting	2018-03-27 19:46:15 -05:00
Manfred Karrer	02d616aec3	Merge pull request #1479 from ripcurlx/add-info-for-market-based-price-input ... Adds information/warning icon for market based price input field	2018-03-27 13:02:59 -05:00
Manfred Karrer	7f1c0f8afb	Remove dev log	2018-03-27 12:29:23 -05:00
Christoph Atteneder	24522f0290	Remove new Fontawesome icon library as it creates side-effects depending which version of the font is loaded first. Have to be replaced everywhere at once.	2018-03-27 18:14:25 +02:00
Manfred Karrer	969f32f05a	Implement issuance	2018-03-27 10:53:28 -05:00
Christoph Atteneder	65a5580697	Add info icon to market based price input field	2018-03-27 17:29:31 +02:00
Christoph Atteneder	50239b69bc	Add Fontawesome Icon support	2018-03-27 17:28:46 +02:00
Manfred Karrer	ee7c79fe6a	Merge pull request #1477 from ripcurlx/improve-create-offer-step-one ... Create offer screen improvements part 1	2018-03-26 12:50:43 -05:00
Christoph Atteneder	779f42beee	Use absolut value again, as there was a reason for using it that way	2018-03-26 17:32:30 +02:00
Christoph Atteneder	d527eeb0ec	Replace toggle button with toggle icon and enable/disable active offer type	2018-03-26 16:47:02 +02:00
Christoph Atteneder	23d0ca990b	Add new material design icons for offer type (Fixed | Percentage)	2018-03-26 14:10:52 +02:00
Christoph Atteneder	4a60865b6b	Use relative font size	2018-03-26 14:09:21 +02:00
Christoph Atteneder	626cf5fb1b	Remove unused library	2018-03-26 14:08:38 +02:00
Christoph Atteneder	1ad4a679be	Add new version of icon library to enable step-by-step migration	2018-03-26 12:02:31 +02:00
Manfred Karrer	bf028f21bd	Merge pull request #1474 from ManfredKarrer/voting ... Support for blind voting	2018-03-25 00:16:32 -05:00
Manfred Karrer	b768eee4c6	Add missing DaoPeriodService.Phase entries in switch cases	2018-03-24 11:32:42 -05:00
Manfred Karrer	7ac8e35083	Merge branch 'master' into voting	2018-03-23 22:09:34 -05:00
Manfred Karrer	2a9915b6ca	Implement issuance and vote result calculation (WIP)	2018-03-23 20:32:09 -05:00
Chris Beams	04bace7a28	Disable IDEA wrap on typing ... See bisq-network/style#3	2018-03-23 23:29:57 +01:00
Manfred Karrer	1267341639	Implement vote reveal tx and data structure	2018-03-22 20:47:01 -05:00
Manfred Karrer	b4ee6c19a7	Merge pull request #1475 from ripcurlx/fix-total-amount-duplication-in-spread-view ... Add missing parenthesis	2018-03-22 19:08:46 -05:00
Christoph Atteneder	058d782ef6	Add missing parenthesis	2018-03-22 15:54:10 +01:00
Chris Beams	92ec88f1fc	Enable Travis CI Gradle dependency caching ... Per https://docs.travis-ci.com/user/languages/java/#Caching	2018-03-22 11:27:51 +01:00
Chris Beams	96207654d0	Increase Gradle HTTP timeouts from 30 => 120 seconds ... Problem: Gradle's default 30 second HTTP timeouts often cause bisq-* component builds to fail when resolving dependencies built on the fly via JitPack, e.g.: https://travis-ci.org/bisq-network/bisq-core/builds/356777615#L518-L525. Solution: Increase timeout values to 120 seconds, which should be more that sufficient. See: - gradle/gradle#3370 - gradle/gradle#3371 - gradle/gradle#4629	2018-03-22 10:39:52 +01:00