mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,235 Commits 4 Branches 148 Tags 4.3 GiB
c907418c37
Commit Graph

533 Commits

Author SHA1 Message Date
Christoph Atteneder
9f42035108
Bump version number for v1.7.0 2021-06-23 14:27:22 +02:00
jmacxx
1c05e5d990
PriceNode: exclude currencies via config 2021-06-22 16:46:47 -05:00
cd2357
eea3acae36
Bump guice version to fix startup warnings 
Bump guice to v5.0.1 to fix reflection warning logs shown each time Bisq started.
 2021-06-11 12:03:28 +02:00
Christoph Atteneder
351d5f13e7
Revert to SNAPSHOT version 2021-05-31 09:53:33 +02:00
Christoph Atteneder
59de78c332
Bump version number for v1.6.5 2021-05-21 20:00:49 +02:00
Christoph Atteneder
0160039788
Revert "Remove openjfx plugin and manually add cross-platform openjfx libs" 
This reverts commit 1c0409ad84.
 2021-05-20 16:19:48 +02:00
Christoph Atteneder
1c0409ad84
Remove openjfx plugin and manually add cross-platform openjfx libs 2021-05-19 11:37:38 +02:00
Christoph Atteneder
e3842f2d04
Use gradle javafx plugin 2021-05-18 17:19:56 +02:00
Christoph Atteneder
fb410ac345
Upgrade JavaFX to v16 2021-05-18 16:44:30 +02:00
cd2357
a4863baa94
Preserve shadow plugin name 
Include plugins.gradle.org repository, which contains the shadow plugin of the same artefact group and name as used before in jcenter.
 2021-05-17 12:55:32 +02:00
cd2357
f26ccb15b7
Remove jcenter repository 
Replace the jcenter repo with mavenCentral and jitpack.
 2021-05-16 15:17:44 +02:00
Christoph Atteneder
25d2731fb4
Revert to SNAPSHOT version 2021-05-06 20:40:11 +02:00
Christoph Atteneder
dba59138df
Bump version number for v1.6.4 2021-05-05 10:27:42 +02:00
Christoph Atteneder
2c5e785a1e
Bump version number for v1.6.3 2021-04-22 10:36:37 +02:00
Christoph Atteneder
3281767a52
Clean build files and adapt binary signing 2021-04-20 15:10:44 +02:00
Christoph Atteneder
b5beea58db
Temporary delete QR code scanner 
used for mobile notification pairing because of missing current macOS support by currently used webcam library
 2021-04-20 10:20:58 +02:00
cd2357
e04537aca6
Merge remote-tracking branch 'bisq-network/hotfix/v1.6.2' into upgrade-javafax-14 2021-04-10 10:31:04 +02:00
Christoph Atteneder
c2834cebd6
Revert to SNAPSHOT version 2021-04-01 15:45:10 +02:00
Christoph Atteneder
8623b7b546
Bump version number for v1.6.2 2021-04-01 09:41:07 +02:00
cd2357
ca5f41a9d9
Merge remote-tracking branch 'bisq-network/hotfix/v1.6.1' into upgrade-javafax-14 
# Conflicts:
#	build.gradle
 2021-03-29 18:37:14 +02:00
Christoph Atteneder
0c40d35ddb
Revert to SNAPSHOT version 2021-03-29 16:26:28 +02:00
cd2357
6c44f25738
Bump tor to v0.4.5.7 
Bump tor-binary and netlayer dependencies to the newest versions which package tor v0.4.5.7.
 2021-03-28 20:15:19 +02:00
Christoph Atteneder
b7524270dd
Bump version number for v1.6.1 2021-03-28 20:11:26 +02:00
Steven Barclay
f21379160b
Merge branch 'release/v1.6.0' into implement-segwit-for-bsq 2021-03-20 23:18:49 +00:00
Christoph Atteneder
378fd026bf
Bump version number for v1.6.0 2021-03-18 19:19:26 +01:00
Christoph Atteneder
38a9bf0277
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.9 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2021-03-11 16:26:50 +01:00
Christoph Atteneder
fb053e85ad
Revert to SNAPSHOT version 2021-03-11 16:24:32 +01:00
sqrrm
463f87b39e
Merge pull request #5284 from ghubstan/07-validate-paymentacct-n-new-offer 
Validate offer <-> payment-acct in createoffer
 2021-03-09 16:51:56 +01:00
