Commit graph

11959 commits

Author SHA1 Message Date
cd2357
ef680f9ba6
Codacy: Test tag to skip check
Try out optional tag to check how it affects codacy behavior. [skip ci]
2020-09-19 07:50:50 +02: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
aae99703eb
Codacy: Fix md styling, part 5
Fix styling to match Codacy rules.
2020-09-18 06:43:12 +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
cd2357
c82d76e8ea
Codacy: Fix md styling, part 5
Fix styling to match Codacy rules.
2020-09-17 10:39:56 +02:00
cd2357
b877c9f973
Codacy: Fix md styling, part 4
Fix styling to match Codacy rules.
2020-09-17 09:05:40 +02:00
cd2357
24296fae59
Codacy: Fix md styling, part 3
Fix styling to match Codacy rules.
2020-09-17 08:52:07 +02:00
cd2357
9cc77850e4
Codacy: Fix md styling, part 2
Fix styling to match Codacy rules.
2020-09-17 08:40:59 +02:00
cd2357
f8dfcc9502
Codacy: Fix md styling
Fix styling to match Codacy rules.
2020-09-17 08:16:22 +02:00
cd2357
dc9288cf1d
Upgraded Gradle to v6.6.1
Upgraded Gradle to the latest version, which has better module-info support for the imported gradle dependencies.
2020-09-17 01:59:51 +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
sqrrm
6cf10c43a6
Merge pull request #4525 from ghubstan/2-refactor-apitest-grpcstubs
Refactor apitest for api calls to any daemon type
2020-09-16 16:42:19 +02:00
sqrrm
b812a261cf
Merge pull request #4524 from ghubstan/1-register-regest-dispute-agents
Add core support for registration of regtest dispute agents via API
2020-09-16 16:33:18 +02:00
cd2357
51e0de8116
Upgrade JavaFX to v15
Upgrade JavaFX to most recent release.
2020-09-16 16:24:37 +02:00
ghubstan
57423f4fdb
Refactor to fix dispute agent mgr usage 2020-09-16 11:14:30 -03:00
Christoph Atteneder
06ac7a7605
Bump version number for v1.3.9 2020-09-16 15:58:58 +02:00
chimp1984
f6cb7c6696
Ensure the division is not by 0 and add try catch to MovingAverage 2020-09-16 15:56:19 +02:00
chimp1984
601de7890d
Add try/catch at setSuggestedSecurityDeposit code 2020-09-16 15:56:13 +02:00
Christoph Atteneder
8cb4b5016c
Merge pull request #4529 from chimp1984/make-moving-average-code-more-safe
Make moving average code more safe
2020-09-16 15:51:14 +02:00
sqrrm
e8c2974f14
Merge pull request #4515 from m52go/refresh-strings-1
Refresh strings, 1/n
2020-09-16 14:46:06 +02:00
cd2357
e55594d1e3
Fix FeeReceiverSelectorTest
Split test into sub-tests in order to avoid mockito UnnecessaryStubbingExceptions. These exceptions occurred because of 3 ambiguous uses of "when().thenReturn()" in the same test. These calls were ambiguous, because the when() argument was identical and mockito did not check the thenReturn() arguments, which would have differentiated the calls. Splitting this test method into 4 test methods achieved this call differentiation.
2020-09-16 11:35:33 +02:00
cd2357
7a73fea622
Fix UnnecessaryStubbingException in test
Remove duplicate call to a stubbed method. This caused an
UnnecessaryStubbingException with Mockito's strict validation settings.
2020-09-16 09:24:29 +02:00
cd2357
2bc85d7553
Upgrade to Mockito 3.3.0
Use Mockito 3.3.0, which fixes some bugs that caused valid tests to fail
in the Java 14 environment.
2020-09-16 09:16:22 +02:00
cd2357
e6920c179c
Upgrade to Lombok 1.18.12
Use Lombok v1.18.12, which adds support for Java 14.
2020-09-16 09:15:13 +02:00
cd2357
77134a97b7
Upgrade to Gradle 6.3
Use Gradle 6.3, which adds support for Java 14.
2020-09-16 09:15:13 +02:00
cd2357
1109bafae0
Upgrade buildserver config to OpenJDK 14
Use java 14 to build the necessary artifacts. This is the most recent
version which brings support for JavaFX 14, as well as a newer packager
tool to build native applications.
2020-09-16 09:15:13 +02:00
cd2357
2ce807c9c8
Upgrade JavaFX to v14
Update the gradle dependency to JavaFX 14.

