From cae95ce2f9d348b3f36c9fadca66d7478efcd7bf Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Sun, 24 Jan 2021 16:23:21 +0100 Subject: [PATCH 1/2] Update bitcoinj checkpoints for v1.5.5 --- core/src/main/resources/wallet/checkpoints.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt index 51a1adad07f..8326d3cd821 100644 --- a/core/src/main/resources/wallet/checkpoints.txt +++ b/core/src/main/resources/wallet/checkpoints.txt @@ -1,6 +1,6 @@ TXT CHECKPOINTS 1 0 -327 +330 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G @@ -328,3 +328,6 @@ FMlwaWsoL8M1y3sGAAn3gAAAICD2It4VF1dZC7XR51SjkuBPy2c1ot7iBQAAAAAAAAAAAOto2NUucHcz FVin/nTPxZEaUhFJAAn/YADg/zdLnpRRoj5nb9aeuWAA1TG1ZV/ig3PhBQAAAAAAAAAAAP7jjrVesvd94nsFrp03Zj496k0mgpUa+z2F/FaP1R7omhShXzPEEBcdNBS1 FdDmSXs4LVrTs1CaAAoHQAAAACDvuQVfiWazEOmUBkUubcV9HD6bQ4YDCQAAAAAAAAAAAIpAWQyuvdv0i6cfyxgL/cqONcYtUdP6eDTQOlOgmOc5h7CyX93+DxdiV5Q4 Fk7wqQvRa3I8HIU0AAoPIAAAACClMk0cUuhV+1lsN2AW0bLOzyOjOxhvBAAAAAAAAAAAAHvW0itHeUSYGKmni03ZQ4CQz/twR/T8aM+iCLhkzgVuGaXDX1axDheZrIxe +FtgmMCmxHYDfZVDnAAoXAADg/ydUahAkyDODrqzZ/A9vg1WNyOWPKEjSBgAAAAAAAAAAAIF1YVHIYoFF9C7GrkXnuXeYn2j+2cNXhc5hrQ9iuMiyW5nWX3ITDxcvOs69 +F13fK/nssCNHFGj5AAoe4AAAQCDp4pHELBlNIcdX51i41BvbBjtbfHsECgAAAAAAAAAAAIcgs1NcVR2veWwlmJK7rkICXTqwbukwNfe5scvzGUskkCDpXxciDxc/NQHe +F+MYpAKDBczv4JWTAAomwAAAACBS1/Bd73vGgmzadPW9r4Vf4TzSyKulDgAAAAAAAAAAALu0Rd+bUPZVV1LffkjQnE9dvY5cjr8wr/G1X47UTZ6Atcr5X6GoDRcUdkaH From 60fc17be2c2e3f0e218abdeba147c84e4a7971a3 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 25 Jan 2021 14:18:21 +0100 Subject: [PATCH 2/2] Update data stores for v1.5.5 --- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/macosx/copy_dbs.sh | 2 +- .../main/resources/AccountAgeWitnessStore_1.5.5_BTC_MAINNET | 3 +++ p2p/src/main/resources/DaoStateStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET | 4 ++-- .../main/resources/TradeStatistics3Store_1.5.5_BTC_MAINNET | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 p2p/src/main/resources/AccountAgeWitnessStore_1.5.5_BTC_MAINNET create mode 100644 p2p/src/main/resources/TradeStatistics3Store_1.5.5_BTC_MAINNET diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index ad31145643a..0313f44f4e1 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -37,7 +37,7 @@ public class Version { * This must not contain each version but only those where we add new version-tagged resource files for * historical data stores. */ - public static final List HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2"); + public static final List HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2", "1.5.5"); public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh index 6da5e4def41..72fda0568d0 100755 --- a/desktop/package/macosx/copy_dbs.sh +++ b/desktop/package/macosx/copy_dbs.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version="1.5.2" +version="1.5.5" # Set BISQ_DIR as environment var to the path of your locally synced Bisq data directory e.g. BISQ_DIR=~/Library/Application\ Support/Bisq diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_1.5.5_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.5.5_BTC_MAINNET new file mode 100644 index 00000000000..b08932dc70d --- /dev/null +++ b/p2p/src/main/resources/AccountAgeWitnessStore_1.5.5_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73fb2e89f9cea66437ae20c7732465e9ad70232dbdc2f198de532d63f8aa2f13 +size 185542 diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET index 7870991d893..0f6d7e06511 100644 --- a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET +++ b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:689a1b07b04c369a9b32dd05a8714f26128f7ca350f3e1cf6bfb0cc8c159677e -size 100617580 +oid sha256:6287d47e59252948bad651c35cdd2cd1ddfc652be76646bf192d0e3ec72f525b +size 107895125 diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET index 91ac6f702b7..cf87d900749 100644 --- a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET +++ b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b26bee55f35f78f43da40f5a3baf7ad9cf3a29be47c7145eefc2e66a3b0a0cda -size 5001045 +oid sha256:51cfc54d3bfbefcf769c931e6c0fcc31c3afee4d609758cabe0ab456de2e4f95 +size 5955917 diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.5.5_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.5.5_BTC_MAINNET new file mode 100644 index 00000000000..ab03d5c6a57 --- /dev/null +++ b/p2p/src/main/resources/TradeStatistics3Store_1.5.5_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c8ddbb5b2cbd7d66d3882878d07b9aa8846aba8769ad2334380cef5810385e2 +size 364747