mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,264 Commits 4 Branches 148 Tags 4.3 GiB
0a1dc70ec0
Commit Graph

1871 Commits

Author SHA1 Message Date
Manfred Karrer
1d7c15f34a
Make validators not singleton. Remove address from fee estimation call 2017-11-30 19:43:49 -05:00
Manfred Karrer
6b84642015
Use FullAddress for filtered node check 2017-11-30 19:42:48 -05:00
Manfred Karrer
d7d5ffe9e1
Fix bugs with comp x 2017-11-30 11:22:59 -05:00
Manfred Karrer
fd386c564b
Make comp requests persistable 2017-11-30 10:00:05 -05:00
Manfred Karrer
bf87dc3713
Adjust fees and sec. deposit 2017-11-28 18:53:19 -05:00
Manfred Karrer
fe92092f9c
Hide fee window if DAO trading is deactivated 2017-11-28 18:38:16 -05:00
Manfred Karrer
0e44efcfb9
Use fee selection popup for take offer 2017-11-28 18:12:43 -05:00
Manfred Karrer
a269be7f16
Apply formatting 2017-11-27 12:40:23 -05:00
Manfred Karrer
8572ea76d1
Fix missing handling for case when no other seed nodes are available 2017-11-27 11:30:34 -05:00
Manfred Karrer
6ac331a368
Use new regtest genesis tx 2017-11-27 11:29:23 -05:00
Manfred Karrer
0aaab849eb
Add second seed node for Dash and LTC 2017-11-27 08:03:24 -05:00
Manfred Karrer
6159ae7f9f
Remove failing btc node 2017-11-26 17:12:10 -05:00
Manfred Karrer
e3c9f150f5
Clean up 2017-11-26 16:35:47 -05:00
Manfred Karrer
7a1e377ec4
Fix SetupIconFile path. Comment out dead btc node 2017-11-26 16:18:56 -05:00
Manfred Karrer
cc0c540afc
Reduce nr. of btcj nodes from 12 to 10. Improve logging. Cleanup. 2017-11-26 13:48:53 -05:00
Manfred Karrer
838bf72a60
Use libdohj bba4088c. Improve logging. Cleanup 2017-11-26 11:40:53 -05:00
Mike Rosseel
b8b84bc35f
Add Bitcoin Cash, Bitcoin Gold and Bitcoin Clashic so that these can 
be transacted in a privacy-preserving way
 2017-11-25 10:07:25 +01:00
Manfred Karrer
07d85b3f8b
Set version 0.6.1. Add versions for seed and statistics nodes 2017-11-24 14:23:49 -05:00
Manfred Karrer
61a2f8303d
Add Madcoin 2017-11-24 14:00:56 -05:00
Manfred Karrer
af754706f6
Add Sepa instant payment 2017-11-23 19:13:43 -05:00
Manfred Karrer
706bc19afd
Fix layout issue 2017-11-23 19:10:03 -05:00
Manfred Karrer
9db3e5b4d5
Fix missing guice bindings for statistics node 2017-11-16 23:23:01 -05:00
Manfred Karrer
b9132df5f4
Add new btc node 2017-11-16 08:48:53 -05:00
Manfred Karrer
65c9729b00
Improve logging, fix explorer url 2017-11-15 23:22:30 -05:00
Manfred Karrer
b045c278d4
Don't re-broadcast old tradestatistic objects 2017-11-15 22:28:58 -05:00
Manfred Karrer
b8125ccac5
Move applyLatestBisqMarketPrice() to PriceFeedService 2017-11-15 22:11:13 -05:00
Manfred Karrer
a788e25929
Add new seed and price relay node 2017-11-15 20:10:27 -05:00
Manfred Karrer
6186a3e8cf
Merge branch 'newTradeStat' into Development 2017-11-15 19:42:29 -05:00
Manfred Karrer
d99461deee
Use new data structure for TradeStatistics 2017-11-15 19:22:11 -05:00
Chris Beams
8516cef2e1
Remove btc.beams.io Bitcoin Core node for now 
See https://github.com/bisq-network/roles/issues/39#issuecomment-344681479
 2017-11-15 19:20:26 +01:00
