Commit Graph

2405 Commits

Author SHA1 Message Date
Manfred Karrer
d80af564ed
Move javafx dependencies to common
For the upcoming API work we use java fx classes also in common (PR
is pending), so that is one reason to move that. But there was also an
issue on Linux (travis) as the platform property was not set in the
core gradle build file, but it is already defined in common.
2018-10-22 16:01:02 -05:00
Manfred Karrer
871e776509
Move javafx dependencies to core
We use some javafx (Properties,...) classes in core as well, so we need
to have the dependency resolved there already.
2018-10-22 13:17:06 -05:00
Christoph Atteneder
db2cda1355
Merge branch 'master' of github.com:bisq-network/bisq into redesign
# Conflicts:
#	desktop/build.gradle
2018-10-22 19:27:31 +02:00
Christoph Atteneder
01cf2a46cb
Adapt preference view to match design template 2018-10-22 17:47:01 +02:00
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
75e0daefbf
Merge branch 'master' into DAO-UI-hide-details 2018-10-19 21:01:53 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Christoph Atteneder
9740a97bbf
Add missing translations for market provider info 2018-10-19 16:51:50 +02:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements
Persitence of DAO state
2018-10-18 16:15:28 -05:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
15177e6537
Add comment 2018-10-17 14:21:31 -05:00
Manfred Karrer
dbe5cf6f85
Replace double quote with single
Double quotes are only needed when a placeholder ({0}) is used in the text. Otherwise it would show 2 quotes.
2018-10-17 11:02:34 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04:00
Manfred Karrer
6d18a9ea78
Rename BsqState to DaoState 2018-10-17 00:13:42 -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
8e46b1760f
Add new storage type to p2p library
- We introduce a new basic storage type for reading from a resource file
if available and reading initial db file if available. That is required
for the snapshots of the DaoState which will be shipped with the source
code.

