Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings
...
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
2018-10-19 23:43:07 -05:00
Manfred Karrer
4fd641fd51
Improve UI
2018-10-19 21:00:50 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements
2018-10-17 10:59:05 -05:00
Manfred Karrer
e6f44ff1ae
Comment out BsqState in PB definitions
2018-10-16 23:22:50 -05:00
Manfred Karrer
a308469ac6
Support for persisted bsqState as resource file
...
- Move DecryptedBallotsWithMerits list and EvaluatedProposal list to
BsqState
- Use StoreService for handling persistence of snapshots
2018-10-16 23:21:11 -05:00
Manfred Karrer
ce5a8b4f19
Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
2018-10-16 11:48:11 -05:00
Manfred Karrer
dc6c25ed81
Merge branch 'master' into arbitration-system-improvements
2018-10-16 11:32:07 -05:00
Manfred Karrer
9b40306d9a
Add handling for missing proposal data
2018-10-09 22:32:03 -05:00
Manfred Karrer
5141806509
Add handling for missing blindVote data
2018-10-09 22:00:02 -05:00
Manfred Karrer
58e6db0a25
Persist DecryptedBallotsWithMeritsList
2018-10-08 20:13:22 -05:00
Manfred Karrer
4cc17feace
Persist EvaluatedProposalList
2018-10-08 19:47:54 -05:00
Manfred Karrer
2d593ee88f
Merge branch 'master' into arbitration-system-improvements
2018-10-05 15:21:41 -05:00
Manfred Karrer
4770ac9ef5
Remove asset from comboBoxes if it was removed by voting
2018-10-05 00:46:03 -05:00
Manfred Karrer
3e7eba8f04
Add Generic- and removeAsset proposals
2018-10-04 23:24:14 -05:00
Manfred Karrer
248c5546be
Refactor parser classes
...
- Move unlockBlockHeight field from Tx to TxOutput
2018-10-03 21:31:26 -05:00
Manfred Karrer
e11e2b3c9e
Fix PB enum
...
As PB handles enums globally there must not be same entries in 2 diff.
enums. Therefore I postfixed with _OUTPUT 3 entries in TxOutputType.
2018-10-03 17:32:34 -05:00
Manfred Karrer
48fa9e75c9
Fix incorrect TxType entries in PB definitions
2018-10-03 17:28:44 -05:00
Manfred Karrer
7d045f028f
Fix incorrect/missing TxOutputType entries in PB definitions
2018-10-03 17:12:51 -05:00
Manfred Karrer
b2fd120eff
Add arbitrator_node_address to PB
2018-10-02 22:27:01 -05:00
Manfred Karrer
8bcefaa135
Implement new arbitrator selection rule
2018-10-02 22:09:15 -05:00
Manfred Karrer
1e7dc5e95f
Add arbitrator to OfferAvailabilityResponse
2018-10-02 18:17:15 -05:00
Manfred Karrer
8eabd665c7
Fix snapshot handling
...
- Fix wrong start height
- Improve logging
2018-09-26 22:41:41 -05:00
Manfred Karrer
0bf859e3e3
Add shortcut to toggle tor logging
...
- If user press cmd+t it switches to DEBUG log level for the tor
network library. If the user press it again it switch back to WARN level.
- If there is a connection startup timeout where we display the Tor
network settings popup we switch log level as well to DEBUG.
2018-09-26 15:26:56 -05:00
Manfred Karrer
8414911395
Update libdohj to d4ace7bc
2018-09-25 00:43:19 -05:00
Manfred Karrer
bfc7320ddc
Update to libdohj 411a920e
...
Update dependencyVerification entries
2018-09-24 11:15:49 -05: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
Christoph Atteneder
4c068af7b3
Use default security provider instead of Bouncy Castle
2018-09-14 16:02:58 +02:00
Christoph Atteneder
bd9a208977
Update source compatibility to Java 10
2018-09-07 11:35:45 +02:00
Christoph Atteneder
73e4ee5f47
Update lombok library
2018-09-05 18:54:18 +02:00
Christoph Atteneder
00bce03695
Fix Javadoc errors
2018-09-05 11:20:44 +02:00
Christoph Atteneder
fce7f45a41
Merge common project at 6085d83
2018-09-05 10:39:56 +02:00
Chris Beams
2c0392bceb
Move common module to new bisq-common repository
2018-03-10 17:31:14 +01:00
Manfred Karrer
209fdffedf
Remove consensus module
2018-03-10 10:59:05 -05:00
Manfred Karrer
3af5975be0
Move io.bisq.consensus.UsedForTradeContractJson to io.bisq.common.consensus.UsedForTradeContractJson
2018-03-10 10:57:24 -05:00
Manfred Karrer
4dda4401e2
Rename RestrictedByContractJson to UsedForTradeContractJson
2018-03-10 10:52:58 -05:00
Manfred Karrer
b44fdc9cd7
Merge branch 'list-wmcc' of https://github.com/WorldMobileCoin/bisq-exchange into WorldMobileCoin-list-wmcc
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:15:06 -05:00
Manfred Karrer
cc065e6c85
Rearrange code positions
2018-03-10 10:13:55 -05:00
Manfred Karrer
afe47c3ad7
Merge branch 'list-ROIcoin' of https://github.com/ghobson2013/exchange into ghobson2013-list-ROIcoin
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-03-10 10:13:47 -05:00
Manfred Karrer
68dd8d9831
Rearrange code positions
2018-03-10 10:12:00 -05:00
Manfred Karrer
7cb674a0a4
Merge branch 'master' of https://github.com/swordfish6975/exchange into swordfish6975-master
...
# Conflicts:
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:11:49 -05:00
Manfred Karrer
b5786f038f
Rearrange code positions
2018-03-10 10:09:25 -05:00
Manfred Karrer
e9a0d7e3ff
Merge branch 'list-din-altcoin' of https://github.com/dinerocoin/exchange into dinerocoin-list-din-altcoin
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:08:57 -05:00
Manfred Karrer
cd04e1b0f9
Put new code for altcoin in right places.
2018-03-10 10:06:42 -05:00
Manfred Karrer
8754f41c1e
Merge branch 'master' of https://github.com/angelcoinmoney/exchange into angelcoinmoney-master
2018-03-10 10:01:41 -05:00
Manfred Karrer
0d45977913
Make constructor private, add Nullable.
2018-03-09 19:55:28 -05:00
Manfred Karrer
2afcef9eb5
Merge branch 'refactor-dao-data-model'
...
# Conflicts:
# core/src/main/java/io/bisq/core/dao/DaoModule.java
# core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java
# core/src/main/java/io/bisq/core/dao/blockchain/SnapshotManager.java
# core/src/main/java/io/bisq/core/dao/node/BsqNode.java
# core/src/main/java/io/bisq/core/dao/node/BsqParser.java
# core/src/main/java/io/bisq/core/dao/node/consensus/BsqTxController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/CompensationRequestController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/GenesisTxController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/IssuanceController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/PeriodController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxInputController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxInputsController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxOutputController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/VotingController.java
# core/src/main/java/io/bisq/core/dao/node/full/FullNode.java
# core/src/main/java/io/bisq/core/dao/node/full/FullNodeParser.java
# core/src/main/java/io/bisq/core/dao/node/full/network/FullNodeNetworkManager.java
# core/src/main/java/io/bisq/core/dao/node/full/network/GetBsqBlocksRequestHandler.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNode.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeExecutor.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeParser.java
# core/src/main/java/io/bisq/core/dao/request/compensation/CompensationRequestManager.java
# core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
2018-03-09 19:47:08 -05:00
Manfred Karrer
dd5fe5d197
Use Interface for read and write access to BsqBlcokChain. Use SingleThreadExecutor in Full- and LiteNodeExecutor.
2018-03-09 19:45:40 -05:00
Manfred Karrer
456fd28e94
Revert "Fix parsertest"
2018-03-09 14:42:56 -05:00
Manfred Karrer
182158af20
Merge pull request #1445 from sqrrm/fix-parsertest
...
Fix parsertest
2018-03-09 12:34:57 -05:00
Chris Beams
19b9c6fe59
Set Maven version to -SNAPSHOT
...
Problem: d218094
set the version to 0.7.0-SNAPSHOT, but that change
failed to produce the intended effect detailed in the commit comment.
Setting the version to a value like 0.7.0-SNAPSHOT works fine when
publishing artifacts to a local ~/.m2 repository, but JitPack has no
awareness of version metadata within pom files, and can only retreive
artifacts based on Git metadata, namely tags, branch names and commit
hashes. This means it is impossible to resolve artifacts from JitPack
with a GAV like `io.bisq.exchange:core:0.7.0-SNAPSHOT` unless there is a
branch named `0.7.0`. This is why the pull request at
bisq-network/bisq-seednode#1 failed.
Solution: JitPack supports the semantics of Maven-style `-SNAPSHOT`
versioning, and as a special case, allows for versions to be named
literally `-SNAPSHOT` with no preceding version string [1,2]. This
commit sets all Maven versions to `-SNAPSHOT`, achieving the original
effect intended by d218094
. Now downstream components (like
bisq-seednode) can resolve dependencies seamlessly from JitPack or a
local ~/.m2 repo with a GAV like `io.bisq.exchange:core:-SNAPSHOT`. This
is a slightly unconventional arrangement, but should actually result in
fewer updates to pom files over time as there may in fact be no reason
to ever change this version string so long as we continue using JitPack
and avoid publication to Maven Central / JCenter or similar.
[1]: https://jitpack.io/docs/#building-with-jitpack
[2]: https://github.com/jitpack/jitpack.io/issues/351
See #1440
2018-03-09 10:29:23 +01:00