Commit graph

1602 commits

Author SHA1 Message Date
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
Manfred Karrer
47972382ac
Add comments for support of hash of payment account 2017-09-18 08:34:42 -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. bisq-network/bisq-exchange is too
verbose, and other repositories have been shortened as well, e.g.
bisq-network/price-relay-node has become bisq-network/pricenode.
2017-09-05 14:55:42 +02:00
Mike Rosseel
d826efc984 update dependencies to fix the build 2017-09-04 14:23:16 +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
Mike Rosseel
9456b00127 Merge branch 'Development' into issue544-api 2017-08-28 09:31:45 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange 2017-08-23 15:36:17 +02:00
Manfred Karrer
a7c0f1d16f Merge branch 'Development' into DAO_phase1 2017-08-09 12:48:56 +02:00
Manfred Karrer
e8c46c9709 Merge branch 'master' into Development
# Conflicts:
#	doc/build.md
2017-08-09 12:48:07 +02:00
Chris Beams
6ece78352f
Replace snapshot versions of JitPack deps with fixed SHAs (#899) 2017-08-09 12:41:18 +02:00
Chris Beams
ae05c015b9
Consume custom bitcoinj/libdojh/btcd deps via JitPack (#899)
This change removes the need to clone and build bisq's forks of
bitcoinj, libdohj and btcd-cli4j in order to build bisq itself.
2017-08-09 12:13:47 +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
ba2fc3c162 Merge branch 'Development' into DAO_phase1 2017-07-26 13:21:07 +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
Manfred Karrer
03c33964a7 Add more selectors to filter. 2017-07-26 00:07:44 +02:00
Mike Rosseel
6d782cdd73 adding command-line switch to GUI, ENABLE_API 2017-07-25 18:31:11 +02:00
Mike Rosseel
8602108ef3 Merge branch 'Development' into issue544-api 2017-07-25 16:36:27 +02:00
Mike Rosseel
dc4e169602 update dependency versions for api (dropwizard/swagger compatibility): guava, jackson-annotations. 2017-07-25 16:32:19 +02:00
Manfred Karrer
72a7104f94 Refactoring: Merge BsqBlockVo into BsqBlock, TxInputVo into TxInput and TxOutputVo into TxOutput 2017-07-24 20:05:50 +02:00
Mike Rosseel
537a99eb0f adding healthchecks, adapting offer_make to new ctor (wip), adding banner, start of swagger integration 2017-07-18 17:32:44 +02:00
Mike Rosseel
337610ef7c Merge branch 'Development' into issue544-api 2017-07-17 13:19:24 +02:00
Manfred Karrer
a7f3d68cb1 Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir). 2017-07-17 10:05:08 +02:00
Mike Rosseel
cda82172e3 Merge branch 'Development' into issue544-api
Conflicts:
	.idea/codeStyleSettings.xml
2017-07-17 09:03:15 +02:00
Manfred Karrer
c237c64550 Ignore failing tests, add TODO 2017-07-16 17:12:45 +02:00