This brings to Bisq the latest JavaFX fixes and improvements, especially
 in the areas of UI performance, memory management and security.

JavaFX can be upgraded independently of the JDK used to build the
application, so this change is modular and does not affect other parts
of the build process.

Related / likely related to: #350 #2135 #2509 #3128 #3307 #3308 #3343
#3430 #3657 #3677 #3683 #3686 #3786 #3787 #3892 #3917 #3918 #3936
2020-09-16 09:15:13 +02:00
sqrrm
b2d6d81d5d
Merge pull request #4528 from bisq-network/release/v1.3.8
Merge v1.3.8
2020-09-15 14:56:20 +02:00
Christoph Atteneder
98b03937d8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
2020-09-15 13:24:06 +02:00
Christoph Atteneder
5f957f0a64
Revert to SNAPSHOT version 2020-09-15 09:26:08 +02:00
chimp1984
70d98d9554
Ensure the division is not by 0 and add try catch to MovingAverage 2020-09-14 16:06:52 -05:00
chimp1984
71d57298b0
Add try/catch at setSuggestedSecurityDeposit code 2020-09-14 16:05:47 -05:00
ghubstan
3f0394f722
Bump version to 1.3.8 2020-09-14 12:14:37 -03:00
ghubstan
8384dd8004
Add api dispute agent registration test case
This test case checks that mediators and refund agents can be
registered over grpc, but not on mainnet.
2020-09-14 12:13:36 -03:00
ghubstan
148a0f1200
Refactor test cases to use arbitrary grpc stubs
Most test cases send requests to the alicedaemon, but new test cases
will need to be able to send requests to arbitration and bob daemons.
2020-09-14 12:09:04 -03:00
ghubstan
899bea8df5
Replace "localhost" strings with InetAddress.getLoopbackAddress calls 2020-09-14 11:53:02 -03:00
ghubstan
304047eaca
Create GrpcDisputeAgentsService stub 2020-09-14 11:40:22 -03:00
ghubstan
3386b43e52
Add GrpcDisputeAgentsService to GrpcServer 2020-09-14 11:39:36 -03:00
ghubstan
bbf4f09181
Add core impl for registering dispute agents
This change supports registering mediators and refund agents on
daemons running on regest or testnet chains.  Registering
arbitrators is not supported.
2020-09-14 11:04:10 -03:00
ghubstan
15b6044587
Add dispute agents service proto def to grpc.proto 2020-09-14 10:44:19 -03:00
ghubstan
359037a3ba
Move version service proto def to bottom of grpc.proto 2020-09-14 10:43:31 -03:00
sqrrm
7e08fdf6c2
Merge pull request #4523 from ripcurlx/datastore-updates-for-v1.3.8
Update data stores for v1.3.8 (second attempt)
2020-09-14 10:38:20 +02:00
Christoph Atteneder
efcca92688
Update data stores for v1.3.8 (second attempt) 2020-09-14 10:16:42 +02:00
Christoph Atteneder
f8a69411f2
Update data stores for v1.3.8 (second attempt) 2020-09-14 10:09:38 +02:00
chimp1984
156559cb9a
Increase timeouts 2020-09-14 09:53:52 +02:00
sqrrm
5911667b03
Merge pull request #4521 from chimp1984/increase-timeouts
Increase timeouts
2020-09-14 09:47:18 +02:00
chimp1984
76267afabf
Increase timeouts 2020-09-13 17:12:25 -05:00
Christoph Atteneder
a19c662b44
Merge pull request #4511 from sqrrm/return-on-null
Return if setting not present
2020-09-11 16:53:21 +02:00
Christoph Atteneder
2b9445d50f
Merge pull request #4507 from chimp1984/fix-bug-with-seed-restore-and-open-offers
Fix bug with seed restore and open offers
2020-09-11 16:52:11 +02:00