Commit Graph

1931 Commits

Author SHA1 Message Date
Manfred Karrer
f86bb433ed
Merge remote-tracking branch 'origin/master' 2018-03-05 18:16:49 -05:00
Manfred Karrer
b706edd15a
Merge branch 'show-past-comps' of https://github.com/sqrrm/exchange into sqrrm-show-past-comps 2018-03-05 18:03:16 -05:00
sqrrm
5c2bd9e906
Fix BsqParserTest after changing genesis distribution 2018-03-05 19:41:40 +01:00
Manfred Karrer
2bc210bbd0
Ignore BsqParserTest temporary 2018-03-05 12:59:39 -05:00
Manfred Karrer
6f8e89cf87
Change denomination of BSQ from 1000 satoshi to 100 satoshi (#1423) 2018-03-05 12:45:28 -05:00
Manfred Karrer
1f6122e934
Add option key: genesisBlockHeight. Rename option key regTestBsqGenesisTxId to genesisTxId. Remove hard coded dev genesis tx id and height. 2018-03-05 12:05:24 -05:00
Manfred Karrer
9246b530d3
Fix minBroadcastConnections for regTest. Set RegTestHost.LOCALHOST as default. 2018-03-05 11:51:30 -05:00
Manfred Karrer
b8eaa647c4
Apply camelCase to option key regtestBsqGenesisTxId to regTestBsqGenesisTxId 2018-03-05 11:11:58 -05:00
Manfred Karrer
b7064f9820
Add option key for dev mode 2018-03-05 11:10:00 -05:00
sqrrm
159b651dcc
Init DAO persistedDataHost for seednode 2018-03-05 16:58:06 +01:00
Manfred Karrer
aac493cc41
Add Restrictions with min and max comp request amounts. Refactor validator. 2018-03-05 10:33:25 -05:00
Manfred Karrer
a60f56c623
Merge branch 'compensation-req-checks' of https://github.com/sqrrm/exchange into sqrrm-compensation-req-checks 2018-03-05 09:39:42 -05:00
Manfred Karrer
4e8a6adff4
Refactor configPeerNodes methods 2018-03-05 09:31:25 -05:00
Bernard Labno
961b01403f Use btcNodes argument in regtest mode. 2018-03-02 22:47:39 +01:00
Manfred Karrer
1d0591084d
Merge branch '0.6.7'
# Conflicts:
#	common/pom.xml
#	common/src/main/java/io/bisq/common/app/Version.java
#	common/src/main/resources/i18n/displayStrings.properties
#	common/src/main/resources/i18n/displayStrings_hu.properties
#	common/src/main/resources/i18n/displayStrings_ro.properties
#	consensus/pom.xml
#	core/pom.xml
#	core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
#	core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java
#	core/src/main/java/io/bisq/core/provider/fee/FeeService.java
#	gui/pom.xml
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java
#	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
#	monitor/pom.xml
#	network/pom.xml
#	network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
#	package/linux/32bitBuild.sh
#	package/linux/64bitBuild.sh
#	package/linux/Dockerfile
#	package/osx/create_app.sh
#	package/osx/finalize.sh
#	package/windows/32bitBuild.bat
#	package/windows/64bitBuild.bat
#	package/windows/Bisq.iss
#	pom.xml
#	seednode/pom.xml
#	statistics/pom.xml
2018-02-26 22:03:47 -05:00
Manfred Karrer
fd47cefc6c
Set v0.6.7 2018-02-26 20:23:07 -05:00
Manfred Karrer
2a16e68939
Fix bug: Cannot remove deactivated offer #1403 2018-02-26 20:17:21 -05:00
Manfred Karrer
250a3724be
Move useDevPrivilegeKeys from ArbitratorModule to BisqAppModule 2018-02-26 12:51:04 -05:00
Manfred Karrer
c19cf3c0cd
Merge pull request #1383 from blabno/feature/extract-USE_DEV_PRIVILEGE_KEYS-from-dev-env
Make USE_DEV_PRIVILEGE_KEYS flag configurable
2018-02-26 12:48:29 -05:00
Manfred Karrer
ac082da72e
Refactoring: Rename AddOfferOfferBook to AddToOfferBook 2018-02-26 09:43:09 -05:00
Manfred Karrer
2c593559db
Merge 0.6.6 branch to master 2018-02-23 21:40:34 -05:00
Manfred Karrer
70a452a335
Reduce min. trade fee from 0.0002 BTC to 0.00005 BTC #1394 2018-02-23 19:12:05 -05:00
Manfred Karrer
0b6edbb883
Set version 0.6.6 2018-02-23 15:41:24 -05:00
Manfred Karrer
a04f96335b
Add new altcoins: Cassubian Detk, DigiMoney, SpeedCash, SOS Coin, AchieveCoin, vDinar (#1385, #1381, #1377, #1370, #1369, #1367) 2018-02-23 11:10:06 -05:00
Manfred Karrer
dac2b3f042
Change maxTradeLimitHighRisk to 0.16 BTC (#1347) 2018-02-23 10:07:22 -05:00
Manfred Karrer
3e3fd3ab45
Remove DOGE as basecurrency 2018-02-23 08:35:41 -05:00
Manfred Karrer
6b01493ded
Use 1 day for popmoney 2018-02-22 20:08:28 -05:00
Manfred Karrer
e606215062
Set maxTradeLimitHighRisk for new payment methods 2018-02-22 19:51:41 -05:00
Manfred Karrer
9800c3cc63
Fix bug with currency selection of multi currency accounts in create offer view 2018-02-22 19:49:11 -05:00
Manfred Karrer
e5a1953929
Add payment method Revolut #1312 2018-02-22 19:48:37 -05:00
Manfred Karrer
3048e0f385
Fix failed unit test 2018-02-22 12:23:30 -05:00
Manfred Karrer
43ce9f796f
Fix issue #1386: Offers with Cash deposit cannot be taken.
Fix handling for Sepa related accounts.
Optimize handling for same bank and specific banks.
Add comments
2018-02-22 12:10:25 -05:00
Bernard Labno
051694dfdb Make USE_DEV_PRIVILEGE_KEYS flag configurable 2018-02-21 16:29:57 +01:00
sqrrm
86c3516890
Fix comments from PR 2018-02-19 13:53:57 +01:00
Manfred Karrer
1ee6117831
Fix Cashdeposit account bug 2018-02-19 06:55:19 -05:00
Manfred Karrer
fbc2761bf7
Update comment for price node operator 2018-02-19 05:57:24 -05:00
Manfred Karrer
c52441c704
Update comment for price node operator 2018-02-19 05:54:18 -05:00
Manfred Karrer
66f65411fc
Remove Venmo 2018-02-18 20:54:23 -05:00
Manfred Karrer
dd86ead7d8
Add popmoney (#1273) 2018-02-18 20:20:04 -05:00
Manfred Karrer
378134c413
Add holder name to venmo 2018-02-18 19:38:44 -05:00
Manfred Karrer
a129d06863
Use Cashtag only for CashApp 2018-02-18 19:38:27 -05:00
Manfred Karrer
7654a5d8ff
Add payment method Venmo (#1347) 2018-02-18 19:08:03 -05:00
Manfred Karrer
beaaf59b70
Add feature for deactivating an offer #1368 2018-02-18 14:45:02 -05:00
sqrrm
07007ea51e
Forgot to check in 2018-02-17 17:33:28 +01:00
sqrrm
7773127676
Allow compensation request with no bsq output
The case where the Bsq input equals the compensation request fee will
generate a transaction with no bsq output. It's still an allowed
compensation request. There should still be an issuance output that's
not yet considered bsq.
2018-02-17 17:00:05 +01:00
sqrrm
fa2c33e5d1
Check that min comp req is more than comp req fee 2018-02-17 16:54:48 +01:00
Christoph Atteneder
a6ff095234
Add isRange method 2018-02-16 09:54:54 +01:00
sqrrm
80a0829c2a
Some cleanup of CompensationRequestManager 2018-02-14 12:57:29 +01:00
Manfred Karrer
521dd62114
Change max. deviation of market price #1356 2018-02-13 21:10:55 -05:00
Manfred Karrer
ff629542e7
Use camelCase 2018-02-13 20:56:23 -05:00