ghubstan
304781ce92
Add jupiter test support to :cli subproject 2021-03-05 07:15:01 -03:00
Christoph Atteneder
c1d6ea93bb
Bump version number for v1.5.9 2021-03-02 18:53:37 +01:00
Christoph Atteneder
996e264cfb
Revert to SNAPSHOT version 2021-03-02 10:03:29 +01:00
Christoph Atteneder
5288d0840b
Bump version number for v1.5.8 2021-03-01 11:24:04 +01:00
Christoph Atteneder
52c90dc9c1
Revert to SNAPSHOT version 2021-02-26 21:06:35 +01:00
cd2357
fb3ed20d74
Bump netlayer and tor-binary versions 
Update dependencies to use tor v0.4.5.6
 2021-02-26 17:20:01 +01:00
Christoph Atteneder
2dc34dce48
Bump version number for v1.5.7 2021-02-18 21:50:32 +01:00
cd2357
7c2b4e02b8
Merge remote-tracking branch 'bisq-network/hotfix/v1.5.6' into upgrade-javafax-14 2021-02-17 23:16:52 +01:00
Christoph Atteneder
5c614be5d7
Revert to SNAPSHOT version 2021-02-16 21:23:37 +01:00
Christoph Atteneder
1507b58e26
Bump version number for v1.5.6 2021-02-16 09:04:10 +01:00
cd2357
5a358b49de
Merge remote-tracking branch 'bisq-network/release/v1.5.5' into upgrade-javafax-14 2021-02-04 11:58:43 +01:00
Steven Barclay
b4ad6bf637
Upgrade jsonrpc4j & Jackson; simplify BitcoindClient 
Change jsonrpc4j version from 1.5.3 to 1.6.0.bisq.1, forked to the Bisq
repo from the recent 1.6.0 release. The forked version changes the class
'com.googlecode.jsonrpc4j.HttpException' to be public, instead of (prob.
mistakenly) package private, so we can avoid using reflection to catch
it and re-throw as a 'bisq.network.http.HttpException'. Remove the now
unused constructors from the latter.

As part of this, upgrade Jackson to the latest stable (2.12.1) release,
since jsonrpc4j now depends on a newer version than the previous 2.8.10.
 2021-02-04 07:51:38 +00:00
Christoph Atteneder
63b39d5995
Revert to SNAPSHOT version 2021-02-02 10:34:27 +01:00
Christoph Atteneder
b9e889050a
Bump version number for v1.5.5 2021-01-21 16:01:45 +01:00
Steven Barclay
8104301b52
Use new Bitcoind(Client|Daemon) & remove btcd-cli4j 
Migrate RpcService over to the new block notification daemon and RPC
client based on jsonrpc4j. Drop in own DTO classes in place of the ones
defined by btcd-cli4j and rename requestBtcBlock & addNewBtcBlockHandler
to requestDtoBlock & addNewDtoBlockHandler respectively.

Also remove now redundant filtering from the logback config and update
grade-witness.
 2021-01-21 10:10:28 +00:00
Steven Barclay
dbe4953f63
Add replacement bitcoind RPC client using jsonrpc4j 
Create a new 'BitcoindClient' interface and a corresponding builder, to
replace the old 'com.neemre.btcdcli4j.core.client.BtcdClientImpl' class
from the btcdcli4j library. This is instantiated by jsonrpc4j using a
dynamic proxy. It provides only a cut down version of the bitcoind RPC
API, exposing the methods 'getblock', 'getblockcount' & 'getblockhash',
as they are the only ones currently being used by RpcService.

Add corresponding Jackson-annotated DTO classes to model the JSON
structures returned by bitcoind, very similar to the classes provided by
btcdcli4j. Note that we use Double instead of BigDecimal to represent
fractional fields (difficulties + coin amounts in BTC), as they have
more consistent Jackson (de)serialisation and appear to be able to
faithfully round-trip numeric fields produced by bitcoind. Also note
that doubles can faithfully represent any valid decimal BTC amount (that
is, with 8 d.p. of precision) up to 21 million.

For now, keep the old BtcdClientImpl instance used by RpcService in
place, as the btcdcli4j block notification daemon is dependent upon it
and would also need to be replaced.

Also add unit tests for BitcoindClient which test against sample regtest
responses, using a mock HttpURLConnection.
 2021-01-21 10:08:22 +00:00
