ghubstan
2f7f14670c
Replace junit with jupiter asserts
...
Don't mix junit and jupter apis, apitest should only be using
jupiter. Also moved a file.deleteOnExit statement within the
method that created the file.
2020-12-28 14:32:16 -03:00
ghubstan
bcc7216c9e
Fix tmp file deletion bug
2020-12-28 14:30:07 -03:00
ghubstan
1f99192a31
Make visible to subclasses
2020-12-28 13:12:34 -03:00
ghubstan
3bbf1e02dd
Add convenience method to convert enum[] to comma delimited string
2020-12-28 13:11:12 -03:00
ghubstan
32e9bd285f
Delete unused method
2020-12-28 12:52:29 -03:00
sqrrm
00c82bb7e9
Merge pull request #5012 from bisq-network/release/v1.5.2
...
Release/v1.5.2
2020-12-28 15:08:13 +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
sqrrm
c52d6691d4
Merge pull request #4996 from ghubstan/fix-bitcoind-config-bug
...
Pass hash to bitcoind blocknotify script
2020-12-23 23:34:08 +01:00
ghubstan
2070e7633b
Pass hash to bitcoind blocknotify script
2020-12-23 16:18:31 -03:00
sqrrm
7d7f1b09e7
Merge pull request #4966 from ghubstan/10-callrate-interceptor
...
Prevent excessive api calls
2020-12-23 16:19:29 +01:00
ghubstan
10727fc083
Fix GrpcCallRateMeter method and variable name
...
- Change method isAllowed() -> checkAndIncrement().
- Change variable allowedCallsPerTimeUnit -> allowedCallsPerTimeWindow.
2020-12-23 11:30:16 -03:00
ghubstan
b8c5a29659
Disable CallRateMeteringInterceptorTest and run it from test suite
...
This will reduce the entire apitest suite's exec time
2020-12-22 22:03:06 -03:00
ghubstan
63564760a8
Support more fine grained rate metering
...
We need to be able to define call rate meters for time spans not limited
to TimeUnit intervals of 1 SECOND, 1 HOUR, or 1 DAY. This change allows
more flexibility, e.g., 10 per 5 seconds, 10 per 5 hrs, 100 per 7 days.
2020-12-22 21:11:04 -03:00
ghubstan
c8ef4141e3
Fix comment
2020-12-22 18:33:18 -03:00
ghubstan
0d4ed952e7
Remove redundant callCount field
...
The size of the timestamp queue is the call count
2020-12-22 17:00:01 -03:00
ghubstan
d61521276f
Remove unused local var
2020-12-22 16:30:37 -03:00
ghubstan
01546ad11d
Use a simpler, time windowing call rate meter
...
Rewrote the GrpcCallRateMeter class and adjusted afected classes.
These changes were requested in PR review
https://github.com/bisq-network/bisq/pull/4966#pullrequestreview-557040093
2020-12-22 16:14:49 -03:00
Christoph Atteneder
4e707a59fe
Merge pull request #4980 from Jakub-CZ/improve-msg-in-wallet-info
...
Improve paragraph under "Wallet balances"
2020-12-22 09:32:54 +01:00
Christoph Atteneder
142d14b58f
Merge pull request #4991 from m52go/walletinfo-path-wording
...
Improve path text on wallet info screen
2020-12-22 09:32:12 +01:00
Christoph Atteneder
73fdb9f6ec
Merge pull request #4984 from chimp1984/improve-localnode-popup-text
...
Improve popup text in case a local node is detected
2020-12-22 09:31:28 +01:00
chimp1984
823980c678
Improve text
2020-12-21 16:26:26 -05:00
sqrrm
c5218c66c3
Merge pull request #4971 from chimp1984/use-resource-file-instead-of-resync-from-genesis
...
Avoid resync from genesis in case of dao state issues
2020-12-21 22:00:42 +01:00
m52go
409b092c1f
Edit path text on wallet info screen
2020-12-21 15:21:05 -05:00
Jakub Loucký
a6f13223d1
Remove dangling line break
2020-12-21 21:06:14 +01:00
Jakub Loucký
9aeb775443
Apply suggestions from code review
...
Co-authored-by: m52go <735155+m52go@users.noreply.github.com>
2020-12-21 21:03:28 +01:00
ghubstan
27efc5f3c2
Merge branch '09-refactor-grpc-error-handling' into 10-callrate-interceptor
...
Adjust to reverting to reverting 6aa385e
2020-12-21 15:44:34 -03:00
ghubstan
8ee3a1599c
Merge branch '08-gettransaction' into 09-refactor-grpc-error-handling
...
Adjust to reverting 6aa385e
2020-12-21 15:35:15 -03:00
ghubstan
1507a2c791
Resolve file conflict w/ master
2020-12-21 15:31:07 -03:00
ghubstan
4aa4270ed9
Adjust TradeTest to reverting 6aa385e494
2020-12-21 15:23:23 -03:00
ghubstan
3a770f4bc0
Adjust TakeSellBTCOfferTest to reverting 6aa385e494
2020-12-21 15:22:05 -03:00
ghubstan
97dcac2a2d
Adjust TradeFormat to reverting 6aa385e494
2020-12-21 15:19:10 -03:00
ghubstan
64c2ac5169
Adjust grpc.proto to reverting 6aa385e494
2020-12-21 15:17:52 -03:00
ghubstan
bdde24a463
Ajust TradeInfo to reverting 6aa385e494
2020-12-21 15:10:43 -03:00
ghubstan
672eb79f95
Revert "Append nullable withdrawalTxId field to Trade proto message"
...
This reverts commit 6aa385e494
2020-12-21 15:05:54 -03:00
ghubstan
d08dfb5f5f
Adjust create transferwise acct test
...
A new acct now has no default trade currencies.
Also fixed imports to not mix jupiter and junit asserts.
2020-12-21 17:18:01 +01:00
Christoph Atteneder
f66b8e33ce
Merge pull request #4989 from ghubstan/fix-apitest-createtransferwiseaccttest
...
Adjust create transferwise acct test
2020-12-21 17:17:47 +01:00
ghubstan
11ec853d91
Adjust create transferwise acct test
...
A new acct now has no default trade currencies.
Also fixed imports to not mix jupiter and junit asserts.
2020-12-21 11:58:52 -03:00
sqrrm
df1461c0d7
Merge pull request #4968 from ripcurlx/fix-dark-mode-private-notification-window
...
[v1.5.2] Fix private notification style issue in dark mode
2020-12-21 13:08:43 +01:00
Christoph Atteneder
d805b37a60
Merge pull request #4985 from chimp1984/improve-trade-fee-display
...
Improve trade fee display at create and take offer screens and popups
2020-12-21 11:23:07 +01:00
Christoph Atteneder
a344ae9310
Merge pull request #4977 from chimp1984/add-extra-note-for-amazon-gift-cards
...
[1.5.2] Add extra note for amazon gift cards
2020-12-21 11:22:13 +01:00
sqrrm
c801a57084
Merge pull request #4981 from chimp1984/fix-wrong-account-age-data-access
...
[1.5.2] Fix wrong account age data access
2020-12-21 10:14:10 +01:00
sqrrm
b9346883a6
Merge pull request #4975 from chimp1984/fix-isPubKeyValid-check
...
Improve CleanupMailboxMessages
2020-12-21 10:09:31 +01:00
Christoph Atteneder
fa46a1687b
Merge pull request #4987 from chimp1984/remove-popup
...
Remove redundant popup
2020-12-21 09:59:36 +01:00
chimp1984
e59f480392
Improve popup text in case a local node is detected
2020-12-20 19:02:06 -05:00
chimp1984
d689a3974b
Fix param change in test
2020-12-20 19:01:10 -05:00
chimp1984
4050644677
Remove redundant popup
2020-12-20 18:54:32 -05:00
chimp1984
bf720737db
Improve trade fee display at create and take offer screens and popups
2020-12-20 18:01:19 -05:00
sqrrm
99184567b3
Merge pull request #4953 from chimp1984/cache-results-in-account-witness-domain
...
Cache results in account witness domain
2020-12-20 23:56:51 +01:00
sqrrm
402c8efb54
Merge pull request #4982 from sqrrm/copy-account-shortcut
...
Avoid standard shortcuts
2020-12-20 18:05:00 +01:00