- We separate the support for maps to MapStoreService
2018-10-16 23:16:52 -05:00
Manfred Karrer
d33298d087
Add more tests 2018-10-16 13:53:58 -05:00
Christoph Atteneder
95fa81361e
Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-16 19:45:50 +02:00
Manfred Karrer
dabe6907e1
Fix missing sorting 2018-10-16 12:40:10 -05:00
Christoph Atteneder
29adc6b472
Merge branch 'master' of github.com:bisq-network/bisq into redesign
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
2018-10-16 19:38:16 +02:00
Christoph Atteneder
dd568111a5
Update translations without colons 2018-10-16 19:35:05 +02:00
Manfred Karrer
254059b411
Fix typo 2018-10-16 11:57:50 -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
sqrrm
b3c8610f10
Add bonded reputation service, storage 2018-10-16 17:11:40 +02:00
Christoph Atteneder
0edbb1733c
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
#	desktop/src/main/java/bisq/desktop/util/FormBuilder.java
2018-10-16 10:09:37 +02:00
sqrrm
7b72f10eb2
Add bonded reputation 2018-10-14 12:51:36 +02:00
sqrrm
b9d6b3a007
Add interface for BondedRole to allow for more generic bonds 2018-10-13 12:31:02 +02:00
Manfred Karrer
5879dd98df
Change log level for printing asset trade stats 2018-10-10 15:34:02 -05:00
Manfred Karrer
62a824653d
Update comments 2018-10-10 15:33:01 -05:00
Manfred Karrer
c3f508e24c
Adjust DAO params 2018-10-10 15:20:17 -05:00
Manfred Karrer
aeebae9297
Support trade fees defined DAO params
- Use DAO Params to get the trade fees
- Rename existing params
- Add min fee values
2018-10-10 15:02:38 -05:00
Manfred Karrer
048767af1a
Make ProposalConsensus and CompensationConsensus methods static 2018-10-10 14:28:49 -05:00
Manfred Karrer
4b9073ce8a
Rename support for other base currencies in getDefaultMinFeePerByte 2018-10-10 14:28:03 -05:00
Manfred Karrer
965d741657
Rename fields and params 2018-10-10 14:21:11 -05:00
Manfred Karrer
8e22916914
Adjust comments 2018-10-10 14:18:56 -05:00
Manfred Karrer
923aaf6cdc
Remove other base currencies from FeeService 2018-10-10 14:06:24 -05:00
Manfred Karrer
c8f0098b2b
Add comments, cleanups 2018-10-10 14:03:53 -05:00
Manfred Karrer
280af36fc5
Reduce default btc miner fee from 200 to 50 sat/byte 2018-10-10 13:47:26 -05:00
Manfred Karrer
e99d733642
Remove PHASE_BREAK4, adjust phase periods and fees 2018-10-10 13:39:51 -05:00
Manfred Karrer
db3cd329b9
Add VoteResultExceptionHandler 2018-10-09 23:31:43 -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
d279dae032
Rename chainHeadHeight to chainHeight 2018-10-08 11:22:57 -05:00
Manfred Karrer
57355f2b19
Merge branch 'Dao-UI-improvements' 2018-10-08 11:18:42 -05:00
Manfred Karrer
d87bbf9318
Merge pull request #1763 from ManfredKarrer/tx-broadcaster-fix
Tx broadcaster fix
2018-10-08 07:10:52 -05:00
Manfred Karrer
8232eeecd8
Deactivate OKPay as it does not exist anymore
OkPay seems to have rebranded to Weezzo.
The OkPay webpage is offline but some links go to Weezzo.
Seems pretty unprofessional hwo they did the move...
Seems they have been involved with BTC-e…
https://bitcointalk.to/index.php?topic=2094721.0
2018-10-07 21:54:00 -05:00
Manfred Karrer
be1f177fc7
Increase timeout to 30 sec 2018-10-07 17:40:44 -05:00
Manfred Karrer
85c80bcd5c
Remove the maybeCommitTx call at timeout 2018-10-07 17:40:01 -05:00
Manfred Karrer
fbbec72eb0
Merge branch 'master' into arbitration-system-improvements 2018-10-07 00:47:42 -05:00
Manfred Karrer
5dfbb6d596
Merge branch 'master' into Dao-UI-improvements 2018-10-07 00:46:48 -05:00
Manfred Karrer
2d593ee88f
Merge branch 'master' into arbitration-system-improvements 2018-10-05 15:21:41 -05:00
Manfred Karrer
8c85a1bab5
Merge branch 'master' into small-fixes 2018-10-05 15:21:14 -05:00
Manfred Karrer
f4cfeef2cd
Add checkTradeActivity method, remove ConvertToTradeStatistics2 2018-10-05 02:36:20 -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
072cedc29b
Improve param change selection (WIP)
- Show current formatted value
- Parse input to correct domain value
- Add validation (WIP)
- Add boundary checks (WIP)
2018-10-04 21:36:17 -05:00
Manfred Karrer
ccdac8e20b
Add new items to Param
- Add COMPENSATION_REQUEST_MIN_AMOUNT and COMPENSATION_REQUEST_MAX_AMOUNT
As BSQ based validation values can change over time if BSQ value
rise we need to support that in the Params as well.

