Manfred Karrer
|
ccb060193e
|
Adpot changes to merged branch
|
2017-03-16 12:59:17 -05:00 |
|
Manfred Karrer
|
34b4c61792
|
Merge branch 'separateSecDeposit' into DAO
# Conflicts:
# gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
# gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
# gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java
# network-messages/src/main/java/io/bisq/network_messages/trade/offer/payload/OfferPayload.java
# network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java
# network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java
|
2017-03-16 12:28:59 -05:00 |
|
Manfred Karrer
|
ae2cdcae72
|
Merge branch 'temp' into DAO
|
2017-03-16 12:22:00 -05:00 |
|
Manfred Karrer
|
6d895bee79
|
Add temp node addresses for seed node and provider
|
2017-03-16 11:59:57 -05:00 |
|
Manfred Karrer
|
7992e081d8
|
Merge pull request #776 from bitsquare/messages-refactoring
Messages refactoring
|
2017-03-16 11:56:28 -05:00 |
|
Mike Rosseel
|
7ed46912cb
|
move tests
|
2017-03-16 17:08:27 +01:00 |
|
Mike Rosseel
|
4a56abbf0b
|
renamed package name to conform to module
|
2017-03-16 16:57:21 +01:00 |
|
Mike Rosseel
|
bd65f274aa
|
move the last messages to the correct module
|
2017-03-16 16:50:53 +01:00 |
|
Mike Rosseel
|
d89e8e98d1
|
move the last messages to the correct module
|
2017-03-16 16:48:54 +01:00 |
|
Mike Rosseel
|
e0151df520
|
fix bugs and replace errors
|
2017-03-16 15:33:45 +01:00 |
|
Mike Rosseel
|
7920fcb105
|
new files (or moves which intellij didn't recognize)
|
2017-03-16 14:39:17 +01:00 |
|
Mike Rosseel
|
2efc3acb29
|
split network-messages in its own module. Compiles.
|
2017-03-16 14:38:18 +01:00 |
|
Manfred Karrer
|
436a7400d9
|
Add PersistedP2PStorageData (need to be updated when data structure changes)
|
2017-03-15 20:32:28 -05:00 |
|
Manfred Karrer
|
5afd2bde11
|
Separate security deposit for buyer and seller. Remove arbitrator amount and address at dispute result. Remove Payout policy. Add bank as reason.
|
2017-03-15 17:06:44 -05:00 |
|
Manfred Karrer
|
a4b15f5906
|
Separate security deposit for buyer and seller (WIP)
|
2017-03-15 15:04:32 -05:00 |
|
Mike Rosseel
|
412da90ccc
|
remove TODO
|
2017-03-13 10:26:34 +01:00 |
|
Mike Rosseel
|
c6e51fdeca
|
fix bug where the DisputeResult was not correctly deserialized.
Added ctor with all transmitted data.
|
2017-03-13 10:23:44 +01:00 |
|
Manfred Karrer
|
8527762154
|
Fix incorrect/missing display strings, fix null pointer, cleanup
|
2017-03-12 22:31:23 -05:00 |
|
Manfred Karrer
|
9ff23016c8
|
Fix incorrect display strings
|
2017-03-12 16:14:32 -05:00 |
|
Manfred Karrer
|
3b557463da
|
Rebranding: replace bitsquare with bisq
|
2017-03-12 16:00:40 -05:00 |
|
Manfred Karrer
|
be1096582c
|
Rebranding: rename package io.bitsquare to io.bisq
|
2017-03-12 15:09:39 -05:00 |
|
Manfred Karrer
|
75fc7d2286
|
Rebranding: Change occurance of Bitsquare to bisq
|
2017-03-12 14:28:14 -05:00 |
|
Manfred Karrer
|
46995c102c
|
Resolve merge conflicts, move locale package to common, use constancts for dev keypair.
|
2017-03-12 13:46:40 -05:00 |
|
Manfred Karrer
|
5b557ed37a
|
Merge branch 'doa_with_translations' into DAO
# Conflicts:
# common/src/main/java/io/bitsquare/app/DevFlags.java
# gui/src/main/java/io/bitsquare/gui/components/PeerInfoIcon.java
# gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java
# gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SameBankForm.java
# gui/src/main/java/io/bitsquare/gui/main/MainView.java
# gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
# gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
# gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
# gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
# gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
# gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
# gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
# gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
# gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java
# gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
# gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
# gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java
# gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
# gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
# gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
# gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
# gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
# gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java
# network/src/main/java/io/bitsquare/messages/provider/price/PriceFeedService.java
# network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
|
2017-03-12 12:50:36 -05:00 |
|
Manfred Karrer
|
382607a965
|
Dont log error if we have stopped already
|
2017-03-10 20:20:00 -05:00 |
|
Manfred Karrer
|
82f9b73468
|
Add null check, return if msg is null
|
2017-03-10 19:44:13 -05:00 |
|
Manfred Karrer
|
cfb079609d
|
Make offererContractSignature nullable
|
2017-03-10 19:43:06 -05:00 |
|
Mike Rosseel
|
9fdd636f7d
|
fix disputeResult protobuffer handling
|
2017-03-10 16:28:25 +01:00 |
|
Mike Rosseel
|
2fab74db0c
|
fix arbitrator flow, mainly @Nullable fields, non-filled in fields for the protobuf message, missing uid, missing attachment setting on deserialize.
|
2017-03-10 13:47:32 +01:00 |
|
Mike Rosseel
|
daef9e4527
|
refactor to new way of testing nullable
|
2017-03-09 08:09:24 +01:00 |
|
Mike Rosseel
|
22d5e7ad05
|
Merge branch 'DAO' into protobuffer
Conflicts:
common/src/main/java/io/bitsquare/app/Log.java
core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
core/src/main/java/io/bitsquare/btc/BitcoinModule.java
core/src/main/java/io/bitsquare/btc/wallet/BsqWalletService.java
core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
core/src/main/java/io/bitsquare/btc/wallet/WalletService.java
core/src/main/java/io/bitsquare/btc/wallet/WalletsSetup.java
core/src/main/java/io/bitsquare/dao/DaoModule.java
core/src/main/java/io/bitsquare/dao/vote/VotingManager.java
gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.java
gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
network/pom.xml
network/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
network/src/main/java/io/bitsquare/messages/alert/Alert.java
network/src/main/java/io/bitsquare/messages/btc/provider/fee/FeeService.java
network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
network/src/main/java/io/bitsquare/messages/user/Preferences.java
network/src/main/java/io/bitsquare/p2p/network/Connection.java
pom.xml
statistics/src/main/java/io/bitsquare/statistics/Statistics.java
|
2017-03-07 16:41:23 +01:00 |
|
Mike Rosseel
|
fed47a0342
|
Merge branch 'DAO' into protobuffer
Conflicts:
common/src/main/java/io/bitsquare/app/Log.java
core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
core/src/main/java/io/bitsquare/btc/BitcoinModule.java
core/src/main/java/io/bitsquare/btc/wallet/BsqWalletService.java
core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
core/src/main/java/io/bitsquare/btc/wallet/WalletService.java
core/src/main/java/io/bitsquare/btc/wallet/WalletsSetup.java
core/src/main/java/io/bitsquare/dao/DaoModule.java
core/src/main/java/io/bitsquare/dao/vote/VotingManager.java
gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.java
gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
network/pom.xml
network/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
network/src/main/java/io/bitsquare/messages/alert/Alert.java
network/src/main/java/io/bitsquare/messages/btc/provider/fee/FeeService.java
network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
network/src/main/java/io/bitsquare/messages/user/Preferences.java
network/src/main/java/io/bitsquare/p2p/network/Connection.java
pom.xml
statistics/src/main/java/io/bitsquare/statistics/Statistics.java
|
2017-03-07 16:40:57 +01:00 |
|
Mike Rosseel
|
af0f748cb2
|
add optional to dispute protobuf
|
2017-03-07 07:59:24 +01:00 |
|
Manfred Karrer
|
7f5441b953
|
Merge remote-tracking branch 'origin/Allow_reopen_dispute' into doa_with_translations
|
2017-03-06 15:08:46 -05:00 |
|
Manfred Karrer
|
cea8b7d992
|
delay removeEntryFromMailbox call to avoid repeated application of the same msg
|
2017-03-06 14:47:45 -05:00 |
|
Mike Rosseel
|
e06db65629
|
fix various mailbox related errors
|
2017-03-06 12:21:45 +01:00 |
|
Manfred Karrer
|
a9fa5420ca
|
Remove PersistedP2PStorageData_old
|
2017-03-04 18:59:23 -05:00 |
|
Manfred Karrer
|
01cd10c79b
|
Add PersistedP2PStorageData_old
|
2017-03-04 18:56:43 -05:00 |
|
Mike Rosseel
|
9041960e74
|
set null fields to the default protobuffer values, otherwise Offer classes are not the same on both sides of the wire
|
2017-03-02 22:43:53 +01:00 |
|
Manfred Karrer
|
7ad15f8567
|
Add PersistedP2PStorageData
|
2017-03-01 18:30:14 -05:00 |
|
Mike Rosseel
|
c25e083cbe
|
fix protobuffer bugs, nullcheck for truncatedString utility
|
2017-03-01 16:28:27 +01:00 |
|
Mike Rosseel
|
cc08e31546
|
logging changes
|
2017-03-01 16:26:40 +01:00 |
|
Mike Rosseel
|
fd9e48d8b7
|
revert to as close as the old version as possible
|
2017-03-01 16:26:07 +01:00 |
|
Mike Rosseel
|
5b5329ffd4
|
fix string interning problem by removing Utilities.serialize calls and doing signing also with protobuffer
|
2017-03-01 09:20:13 +01:00 |
|
Manfred Karrer
|
56db98b788
|
Use MAX_MSG_SIZE_GET_DATA for GetDataRequest
|
2017-02-28 09:53:55 -05:00 |
|
Mike Rosseel
|
2cdb9917de
|
fix missing round-trip ctor arguments
|
2017-02-24 16:13:28 +01:00 |
|
Mike Rosseel
|
f6f61a36fc
|
fix the non-serialisable LazyStringArrayList objects which come from protobuffer if no value was present.
|
2017-02-22 16:55:38 +01:00 |
|
Mike Rosseel
|
a18bbc5f39
|
first pass at fixing NPE's
|
2017-02-21 15:05:44 +01:00 |
|
Mike Rosseel
|
1017502035
|
fix communication problem
|
2017-02-20 15:12:42 +01:00 |
|
Mike Rosseel
|
7db8b8ece3
|
remove BSEnvironment changes, add logging to fromProtoBuffer
|
2017-02-20 10:58:34 +01:00 |
|