Mike Rosseel
ebe23a8c62
Merge remote-tracking branch 'upstream/Development' into netlayer
...
Conflicts:
network/pom.xml
network/src/main/java/io/bisq/network/p2p/network/TorNetworkNode.java
2017-10-30 12:59:57 +01:00
sqrrm
bd1848bba3
Fix #559 , misaligned trade data
...
Store the ticks to be displayed for easier reference and comparison
rather. Properly handle intervals for the local time zone.
2017-10-29 10:50:46 +01:00
sqrrm
7d70f61e68
Fix TradesChartsViewModelTest
...
These tests now run. One test fails due a TradesChartsViewModel
bug/inconsistency, to be fixed.
2017-10-29 10:50:46 +01:00
Manfred Karrer
d939c902f0
Fix wrong redundatnt % symbol in take offer screen
2017-10-27 19:42:06 -05:00
Manfred Karrer
63cdbaf23b
Fix wrong currency display and text in take offer screen
2017-10-27 19:38:22 -05:00
Manfred Karrer
065a57606a
Show recommended miner fee in popup when ask user for funding offer
2017-10-27 18:25:08 -05:00
Manfred Karrer
c190d7f1df
Remove balance listener when taking offer
2017-10-27 17:49:38 -05:00
Manfred Karrer
412fba82c3
Remove balance listener when placing offer
2017-10-27 17:47:02 -05:00
ivkovnikola
8a3abcca43
Merge request for INXT
2017-10-27 20:23:57 +02:00
Manfred Karrer
9ff2c643bd
Only show fee info popup once
2017-10-27 11:40:47 -05:00
Mike Rosseel
5fc596b805
Integrate 0.3.1 version of netlayer, still not working.
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-27 15:00:15 +02:00
Manfred Karrer
462fc2a472
Remove maxTradePeriod from PaymentAccountPayload
2017-10-26 19:54:06 -05:00
Manfred Karrer
2a0547d508
Show popup if seed or price relay node get banned. Cleanups.
2017-10-26 19:01:36 -05:00
Manfred Karrer
afaabf9e36
Add support of seed and price rleay node filters. Use guice in P2P network domain classes.
2017-10-26 15:46:48 -05:00
Manfred Karrer
90cfc84d35
Add filter for seed and price relay nodes
2017-10-25 19:16:52 -05:00
Manfred Karrer
2c84623154
Add filter for arbitrators
2017-10-25 17:24:54 -05:00
Manfred Karrer
d6e1f954b7
Merge remote-tracking branch 'origin/Development' into Development
2017-10-25 16:04:19 -05:00
Manfred Karrer
f24cbd9592
Merge Terracoin
2017-10-25 16:04:01 -05:00
Manfred Karrer
e8290e3b8a
Fix missing verifications, handle altcoins, cleanup
2017-10-25 14:18:26 -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
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
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
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
085f6b354b
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-20 18:54:23 -05:00
Manfred Karrer
1206878579
Add peers account age witness verifications in trade process
2017-10-17 20:41:33 -05: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
vroehrig
801ffaefce
Update AltCoinAddressValidator.java
2017-10-15 08:22:12 +13:00
Manfred Karrer
a3ab418079
Filter offer by account age withness age (WIP)
2017-10-14 12:54:03 -05:00
Manfred Karrer
cb50faca95
Apply age based trade limit to offer
2017-10-13 21:36:15 -05:00
Manfred Karrer
b1a45f5365
Show account age and categroy in PeerIcon
2017-10-13 20:32:23 -05:00
vroehrig
1e6c12cec7
Update AltCoinAddressValidator.java
2017-10-14 13:16:07 +13:00
vroehrig
5dbb545bdd
Create XCNAddressValidator.java
2017-10-14 13:14:35 +13:00
vroehrig
aed946370b
Update AltCoinAddressValidatorTest.java
2017-10-14 13:13:58 +13:00
Manfred Karrer
7c122369be
Show account age in peer info icon
2017-10-13 11:41:26 -05:00
Manfred Karrer
5adda7b64f
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-13 10:30:53 -05:00
Manfred Karrer
46b2a14954
Fix wrong getMakerFee method, cleanup
2017-10-13 10:12:32 -05:00
Manfred Karrer
ca171bcb43
Merge branch 'api-pr1' of https://github.com/mrosseel/bisq-exchange into mrosseel-api-pr1
2017-10-13 09:16:53 -05:00
Mike Rosseel
0d411707e5
Documentation and cleanup of Offer related classes
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-13 14:40:18 +02:00
Manfred Karrer
5e8c8310ba
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-12 19:44:30 -05:00
Manfred Karrer
b0f451a2df
Merge remote-tracking branch 'upstream/Development' into Development
2017-10-12 19:11:26 -05:00
Manfred Karrer
9543b01d81
Merge branch 'master' into Development
2017-10-12 14:11:10 -05:00
Mike Rosseel
68048bc2d3
Removing all changes to make GUI work with the API
...
The other changes in GUI, namely small refactoring to have the GUI
and the API use the same methods to calculate things have been
left in place.
2017-10-12 17:32:59 +02:00
Mike Rosseel
c79d9e992c
Reverting non-relevant changes
2017-10-12 16:12:21 +02:00
Manfred Karrer
5d0c2d65c3
Change restrictiron for pw lenght from 50 to 500 chars
2017-10-11 15:17:01 -05:00
Mike Rosseel
0755cac9d1
Merge remote-tracking branch 'origin/Development' into api-pr1
...
Conflicts:
common/src/main/java/io/bisq/common/locale/LocaleUtil.java
2017-10-11 14:38:34 +02:00
Manfred Karrer
01cf823d7a
Prepare merge Dev
2017-10-11 07:21:50 -05:00
Manfred Karrer
e179475bb9
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange
2017-10-11 07:14:01 -05:00
Manfred Karrer
27ecbf7260
Publish accountAgeWitness data to P2P network (WIP)
2017-10-09 21:14:40 -05:00
Manfred Karrer
130c9bd5bc
Merge branch 'Development' into PaymentAccountAgeVerification
2017-10-09 09:39:52 -05:00
Mike Rosseel
fbfb9ccc50
Merge branch 'Development' into issue544-api
2017-10-09 16:11:37 +02:00
Manfred Karrer
a8c81871c9
Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development
2017-10-08 21:12:02 -05:00
Manfred Karrer
a76b4d17f5
Show better text in PeerInfo if 0 trades
2017-10-08 21:03:08 -05:00
Manfred Karrer
361a520048
Remove sum column in market offerbook tables
2017-10-08 20:48:11 -05:00
Manfred Karrer
4522f50149
Fix wrong fee group at Create offer screen. Improve wording
2017-10-08 20:39:09 -05:00
Manfred Karrer
cb24b973ba
Don't show fee and security deposit fields if BSQ is not enabled
2017-10-08 19:53:52 -05:00
Manfred Karrer
ce25beff5e
Merge master to Development
2017-10-06 21:04:04 -05:00
Manfred Karrer
e5738507c3
Merge branch 'master' into Development
2017-10-06 20:57:32 -05:00
Pepper Lebeck-Jobe
a85611ca4d
Add a paddedId and use it for String concatenation
...
See #957 for why this is needed.
Fixes #957
2017-10-06 16:21:58 +02:00
Manfred Karrer
e6498e2659
Remove pre-filled entries in ManualPayoutTxWindow
2017-09-26 09:06:12 -05:00
Manfred Karrer
da2b12f71a
Rename SpendFromDepositTxWindow to ManualPayoutTxWindow
2017-09-26 08:47:55 -05:00
Manfred Karrer
efcc7ff05c
Remove accountSalt from trade messages and TradePeer
2017-09-25 12:47:09 -05:00
Manfred Karrer
b667e1b18a
Rename PaymentAccountAgeWitnessService to AccountAgeWitnessService
2017-09-25 09:16:01 -05:00
Manfred Karrer
8c7e1fd04a
Add verification methods, add hash to offer, add salt to trde process (WIP)
2017-09-25 09:13:23 -05:00
Mike Rosseel
bc4460bc9e
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-09-22 13:09:06 +02:00
Manfred Karrer
af27682f2f
Merge Development
2017-09-21 09:56:01 -05:00
Manfred Karrer
86c20682e9
Cleanup startup process
2017-09-21 09:03:50 -05:00
Ellaismer
a61f37b6e1
Add Ellaism coin
2017-09-21 04:38:36 +08:00
Manfred Karrer
80111caf3b
Rename bisq.io to bisq.network.
2017-09-20 15:21:13 -05:00
Manfred Karrer
ac0bf80606
Support different keys for code signing in download-tool
2017-09-20 15:05:25 -05:00
Manfred Karrer
981e6814cc
Add Chris Beams' gpg key 5BC5ED73 to resources
2017-09-20 13:07:50 -05:00
Manfred Karrer
016626c745
Activate DAO for BTC testnet and regtest
2017-09-19 20:53:51 -05:00
Manfred Karrer
2f459cd05e
Decrease font size and width of Tac window for small screens
2017-09-19 19:18:45 -05:00
Manfred Karrer
0bc339f916
Remove DOGE from base currency selection
2017-09-18 12:53:23 -05:00
Manfred Karrer
322ffab270
Cleanup
2017-09-18 12:21:48 -05:00
Manfred Karrer
76e031bbb2
Merge Development
2017-09-18 11:48:25 -05:00
Roznovjak
8e7e720bb7
Update AltCoinAddressValidatorTest.java
...
DCT integration
2017-09-18 15:03:03 +02:00
Roznovjak
668e9758af
Update AltCoinAddressValidator.java
...
DCT integration
2017-09-18 14:58:35 +02:00
Mike Rosseel
a72986ff5b
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-09-18 09:45:22 +02:00
Manfred Karrer
b72d716910
Merge Development
2017-09-17 11:28:34 -05:00
Manfred Karrer
1aa3038a07
Merge WACoin
2017-09-17 10:16:00 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development
...
Merge master to Development
2017-09-16 12:28:49 -05:00
Manfred Karrer
7daee4f212
Remove comment
2017-09-16 12:22:20 -05:00
Manfred Karrer
262c947d85
Merge PR 919 (ZenCash)
2017-09-16 12:16:54 -05:00
Mike Rosseel
7e980c1ad2
Fix an offer_make issue, add wallet tx support, remove offer_take param
...
This fixes an offer_make issue, but there is still one left.
General cleanup of model files/parameters no longer needed.
Remove offer_take savings_wallet param because it's always implied,
external wallets are not yet supported.
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-09-14 12:09:41 +02:00
Казьмина Татьяна
daaeddb968
Add new altcoin with code "PNC": additional code in AltCoinAddressValidator and AltCoinAddressValidatorTest and 2 specific classes: PNCAddressValidator and PNCParams.
2017-09-09 15:23:00 +03:00
smrtz
728e178828
Adds ZenCash Support
2017-09-05 18:38:59 -04:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange}
...
This is a follow on to 6ffa52a00
2017-09-05 14:55:42 +02:00
Mike Rosseel
68a7e7c9c5
check that the corrent paymentaccount is used for this offer
2017-09-04 19:59:40 +02:00
Mike Rosseel
9101aa367b
fix startup issues in some cases, where the p2pservice calls an onmessage before the storagefile is initialised.
...
Aligning Api module with other modules by using the AppSetupWithP2P class.
2017-09-04 13:26:56 +02:00
Mike Rosseel
46641200bc
adding more checks to offer_make, provide a cleaner/easier feedback mechanism between proxy/api.
...
Use threading to wait for offer creation results, add callback for errors.
Most exceptions coming from the bisq code are now propagated to the api result.
Added market check to forbid offers on non-existing markets.
TODO: further testing of rest api, adding checks
2017-09-02 11:39:27 +02:00