- Add validateParamValue to ChangeParamValidator
2018-10-04 20:28:17 -05:00
Manfred Karrer
6299411a2f
Fix/add comments 2018-10-04 18:15:00 -05:00
Manfred Karrer
c6c617e4b6
Improve comment 2018-10-04 15:06:44 -05:00
Manfred Karrer
281e156449
Rename AvoidStandbyMode to AvoidStandbyModeService 2018-10-04 11:36:29 -05:00
Manfred Karrer
0728d04b02
Improve logs, don't show popups in dev mode 2018-10-04 11:33:44 -05:00
Manfred Karrer
1b8863652c
Merge branch 'master' into DAO-improvements 2018-10-04 10:40:42 -05:00
Manfred Karrer
fcc333cd89
Merge pull request #1747 from fotispap/fotispap/remove-age-altcoin-accounts
Remove age from limitations of altcoin accounts
2018-10-04 10:09:57 -05:00
Manfred Karrer
3ed70f76be
Fix wrong log 2018-10-04 00:51:30 -05:00
Manfred Karrer
ba876d8884
Refactor parsing of genesis tx
- Extract genesis parsing to GenesisTxParser
- Cleanups
2018-10-04 00:38:21 -05:00
Manfred Karrer
40177dd52c
Refactor parser classes
- Use commitUTXOCandidates for processGenesisTxOutput
- Cleanup
2018-10-03 23:30:19 -05:00
Manfred Karrer
886272d6ce
Refactor parser classes
- Add check for opReturn in processTxOutput
- Handle burntBondValue
- Check for TxOutputType.INVALID_OUTPUT in isTxInvalid
2018-10-03 23:11:49 -05:00
Manfred Karrer
56b8a3986b
Refactor parser classes
- Remove tempTx from TxOutputParser
- Renamings
- Add isOpReturnOutput method to TempTxOuput
2018-10-03 22:28:31 -05:00
Manfred Karrer
c0d776e536
Fix wrong check for isVoteRevealInputValid 2018-10-03 21:45:49 -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
097fa66c99
Refactor parser classes
- Add isUnLockInputValid to TxInputParser
- Continue to refactor to make methods more testable
- Clean up
2018-10-03 20:55:25 -05:00
Manfred Karrer
5df40f7e1f
Refactor parser classes
- Continue to refactor to make methods more testable
2018-10-03 20:13:16 -05:00
Manfred Karrer
7d14ab8376
Refactor parser classes
- Remove voteRevealInputState and replace with isVoteRevealInputInValid
in TxInputParser
- Rename optionalVerifiedOpReturnType to optionalOpReturnType
- Replace if checks with checkNotNull if case must not happen
- Remove unused isLastOutput param
- Inline handleOpReturnOutput code to processOpReturnOutput
- Remove class fields remainingInputValue and use a local var instead
- Rename getOptionalVerifiedOpReturnType to getOptionalOpReturnType
2018-10-03 19:03:43 -05:00
Manfred Karrer
744f0cc516
Refactor TxOutputParser
- Remove unneeded isLastOutput
- Rename bsqOutputs to tempTxOutputs
- Rename commitTxOutputs to commitTxOutputsForValidTx
2018-10-03 17:59:34 -05:00
Manfred Karrer
0c8d475c24
Improve string 2018-10-03 17:58:01 -05:00
Manfred Karrer
69210d9125
Fix missing updates of enum entries 2018-10-03 17:50:36 -05:00
Manfred Karrer
294c941512
Fix missing updates of enum entries 2018-10-03 17:34:40 -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
275286690b
Improve logs 2018-10-03 17:28:54 -05:00
Manfred Karrer
126d279e6e
Merge pull request #1718 from sqrrm/refactor-dao-parser
[WIP] Refactor dao parser
2018-10-03 17:10:13 -05:00
fotispap
c305a3cb03 Remove age from limitations of altcoin accounts 2018-10-03 22:26:50 +02:00
sqrrm
bc262460a1
Merge remote-tracking branch 'origin/master' into refactor-dao-parser 2018-10-03 10:51:49 +02:00
Manfred Karrer
32bfe0eb8e
Set activation date, add logs 2018-10-02 22:58:38 -05:00
Manfred Karrer
984c305b77
Remove isAutoSelectArbitrators and hasMatchingLanguage check 2018-10-02 22:48:07 -05:00
Manfred Karrer
cb17b008a3
Remove arbitrator selection view 2018-10-02 22:35:16 -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
78a298cb13
Add ARBITRATOR_ADDRESS to extra map in trade statistics 2018-10-02 18:16:34 -05:00
Manfred Karrer
f2e289d0a6
Add ArbitratorSelection based on tradestatistics 2018-10-02 18:15:47 -05:00
Manfred Karrer
d68f9b5474
Fix wrong validation checks on proposals and ballots
- We cannot validate the txType at startup as the blockchain is nto ready at that moment. So we cannot apply that validation when we receive the payloads. We do the validation instead at the access to the lists.
- We fix a glitch with missing cycle start time in ResultsOfCycle
- Cleanup in VoteResultView
2018-10-01 21:19:12 -05:00
Manfred Karrer
2de9c7282e
Make DaoFacade implement DaoSetupService
- Fixes a bug that the phaseProperty was not set in DaoFacade as the
class was instantiated on demand and missed updates.
2018-10-01 21:16:02 -05:00
Manfred Karrer
030dc0209b
Change btcd-cli4j to 3864e1c4 2018-10-01 12:17:40 -05:00
Manfred Karrer
b981737775
Change log msg with update to new btcd-cli4j 2018-10-01 12:17:28 -05:00
Manfred Karrer
7ac2a02279
Fix startHeight, handle errors 2018-10-01 11:39:45 -05:00
Manfred Karrer
6873d03216
Merge pull request #1735 from ManfredKarrer/master
Fixes and improvements
2018-09-29 12:27:04 -05:00
Manfred Karrer
012dab9ad2
Add isUnspent to JsonTxOutput 2018-09-28 19:58:03 -05:00
Manfred Karrer
3de2746834
Rename outputIndex 2018-09-28 19:49:36 -05:00
Manfred Karrer
54fc96a5d7
Update json classes for BSQ explorer 2018-09-28 19:34:08 -05:00
Manfred Karrer
dcd0ff5efd
Add tx validation for proposals 2018-09-28 14:53:27 -05:00
Manfred Karrer
1760094286
Handle reorgs 2018-09-28 14:52:59 -05:00
Manfred Karrer
2b5731ce7f
Add buyers payment account name to trade screen
In case the buyer has setup multiple accounts for a payment method
we show the used payment account for that offer in the trade screen.

