From 2ba15a97ac687a6eb5ae86c4cf5225f87b0cd663 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 17 Dec 2020 15:47:36 +0100 Subject: [PATCH 1/2] Update bitcoinj checkpoints for v1.5.2 --- core/src/main/resources/wallet/checkpoints.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt index 8e22a7f75a9..51a1adad07f 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 -325 +327 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G @@ -326,3 +326,5 @@ E7TgpleovIarz4zNAAnnwADg/zelTTDUGas2KxqgEH2WV5EilGEY8VASBgAAAAAAAAAAAJVJFZNI4Kxh FD83ZUplM/sW8MloAAnvoAAAQCBUTUlenrKovQvyeNaLUYJBmxfT5hcuDQAAAAAAAAAAAIaxf5jfjr8MifLPauOJeh6OWDYxSUUPluG5E8hVh+rrWD95X96VDhf7Be0Q FMlwaWsoL8M1y3sGAAn3gAAAICD2It4VF1dZC7XR51SjkuBPy2c1ot7iBQAAAAAAAAAAAOto2NUucHczD9ZpnC5X1L05HcifvGpMh8gwIt7mZ2DW3BWLX04TDhdKX1k6 FVin/nTPxZEaUhFJAAn/YADg/zdLnpRRoj5nb9aeuWAA1TG1ZV/ig3PhBQAAAAAAAAAAAP7jjrVesvd94nsFrp03Zj496k0mgpUa+z2F/FaP1R7omhShXzPEEBcdNBS1 +FdDmSXs4LVrTs1CaAAoHQAAAACDvuQVfiWazEOmUBkUubcV9HD6bQ4YDCQAAAAAAAAAAAIpAWQyuvdv0i6cfyxgL/cqONcYtUdP6eDTQOlOgmOc5h7CyX93+DxdiV5Q4 +Fk7wqQvRa3I8HIU0AAoPIAAAACClMk0cUuhV+1lsN2AW0bLOzyOjOxhvBAAAAAAAAAAAAHvW0itHeUSYGKmni03ZQ4CQz/twR/T8aM+iCLhkzgVuGaXDX1axDheZrIxe From 63847533323346873e851dab79172d5cff2c09dc Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 17 Dec 2020 15:48:05 +0100 Subject: [PATCH 2/2] Update data stores for v1.5.2 --- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/macosx/copy_dbs.sh | 2 +- .../main/resources/AccountAgeWitnessStore_1.5.2_BTC_MAINNET | 3 +++ p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET | 3 --- p2p/src/main/resources/DaoStateStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET | 4 ++-- .../main/resources/TradeStatistics3Store_1.5.2_BTC_MAINNET | 3 +++ 7 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 p2p/src/main/resources/AccountAgeWitnessStore_1.5.2_BTC_MAINNET delete mode 100644 p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET create mode 100644 p2p/src/main/resources/TradeStatistics3Store_1.5.2_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 62a68e40c96..ef2c3c0064a 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"); + public static final List HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2"); 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 520841cd2fa..6da5e4def41 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.0" +version="1.5.2" # 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.2_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.5.2_BTC_MAINNET new file mode 100644 index 00000000000..52194824ac4 --- /dev/null +++ b/p2p/src/main/resources/AccountAgeWitnessStore_1.5.2_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed73dc1b5c847ea08ca61c9903887525f155817aeef7cf7f7bb0db7d00be07a8 +size 2178782 diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET deleted file mode 100644 index a9ad8621cc8..00000000000 --- a/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86921ed15d886ece795f6400e2835eb7bdb392d87be314f99c122505a6c7bf7e -size 2088756 diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET index fe7ba0d56e2..7870991d893 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:0417e59cc6a9674956c06cde8c3691926c2277b42ad91510aaaae71256b60ea2 -size 96464108 +oid sha256:689a1b07b04c369a9b32dd05a8714f26128f7ca350f3e1cf6bfb0cc8c159677e +size 100617580 diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET index 7e6c8778946..91ac6f702b7 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:6c5b7d98da6da5f50dd01e902a7ee1ba578f3e8661206c2576c477ec0c3e169b -size 4564514 +oid sha256:b26bee55f35f78f43da40f5a3baf7ad9cf3a29be47c7145eefc2e66a3b0a0cda +size 5001045 diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.5.2_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.5.2_BTC_MAINNET new file mode 100644 index 00000000000..ee799a6ee3b --- /dev/null +++ b/p2p/src/main/resources/TradeStatistics3Store_1.5.2_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7c198cde0661203db82a2c77356075c26415fa1c5ced1f21cfeb78aa9abce6 +size 255823