Commit Graph

13632 Commits

Author SHA1 Message Date
sqrrm
fb3b3a357a
Merge pull request #5024 from ghubstan/01-misc
Tidy up apitest
2021-01-01 16:57:30 +01:00
ghubstan
f8cf109aed
Fix CLI --help formatting bugs 2020-12-31 12:18:33 -03:00
ghubstan
81371d477c
Merge branch 'master' into 01-misc 2020-12-31 11:58:18 -03: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
sqrrm
6e12bad4b5
Merge pull request #5033 from chimp1984/add-date-check-at-republish=account-age-witness
[1.5.4] Only publish witness if we are in date tolerance
2020-12-31 11:57:44 +01:00
sqrrm
d633d13b88
Merge pull request #5032 from chimp1984/check-for-duplicates-at-onBundleOfEnvelopes
[1.5.4] Check for duplicate hashes at onBundleOfEnvelopes
2020-12-31 11:52:36 +01:00
sqrrm
4c14d4e232
Merge pull request #5030 from chimp1984/fix-incorrect-map-lookup-forhistorical-data-stores
[1.5.4] We need to use the getMapOfAllData method for HistoricalDataStoreServices
2020-12-31 11:28:30 +01:00
chimp1984
4d2e9c1f4f
Fix missing param in test 2020-12-31 07:18:53 +01:00
chimp1984
f79c155efd
Only publish witness if we are in date tolerance 2020-12-31 07:18:45 +01:00
chimp1984
9f51bbc627
Check for duplicate hashes at onBundleOfEnvelopes
Set log level to debug to not spam logs with it.
2020-12-31 07:18:08 +01:00
chimp1984
55c5d4e078
We need to use the getMapOfAllData method for HistoricalDataStoreServices 2020-12-31 07:17:50 +01:00
chimp1984
8c0346c23c
Revert dev values for NUM_SEEDS_FOR_PRELIMINARY_REQUEST and NUM_ADDITIONAL_SEEDS_FOR_UPDATE_REQUEST 2020-12-31 07:17:31 +01:00
chimp1984
35c6a9aca4
Force travis for rebuild 2020-12-31 00:56:21 -05:00
Christoph Atteneder
3914e5c198
Bump version number for v1.5.4 2020-12-31 06:55:20 +01:00
chimp1984
203a6e0681
Force travis for rebuild 2020-12-31 00:44:57 -05:00
chimp1984
a3e8d4d225
Fix missing param in test 2020-12-31 00:42:23 -05:00
chimp1984
381322f600
Only publish witness if we are in date tolerance 2020-12-30 23:20:38 -05:00
chimp1984
b9ca29988f
Check for duplicate hashes at onBundleOfEnvelopes
Set log level to debug to not spam logs with it.
2020-12-30 20:56:51 -05:00
chimp1984
6a35410c69
Log error (and throw exception if in devMode) if
HistoricalDataStoreService.getMap is called.

HistoricalDataStoreService.getMap should not be used by domain
clients but rather the custom methods getMapOfAllData,
getMapOfLiveData or getMapSinceVersion.

As we have not removed the calls from ProposalService and
other domains we return getMapOfAllData() instead of the live map.
This was prevented earlier for performance reasons. It is more safe
thought to return in case of an illegal access all data instead of
live data only.
2020-12-30 20:47:15 -05:00
chimp1984
4489e57849
Use concrete dataStorageServices instead
p2PService.getP2PDataStorage().getAppendOnlyDataStoreMap().