See: https://github.com/bisq-network/bisq/issues/1733
2018-09-28 12:04:09 -05:00
Manfred Karrer
2f8172f704
Apply rounding or fiat volume to trade statistics 2018-09-28 10:46:25 -05:00
Christoph Atteneder
a07f984e7e
Adapt Offer Book View 2018-09-28 17:27:22 +02:00
Manfred Karrer
0508489191
Add comment, cleanup 2018-09-27 21:26:21 -05:00
Manfred Karrer
19f1d2b565
Add log 2018-09-27 20:17:53 -05:00
Manfred Karrer
774b2b3c51
Add missing scriptType enum 2018-09-27 20:16:57 -05:00
Manfred Karrer
0414b1baec
Update to btcd-cli4j 1763d7ef
- Fixes missing scriptType enum
2018-09-27 20:16:44 -05:00
Devin Bileck
3663d6cf14
Fix last update timestamp in price feed service 2018-09-27 12:55:02 -07:00
Manfred Karrer
a9e32c0bdd
Move maker classes back to desktop module 2018-09-27 00:16:24 -05:00
Manfred Karrer
29193ad928
Fix failing test 2018-09-26 23:58:58 -05:00
Manfred Karrer
dbe0993fae
Fix nullpointer 2018-09-26 23:58:47 -05:00
Manfred Karrer
8eabd665c7
Fix snapshot handling
- Fix wrong start height
- Improve logging
2018-09-26 22:41:41 -05:00
Manfred Karrer
97479e295c
Fix wrong logging
- If both verifiedOpReturnType and opReturnTypeCandidate are empty we
got an error logged. We change that so that only of both are present
but not matching we log a warning.
2018-09-26 22:40:50 -05:00
Manfred Karrer
fc5c0da159
Fix wrong minDecimals for BSQ in trade volume display 2018-09-26 21:04:18 -05:00
Manfred Karrer
fd87ff369c
Refactor and fix asset checks 2018-09-26 18:37:41 -05:00
Manfred Karrer
c231750900
Move classed from desktop to core 2018-09-26 16:03:42 -05:00
Manfred Karrer
4cd26882fe
Merge branch 'master' into DAO-improvements 2018-09-26 15:31:42 -05:00
Manfred Karrer
c11070f7c4
Fixes assetMatchesNetwork method, rename method
- Rename excludeBsqUnlessDaoTradingIsActive to
isNotBsqOrBsqTradingActivated to make it more clear
- Fix wong check with getDefaultBaseCurrencyNetwork (use
getBaseCurrencyNetwork instead)
- Add comment to support network check or Tokens
2018-09-26 15:30:21 -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
a423f205ee
Update Genesis defaults, deactivate SnapshotManager, improve logs 2018-09-26 15:22:23 -05:00
Manfred Karrer
b1182e9784
Use GenesisTxInfo instead of option key for genesis block height 2018-09-25 22:43:27 -05:00
Manfred Karrer
cd8ff29aa5
Add testnet genesis tx 2018-09-25 22:42:34 -05:00
Manfred Karrer
70f6a712f7
Don't use default genesis tx if regtest or testnet 2018-09-25 22:20:22 -05:00
Manfred Karrer
a85bc097a2
Enable DAO if testnet or regtest 2018-09-25 22:06:05 -05:00
Manfred Karrer
f8feec2948
Change testnet seed node to o5qw2hy6l7jsf654 2018-09-25 21:45:30 -05:00
Manfred Karrer
b03aab24b7
Change label for network selector 2018-09-25 21:03:02 -05:00
Manfred Karrer
5b70d71580
Add isTestNet method 2018-09-25 20:52:08 -05:00
Manfred Karrer
401418e963
Add GenesisTxInfo to param in test class 2018-09-25 20:01:29 -05:00
Manfred Karrer
3689e4cbf1
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/src/main/java/bisq/core/dao/state/SnapshotManager.java
2018-09-25 19:58:15 -05:00
Manfred Karrer
0bcb96b724
Add checks for snapshot 2018-09-25 19:55:41 -05:00
Manfred Karrer
a8d04d3acc
Add more testnet seed nodes 2018-09-25 19:55:22 -05:00
Christoph Atteneder
5d46a991a8
Merge pull request #1720 from ManfredKarrer/handle-xmr-popup-text
Adjust trade popup text for XMR
2018-09-25 17:27:59 +02:00
Manfred Karrer
b6a4e028c6
Merge pull request #1721 from ManfredKarrer/update-json-for-bsq-explorer
Update json for bsq explorer
2018-09-25 09:50:15 -05:00
Manfred Karrer
2be68a76fc
Fix issue with not filtered ballots
- When creating the ballot list we used all ballots of all cycles.
We added a new method to get the ballots of the current cycle.

