Commit graph

1943 commits

Author SHA1 Message Date
Christoph Atteneder
64370f7adb
Fix JMockit setup 2018-09-13 10:46:07 +02:00
Christoph Atteneder
8ed7f4218f
Add not working JMockit setup (help wanted) 2018-09-07 14:03:52 +02:00
Christoph Atteneder
e319449186
Make power mock tests Java 10 compatibile 2018-09-07 14:02:22 +02:00
Christoph Atteneder
7a5eb33b67
Merge commit for @chirhonul 's commit "core: Drop now unnecessary files" 8cd93def30bd7039f5c8da77c1c9eff0a8cc35d8 2018-09-05 11:00:49 +02:00
Christoph Atteneder
049655b685
Merge core repository at 4597613 2018-09-05 10:48:22 +02:00
Chris Beams
970095f9ab
Move core module to new bisq-core repository 2018-03-10 17:29:25 +01: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
0cd1318436
Apply to new data structure 2018-03-10 10:22:59 -05:00
Manfred Karrer
a8962c833a
Merge branch 'handle-genesis-change' of https://github.com/sqrrm/exchange into sqrrm-handle-genesis-change
# Conflicts:
#	core/src/main/java/io/bisq/core/dao/node/consensus/GenesisTxController.java
2018-03-10 10:22:43 -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
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
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
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,
re-applying them after the renaming of CoreSeedNodesRepository =>
DefaultSeedNodeRepository that happened earlier on this branch. The
other changes made in that original commit are no longer relevant here,
or have already been made in earlier commits on this refactoring branch.
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
sqrrm
4346b64c91
Handle change output from genesis transaction 2018-03-09 16:26:13 +01: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
park-alter
5cc333e33f list-wmcc 2018-03-07 21:01:34 +08: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
ghobson2013
c51851809c adding ROIcoin 2018-03-06 11:11:31 -06:00