p2PService.getP2PDataStorage().getAppendOnlyDataStoreMap() iterates
over all services including the historical data store service. It used the
getMap method which should not be used at historical data store service as
it is not clear if the live data or all data should be accessed.
2020-12-30 20:38:42 -05:00
chimp1984
85caf88913
We need to use the getMapOfAllData method for HistoricalDataStoreServices 2020-12-30 20:20:57 -05:00
sqrrm
0c1bc025e8
Merge pull request #5029 from chimp1984/fix-num-seeds-to-connect-to
Revert dev values for NUM_SEEDS_FOR_PRELIMINARY_REQUEST and NUM_ADDIT…
2020-12-31 00:04:18 +01:00
chimp1984
ae65da2861
Revert dev values for NUM_SEEDS_FOR_PRELIMINARY_REQUEST and NUM_ADDITIONAL_SEEDS_FOR_UPDATE_REQUEST 2020-12-30 14:27:33 -05:00
sqrrm
0069581c45
Merge pull request #5027 from bisq-network/hotfix/v1.5.3
Hotfix/v1.5.3
2020-12-30 15:47:00 +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
chimp1984
85d0d6120b
Filter out AccountAgeWitness data if it appears to be a dos attack or caused from a bug 2020-12-30 13:34:53 +01:00
chimp1984
a81188e28f
Disconnect nodes at RequestDataManager.onMessage < 1.5.1 2020-12-30 13:34:42 +01:00
Christoph Atteneder
e92be14a57
Bump version number for v1.5.3 2020-12-30 13:34:08 +01:00
sqrrm
9f50dcae2f
Merge pull request #5026 from chimp1984/add-dos-protection
Add dos protection
2020-12-30 12:57:53 +01:00
chimp1984
a6413e4c6f
Filter out AccountAgeWitness data if it appears to be a dos attack or caused from a bug 2020-12-30 06:13:57 -05:00
chimp1984
510a941cb4
Disconnect nodes at RequestDataManager.onMessage < 1.5.1 2020-12-30 06:12:37 -05:00
Christoph Atteneder
aaad74fbf0
Merge pull request #5009 from chimp1984/improve-log-of-initial-data-response
Add estimated size to log of initial data response
2020-12-29 20:00:54 +01:00
Christoph Atteneder
115ec78f4d
Merge pull request #5011 from chimp1984/show-stacktrace-in-error-popup-at-view-exceptions
Show stacktrace in error popup at view exceptions
2020-12-29 19:58:01 +01:00
Christoph Atteneder
30cfe5de7b
Merge pull request #5015 from Jakub-CZ/fix-withdrawal-label
Fix missing apostrophe in Withdrawal view
2020-12-29 19:57:02 +01:00
Christoph Atteneder
94cf02303e
Merge pull request #4950 from chimp1984/improve-offer-publishing
Improve offer publishing
2020-12-29 19:51:21 +01:00
Christoph Atteneder
6564c3fe7f
Merge pull request #4988 from chimp1984/rearrange-bsq-price-rows
Move BSQ price in USD at first row
2020-12-29 19:45:44 +01:00
Christoph Atteneder
a2a542e11e
Merge pull request #4999 from chimp1984/persist-app-window-layout
Add generic map (cookie) to UserPayload
2020-12-29 19:44:29 +01:00
ghubstan
206364de42
Reduce some trade test wait times
Commit 2070e76 fixed the repeating dao sync bug, so don't need to
wait as long after generating a btc block.
2020-12-29 14:12:55 -03:00
ghubstan
6594d147d3
Refactor wallet test fixtures into util 2020-12-29 13:54:27 -03:00
ghubstan
9250845a66
Explain why balance asserts are checking a range, not one value
And change log.info to log.debug.
2020-12-29 13:14:05 -03:00
ghubstan
bb07f10990
Remove unused imports 2020-12-29 12:52:03 -03:00
ghubstan
7e24c57dc8
Adjust lombok annotations to reduce build warnings
This change fixes the underlying problems behind five compiler warnings:
"Generating equals/hashCode implementation but without a call to superclass".

Some core classes use @Value and @Data annotations where not necessary, for
example, where equals, hashCode, and toString are implemented by the developer,
and where final class and field modifiers are defined by the developer.

From lombok classes and documents for the shortcut annotations
	@Value https://projectlombok.org/features/Value and
	@Data  https://projectlombok.org/features/Data,
we find some implicit annotations applied by these shortcuts are not needed.
Adjustments are described below.

- Tx Replace @Value with @Getter.

- TxOutput  Replace @Data with @Getter and @Setter.

- ChangeParamProposal  Replace @Value with @Getter.

- GetInventoryRequest, GetInventoryResponse
  An @EqualsAndHashCode(callSuper = false) is added to supress build
  warnings.
2020-12-29 12:39:08 -03:00
ghubstan
651e772c18
Merge branch 'master' into 01-misc 2020-12-29 10:37:23 -03:00
Christoph Atteneder
1f06429d25
Merge pull request #5018 from Jakub-CZ/fix-button-checkbox-overlap
Fix layout of button and checkbox in Receive funds
2020-12-29 14:18:38 +01:00
sqrrm
9cc3f687c0
Merge pull request #4851 from chimp1984/improve-bsq-get-block-request-handling
Improve getBlocks request handling
2020-12-29 13:55:40 +01:00
Jakub Loucký
338d5a3ecf
Fix layout of button and checkbox in Receive funds 2020-12-29 01:17:02 +01:00
Christoph Atteneder
785c76e9d6
Merge pull request #5010 from chimp1984/dao-performance-improvements
Dao performance improvements
2020-12-28 20:06:58 +01:00
chimp1984
862b12fe03
Apply code inspection
Cleanups
2020-12-28 13:34:50 -05:00