- Add check if optionalTx.isPresent() in isTxInPhaseAndCycle
2018-09-24 21:23:03 -05:00
Manfred Karrer
ff796b3e6c
Add toString methods, add better logging 2018-09-24 19:15:19 -05:00
Manfred Karrer
d9cada9ec0
Fix issue with wrong merit
- We need to ignore the compensationProposal from the current cycle
when creating the merit list
2018-09-24 19:14:44 -05:00
Manfred Karrer
ee1317c64a
Fix issue causing invalid vote reveal tx
- Set PHASE_VOTE_REVEAL duration to 2 blocks as 1 block would cause an
invalid state (confirmation block is one block after phase)
- Rename getStateBuilder to getBsqStateBuilder
2018-09-24 18:30:05 -05:00
Manfred Karrer
835db24e53
Fix threading issues with ExportJsonFilesService
- Rename JsonBlockChainExporter to ExportJsonFilesService
- Remove getBlocksFromState method
- Add ExportJsonFilesService to DaoSetup and implement DaoSetupService
- Add json dir for all json sub dirs
- Move access to bsqStateService out from thread in ExportJsonFilesService
- Only do write to disk in thread
- Sync model files
2018-09-24 17:39:23 -05:00
Manfred Karrer
aefa986467
Fix threading issues with ExportJsonFilesService
- Rename JsonBlockChainExporter to ExportJsonFilesService
- Remove getBlocksFromState method
- Add ExportJsonFilesService to DaoSetup and implement DaoSetupService
- Add json dir for all json sub dirs
- Move access to bsqStateService out from thread in ExportJsonFilesService
- Only do write to disk in thread
2018-09-24 14:03:10 -05:00
Manfred Karrer
86086c1e09
Adjust trade popup text for XMR
Fixes https://github.com/bisq-network/bisq/issues/1555
2018-09-24 13:01:33 -05:00
Manfred Karrer
e47c160a27
Merge branch 'master' into fix-multiple-btc-peers 2018-09-24 12:11:58 -05:00
sqrrm
3f87460b57
Wait to commit BSQ txOutputs to bsqStateService until after parsing
If a transaction is considered invalid it should consider all the
txOutputs to be invalid. To avoid counting a txOutput as valid it's
better to commit to stateservice only after checking the validity of the
transaction.
2018-09-24 19:04:46 +02:00
sqrrm
5dffe7159e
Check for multiple opReturns before processing txOutputs 2018-09-24 19:04:46 +02:00
sqrrm
f31bf0d5cf
Process opReturn txOutput before remaining outputs 2018-09-24 19:04:46 +02:00
sqrrm
a623fd3852
Extract opreturn post processing functions 2018-09-24 19:04:46 +02:00
sqrrm
e8b9466516
Rename processOpReturnCandidate -> isOpReturnCandidate 2018-09-24 19:04:46 +02:00
sqrrm
dc1964bda2
Parse opreturn before other outputs
Since the effects of opreturn act on the BSQ outputs it makes more sense
to parse the opreturn before parsing the remaining outputs.