cd2357
47c4e09d69
Merge remote-tracking branch 'bisq-network/hotfix/v1.5.4' into upgrade-javafax-14 2021-01-13 19:44:12 +01:00
Christoph Atteneder
0f7756267d
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.4 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2020-12-31 14:00:12 +01:00
Christoph Atteneder
31ee62b6c0
Revert to SNAPSHOT version 2020-12-31 13:58:20 +01:00
Christoph Atteneder
3914e5c198
Bump version number for v1.5.4 2020-12-31 06:55:20 +01:00
Christoph Atteneder
0c83a9b0cd
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.3 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2020-12-30 15:15:06 +01:00
Christoph Atteneder
a9dc664560
Revert to SNAPSHOT version 2020-12-30 15:00:16 +01:00
Christoph Atteneder
e92be14a57
Bump version number for v1.5.3 2020-12-30 13:34:08 +01:00
Christoph Atteneder
850e031158
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.2 
# Conflicts:
#	core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
#	core/src/main/java/bisq/core/trade/closed/CleanupMailboxMessages.java
 2020-12-28 14:57:08 +01:00
Christoph Atteneder
0ad39761ce
Revert to SNAPSHOT version 2020-12-28 14:54:55 +01:00
ghubstan
5de910a03d
Add unit test dependencies to daemon subproject 2020-12-19 15:40:27 -03:00
Oscar Guindzberg
a161376da3
Use bitcoinj 0.15.8.bisq.13 (commit dcf8af0) 2020-12-16 14:57:41 -03:00
Christoph Atteneder
a6bee1116a
Bump version number for v1.5.2 2020-12-16 14:19:41 +01:00
cd2357
b82f3c1caa
Merge remote-tracking branch 'bisq-network/hotfix/v1.5.1' into upgrade-javafax-14 2020-12-13 13:57:28 +01:00
Christoph Atteneder
a04cc7bfe2
Revert to SNAPSHOT version 2020-12-08 22:14:56 +01:00
Oscar Guindzberg
9ca20d8b3d
Use bitcoinj 0.15.8 (commit dcf8af0) 2020-12-07 11:39:58 -03:00
Christoph Atteneder
4ab75b656d
Bump version number for v1.5.1 2020-12-03 12:57:43 +01:00
cd2357
72a719dcc9
Merge remote-tracking branch 'bisq-network/release/v1.5.0' into upgrade-javafax-14 2020-11-27 16:59:23 +01:00
Christoph Atteneder
dbb0160a35
Revert to SNAPSHOT version 2020-11-25 13:46:24 +01:00
Oscar Guindzberg
e667f8fbad
Upgrade bitcoinj to commit 60b4f2f 2020-11-23 14:39:26 -03:00
Oscar Guindzberg
6bba6a526f
Use bitcoinj 0.15.8 (commit 60b4f2f) 2020-11-05 11:51:43 -03:00
Oscar Guindzberg
ef97daac89
Use bitcoinj 0.15.8 (commit fcec3da) 2020-11-05 11:47:38 -03:00
Christoph Atteneder
66fcde11bf
Bump version number for v1.5.0 2020-11-05 11:34:40 +01:00
sqrrm
f2cf5e2984
Merge pull request #4723 from ghubstan/16-improve-apitest-logging 
Improve apitest cmd line console logging
 2020-11-02 13:12:02 +01:00
sqrrm
53a16698e2
Merge pull request #4722 from ghubstan/15-upgrade-jupiter 
Upgrade jupiterVersion = '5.7.0'
 2020-11-02 13:05:39 +01:00
ghubstan
d6524bf46d
Improve apitest cmd line console logging 
- Show full stack traces in console
- Do use previously cached test outputs
- Do not show skipped test name in console (too noisy)
- Show test run summary, including number of skipped tests
- Show note about skipped test info in the html report
- Show link to html report on test SUCCESS
 2020-10-28 17:39:50 -03:00
ghubstan
8e51e1e495
Upgrade jupiterVersion = '5.7.0' 
This upgrades jupiter for all subprojects using this library, but
it does not affect released code.
 2020-10-28 17:21:04 -03:00
cd2357
ca56d002df
Update netlayer references to bisq repos 
Update build.gradle to rely on the netlayer libraries from the bisq-network repo. The library versions (commit IDs) remain the same, only the repo from which they are pulled is changed.
 2020-10-24 13:33:22 +02:00
cd2357
0cd97a57eb
Bump mockito version to fix tests 
Newer mockito version fixes tests which started failing for this branch after the merge of v1.4.2.
 2020-10-24 11:26:15 +02:00
cd2357
416373edf5
Merge remote-tracking branch 'bisq-network/release/v1.4.2' into upgrade-javafax-14 2020-10-24 11:22:25 +02:00
chimp1984
aa812ba7f1
Add shadow plugin 2020-10-23 01:17:33 -05:00
chimp1984
821fa39a7e
Add sparkjava dependency 2020-10-23 01:17:33 -05:00
chimp1984
3521619e03
Add inventory module 
Simple monitor dumping json files with data result and request/response time to disk. Can be used by a simple web server to show state of seed nodes.
 2020-10-23 01:17:32 -05:00
