1217 commits

Author	SHA1	Message	Date
Manfred Karrer	8a131dcd75	Cleanup	2017-03-26 15:34:44 -05:00
Manfred Karrer	d551c056c1	Refactor trade state and phase. support correct handling for payment limits in offer	2017-03-26 12:40:16 -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	4103920a31	Remove taks for laod trade fee tx (use verify task for it) (WIP)	2017-03-25 12:06:50 -05:00
Manfred Karrer	c860845c9a	Refactoring: Further renaming... (WIP)	2017-03-25 12:00:50 -05:00
Manfred Karrer	598291540e	Refactoring: Rename all usages of "offerer" with "maker" (excluding translation strings). Separate maker, taker, buyer, seller, buyerAsTaker, BuyerAsMaker, sellerAsMaker and sellerAsTaker in protocol	2017-03-25 11:50:08 -05:00
Manfred Karrer	1bfead7a77	Refactorings, add verifyFee tasks (WIP)	2017-03-25 11:05:26 -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	af258497f5	Apply @Slf4j	2017-03-24 19:52:55 -05:00
Manfred Karrer	d158b008fb	BuyerAsOfferer protocol working with timelock removed (WIP)	2017-03-24 19:42:41 -05:00
Manfred Karrer	b6b7c44004	Remove timeLock properties (WIP)	2017-03-24 15:00:37 -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
Mike Rosseel	284f405844	fix inject error	2017-03-24 13:29:09 +01:00
Manfred Karrer	510dc95ae4	Merge changes from master	2017-03-23 12:58:04 -05:00
Manfred Karrer	2520542ca6	Merge changes from master	2017-03-23 12:53:35 -05:00
Mike Rosseel	ba98228fb8	DisputeList refactoring, PaymentAccount handling (removed all subclasses is proto)	2017-03-23 13:32:58 +01:00
Manfred Karrer	57f201fa55	Reduce nr. of backups for PersistedP2PStorageData and TradeStatisitics	2017-03-22 21:31:56 -05:00
Manfred Karrer	adbb547eb1	Rename offererMultiSigPubKey to offererBtcPubKey (as well as wellers side) to not break serialized data	2017-03-22 13:31:45 -05:00
Manfred Karrer	50329567bd	Increase non trade tx fee default value. change upper limit for tx fee. increase width of data column in arbitr. screen	2017-03-22 13:04:13 -05:00
Manfred Karrer	b2a85d65f3	Merge branch 'master' into Development ... # Conflicts: # pom.xml	2017-03-22 12:14:42 -05:00
Manfred Karrer	6348c9c70a	Cleanup	2017-03-22 11:55:15 -05:00
Mike Rosseel	ee51d8793e	transaction replaced by transactionid, some lombok work	2017-03-22 16:50:31 +01:00
Mike Rosseel	68265aabf0	voteitemlist no longer extends ArrayList	2017-03-22 16:23:55 +01: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	4eedfd22b4	Merge remote-tracking branch 'origin/DAO' into disk-protobuffer ... Conflicts: wire/src/main/proto/bsmessage.proto	2017-03-21 16:07:28 +01: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	de7b73f7a9	Remove default values in case of null, apply Lombok annotations	2017-03-20 23:28:09 -05:00
Manfred Karrer	5fee4b0b66	Add missing equals/hashcode to Offer	2017-03-20 22:31:18 -05: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	a41d13a093	Remove unused fields	2017-03-20 08:59:48 -05:00
Manfred Karrer	6790eec935	Remove marketPriceTypes. Use last price in all cases (no bid and ask)	2017-03-20 00:59:20 -05:00
Manfred Karrer	0c88f204a2	Fix wrong monetaryFormat	2017-03-20 00:37:30 -05:00
Manfred Karrer	48446e454a	Refactor price handling	2017-03-19 23:44:58 -05:00
Manfred Karrer	f2c9ff247b	Use normal rolling backup in case of restore (support correct handling of pw change - to delete unencrypted backups).	2017-03-18 12:42:29 -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
Mike Rosseel	e92fd88d52	delegate test	2017-03-17 16:52:27 +01:00
Manfred Karrer	524a176305	setAddPeersFromAddressMessage	2017-03-17 00:44:32 -05:00
Manfred Karrer	30e91ea0ee	Dont use peers from AddressMessage calls in btcj if we have set our own node addresses or use localhost.	2017-03-17 00:44:01 -05:00
Manfred Karrer	af48575b7f	Apply code inspection	2017-03-16 22:01:25 -05:00
Manfred Karrer	07d428de6f	Use base package iwth same name as module in all modules.	2017-03-16 21:12:06 -05:00
Manfred Karrer	3e91b89bbd	Rename network-messages module to wire. Further refactorings.	2017-03-16 20:35:46 -05:00
Manfred Karrer	3c9111441e	Refactor package structure in network-message module. Move domain objects as far as possible.	2017-03-16 20:03:14 -05:00
Manfred Karrer	dcf71b8196	Refactor package structure in network-message module. Move domain object to core. Add readObject to Offer again	2017-03-16 18:45:48 -05:00