Put the lock time in the LOCKUP txOutput. It makes more logical sense to
keep it there.
2018-09-24 19:04:46 +02:00
Christoph Atteneder
3bb503d289
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-09-24 11:34:05 +02:00
Christoph Atteneder
a22e5d5b2b
Adapt create offer screen 2018-09-24 11:31:41 +02:00
Christoph Atteneder
95f42fed21
Merge pull request #1716 from ManfredKarrer/small-improvements
Small improvements
2018-09-24 06:31:57 +02:00
Manfred Karrer
4227fcab85
Add package info and comment 2018-09-23 15:36:57 -05:00
Manfred Karrer
bb20264473
Move classes 2018-09-23 15:35:06 -05:00
Manfred Karrer
6f03624fd2
Add comment 2018-09-23 15:34:43 -05:00
Manfred Karrer
920ad2e1b5
Rename network package to nodes 2018-09-23 15:29:09 -05:00
Manfred Karrer
8d0f6b7556
Rename BitcoinNodes to BtcNodes 2018-09-23 15:22:20 -05:00
Manfred Karrer
361605d4e3
Rename PeerAddressesRepository to BtcNodesRepository 2018-09-23 15:21:41 -05:00
Manfred Karrer
6e90554f84
Rename WalletNetworkConfig to BtcNetworkConfig 2018-09-23 15:20:41 -05:00
Manfred Karrer
06d0a4a80a
Rename WalletSetupPreferences to BtcNodesSetupPreferences 2018-09-23 15:19:57 -05:00
Manfred Karrer
5f56d08d33
Fix package structure in tests 2018-09-23 15:18:22 -05:00
Manfred Karrer
f7d8b35b32
Add model package and move classes 2018-09-23 15:13:42 -05:00
Manfred Karrer
0d86176f4e
Further refactorings: move classes to other packages 2018-09-23 15:09:22 -05:00
Manfred Karrer
16fac73b6d
Further refactorings move classes to other packages 2018-09-23 14:56:46 -05:00
Manfred Karrer
6c7bf96fee
Move exception classes to exception package 2018-09-23 14:50:32 -05:00
Manfred Karrer
9b9d56c79c
Add missing import 2018-09-23 14:47:41 -05:00
Manfred Karrer
f3f719a632
Move btc setup classes to setup package 2018-09-23 14:46:58 -05:00
Manfred Karrer
f0471bccfd
Warn user when closing with open offers
Fixes https://github.com/bisq-network/bisq/issues/1663
2018-09-23 13:48:01 -05:00
Manfred Karrer
38e910c366
Add contact info for seller in case of aa F2F trade
Fixes: https://github.com/bisq-network/bisq/issues/1707#issuecomment-423724283
2018-09-22 18:59:15 -05:00
Christoph Atteneder
97fb1b8ec1
Merge pull request #1712 from ManfredKarrer/PreventAppNap
Play silent sound to avoid standby mode
2018-09-22 06:52:50 +02: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
Manfred Karrer
56c657c400
Add printAllCurrencyStats method 2018-09-21 12:52:03 -05:00
Christoph Atteneder
fd07bff243
Fix padding and use translation keys 2018-09-20 16:38:27 +02:00
Christoph Atteneder
de48516a04
Use JFXComboBox for filtering with label on top 2018-09-20 12:11:57 +02:00
Christoph Atteneder
cf7884d864
Add password field behavior with floating text 2018-09-19 09:09:31 +02:00
Manfred Karrer
705025fea9
Add info for Faster Payment that the receivers name is not required
See:
https://github.com/bisq-network/bisq/issues/1693
2018-09-18 17:34:58 -05:00
Manfred Karrer
61caac07c2
Merge pull request #1688 from ManfredKarrer/master
Add Citibank to supported Zelle banks, update DAO rpc doc
2018-09-18 17:00:05 -05:00
Christoph Atteneder
db179914ad
Remove not thrown exceptions 2018-09-18 20:50:01 +02:00
Christoph Atteneder
f7e4e5ae14
Add missing result handler execution 2018-09-18 20:29:10 +02:00
Manfred Karrer
824d231a69
Add Citibank to supported Zelle banks
See: https://github.com/bisq-network/payment-methods/issues/10
2018-09-15 09:54:14 -05:00
Christoph Atteneder
40eadcc6e9
Merge branch 'master' into java10-support 2018-09-14 16:05:16 +02:00
Christoph Atteneder
4c068af7b3
Use default security provider instead of Bouncy Castle 2018-09-14 16:02:58 +02:00
Aruna Surya
cd5c5eda65
Improve grammar of Welcome text 2018-09-13 20:01:10 +02:00
Christoph Atteneder
64370f7adb
Fix JMockit setup 2018-09-13 10:46:07 +02:00
Aruna Surya
a89d22118d
Improve grammar of seed info 2018-09-11 21:40:40 +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
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
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
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
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
Manfred Karrer
182158af20
Merge pull request #1445 from sqrrm/fix-parsertest
Fix parsertest
2018-03-09 12:34:57 -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
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
Manfred Karrer
92514a25e8
Refactor BsqBlockChain with ReadModel and WriteModel 2018-03-09 00:43:20 -05:00
Manfred Karrer
da657ed055
Merge pull request #1440 from cbeams/change-groupid-and-version
Update artifact metadata to allow seamless resolution from JitPack or local ~/.m2 repo
2018-03-08 22:01:41 -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
Chris Beams
d218094269
Bump Maven artifact versions to 0.7.0-SNAPSHOT
Problem: When resolving Bisq libraries, e.g. `core` or `network` from
JitPack for use in other components like bisq-seednode or
bisq-pricenode, we have historically, resolved them by tag or by
branchname, e.g. with GAV coordinates like `io.bisq:core:v0.6.7` or
`io.bisq:core:master`. This works well enough, but now that we are
beginning to modularize more aggressively, we want to make sure that
it's possible at any time to publish the latest snapshots of these
libraries to one's own local ~/.m2 repository such that they can be
easily resolved from downstream components without the need to push
commits to the bisq-network/exchange remote, and to wait for JitPack to
do a just-in-time build.