Manfred Karrer
73865ec8b8
Remove email from BankAccontPayload 2017-11-14 22:18:05 -05:00
Manfred Karrer
4681574e21
Add Blockcypher explorer 2017-11-14 18:29:42 -05:00
Manfred Karrer
a2380a466e
Decrease delay for persistence (again) 2017-11-14 17:28:09 -05:00
Manfred Karrer
e13ef7a00d
Use max 12 btc nodes 2017-11-14 17:19:42 -05:00
Manfred Karrer
e9193316df
Set ineetAddress for BTC onion peers in PeerAddress to avoid nullpointer at wallet persistance 2017-11-14 17:19:23 -05:00
Manfred Karrer
8f57a95976
Increase delay for persistance 2017-11-14 15:49:00 -05:00
Manfred Karrer
a80092388f
Add new btc node 3r44ddzjitznyahw.onion 2017-11-14 15:48:19 -05:00
sqrrm
6ada57adb4
Fix national account email mismatch 
For newly created account the email is set to empty string but in the
protobuf conversion it was set to null. Now fixed to use "" for protobuf
conversion as well.
 2017-11-14 19:06:57 +01:00
Manfred Karrer
16f23cc310
Remove max limit check for fiat price and volume 2017-11-14 09:42:42 -05:00
Manfred Karrer
7cb8e02e9f
Add new seed node 2017-11-13 15:36:36 -05:00
Manfred Karrer
1c357f915d
Set seed nodes 2017-11-13 12:04:39 -05:00
Manfred Karrer
90760ffc78
Add missing Capabilities 2017-11-13 09:29:22 -05:00
Manfred Karrer
2778456b13
Cleanup seed restore screens. Add try/cathc for wallet encryption. Add more warnings when applying seed words. 2017-11-12 21:01:57 -05:00
Manfred Karrer
32180c9fa4
Add <open log file> button to error msg popup 2017-11-12 20:16:31 -05:00
Manfred Karrer
11338f6567
Fix nullable problems in DisputeResult 2017-11-12 19:43:10 -05:00
Manfred Karrer
15243f6a01
Add Particl 2017-11-12 18:24:17 -05:00
Manfred Karrer
2583ddf044
Fix text. Improve logging. Add check for BankAccount 2017-11-12 12:45:48 -05:00
Manfred Karrer
6f0a7e7036
Add missing parts for WU support 2017-11-11 15:23:10 -05:00
Nolaan
8b72eba1e0 Rebase correction 
Add one more argument
 2017-11-11 18:11:21 +01:00
Nolaan
48dcdf58fc First Workflow 
First Western Union Workflow
 2017-11-11 16:45:41 +01:00
Nolaan
53919fb6c8 Western Union payment method 
Prepare Western Union Paymenet Method UI and logic.
 2017-11-11 16:45:41 +01:00
