Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge v1.5.4 hotfix #5036

Merged
merged 8 commits into from
Jan 3, 2021
Merged

Merge v1.5.4 hotfix #5036

merged 8 commits into from
Jan 3, 2021

Commits on Dec 31, 2020

  1. Bump version number for v1.5.4

    @ripcurlx
    ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    3914e5c View commit details
    Browse the repository at this point in the history

  2. Revert dev values for NUM_SEEDS_FOR_PRELIMINARY_REQUEST and NUM_ADDIT… 

    …IONAL_SEEDS_FOR_UPDATE_REQUEST
    @chimp1984 @ripcurlx
    chimp1984 authored and ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    8c0346c View commit details
    Browse the repository at this point in the history

  3. We need to use the getMapOfAllData method for HistoricalDataStoreServ… 

    …ices
    @chimp1984 @ripcurlx
    chimp1984 authored and ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    55c5d4e View commit details
    Browse the repository at this point in the history

  4. Check for duplicate hashes at onBundleOfEnvelopes 

    Set log level to debug to not spam logs with it.
    @chimp1984 @ripcurlx
    chimp1984 authored and ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    9f51bbc View commit details
    Browse the repository at this point in the history

  5. Only publish witness if we are in date tolerance

    @chimp1984 @ripcurlx
    chimp1984 authored and ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    f79c155 View commit details
    Browse the repository at this point in the history

  6. Fix missing param in test

    @chimp1984 @ripcurlx
    chimp1984 authored and ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    4d2e9c1 View commit details
    Browse the repository at this point in the history

  7. Revert to SNAPSHOT version

    @ripcurlx
    ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    31ee62b View commit details
    Browse the repository at this point in the history

  8. 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
    @ripcurlx
    ripcurlx committed Dec 31, 2020
    Configuration menu
    Copy the full SHA
    0f77562 View commit details
    Browse the repository at this point in the history