Solution: By updating the version value of all modules here in the
exchange repository from 0.6.7 => 0.7.0-SNAPSHOT, one can run
`mvn install` to publish the latest "snapshot" of exchange libraries to
the local ~/.m2 repository and be sure to resolve them from whatever
downstream component that they are working on. The -SNAPSHOT qualifier
ensures that no caching occurs, and that the very latest such binary
will always be used.

This new arrangement creates a situation where one can transparently
resolve these dependencies remotely from JitPack and then subsequently
resolve them locally from one's ~/.m2 repository without having to
change a line of code.

It also opens up the ability to manage all Bisq components together in a
single IDE window as if they were all in one repository, avoiding the
need even to issue a `mvn install` command to publish locally--but
that's not the main focus of this change.

Note that the change to 0.7.0 here is based on the fact that we already
planned to have the next version shipped from `master` be 0.7.0, as
there are quite a few new UI changes that probably merit the bump in
minor version. The version change also aligns well with the fact that
we're modularizing a number of components right now, and all
newly-extracted components have been jumping to v0.7.0 to indicate their
new independent status. This has been the case with bisq-seednode and
pricenode so far.

Finally, it is important to note here that the ONLY versions updated by
this change are those specific to Maven metadata and therefore artifact
management / dependency resolution. The version that the Bisq desktop
client reports in its UI and to the network in its user agent has NOT
been changed, on account of the fact that users may run Bisq from
source, and we need to think through more fully the implications of
reporting a verison like 0.7.0-SNAPSHOT in those situations. Here is a
list of files containing the old version (0.6.7) that have NOT been
updated:

 - common/src/main/java/io/bisq/common/app/Version.java
 - package/linux/32bitBuild.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
 - package/linux/64bitBuild.sh

One thing we know for sure that wouldn't work here is that Bisq's
Version class currently does not support -SNAPSHOT qualifiers. It just
breaks the version string validation entirely. So we'd need to patch
that in any case if we do decide it's a good idea to let pre-release
builds report their version accurately.
2018-03-08 19:49:30 +01:00
Chris Beams
19d8c252ba
Change groupid from io.bisq => io.bisq.exchange
Problem: The current `io.bisq` groupid does not align with the way
JitPack supports custom groupids. In order to be able to both resolve
artifacts from JitPack *and* be able to resolve the same artifacts from
one's local ~/.m2 repository, Bisq artifacts need to have the same GAV
coordinates everywhere (groupid, artifactid, version).

Solution: This commit changes all groupids from io.bisq =>
io.bisq.exchange to match the GAV coordinates produced / expected by
JitPack.

So where Bisq's core module would previously have been resolvable with
GAV coordinates `io.bisq:core:v0.6.7` it will now be resolvable as
`io.bisq.exchange:core:v0.6.7`.

Note that this change is not just to satisfy JitPack idiosyncracies, but
is actually good naming practice anyway where a multi-module build is
involved, and is arguably the way it should have been all along.

[1]: https://jitpack.io/docs/#publishing-on-jitpack
2018-03-08 18:59:31 +01: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
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