Manfred Karrer
01d4c6fb8c
Set delay for persistence in each client 2017-11-10 21:17:40 -05:00
Manfred Karrer
330a531e01
Add dispute to list before setting state in trade (caused bug in UI) 2017-11-10 13:29:02 -05:00
Manfred Karrer
1134c8bc71
Add new clearnet node for dev testing 2017-11-10 13:04:28 -05:00
Manfred Karrer
2b5ad475e0
Add btc node from mrosseel 2017-11-10 12:34:06 -05:00
Manfred Karrer
7067b0f3be
Set new genesis tx for November redistribution 2017-11-09 19:24:58 -05:00
Manfred Karrer
a4136631ed
Don't use SeedPeers for testnet 2017-11-09 17:57:44 -05:00
Manfred Karrer
17bb2ae974
Request price after tor is ready not after hidden service is published 2017-11-09 17:05:47 -05:00
Manfred Karrer
f1ff395cc5
Ignore provided bitcoin nodes if testnet or other base currency is used 2017-11-09 16:41:57 -05:00
Manfred Karrer
97fd462761
Add btc.jochen-hoenicke.de to bitcoin nodes 2017-11-09 14:43:11 -05:00
Manfred Karrer
6e19c69a47
Add maxTradePeriod to PaymentAccountPayload again as it would break trade contract otherwise 2017-11-09 14:34:37 -05:00
Manfred Karrer
df43af6aae
Add new pricerelay node 2017-11-09 12:52:43 -05:00
Manfred Karrer
07bf0b3fc0
Add bitcoin core ndoe bcwat.ch 2017-11-08 17:27:14 -05:00
Manfred Karrer
118d185282
Add latest altcoins to printAllCurrencyStats 2017-11-08 17:00:03 -05:00
Manfred Karrer
7e3b7f22cf
Remove outdated in_dev translation files 2017-11-08 11:21:07 -05:00
Manfred Karrer
677d7dc477
Set v0.6.0 2017-11-08 11:11:51 -05:00
Manfred Karrer
04dacca556
Add operator to btc nodes. Add more nodes 2017-11-08 11:08:24 -05:00
Manfred Karrer
96081ddb63
Add provided bitcoin nodes and filter message for deactivating public network selection. 2017-11-07 23:43:08 -05:00
Manfred Karrer
9b2e9e2986
Support onion addresses for custom bitcoin nodes 2017-11-07 13:20:18 -05:00
Manfred Karrer
58ed7c9e6a
Make user selection in tor network settings persistable 2017-11-06 21:49:19 -05:00
Manfred Karrer
b0aeef472e
Create a dummy tx to estimate create offer tx size for finding correct tx fee 2017-11-06 10:58:12 -05:00
Manfred Karrer
a4b4737f95
Adjust fees and security deposit 2017-11-05 20:56:29 -05:00
Manfred Karrer
fa2b14ba0c
Add default bridges from Tor browser and UI 2017-11-04 22:46:06 -05:00
Manfred Karrer
845e3363ac
Handle bridgeAddresses as nullable 2017-11-04 14:48:55 -05:00
Manfred Karrer
cb568ac05a
Merge branch 'Development' into netlayer 
# Conflicts:
#	core/src/main/java/io/bisq/core/user/PreferencesPayload.java
 2017-11-04 14:42:56 -05:00
Chris Beams
e1a6f87a98
Reformat Java sources with Editorconfig settings 
This change is the result of a global reformatting in IDEA now that
`.editorconfig` settings are in place. Note that Editorconfig's
`continuation_indent_size` property [1] was also added and set to 8
here, as this reflects the dominant style already present in the
codebase. i.e. in created a much smaller diff to set the continuation
indent to 8 that would have been created leaving this property out and
letting it default to 4.

[1]: https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
 2017-11-04 20:11:30 +01:00
Manfred Karrer
753b5afe91
Use RegTestHost.NONE as default 2017-11-04 11:10:05 -05:00
Manfred Karrer
04bc3d7ef4
Merge branch 'Development' into netlayer 2017-11-04 10:55:56 -05:00
Mike Rosseel
f1afee48dc
Bug fix in WalletSetup 
so far i understand your version is working bc another bug in the
walletsetup where the Socks5MultiDiscovery is not used. so u use default
dnsdiscover which leaks dns. that works only with SafeSocks 0.
if using Socks5MultiDiscovery as is it should i only get 4 nodes form dns seeds.

Signed-off-by: Mike Rosseel <mike@eon-consult.be>
 2017-11-04 16:33:20 +01:00
Manfred Karrer
d8845f0cc6
Refactor getWitness method 2017-11-03 11:48:22 -05:00
Mike Rosseel
dfb7745f27
Merge remote-tracking branch 'upstream/Development' into netlayer 2017-11-02 16:24:46 +01:00
Mike Rosseel
c7e51e1593
Fixed the nullable bridgeAddresses proto handling 
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
 2017-11-02 16:04:56 +01:00
Mike Rosseel
0ec4b5edac
Merging and adapting old bridges UI code to new bisq structure 
Had to merge by hand because of the many changes in the new bisq
structure. Also removed the 'default bridges' concept because it's
discouraged to do that.
Open issues: UI screen is still WIP, and bitcoinj SOCKS proxy error
which makes that we can't connect to bitcoin nodes anymore.

Signed-off-by: Mike Rosseel <mike@eon-consult.be>
 2017-11-02 15:50:06 +01:00