Christoph Atteneder
f6d8cadee8
Revert to SNAPSHOT version 2020-10-22 09:36:50 +02:00
Christoph Atteneder
062b58b65d
Bump version number for v1.4.2 2020-10-21 09:23:51 +02:00
Christoph Atteneder
7ae6e84e02
Bump version number for v1.4.1 2020-10-18 19:22:53 +02:00
Christoph Atteneder
bac1e7b04c
Revert to SNAPSHOT version 2020-10-16 14:47:43 +02:00
Oscar Guindzberg
417daf5692
Use bitcoinj 0.15.8 (commit a733034) 2020-10-08 16:33:58 -03:00
Christoph Atteneder
5294820eb6
Bump version number for v1.4.0 2020-10-08 09:39:01 +02:00
cd2357
6ef9368b75
Bump netlayer to use tor binary from tor browser v10.0 
Upgrade netlayer to a version that uses tor binaries extracted from the latest tor-browser v10.0.
 2020-10-06 18:03:59 +02:00
Oscar Guindzberg
5db273010f
Use bitcoinj 0.15.8 (commit 44ddbdc) 2020-09-30 13:10:05 -03:00
Oscar Guindzberg
93d321b995
Use bitcoinj 0.15.8 (commit 5312aa3) 2020-09-26 11:36:48 -03:00
cd2357
50f5d9b2c3
Update jfoenix to latest v9.0.10 
Update jfoenix to attempt to fix JavaFX NPEs.
 2020-09-23 18:18:04 +02:00
cd2357
150599cc31
Integrate jpackage to build platform-specific binaries 
Extend the gradle script with tasks that use jpackage to generate Bisq binaries. The kind of binaries generated depend on the OS where this is executed.

The packaging of binaries can be started by calling:
./gradlew --console=plain packageInstallers
from the root project folder.
 2020-09-22 18:18:28 +02:00
cd2357
b9164e6e82
Include version in bisq-desktop jar manifest 
Include the application version number in the jar manifest. This makes it easier later on, in the packaging process, to programmatically retrieve the build version from a reliable source.
 2020-09-19 20:48:28 +02:00
Oscar Guindzberg
0d25ca1381
Remove okhttp and okio dependencies 2020-09-18 18:29:38 -03:00
Oscar Guindzberg
daaacecafb
Use bitcoinj 0.15.8 (commit 0d98efb) 2020-09-18 18:29:37 -03:00
Oscar Guindzberg
d0b00fb6f4
Use bitcoinj 0.15.8 (commit 0d7762b) 2020-09-18 18:29:36 -03:00
Oscar Guindzberg
b472e3851c
Update btcd-cli4j to 27b9433 2020-09-18 18:29:35 -03:00
Oscar Guindzberg
053b22f16f
Prevent seednode to use older guava version 2020-09-18 18:29:35 -03:00
Oscar Guindzberg
3aea094538
bitcoinj 0.15: bitcoinj exclude dependency bcprov-jdk15on because already included by bisq. 2020-09-18 18:29:27 -03:00
Oscar Guindzberg
41556f25df
bitcoinj 0.15: Update depencencies to match bitcoinj versions 2020-09-18 18:29:26 -03:00
Oscar Guindzberg
e9a8be372a
Use bitcoinj 0.15.8 (commit 86c7094) 2020-09-18 18:29:24 -03:00
cd2357
fbe43c53ed
Merge remote-tracking branch 'bisq-network/release/v1.3.9' into upgrade-javafax-14 2020-09-18 14:13:56 +02:00
cd2357
4322e7275b
Upgrade apache-commons-lang3 to v11 to avoid jdeps issue 
Updated the commons-lang3 version to the latest one, to avoid the existence of multiple versions used by different projects.

Before, v3.8 was used in most projects and v3.9 was brought as a transitive dependency in pricenode. So both were used by different projects. With this commit, all projects use v3.11, since it is explicitly defined in build.gradle.

This resolves an exception thrown by jdeps when trying to list the module dependencies of the desktop-vXYZ-SNAPSHOT-all.jar.
 2020-09-17 11:10:35 +02:00
Christoph Atteneder
81df879881
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2020-09-16 16:52:54 +02:00
Christoph Atteneder
95dd561d91
Revert to SNAPSHOT version 2020-09-16 16:49:48 +02:00