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
b835e7f5a5
Add missing param to log
2017-10-12 13:48:12 -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
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
Mike Rosseel
fbfb9ccc50
Merge branch 'Development' into issue544-api
2017-10-09 16:11:37 +02:00
Manfred Karrer
6904c545b0
Improve logging
2017-10-08 19:53:04 -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
Manfred Karrer
b060766537
Set phase 0 initial genesis tx
2017-10-06 20:45:07 -05:00
Manfred Karrer
fe91c8ee76
Set phase 0 genesis tx
2017-10-06 14:28:50 -05:00
Manfred Karrer
52dd76bd9a
Remove inactive blockexplorer blockr.io
2017-10-06 12:43:59 -05:00
Manfred Karrer
c3320123c5
Add log for invalid arbitrators
2017-09-25 08:55:55 -05:00
Manfred Karrer
01e0ac3f57
Add equals check and diff for contractAsJson
2017-09-23 11:14:55 -05:00
Manfred Karrer
86c20682e9
Cleanup startup process
2017-09-21 09:03:50 -05:00
Manfred Karrer
96601afb9c
Fix issue #927
2017-09-20 15:52:16 -05:00
Manfred Karrer
80111caf3b
Rename bisq.io to bisq.network.
2017-09-20 15:21:13 -05:00
Manfred Karrer
a5ab750ce8
Fix bug with missing MultiSigKey
2017-09-20 11:45:24 -05:00
Mike Rosseel
9e04fe4b15
Add missing OfferUtil and fix docs
...
Branch did not compile due to missing checkin of the OfferUtil file.
Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
2017-09-20 11:38:33 +02:00
Manfred Karrer
016626c745
Activate DAO for BTC testnet and regtest
2017-09-19 20:53:51 -05:00
Manfred Karrer
e5ac5488f7
Remove not traded altcoins
2017-09-19 18:47:55 -05:00
Manfred Karrer
4aeea11d63
Rearrange blockexplorers
2017-09-18 13:04:28 -05:00
Manfred Karrer
bc515475e0
Add OXT blockexplorer
2017-09-18 13:03:10 -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
36b266a204
Add altcoin DEC
2017-09-18 08:59:53 -05:00
Mike Rosseel
a72986ff5b
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-09-18 09:45:22 +02:00
Manfred Karrer
9544095f86
Remove never traded coins
2017-09-17 13:12:12 -05:00
Manfred Karrer
7c45fb78cc
Remove never traded coins
2017-09-17 13:10:34 -05:00
Manfred Karrer
b72d716910
Merge Development
2017-09-17 11:28:34 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development
...
Merge master to Development
2017-09-16 12:28:49 -05:00
Manfred Karrer
9c77da778e
Remove developer log
2017-09-16 10:11:39 -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
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
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
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange
2017-08-23 15:36:17 +02:00
Manfred Karrer
94203b9101
Add BSQ dashboard/statistics
2017-07-29 03:09:39 +02:00
Manfred Karrer
2a67d39d53
Cleanup
2017-07-29 00:04:31 +02:00
Manfred Karrer
db865800fb
Check for null and 0 values at setting market price
2017-07-28 13:37:26 +02:00
Manfred Karrer
50065bb5c9
Use BSQ testnet explorer for testnet
2017-07-28 01:32:44 +02:00
Manfred Karrer
6cee58824e
Add new mainnet geneis tx. Make genesisTx nullable in BsqChainState. Shuffle seedNodeAddresses and remove candiates from list. Add null checks. Filter invlaid OP_RETURN data.
2017-07-28 00:40:17 +02:00
Manfred Karrer
b593f89638
Add BTC TESTNET genesis tx, remvoe LTC genesis txs
2017-07-27 18:00:48 +02:00
Manfred Karrer
0016e33640
Add network selector to resource EntryMap file name
2017-07-27 18:00:18 +02:00
Manfred Karrer
2e8030cfb4
Add default configs
2017-07-27 17:59:05 +02:00
Mike Rosseel
779d388070
Merge branch 'Development' into issue544-api
2017-07-27 08:42:56 +02:00
Manfred Karrer
c744cb5a96
Merge branch 'Development' into DAO_phase1
2017-07-26 21:38:21 +02:00
Mike Rosseel
592bea9dad
make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test
2017-07-26 16:37:59 +02:00
Manfred Karrer
1857cc0b30
Show latest trade price as market price for currencies which have no external price feed provided but have been traded in Bisq
2017-07-26 11:44:28 +02:00
