Commit Graph

723 Commits

Author SHA1 Message Date
Manfred Karrer
b44fdc9cd7
Merge branch 'list-wmcc' of https://github.com/WorldMobileCoin/bisq-exchange into WorldMobileCoin-list-wmcc
# 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-03-10 10:15:06 -05:00
Manfred Karrer
cc065e6c85
Rearrange code positions 2018-03-10 10:13:55 -05:00
Manfred Karrer
afe47c3ad7
Merge branch 'list-ROIcoin' of https://github.com/ghobson2013/exchange into ghobson2013-list-ROIcoin
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-03-10 10:13:47 -05:00
Manfred Karrer
68dd8d9831
Rearrange code positions 2018-03-10 10:12:00 -05:00
Manfred Karrer
7cb674a0a4
Merge branch 'master' of https://github.com/swordfish6975/exchange into swordfish6975-master
# Conflicts:
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:11:49 -05:00
Manfred Karrer
b5786f038f
Rearrange code positions 2018-03-10 10:09:25 -05:00
Manfred Karrer
e9a0d7e3ff
Merge branch 'list-din-altcoin' of https://github.com/dinerocoin/exchange into dinerocoin-list-din-altcoin
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:08:57 -05:00
Manfred Karrer
cd04e1b0f9
Put new code for altcoin in right places. 2018-03-10 10:06:42 -05:00
Manfred Karrer
8754f41c1e
Merge branch 'master' of https://github.com/angelcoinmoney/exchange into angelcoinmoney-master 2018-03-10 10:01:41 -05:00
Manfred Karrer
0d45977913
Make constructor private, add Nullable. 2018-03-09 19:55:28 -05:00
Manfred Karrer
2afcef9eb5
Merge branch 'refactor-dao-data-model'
# Conflicts:
#	core/src/main/java/io/bisq/core/dao/DaoModule.java
#	core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java
#	core/src/main/java/io/bisq/core/dao/blockchain/SnapshotManager.java
#	core/src/main/java/io/bisq/core/dao/node/BsqNode.java
#	core/src/main/java/io/bisq/core/dao/node/BsqParser.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/BsqTxController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/CompensationRequestController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/GenesisTxController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/IssuanceController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/PeriodController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/TxInputController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/TxInputsController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/TxOutputController.java
#	core/src/main/java/io/bisq/core/dao/node/consensus/VotingController.java
#	core/src/main/java/io/bisq/core/dao/node/full/FullNode.java
#	core/src/main/java/io/bisq/core/dao/node/full/FullNodeParser.java
#	core/src/main/java/io/bisq/core/dao/node/full/network/FullNodeNetworkManager.java
#	core/src/main/java/io/bisq/core/dao/node/full/network/GetBsqBlocksRequestHandler.java
#	core/src/main/java/io/bisq/core/dao/node/lite/LiteNode.java
#	core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeExecutor.java
#	core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeParser.java
#	core/src/main/java/io/bisq/core/dao/request/compensation/CompensationRequestManager.java
#	core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
2018-03-09 19:47:08 -05:00
Manfred Karrer
dd5fe5d197
Use Interface for read and write access to BsqBlcokChain. Use SingleThreadExecutor in Full- and LiteNodeExecutor. 2018-03-09 19:45:40 -05:00
Manfred Karrer
456fd28e94
Revert "Fix parsertest" 2018-03-09 14:42:56 -05:00
Manfred Karrer
182158af20
Merge pull request #1445 from sqrrm/fix-parsertest
Fix parsertest
2018-03-09 12:34:57 -05:00
Chris Beams
19b9c6fe59
Set Maven version to -SNAPSHOT
Problem: d218094 set the version to 0.7.0-SNAPSHOT, but that change
failed to produce the intended effect detailed in the commit comment.
Setting the version to a value like 0.7.0-SNAPSHOT works fine when
publishing artifacts to a local ~/.m2 repository, but JitPack has no
awareness of version metadata within pom files, and can only retreive
artifacts based on Git metadata, namely tags, branch names and commit
hashes. This means it is impossible to resolve artifacts from JitPack
with a GAV like `io.bisq.exchange:core:0.7.0-SNAPSHOT` unless there is a
branch named `0.7.0`. This is why the pull request at
bisq-network/bisq-seednode#1 failed.

Solution: JitPack supports the semantics of Maven-style `-SNAPSHOT`
versioning, and as a special case, allows for versions to be named
literally `-SNAPSHOT` with no preceding version string [1,2]. This
commit sets all Maven versions to `-SNAPSHOT`, achieving the original
effect intended by d218094. Now downstream components (like
bisq-seednode) can resolve dependencies seamlessly from JitPack or a
local ~/.m2 repo with a GAV like `io.bisq.exchange:core:-SNAPSHOT`. This
is a slightly unconventional arrangement, but should actually result in
fewer updates to pom files over time as there may in fact be no reason
to ever change this version string so long as we continue using JitPack
and avoid publication to Maven Central / JCenter or similar.

