Commit graph

11955 commits

Author SHA1 Message Date
chimp1984
b0b4334345
Merge branch 'master_upstream' into dispute-agents-sign-summary 2020-09-16 20:38:45 -05:00
sqrrm
b22ab6a1fa
Merge pull request #4531 from bisq-network/release/v1.3.9
Release/v1.3.9
2020-09-16 17:01:48 +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
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
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
chimp1984
966b22a69d
Fix line breaks 2020-09-12 20:24:32 -05:00
chimp1984
de4fb17a19
Improve summary notes 2020-09-12 20:18:04 -05:00
chimp1984
0c46e7dd52
Add more data to summary msg 2020-09-12 16:19:42 -05:00
chimp1984
48066ae124
Remove setting of pubKey as it is not needed 2020-09-12 00:49:27 -05:00
chimp1984
559028e500
Remove unused var 2020-09-12 00:46:52 -05:00
chimp1984
7ac6e715d3
Dispute agent sign summary. Add tool for verification 2020-09-12 00:35:58 -05:00
chimp1984
08fb596629
Call validatePayoutTx only after trades are initialized 2020-09-11 20:25:48 -05:00
chimp1984
677211badf
Allow close dispute for refund agent without payout 2020-09-11 20:24:31 -05:00
chimp1984
d82631f52c
Fix some issues found during testing
Refactorings
2020-09-11 19:41:08 -05:00
chimp1984
c48abbf575
Improve address validation code 2020-09-11 17:37:03 -05:00
chimp1984
2b0433870c
Dont allow opening refudn agent dispute if delayed payout tx is invalid. 2020-09-11 17:00:24 -05:00
chimp1984
4f1cbbd00e
Add check for refund agent if donation address is valid 2020-09-11 15:35:47 -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
Christoph Atteneder
425ae87870
Merge pull request #4496 from freimair/tor_0.4.3.6
Tor 0.4.3.6
2020-09-11 16:46:10 +02:00
wiz
ab5aee5aab
Revert Tether USD for now due to various issues 2020-09-10 21:31:22 +02:00
Christoph Atteneder
43fac2cc31
Merge pull request #4513 from wiz/revert-tether-usd-assets
Revert Tether USD for now due to various issues
2020-09-10 21:30:18 +02:00
wiz
de48b3b040
Revert Tether USD for now due to various issues 2020-09-11 00:51:19 +09:00