mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity
3722 commits 3 branches 150 tags 4.1 GiB
Commit graph

725 commits

Author SHA1 Message Date
Manfred Karrer
70caec1860 Fix incorrect error/shutdown handling 2017-04-16 17:38:54 -05:00
Manfred Karrer
25337c3b7c Refactoring: move generic stuff to ProtoUtil (reuse for persist.) 2017-04-14 00:29:13 -05:00
Manfred Karrer
c14a07abd4 Refactoring: move protpResolver to other packages. Separate network and persist. resolver 2017-04-14 00:01:33 -05:00
Manfred Karrer
ce3070310e Rename getBaseEnvelope to getEnv 2017-04-13 23:32:17 -05:00
Manfred Karrer
d4bdc6f8e3 Fix msg version issues 2017-04-13 23:29:17 -05:00
Manfred Karrer
1dd6385232 Apply code inspection on network module 2017-04-13 22:26:36 -05:00
Manfred Karrer
4a74837b21 Apply code inspection on GUI module 2017-04-13 21:42:43 -05:00
Manfred Karrer
bc32048301 Fix incorrect call at TakerPublishTakerFeeTx 2017-04-13 17:57:25 -05:00
Mike Rosseel
61f4ff5ae8 Merge branch 'disk-protobuffer' into dao-disk-merge 
Conflicts:
	core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockchainManager.java
	core/src/main/java/io/bisq/core/dao/blockchain/TxOutputMap.java
	core/src/main/java/io/bisq/core/user/Preferences.java
	core/src/test/java/io/bisq/core/dao/blockchain/BsqBlockchainServiceTest.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
 2017-04-13 21:39:39 +02:00
Manfred Karrer
60b75f0dbd Fix bug with doublespend at create offer. Handle threading with rpc request. Support snapshots. Start support for P2P network (WIP). 2017-04-11 20:00:12 -05:00
Mike Rosseel
3a7d714385 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	common/src/main/java/io/bisq/common/locale/CountryUtil.java
	common/src/main/java/io/bisq/common/locale/FiatCurrency.java
	core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java
	core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
	core/src/main/java/io/bisq/core/payment/AliPayAccount.java
	core/src/main/java/io/bisq/core/payment/ChaseQuickPayAccount.java
	core/src/main/java/io/bisq/core/payment/ClearXchangeAccount.java
	core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java
	core/src/main/java/io/bisq/core/payment/InteracETransferAccount.java
	core/src/main/java/io/bisq/core/payment/OKPayAccount.java
	core/src/main/java/io/bisq/core/payment/PerfectMoneyAccount.java
	core/src/main/java/io/bisq/core/payment/SepaAccount.java
	core/src/main/java/io/bisq/core/payment/SwishAccount.java
	core/src/main/java/io/bisq/core/payment/USPostalMoneyOrderAccount.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerCreateTakerFeeTx.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	core/src/main/java/io/bisq/core/user/BlockChainExplorer.java
	core/src/main/java/io/bisq/core/user/Preferences.java
	core/src/main/java/io/bisq/core/user/User.java
	gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
	gui/src/main/java/io/bisq/gui/main/MainViewModel.java
	gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
	gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
	gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java
	gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
	gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java
	gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/OfferView.java
	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/createoffer/CreateOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java
	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
	gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java
	gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java
	gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
	gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
	gui/src/main/java/io/bisq/gui/util/BSFormatter.java
	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
	pom.xml
	statistics/src/main/java/io/bisq/statistics/Statistics.java
 2017-04-10 17:46:10 +02:00
Manfred Karrer
35e2d09aae Apply bsq fee for taker 2017-04-08 20:43:55 -05:00
Manfred Karrer
1783441ac6 Rename CreateOfferFee to Maker fee. Add isCurrencyForMakerFeeBtc to OfferPayload. use StringUtils.deleteWhitespace instead of String.replace. 2017-04-06 15:24:38 -05:00
Mike Rosseel
30a2876538 everything should now be Persistable, also HashSet, HashMap, Long, ... . 
commit before Preferences refactoring.
 2017-04-05 14:18:01 +02:00
Manfred Karrer
0cf3072902 Dont use tor if regtest. Dont use tor for provider node if localhost 2017-04-03 22:11:29 -05:00
Manfred Karrer
986ac67f84 Keep historical bsq txos for displaying bss txs in tx list. refactor data structure. detect invalid bsq tx and show popup. 2017-04-03 16:02:33 -05:00
Manfred Karrer
e96e408e33 Fix incorrect handling of logical and/or. Rename rpc optionkeys. Use lombok in BSQ tx value objcts. Use map with txId, index tuple instead of nested map for utxo. Rename BSQ Tx classes. Fix BSQ parsing algo. Add and improve tests. 2017-04-01 11:41:13 -05:00
Mike Rosseel
ce6620a291 AddressEntryList save/load cycle works 2017-03-31 16:44:36 +02:00
Mike Rosseel
bcc93ca602 Merge branch 'DAO' into disk-protobuffer + small changes 
Conflicts:
	core/src/main/java/io/bisq/core/arbitration/Dispute.java
	core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	network/src/main/java/io/bisq/network/p2p/DecryptedMsgWithPubKey.java
	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
 2017-03-28 08:17:20 +02:00
