Commit graph

4648 commits

Author SHA1 Message Date
Manfred Karrer
963fec44a3
Merge branch 'master' into Development
# Conflicts:
#	doc/build.md
2017-10-25 12:20:03 -05:00
Manfred Karrer
c3ba1bf05c
Merge remote-tracking branch 'upstream/master' 2017-10-25 12:17:48 -05:00
Manfred Karrer
e859d0d48f
Fix wrong data check 2017-10-23 17:45:01 -05:00
Manfred Karrer
75e95aef92
Use peers witness not the one from the offer for verification call 2017-10-22 22:06:04 -05:00
Manfred Karrer
f2d1e8b6f6
Remove signature from hash 2017-10-22 21:18:53 -05:00
Manfred Karrer
fe4514b460
Remove PublishAccountAgeWitness task 2017-10-22 19:48:34 -05:00
Manfred Karrer
611428f5f0
Use peers currnet date for witness age calculation 2017-10-22 19:22:46 -05:00
Manfred Karrer
3a50f999db
User max trade limit from offer not the takers local one for the witness age verification 2017-10-22 18:17:34 -05:00
Manfred Karrer
6520010bb5
Add check for size of hash 2017-10-21 23:30:54 -05:00
Manfred Karrer
14bb75ded5
Check accountWitness date only if we receive it from other peers in the P2P network 2017-10-21 23:05:52 -05:00
Manfred Karrer
7c78db5101
Apply account age limit in take offer screen 2017-10-21 20:51:41 -05:00
Manfred Karrer
801a9174ad
Dont publish altcoin account witness 2017-10-21 20:32:05 -05:00
Manfred Karrer
df8ed79e0c
Set extraMap to null with altcoins 2017-10-21 20:30:44 -05:00
Manfred Karrer
db40ae10a5
Re-publish witness data at startup 2017-10-21 14:29:02 -05:00
Manfred Karrer
e56fc44956
Only use accumulated hash in Witness object 2017-10-21 14:07:48 -05:00
Manfred Karrer
a33923cc1e
Add missing linebreak 2017-10-21 09:11:18 -05:00
Manfred Karrer
96fe221eac
Fix path in build.md 2017-10-20 19:00:13 -05:00
Manfred Karrer
1083996d08
Merge branch 'stemarsh-Development' into Development 2017-10-20 18:57:06 -05:00
Manfred Karrer
04cc0707e7
Merge PR 979 2017-10-20 18:56:47 -05:00
Manfred Karrer
085f6b354b
Merge branch 'Development' into PaymentAccountAgeVerification 2017-10-20 18:54:23 -05:00
Manfred Karrer
e4060a8967
Merge remote-tracking branch 'upstream/master' 2017-10-20 18:53:29 -05:00
Manfred Karrer
2259cf7558
Merge branch 'master' into Development 2017-10-20 18:52:08 -05:00
Manfred Karrer
06b0ddf696
Merge remote-tracking branch 'origin/master' 2017-10-20 18:51:24 -05:00
Manfred Karrer
f9635cd7e1
Fix old github repo address 2017-10-20 18:50:31 -05:00
Stephen Marsh
8cf2b1c7a9 Forgot .git extention for URL 2017-10-20 16:00:11 -04:00
Stephen Marsh
32e5060dda Updated build documentation to point to correct repository 2017-10-20 15:53:36 -04:00
Manfred Karrer
1e315a4097
Merge branch 'vroehrig-Cryptonite_XCN_AddRequest' into Development 2017-10-20 09:18:42 -05:00
Manfred Karrer
515311dc98
Move Cryptonite to right position in list 2017-10-20 09:18:21 -05:00
Manfred Karrer
a8476a73be
Merge branch 'Cryptonite_XCN_AddRequest' of https://github.com/vroehrig/exchange into vroehrig-Cryptonite_XCN_AddRequest 2017-10-20 09:16:38 -05:00
Manfred Karrer
0871459cba
Add Terracoin 2017-10-20 09:14:07 -05:00
Manfred Karrer
eaae6a641f
Merge branch 'Development' of https://github.com/diego-ab/exchange into diego-ab-Development 2017-10-20 09:11:43 -05:00
Manfred Karrer
32e54e394a
Merge branch 'ripcurlx-development' into Development 2017-10-20 08:42:30 -05:00
Chris Beams
61547d6a83 Add Editorconfig settings
Per https://github.com/bisq-network/docs/blob/master/CONTRIBUTING.adoc.

See comments in #959 for details.
2017-10-20 10:13:19 +02:00
Manfred Karrer
c26896fb1d
Merge branch 'mrosseel-docker-seednode-pr' into Development 2017-10-19 10:41:33 -05:00
Manfred Karrer
5cd47a610f
Remove space 2017-10-19 10:41:22 -05:00
Mike Rosseel
5ddec3e4f2
Dockerfile for a hidden service seednode
Adds Dockerfile and docker-compose.yml files to easily build a new
seednode from the latest master branch. The Dockerfile assumes you
have a hostname and private_keys.
Also small fixes to SeedNode/SeedNodeMain.

Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-19 14:33:43 +02:00
Manfred Karrer
b750727a95
Derive nonce from peers data input 2017-10-17 22:20:36 -05:00
Manfred Karrer
a5533b9ffb
Add check to only add AccountAgeWitness if it is not older than 1 day. 2017-10-17 21:10:52 -05:00
Manfred Karrer
1206878579
Add peers account age witness verifications in trade process 2017-10-17 20:41:33 -05:00
Manfred Karrer
4c2f06f0be
Prevent that a dev arbitrator can be published on Mainnet 2017-10-17 12:56:58 -05:00
vroehrig
c190f0c3b7 Update CurrencyUtil.java
sorted entries alphabetically as per requirement
2017-10-17 21:19:22 +13:00
Manfred Karrer
5f9d59143e
Add salt field to payment method forms 2017-10-16 18:44:42 -05:00
Manfred Karrer
b60579fc37
Add account age to payment method forms 2017-10-16 18:16:24 -05:00
Manfred Karrer
f6c0d02bc3
Refactor: Rename addAllowedPeriod to addLimitations 2017-10-16 17:01:00 -05:00
Manfred Karrer
654270ec94
Add maxTradeLimit to BtcValidator 2017-10-16 17:00:16 -05:00
Manfred Karrer
851792d1f1
Add new P2P network data structure for AccountAgeWitness without pubKey 2017-10-16 15:52:54 -05:00
diego-ab
7b19f2642c Add Terracoin 2017-10-16 21:47:03 +01:00
Manfred Karrer
0f322ad37f
Add PB support for excludeFromJsonDataMap to all PaymentPayload classes 2017-10-15 13:36:12 -05:00
Manfred Karrer
5d6d457622
Refactoring: Rename PersistedEntryMap to PersistableEntryMap 2017-10-15 11:35:01 -05:00
Manfred Karrer
6056912a00
Refactoring: Remove base interface PersistablePayload from ExpirablePayload 2017-10-15 11:32:08 -05:00