[1]: https://jitpack.io/docs/#building-with-jitpack
[2]: https://github.com/jitpack/jitpack.io/issues/351

See #1440
2018-03-09 10:29:23 +01:00
Manfred Karrer
92514a25e8
Refactor BsqBlockChain with ReadModel and WriteModel 2018-03-09 00:43:20 -05:00
Manfred Karrer
da657ed055
Merge pull request #1440 from cbeams/change-groupid-and-version
Update artifact metadata to allow seamless resolution from JitPack or local ~/.m2 repo
2018-03-08 22:01:41 -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
Chris Beams
d218094269
Bump Maven artifact versions to 0.7.0-SNAPSHOT
Problem: When resolving Bisq libraries, e.g. `core` or `network` from
JitPack for use in other components like bisq-seednode or
bisq-pricenode, we have historically, resolved them by tag or by
branchname, e.g. with GAV coordinates like `io.bisq:core:v0.6.7` or
`io.bisq:core:master`. This works well enough, but now that we are
beginning to modularize more aggressively, we want to make sure that
it's possible at any time to publish the latest snapshots of these
libraries to one's own local ~/.m2 repository such that they can be
easily resolved from downstream components without the need to push
commits to the bisq-network/exchange remote, and to wait for JitPack to
do a just-in-time build.

Solution: By updating the version value of all modules here in the
exchange repository from 0.6.7 => 0.7.0-SNAPSHOT, one can run
`mvn install` to publish the latest "snapshot" of exchange libraries to
the local ~/.m2 repository and be sure to resolve them from whatever
downstream component that they are working on. The -SNAPSHOT qualifier
ensures that no caching occurs, and that the very latest such binary
will always be used.

This new arrangement creates a situation where one can transparently
resolve these dependencies remotely from JitPack and then subsequently
resolve them locally from one's ~/.m2 repository without having to
change a line of code.

It also opens up the ability to manage all Bisq components together in a
single IDE window as if they were all in one repository, avoiding the
need even to issue a `mvn install` command to publish locally--but
that's not the main focus of this change.

Note that the change to 0.7.0 here is based on the fact that we already
planned to have the next version shipped from `master` be 0.7.0, as
there are quite a few new UI changes that probably merit the bump in
minor version. The version change also aligns well with the fact that
we're modularizing a number of components right now, and all
newly-extracted components have been jumping to v0.7.0 to indicate their
new independent status. This has been the case with bisq-seednode and
pricenode so far.

Finally, it is important to note here that the ONLY versions updated by
this change are those specific to Maven metadata and therefore artifact
management / dependency resolution. The version that the Bisq desktop
client reports in its UI and to the network in its user agent has NOT
been changed, on account of the fact that users may run Bisq from
source, and we need to think through more fully the implications of
reporting a verison like 0.7.0-SNAPSHOT in those situations. Here is a
list of files containing the old version (0.6.7) that have NOT been
updated:

 - common/src/main/java/io/bisq/common/app/Version.java
 - package/linux/32bitBuild.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
 - package/linux/64bitBuild.sh

One thing we know for sure that wouldn't work here is that Bisq's
Version class currently does not support -SNAPSHOT qualifiers. It just
breaks the version string validation entirely. So we'd need to patch
that in any case if we do decide it's a good idea to let pre-release
builds report their version accurately.
2018-03-08 19:49:30 +01:00
Chris Beams
19d8c252ba
Change groupid from io.bisq => io.bisq.exchange
Problem: The current `io.bisq` groupid does not align with the way
JitPack supports custom groupids. In order to be able to both resolve
artifacts from JitPack *and* be able to resolve the same artifacts from
one's local ~/.m2 repository, Bisq artifacts need to have the same GAV
coordinates everywhere (groupid, artifactid, version).

Solution: This commit changes all groupids from io.bisq =>
io.bisq.exchange to match the GAV coordinates produced / expected by
JitPack.

So where Bisq's core module would previously have been resolvable with
GAV coordinates `io.bisq:core:v0.6.7` it will now be resolvable as
`io.bisq.exchange:core:v0.6.7`.

Note that this change is not just to satisfy JitPack idiosyncracies, but
is actually good naming practice anyway where a multi-module build is
involved, and is arguably the way it should have been all along.

[1]: https://jitpack.io/docs/#publishing-on-jitpack
2018-03-08 18:59:31 +01: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