Manfred Karrer
f1a3c6e7b2
Fix bugs described in issue #989 2017-11-01 18:38:00 -05:00
Manfred Karrer
ab4d7b066b
Fix bug with not displaying correct price market label and latest bisq price 2017-10-30 18:52:41 -05:00
Manfred Karrer
af7effc1d8
Merge branch 'ajustFee' into Development 2017-10-30 15:58:21 -05:00
Manfred Karrer
e7fa8dbbb3
Change price relay node address 2017-10-29 21:36:10 -05:00
Manfred Karrer
6e4175f480
Add all missing counties 2017-10-26 21:45:46 -05:00
Manfred Karrer
462fc2a472
Remove maxTradePeriod from PaymentAccountPayload 2017-10-26 19:54:06 -05:00
Manfred Karrer
61d64a341d
Change account age based limit in SECOND_PHASE 2017-10-26 19:30:52 -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
3c93bb4527
Reduce trade fees 2017-10-25 16:38:44 -05:00
Manfred Karrer
b7c7f6f615
Reduce security deposit 2017-10-25 16:31:40 -05:00
Manfred Karrer
e8290e3b8a
Fix missing verifications, handle altcoins, cleanup 2017-10-25 14:18:26 -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
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
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
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
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
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
679f3bbf37
Refactoring: Rename PersistedStoragePayload to PersistableNetworkPayload 2017-10-15 11:26:42 -05:00
Manfred Karrer
9c478312b6
Refactoring: Rename StoragePayload to ProtectedStoragePayload 2017-10-15 11:19:43 -05:00
Manfred Karrer
fe38f3a423
Rename Hash.getHash to Hash.getSha256Hash 2017-10-15 11:00:00 -05:00
Manfred Karrer
bd74d03ac1
Use Ripemd with sha256 hash to reduce size of witness hash to 20 bytes 2017-10-15 10:58:49 -05: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
054b746cc5
Reduce trade limits 2017-10-13 20:57:08 -05:00
Manfred Karrer
b1a45f5365
Show account age and categroy in PeerIcon 2017-10-13 20:32:23 -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
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
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
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
175c1e4b96
Add AccountAgeWitnessMap to PB (WIP) 2017-10-06 13:58:35 -05:00
Manfred Karrer
52dd76bd9a
Remove inactive blockexplorer blockr.io 2017-10-06 12:43:59 -05:00
Manfred Karrer
6de0355a4f
Add AccountAgeWitness to PB 2017-09-25 13:07:10 -05:00
Manfred Karrer
efcc7ff05c
Remove accountSalt from trade messages and TradePeer 2017-09-25 12:47:09 -05:00
Manfred Karrer
952c0d00ad
Add accountSalt to tradingPeer 2017-09-25 12:27:56 -05:00
Manfred Karrer
5d960dd901
Change comments 2017-09-25 12:17:29 -05:00
Manfred Karrer
94e2c1bf66
Remove dev value for accountSalt 2017-09-25 11:16:00 -05:00
Manfred Karrer
6274b646ed
Move salt from PaymentAccount to PaymentAccountPayload 2017-09-25 11:10:49 -05:00
Manfred Karrer
091e766e21
Add RestrictedByContractJson interface 2017-09-25 09:41:29 -05:00
Manfred Karrer
791c16a2e6
Add module consensus 2017-09-25 09:41:10 -05:00
Manfred Karrer
d349acb09e
Fix comments 2017-09-25 09:31:07 -05:00
Manfred Karrer
b667e1b18a
Rename PaymentAccountAgeWitnessService to AccountAgeWitnessService 2017-09-25 09:16:01 -05:00
Manfred Karrer
fb5b8ecc0f
Rename PaymentAccountAgeWitness to AccountAgeWitness 2017-09-25 09:15:20 -05:00
Manfred Karrer
ea1666a665
Rename getPayload to createPayload in PaymentAccount 2017-09-25 09:14:29 -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
Manfred Karrer
4ef8309153
Add TakerVerifyOffersAgeWitnessHash to taker protocols 2017-09-25 09:12:02 -05:00
Manfred Karrer
c3320123c5
Add log for invalid arbitrators 2017-09-25 08:55:55 -05:00
Manfred Karrer
6d1a40dbd5
Merge branch 'Development' into PaymentAccountAgeVerification 2017-09-23 11:15:37 -05:00
Manfred Karrer
01e0ac3f57
Add equals check and diff for contractAsJson 2017-09-23 11:14:55 -05:00
Manfred Karrer
007142ed9b
Add AgeWittness domain (WIP) 2017-09-23 10:08:32 -05:00
Manfred Karrer
fcd3106eb4
Remove comment 2017-09-21 09:57:33 -05: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
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
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
Manfred Karrer
b7d8a0acb6 set version 0.5.2 2017-07-16 16:29:10 +02:00
Manfred Karrer
a2563fd0d4 Cleanup, improve comments, small refactorings 2017-07-16 16:06:05 +02:00
Manfred Karrer
bbacd09074 Fix missing break 2017-07-16 15:32:43 +02:00
Manfred Karrer
0b6c3c04da Fix tests 2017-07-16 03:29:52 +02:00
Manfred Karrer
25f9368990 Add info for wallet restore 2017-07-16 02:35:03 +02:00
Manfred Karrer
50d9c453ba Fix wrong decimals for fiat price and volume for offer json 2017-07-16 02:34:26 +02:00
Manfred Karrer
349ae774a8 Increase trade limits to 2 BTC for OK_PAY and Altcoins 2017-07-16 01:16:35 +02:00
Manfred Karrer
51e8aae991 Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract) 2017-07-16 00:34:46 +02:00
Manfred Karrer
04fa5f079f Remove email from bank accounts and fasterpayment 2017-07-15 23:09:13 +02:00
Manfred Karrer
f8ed97cb2e Merge branch 'Development' into 0.5.2 
# Conflicts:
#	core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
 2017-07-15 14:57:42 +02:00
