Commit Graph

732 Commits

Author SHA1 Message Date
Manfred Karrer
92514a25e8
Refactor BsqBlockChain with ReadModel and WriteModel 2018-03-09 00:43:20 -05:00
Manfred Karrer
8e99e7c1e6
Refactor OpReturnVerification. 2018-03-08 21:57:54 -05:00
Manfred Karrer
cf9fc6714d
Refactor check if a tx is a bsq tx. 2018-03-08 20:59:49 -05:00
Manfred Karrer
df093b9712
Remove TxVo and put fields into Tx instead. 2018-03-08 10:50:15 -05:00
park-alter
5cc333e33f list-wmcc 2018-03-07 21:01:34 +08:00
Christoph Atteneder
7cc4a286b8
Change wording from distance to below/above 2018-03-07 13:17:19 +01:00
ghobson2013
c51851809c adding ROIcoin 2018-03-06 11:11:31 -06:00
Manfred Karrer
b5ac9f97ca
Add vote reveal type. Adjust BSQ fees. Refactorings. 2018-03-05 22:00:13 -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
Manfred Karrer
4e66daed8d
Change display text. Remove dev value. 2018-03-05 12:15:25 -05:00
Manfred Karrer
b7064f9820
Add option key for dev mode 2018-03-05 11:10:00 -05:00
sqrrm
dd591a1a43
Add PastCompensationRequestView
Let Active and PastCompensationRequestView share a base class view
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
swordfish5975
82f41cbfcd Strayacoin 2018-03-04 15:56:44 +10:00
dinerocoin
25cd791608 add Dinero 2018-03-03 22:21:37 +00:00
Manfred Karrer
a1befee0bd
Use common superclass for Create- and TakeOfferDataModel to avoid code duplication. 2018-03-01 18:47:38 -05:00
Angelcoin
22715c5731
Update CurrencyUtil.java 2018-02-27 14:09:55 +02: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
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
2c593559db
Merge 0.6.6 branch to master 2018-02-23 21:40:34 -05:00
Manfred Karrer
0b6edbb883
Set version 0.6.6 2018-02-23 15:41:24 -05:00
Chris Beams
b01af2e666
Refine text of per-trade limit info popup (#1388) 2018-02-23 21:38:05 +01: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
2183227cf7
Rename "MoneyBeam" to "MoneyBeam (N26)" (#1349) 2018-02-23 10:11:52 -05:00
Manfred Karrer
82541e6fac
Add DeepOnion to main currencies list 2018-02-23 08:43:41 -05:00
Manfred Karrer
3e3fd3ab45
Remove DOGE as basecurrency 2018-02-23 08:35:41 -05:00
Manfred Karrer
6f342c8d5a
Add popup explaining trade limits #1388 2018-02-22 20:53:59 -05:00
Manfred Karrer
2389611c39
Re-enable national bank transfer for US 2018-02-22 19:54:13 -05:00
Manfred Karrer
e5a1953929
Add payment method Revolut #1312 2018-02-22 19:48:37 -05:00
Manfred Karrer
7a96181ccc
Merge pull request #1378 from stevenkain/patch-7
Update displayStrings.properties
2018-02-21 14:32:48 -05:00
Bernard Labno
051694dfdb Make USE_DEV_PRIVILEGE_KEYS flag configurable 2018-02-21 16:29:57 +01:00
Christoph Atteneder
d377eec122
Merge pull request #1379 from stevenkain/patch-8
Update displayStrings_hu.properties
2018-02-21 09:23:32 +01:00
stevenkain
6af2fccb89
Update displayStrings_ro.properties
New Romanian translations
2018-02-20 23:08:35 +02:00
stevenkain
601bd9ea4e
Update displayStrings_hu.properties
New translations
2018-02-20 23:03:44 +02:00
stevenkain
f0a676bd33
Update displayStrings.properties
"both trades" makes no sense. Shouldn't it be "both traders"?
2018-02-20 22:41:35 +02:00
sqrrm
86c3516890
Fix comments from PR 2018-02-19 13:53:57 +01:00
Bernard Labno
5471a8c9ca Not possible to select English anymore, if system locale is non-English 2018-02-19 11:08:44 +01:00
Manfred Karrer
649c14d28e
Merge pull request #1360 from ripcurlx/shorten-call-to-action-buttons
Shorten labels in call-to-action buttons in offer book
2018-02-18 21:29:44 -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
fa2c33e5d1
Check that min comp req is more than comp req fee 2018-02-17 16:54:48 +01:00
sqrrm
a5364c9f3f
Display txid for compensation requests 2018-02-14 16:16:42 +01:00
Christoph Atteneder
04e5cef9ee
Rename singular/plural translation keys to make it less error-prune and add missing translations for all locales 2018-02-14 12:56:08 +01:00
Christoph Atteneder
436289edc9
Shorten labels in call-to-action buttons in offer book 2018-02-14 12:34:00 +01:00
Christoph Atteneder
899d6aef02
Add german translation 2018-02-14 11:27:05 +01:00
Manfred Karrer
521dd62114
Change max. deviation of market price #1356 2018-02-13 21:10:55 -05:00
Manfred Karrer
0a1dc70ec0
Fix sorting of altcoins 2018-02-13 20:37:26 -05:00
Manfred Karrer
bd6b70a8ba
Add new altcoins: Stellite, Dai Stablecoin, Obsidian, BitDaric, Yenten 2018-02-13 20:34:43 -05:00
Manfred Karrer
f8850dfd0a
Merge branch 'list-odn-coin' of https://github.com/Manbearpixel/exchange into Manbearpixel-list-odn-coin
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-02-13 20:23:02 -05:00
Manfred Karrer
879d8e0660
Merge branch 'add-darx-altcoin' of https://github.com/bitdaric/exchange into bitdaric-add-darx-altcoin
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-02-13 20:19:14 -05:00
Manfred Karrer
c22f52477f
Add Yenten 2018-02-13 20:17:09 -05:00
Manfred Karrer
22a3b94d40
Add Yenten 2018-02-13 20:16:53 -05:00
Manfred Karrer
2f04d1ca89
Merge pull request #1342 from reverendus/list-dai-token
Add DAI Token
2018-02-13 20:11:56 -05:00
Manfred Karrer
2a9305c14b
Disable dev mode 2018-02-13 20:09:05 -05:00
Manfred Karrer
eb0a8b8d49
Add payment method MoneyBeam (#1349) 2018-02-13 20:00:35 -05:00
Manfred Karrer
ad56c26f7f
Add payment method Cash App (#1049) 2018-02-13 19:42:29 -05:00
Manfred Karrer
ead30822e5
Add payment method Uphold 2018-02-13 15:32:44 -05:00
Manfred Karrer
949c1c6f2a
Merge pull request #1352 from ripcurlx/change-offerbook-column-headers
Change offerbook column headers
2018-02-13 12:42:05 -05:00
Manfred Karrer
e5e7ded68f
Merge pull request #1334 from ripcurlx/change-goto-screen-after-trade
Change path after completed trade
2018-02-13 12:38:45 -05:00
Manfred Karrer
d653e8263d
Change text for portfolio.pending.tradePeriodWarning 2018-02-13 12:37:06 -05:00
Manfred Karrer
311b67573f
Merge pull request #1328 from ripcurlx/improve-info-during-trade-process
Improve info during trade process
2018-02-13 12:33:05 -05:00
Manfred Karrer
f29f0e03d7
Change Bitcoin Classic to Bitcoin Clashic 2018-02-13 12:28:17 -05:00
Manfred Karrer
2287ec1eab
Merge pull request #1321 from stevenkain/patch-5
Update displayStrings.properties
2018-02-13 12:27:22 -05:00
Manfred Karrer
6ca1f2500a
Merge pull request #1316 from ripcurlx/finalize-info-icon-for-funds-needed
Finalize info icon for funds needed
2018-02-13 12:06:44 -05:00
Christoph Atteneder
6de488bcc1
Add translations for changed string 2018-02-13 12:46:18 +01:00
Christoph Atteneder
dc2d94b486
Use header label for buy and sell offers that is easier to understand 2018-02-13 12:29:37 +01:00
Manfred Karrer
e6001b17da
Fix wrong fee estimation (#1325) 2018-02-12 13:49:15 -05:00
Hein Bloed
45b2693048 added ODN to createAllSortedCryptoCurrenciesList 2018-02-11 14:02:21 -06:00
bitdaric
51e2d89e5c
add BitDaric 2018-02-11 10:43:24 +03:30
Poompon
fc94fb564e Add YENTEN [YTN] validaion 2018-02-10 15:34:52 +03:00
reverendus
0b83d9de23 Add DAI Token 2018-02-10 11:34:40 +01:00
Christoph Atteneder
65d2c03eac
Change path after completed trade 2018-02-07 16:28:24 +01:00
Christoph Atteneder
d03dd58144
Add info pop over for trade period 2018-02-06 11:18:57 +01:00
Bernard Labno
4b0692c6e0 Use environment locale to select right locale and currency 2018-02-05 12:50:47 +01:00
Christoph Atteneder
a4359e9557
Improve English translation and add German ones 2018-02-05 11:07:53 +01:00
Christoph Atteneder
b1aa86a57c
Add account age translation 2018-02-05 10:13:09 +01:00
Christoph Atteneder
09807a0744
Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process
# Conflicts:
#	common/src/main/resources/i18n/displayStrings_ro.properties
2018-02-05 10:09:55 +01:00
Manfred Karrer
53ec4b2404
Merge pull request #1307 from stellitecoin/master
Add Stellite Coin
2018-02-02 20:11:12 -05:00
stevenkain
2f0a6c1bc9
Update displayStrings_ro.properties
New translation
2018-02-03 00:53:56 +02:00
stevenkain
422f5493de
Update displayStrings.properties
1. blocked by your internet provider or in your country - by your country
2. sent you -> send you
3. capitalized Bisq
4. I would love me some of that Bitcoin Clashic :)
2018-02-03 00:37:14 +02:00
Christoph Atteneder
bd4692f520
Fix wrong expectation of formatter method and add new translations for handling trade limits 2018-02-02 15:31:47 +01:00
Christoph Atteneder
76046c3de6
Remove trade date until from max trade period 2018-02-02 15:27:19 +01:00
Christoph Atteneder
75f0b4ad71
Remove translation that is not used 2018-02-02 15:21:45 +01:00
Manfred Karrer
1149a46837
Merge branch 'ripcurlx-use-info-icon-for-funds' 2018-02-01 15:52:43 -05:00
Manfred Karrer
ee9b133f65
Merge branch 'Development'
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java
2018-02-01 14:10:42 -05:00
Christoph Atteneder
89a3939728
Add fee and deposit information to total funds to pay field 2018-02-01 15:05:24 +01:00
Manfred Karrer
664f094d99
Handle delete of spv chain file at startup for windows 2018-01-31 19:19:49 -05:00
Manfred Karrer
04560092ba
Improve handling of Tor shutdown 2018-01-31 16:52:35 -05:00
Manfred Karrer
89e11ac0e4
Handle locked files at delete directory method. Improve UI handling for TorNetworkSettingWindow 2018-01-31 15:44:30 -05:00
Stellite
a380381e94
fix formatting 2018-02-01 01:11:32 +05:30
root
2b2773e666 Adding STL Token 2018-01-31 19:39:16 +00:00
Manfred Karrer
bf244856b1
v0.6.5 2018-01-31 13:04:24 -05:00
Manfred Karrer
eeeabaf015
Fix typos 2018-01-31 11:42:16 -05:00
Manfred Karrer
64ba300408
Add cleanup tor files button to tor network settings 2018-01-31 00:25:39 -05:00
Manfred Karrer
bfc54f4d68
Add REF token 2018-01-30 19:42:14 -05:00
Manfred Karrer
8098e3c0c6
Merge remote-tracking branch 'origin/master' 2018-01-30 15:03:47 -05:00
Chris Beams
183389356f
Merge pull request #1294 from bisq-network/fix-custom-btc-nodes-issue-#1291
Fix issue with custom btc nodes
2018-01-30 20:59:19 +01:00
Manfred Karrer
25190bbe1f
Merge pull request #1296 from ripcurlx/add-util-tests
Add util tests
2018-01-30 14:58:41 -05:00
Manfred Karrer
1e13375b9c
Merge remote-tracking branch 'origin/master' 2018-01-30 14:45:16 -05:00
Manfred Karrer
8732aeab54
Merge pull request #1287 from bisq-network/TradePeriodStartsAfterConfirmation
Start trading period after deposit transaction confirmation
2018-01-30 14:45:01 -05:00
Manfred Karrer
9ac49bd91a
Change guard logic for bitcoinNodesString 2018-01-30 11:41:42 -05:00
Christoph Atteneder
3d36e56532
Add first simple test for getTradeCurrency 2018-01-30 10:58:58 +01:00
Manfred Karrer
a09df40571
Change sorting 2018-01-29 11:27:21 -05:00
Manfred Karrer
50c1607126
Merge pull request #1290 from bisq-network/fix-zero-balance-after-restore
Fix zero balance after restore
2018-01-29 10:09:01 -05:00
Manfred Karrer
d6d5993627
Merge MVT 2018-01-28 19:15:19 -05:00
Manfred Karrer
20fd6a706e
Merge branch 'list-betr-token' of https://github.com/BetterBetting/exchange-bisq-network into BetterBetting-list-betr-token 2018-01-28 19:08:49 -05:00
Manfred Karrer
b220c1a6e2
Add new strings. Cleanup. 2018-01-26 22:25:03 -05:00
Manfred Karrer
f91da81f87
Reuse FileUtil.renameFile 2018-01-26 22:18:47 -05:00
Manfred Karrer
648a7d4a0b
Add handling for canonical at Windows at file delete. 2018-01-26 22:17:33 -05:00
Manfred Karrer
4af8d44d7e
Change open dispute text 2018-01-26 20:07:36 -05:00
Manfred Karrer
537a9ad8ff
Change open dispute text (make open dispute optional) 2018-01-26 19:55:59 -05:00
Manfred Karrer
3e32a71d64
Improve logic flow of getTimeWhenDisputeOpens. Cleanup. 2018-01-26 14:33:44 -05:00
Manfred Karrer
2a004a2f68
Merge branch 'master' into TradePeriodStartsAfterConfirmation
# Conflicts:
#	core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java
2018-01-26 12:22:45 -05:00
Chris Beams
f1d0abef4a
Fix typos and English errors in banned node dialog 2018-01-26 16:58:37 +01:00
Saborknight
438e426a4d
Add BETR (Better Betting) token 2018-01-25 17:10:46 +00:00
Manfred Karrer
a0cdffaddc
Deactive dev flags 2018-01-24 20:46:32 -05:00
Manfred Karrer
6895ac9105
Refactoring: Rename methods 2018-01-24 20:43:30 -05:00
Manfred Karrer
f1d60ddcdb
Fix wrong argument at callFunctionWithWriteLock 2018-01-24 20:21:22 -05:00
Manfred Karrer
125143c8f5
Merge branch 'bsqparser-test' of https://github.com/sqrrm/exchange into sqrrm-bsqparser-test 2018-01-24 20:13:59 -05:00
Manfred Karrer
34dd0b71d0
Merge branch 'Development' into dao
# Conflicts:
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java
#	gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java
#	gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
2018-01-24 19:44:01 -05:00
sqrrm
e9e4a827ca
bsqblockchain: use write lock for atomic writes
A ReentrantReadWriteLock is used. By acquiring the write lock over the
atomic write all other locks acquired during the atomic operation will
work as expected.
2018-01-23 15:37:22 +01:00
Manfred Karrer
d341c44471
Merge branch 'master' into Development 2018-01-22 20:29:30 -05:00
Manfred Karrer
14b0292460
Merge branch 'Development' into UI-improvements 2018-01-22 19:44:51 -05:00
Chris Beams
c725376e8d
Replace 'that' => 'this' in version update dialog 2018-01-22 08:55:32 +01:00
Manfred Karrer
33eecd81aa
Release 0.6.4 2018-01-20 20:47:53 -05:00
Manfred Karrer
0dc5d82983
Add XIN 2018-01-20 19:41:07 -05:00
Manfred Karrer
0594bddd0d
Add CREA coin 2018-01-20 19:38:00 -05:00
Manfred Karrer
9cf9ce6ea4
Alwyas check for block download complete also if not localhost btc node 2018-01-20 08:44:18 -05:00
Manfred Karrer
fab97fcaf8
Show warning popup if not sufficient btc nodes or localhost btc node not synced 2018-01-19 21:58:26 -05:00
Manfred Karrer
a423c7fe86
Display localhost btc node in footer text and connection lost popup 2018-01-19 21:10:11 -05:00
Manfred Karrer
10a2b53e3a
Merge branch 'master' into dao
# Conflicts:
#	core/src/main/java/io/bisq/core/app/SetupUtils.java
#	core/src/main/java/io/bisq/core/btc/wallet/BsqWalletService.java
#	core/src/main/java/io/bisq/core/btc/wallet/WalletService.java
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
#	gui/src/main/resources/logback.xml
#	network/src/main/java/io/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java
#	network/src/main/java/io/bisq/network/p2p/peers/getdata/RequestDataHandler.java
#	network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
2018-01-12 23:21:22 +01:00
Manfred Karrer
775e687fe5
Merge branch 'master' into TradePeriodStartsAfterConfirmation 2018-01-12 22:43:31 +01:00
Manfred Karrer
848bbdd9b1
Make tx parsing atomic by read/write lock (WIP). Add comments. 2018-01-12 18:26:33 +01:00
Manfred Karrer
d9c9345b59
Add comments. Cleanup 2018-01-12 16:48:05 +01:00
Christoph Fröschl
934d50d473 Merge branch 'Development' of https://github.com/bisq-network/exchange into Development 2018-01-10 19:25:10 +01:00
Manfred Karrer
aeec075c91
Prepare v0.6.3 2018-01-09 23:36:49 +01:00
Manfred Karrer
79e16a4b7a
Add support for start trade period timer after deposit tx has been confirmed. Not working yet. 2018-01-09 23:30:29 +01:00
Manfred Karrer
c3e648dc6b
Disable dev mode 2018-01-09 22:13:55 +01:00
Manfred Karrer
5d217aa347
Merge branch 'deeponion-master' into Development
# Conflicts:
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-01-09 21:44:06 +01:00
Manfred Karrer
532f351b6e
Add WILD token 2018-01-09 21:36:51 +01:00
Manfred Karrer
516d130a5c
Merge branch 'Development' of https://github.com/WildCryptoICO/exchange into WildCryptoICO-Development 2018-01-09 21:34:18 +01:00
Manfred Karrer
4b9788c0bc
Change popup text for Zcoin 2018-01-09 21:30:26 +01:00
Manfred Karrer
7f0e871007
Delay callback of tx broadcaster 2018-01-09 21:15:58 +01:00
Manfred Karrer
e8fbd7a3bc
Delete tor directory (excluding hidden service folder) at startup 2018-01-09 20:18:19 +01:00
Ed Zynda III
bc6aa2eb12
Add WILD Token to currency list 2018-01-02 17:05:58 +02:00