Manfred Karrer
bc6f8d5460 Rename Message to Msg (Message is used in protobuffer as well) 2017-03-27 23:31:09 -05:00
Manfred Karrer
0b5c9651a4 Refactoring: Use CoreProtobufferResolver in core and interface to decouple network and domain. Remove protobuffer and vo modules. 2017-03-27 22:47:53 -05:00
Manfred Karrer
100bfc2101 Use ProtobufferResolver in core 2017-03-27 20:29:42 -05:00
Manfred Karrer
8f8f452b16 Revert PubKey changes 2017-03-27 19:38:37 -05:00
Manfred Karrer
242f816b4e Refactor: Rename KeyRingVo to KeyRing 2017-03-27 16:11:08 -05:00
Manfred Karrer
3f53dd3fd8 Refactor: Move static methods from EncryptionService to NetworkCryptoUtils 2017-03-27 15:39:32 -05:00
Manfred Karrer
eeb0bd45e0 Refactor: Move ProtoCryptoUtil methods to EncryptionService 2017-03-27 15:37:10 -05:00
Manfred Karrer
fdf34283a4 Refactor PubKeyRing (WIP) 2017-03-27 15:31:25 -05:00
Mike Rosseel
a05ae36acc Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
	core/src/main/java/io/bisq/core/payment/PaymentAccount.java
	core/src/main/java/io/bisq/core/trade/TradeManager.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerPublishTakerFeeTx.java
	network/src/main/java/io/bisq/network/p2p/DecryptedMsgWithPubKey.java
	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
	protobuffer/src/main/java/io/bisq/protobuffer/message/offer/OfferAvailabilityResponse.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/arbitration/DisputeResult.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/offer/OfferPayload.java
	protobuffer/src/main/java/io/bisq/protobuffer/payload/trade/statistics/TradeStatistics.java
	protobuffer/src/main/proto/pb.proto
 2017-03-27 10:56:53 +02:00
Manfred Karrer
7f71d260e1 Add mediator to trade process 2017-03-26 21:52:08 -05:00
Manfred Karrer
a26c5b5d7a Refactor trade state and phase. new trade process works so far (WIP) 2017-03-25 23:36:51 -05:00
Manfred Karrer
664b19f8c4 Dont use mailboxMessage for PayDepositRequest. Add setUID for all mailboxMessages. BuyerAsOfferer protocol complete. (WIP) 2017-03-24 22:23:26 -05:00
Manfred Karrer
8e6c9cb3c5 Use underscpre instead of camelCase in proto buffer definition. Add Mediator. Remvoe TTL in proto buffer definitions. Remove Coin in proto buffer definitions 2017-03-24 14:33:32 -05:00
Manfred Karrer
2520542ca6 Merge changes from master 2017-03-23 12:53:35 -05:00
Manfred Karrer
57f201fa55 Reduce nr. of backups for PersistedP2PStorageData and TradeStatisitics 2017-03-22 21:31:56 -05:00
Manfred Karrer
f84a038889 Version 0.4.9.9.1 2017-03-22 16:24:52 -05:00
Manfred Karrer
6283255b21 Update PersistedP2PStorageData 2017-03-22 13:19:07 -05:00
Manfred Karrer
9e085102c8 Move getBaseEnvelope to Message. Cleanup 2017-03-21 23:28:43 -05:00
Manfred Karrer
552a151516 Add vo module. Refactor Alert to separated classes for all differnet domains (core, vo, proto, payload, persistable) 2017-03-21 23:10:55 -05:00
Mike Rosseel
81cf311bc7 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	wire/src/main/proto/bsmessage.proto
 2017-03-21 16:07:04 +01:00
Mike Rosseel
00987dadf7 wip 2017-03-21 07:58:39 +01:00
Manfred Karrer
93531c76d0 Apply Lombok annotations, cleanup, check hashcode and equals methods 2017-03-20 22:10:10 -05:00
Manfred Karrer
63bf1942e4 Add extraDataMap field to all StoragePayload objects 2017-03-20 16:27:54 -05:00
Manfred Karrer
6350875882 Rename PB_Offer to OfferPayload in protobuffer definition 2017-03-20 14:07:44 -05:00
Mike Rosseel
dae0112494 Merge branch 'DAO' into disk-protobuffer 
Conflicts:
	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
 2017-03-20 08:55:22 +01:00
Manfred Karrer
48446e454a Refactor price handling 2017-03-19 23:44:58 -05:00
Manfred Karrer
e65a6adb77 Refactor: Rename ContractData to Payload. 2017-03-17 16:55:44 -05:00
Manfred Karrer
a6eae2745b Refactor OptionKeys 2017-03-17 15:42:52 -05:00
Manfred Karrer
4d784d64fa Refactoring: Remove further dependencies to OfferPayload. Rename Offer in protobuffer definition to PB_Offer 2017-03-17 14:21:03 -05:00
Manfred Karrer
0b0be0bb02 Refactor Offer.Direction: Remove dependencies to OfferPayload (WIP) 2017-03-17 13:19:36 -05:00
Manfred Karrer
d793d6732b Refactor Offer and OfferPayload: Make OfferPayload pure value object 2017-03-17 12:49:26 -05:00