Manfred Karrer
edb5de0ac6 Fix fees, update to libdohj 0.14.2 2017-07-15 14:52:17 +02:00
Manfred Karrer
ca9e53a2ab Remove email from sepa account 2017-07-15 13:12:09 +02:00
Mike Rosseel
b2f6d7435c added dash as base currency 2017-07-14 20:20:19 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
4b5b305389 Merge branch 'master' into Development 2017-07-14 11:41:39 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00
Manfred Karrer
27105efe8e Handle nullable winner in DisputeResult for PB 2017-07-12 10:42:39 +02:00
Manfred Karrer
947a95385f Use TxType.UNDEFINED_TX_TYPE instead of TxType.UNDEFINED 2017-07-11 23:31:17 +02:00
Manfred Karrer
bba9b5179c Rename UNDEFINED to UNDEFINED_TX_TYPE (PB does not allow same enum items in diff. enums ;-() 2017-07-11 23:11:07 +02:00
Manfred Karrer
c9203d481a Check against UNDEFINED instead of null 2017-07-11 23:03:13 +02:00
Manfred Karrer
7860116a27 Add UNDEFINED to TxType as default value 2017-07-11 23:02:49 +02:00
Manfred Karrer
c7ccb56ca5 Add NewBestBlockListener to update BSQ tx UI if best chain has changed 2017-07-11 23:01:40 +02:00
Manfred Karrer
45720486b2 Use Bisq instead of bisq 2017-07-11 22:37:44 +02:00
Manfred Karrer
e51a1c4372 Rename ClearXchange to Zelle (ClearXchange) 2017-07-11 22:31:05 +02:00
Manfred Karrer
baabf3ba26 Allow trade limit of 5 BTC for BSQ 2017-07-11 22:23:27 +02:00
Manfred Karrer
908972deaf Add log 2017-07-11 21:02:00 +02:00
Manfred Karrer
ce62f74eb9 Refactoring: rename method 2017-07-11 21:01:47 +02:00
Manfred Karrer
9b394794ee Adjust setup procedure 2017-07-11 20:45:52 +02:00
Manfred Karrer
c76a4ac898 Use txOutputType = TxOutputType.UNDEFINED; instead of null 2017-07-11 20:45:33 +02:00
Manfred Karrer
d4867f712a Fix null pointer 2017-07-11 15:28:01 +02:00
Manfred Karrer
e2af215a57 Set txOutputType default to TxOutputType.UNDEFINED instead of null 2017-07-11 15:27:47 +02:00