Manfred Karrer
8754f41c1e
Merge branch 'master' of https://github.com/angelcoinmoney/exchange into angelcoinmoney-master
2018-03-10 10:01:41 -05:00
Chris Beams
f20a904568
Merge pull request #1362 from tau3/refactoring/core-seed-nodes-repository
...
Refactoring of CoreSeedNodesRepository + unit tests
2018-03-10 11:11:04 +01:00
Chris Beams
47c7c4fb46
Re-apply "Fix wrong network ID for Dash"
...
This commit essentially cherry-picks the changes made in ea8cbc1
2018-03-10 11:01:23 +01:00
Chris Beams
cef131151c
Merge branch 'master' into tau3-refactoring/core-seed-nodes-repository
2018-03-10 10:59:42 +01: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
92ccf73ca8
Merge branch 'fix-parsertest'
2018-03-09 15:03:26 -05:00
Manfred Karrer
42e712fce3
Merge branch 'fix-parsertest' of https://github.com/sqrrm/exchange into sqrrm-fix-parsertest
...
# Conflicts:
# core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
2018-03-09 15:02:57 -05:00
Manfred Karrer
c611eed0a6
Extract snapshot code from BsqBlockChain to SnapshotManager. Rename *Verification classes to *Controller. Add BsqBlockController.
2018-03-09 14:56:40 -05:00
Manfred Karrer
456fd28e94
Revert "Fix parsertest"
2018-03-09 14:42:56 -05:00
sqrrm
f569776398
Fix FullNodeParserTest after refactoring
2018-03-09 18:06:33 +01:00
Manfred Karrer
e55bba63fb
Deactivate broken test temp.
2018-03-09 10:59:40 -05:00
Manfred Karrer
92514a25e8
Refactor BsqBlockChain with ReadModel and WriteModel
2018-03-09 00:43:20 -05:00
Manfred Karrer
8e99e7c1e6
Refactor OpReturnVerification.
2018-03-08 21:57:54 -05:00
Manfred Karrer
cf9fc6714d
Refactor check if a tx is a bsq tx.
2018-03-08 20:59:49 -05:00
Manfred Karrer
1bd41b638e
Refactor network handlers and managers for dao. Separate them for lite and full node.
2018-03-08 12:10:43 -05:00
Manfred Karrer
72a73b9573
Move TxIdIndexTuple to util package
2018-03-08 10:51:11 -05:00
Manfred Karrer
df093b9712
Remove TxVo and put fields into Tx instead.
2018-03-08 10:50:15 -05:00
Manfred Karrer
d320346a03
Refactor: Rename RequestManager to BlocksRequestManager
2018-03-08 10:06:37 -05:00
Manfred Karrer
eca72f658f
Refactor: Move classes from io.bisq.core.dao.blockchain.p2p to io.bisq.core.dao.node
2018-03-08 10:06:02 -05:00
sqrrm
e48f91cb51
Fix fullnodeparsertest after refactoring
2018-03-08 14:47:49 +01:00
Manfred Karrer
027de5316f
Refactoring of DAO classes and packages. Isolate consensus code to extra classes. Separate better full node and lite nodes.
2018-03-07 22:05:27 -05:00
Manfred Karrer
ad48986395
Fix issues in RequestManager. Refactor BsqLiteNode. Add comments, Refactorings.
2018-03-06 22:34:53 -05:00
Manfred Karrer
f19b6ca0ee
Add missing classes from earlier move. Rename GeneralPurposeRequest.
2018-03-06 20:43:36 -05:00
Manfred Karrer
8d82e8b087
Add consensus package and move relevant classes over there.
2018-03-06 20:39:41 -05:00
Manfred Karrer
f38d7b332f
Move opReturn data creation to OpReturnData class. Add Validation class. Rename io.bisq.core.dao.voterequest to io.bisq.core.dao.request. Add new Request classes.
2018-03-06 20:38:27 -05:00
Manfred Karrer
f0a9316999
Refactor: Move io.bisq.core.dao.compensation to io.bisq.core.dao.voterequest.compensation
2018-03-06 20:16:32 -05:00
Manfred Karrer
034b113f9e
Change params for daoPeriodService. Add commeents. Add VoteRequest class.
2018-03-06 20:13:46 -05:00
Manfred Karrer
16e456ed86
Refactor: Rename DaoConstants to OpReturnTypes
2018-03-06 19:47:59 -05:00
Manfred Karrer
ea8cbc111c
Fix wrong network ID for dash
2018-03-06 18:35:34 -05:00
Manfred Karrer
b5ac9f97ca
Add vote reveal type. Adjust BSQ fees. Refactorings.
2018-03-05 22:00:13 -05:00
Manfred Karrer
f86bb433ed
Merge remote-tracking branch 'origin/master'
2018-03-05 18:16:49 -05:00
Manfred Karrer
b706edd15a
Merge branch 'show-past-comps' of https://github.com/sqrrm/exchange into sqrrm-show-past-comps
2018-03-05 18:03:16 -05:00
sqrrm
5c2bd9e906
Fix BsqParserTest after changing genesis distribution
2018-03-05 19:41:40 +01:00
Manfred Karrer
2bc210bbd0
Ignore BsqParserTest temporary
2018-03-05 12:59:39 -05:00
Manfred Karrer
6f8e89cf87
Change denomination of BSQ from 1000 satoshi to 100 satoshi ( #1423 )
2018-03-05 12:45:28 -05:00
Manfred Karrer
1f6122e934
Add option key: genesisBlockHeight. Rename option key regTestBsqGenesisTxId to genesisTxId. Remove hard coded dev genesis tx id and height.
2018-03-05 12:05:24 -05:00
Manfred Karrer
9246b530d3
Fix minBroadcastConnections for regTest. Set RegTestHost.LOCALHOST as default.
2018-03-05 11:51:30 -05:00
Manfred Karrer
b8eaa647c4
Apply camelCase to option key regtestBsqGenesisTxId to regTestBsqGenesisTxId
2018-03-05 11:11:58 -05:00
Manfred Karrer
b7064f9820
Add option key for dev mode
2018-03-05 11:10:00 -05:00
sqrrm
159b651dcc
Init DAO persistedDataHost for seednode
2018-03-05 16:58:06 +01:00
Manfred Karrer
aac493cc41
Add Restrictions with min and max comp request amounts. Refactor validator.
2018-03-05 10:33:25 -05:00
Manfred Karrer
a60f56c623
Merge branch 'compensation-req-checks' of https://github.com/sqrrm/exchange into sqrrm-compensation-req-checks
2018-03-05 09:39:42 -05:00
Manfred Karrer
4e8a6adff4
Refactor configPeerNodes methods
2018-03-05 09:31:25 -05:00
Bernard Labno
961b01403f
Use btcNodes argument in regtest mode.
2018-03-02 22:47:39 +01:00
Angelcoin
d9149d47ec
Update TradeStatisticsManager.java
2018-02-27 14:08:37 +02:00
Manfred Karrer
1d0591084d
Merge branch '0.6.7'
...
# Conflicts:
# common/pom.xml
# common/src/main/java/io/bisq/common/app/Version.java
# common/src/main/resources/i18n/displayStrings.properties
# common/src/main/resources/i18n/displayStrings_hu.properties
# common/src/main/resources/i18n/displayStrings_ro.properties
# consensus/pom.xml
# core/pom.xml
# core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
# core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java
# core/src/main/java/io/bisq/core/provider/fee/FeeService.java
# gui/pom.xml
# gui/src/main/java/io/bisq/gui/bisq.css
# gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
# gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
# gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
# gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
# gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java
# gui/src/main/java/io/bisq/gui/util/GUIUtil.java
# monitor/pom.xml
# network/pom.xml
# network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
# package/linux/32bitBuild.sh
# package/linux/64bitBuild.sh
# package/linux/Dockerfile
# package/osx/create_app.sh
# package/osx/finalize.sh
# package/windows/32bitBuild.bat
# package/windows/64bitBuild.bat
# package/windows/Bisq.iss
# pom.xml
# seednode/pom.xml
# statistics/pom.xml
2018-02-26 22:03:47 -05:00
Manfred Karrer
2a16e68939
Fix bug: Cannot remove deactivated offer #1403
2018-02-26 20:17:21 -05:00
Manfred Karrer
250a3724be
Move useDevPrivilegeKeys from ArbitratorModule to BisqAppModule
2018-02-26 12:51:04 -05:00
