From 7cddb74168e0d2ad3772e043e17c494e13ed314e Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 22 Aug 2022 11:34:59 +0200 Subject: [PATCH 1/2] Update data stores for v1.9.5 --- common/src/main/java/bisq/common/app/Version.java | 2 +- .../main/resources/AccountAgeWitnessStore_1.9.5_BTC_MAINNET | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_742001-743000 | 4 ++-- .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_743001-744000 | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_744001-745000 | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_745001-746000 | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_746001-747000 | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_747001-748000 | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_748001-749000 | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_749001-750000 | 3 +++ .../resources/BsqBlocks_BTC_MAINNET/BsqBlocks_750001-751000 | 3 +++ p2p/src/main/resources/DaoStateStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET | 4 ++-- .../main/resources/TradeStatistics3Store_1.9.5_BTC_MAINNET | 3 +++ 14 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 p2p/src/main/resources/AccountAgeWitnessStore_1.9.5_BTC_MAINNET create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_743001-744000 create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_744001-745000 create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_745001-746000 create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_746001-747000 create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_747001-748000 create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_748001-749000 create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_749001-750000 create mode 100644 p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_750001-751000 create mode 100644 p2p/src/main/resources/TradeStatistics3Store_1.9.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 4edccd11b4e..9f63abd6a89 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -38,7 +38,7 @@ public class Version { * historical data stores. */ public static final List HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2", - "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0", "1.8.1", "1.8.3", "1.9.0", "1.9.3"); + "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0", "1.8.1", "1.8.3", "1.9.0", "1.9.3", "1.9.5"); public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_1.9.5_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.9.5_BTC_MAINNET new file mode 100644 index 00000000000..b0fb68be780 --- /dev/null +++ b/p2p/src/main/resources/AccountAgeWitnessStore_1.9.5_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21bb55f7ab47bd6e092d050c0aabb6ac5194b83e5f64a63f7146cb040d89bd97 +size 159719 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_742001-743000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_742001-743000 index 8afa1d77b77..ba60d0071f5 100644 --- a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_742001-743000 +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_742001-743000 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:721672bd0fc199f2f0e178b03c0a1caec98530d23420186c22b46f6d6d2fd239 -size 613051 +oid sha256:660df7c5d85fbdff77abf19fc9fdaf692896d3b541744d7da9969b75f5f25d96 +size 1281002 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_743001-744000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_743001-744000 new file mode 100644 index 00000000000..cc0df5bd1eb --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_743001-744000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cb3d346f340cdf58edb94a7c0500d9a48cee539f96368d3bc530f26f763bf55 +size 1654192 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_744001-745000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_744001-745000 new file mode 100644 index 00000000000..9d7e39c8366 --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_744001-745000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e4be00d4984b385eb83493a544220cd5c7c18f3ce4396ef1f68314d965d918b +size 1804081 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_745001-746000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_745001-746000 new file mode 100644 index 00000000000..eaf73d565bd --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_745001-746000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b688e263721a710b8af908f495c14b6a8fbc0956ecc6f1bd3a81338770b98d22 +size 1330824 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_746001-747000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_746001-747000 new file mode 100644 index 00000000000..34b45ae0acf --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_746001-747000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee49f13e51b994ef9454a26cbbb95eb84046526ae7ac2d38349405345b3e0d50 +size 1134726 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_747001-748000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_747001-748000 new file mode 100644 index 00000000000..3e1c203e76e --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_747001-748000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8c5a2e296012d84643926a5b01d371ca70841dbe7e1d637736ffe0234e91879 +size 1384602 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_748001-749000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_748001-749000 new file mode 100644 index 00000000000..33bf955842f --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_748001-749000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:869adec5265991669ea65c3b1a732eab49b38e5a4a5988e2b640165dd3d25cfb +size 1159328 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_749001-750000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_749001-750000 new file mode 100644 index 00000000000..54f12aa78bf --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_749001-750000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1a4783ff8919b20d3fb0cee090168509ccfdd1fd106a9e6f371d0a4ca3ae953 +size 1426149 diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_750001-751000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_750001-751000 new file mode 100644 index 00000000000..daec5cb07ba --- /dev/null +++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_750001-751000 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3ba9dbdbe2033e997678b869f6bf3f2e121673267ab6cce092a1a71423a27a2 +size 684881 diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET index 0b21ddd44d4..99fadd9785a 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:a6e428ecb918e48954656e5acdf6f0ed21b0ad667c42deec3922068a3164aa98 -size 25520941 +oid sha256:0ccd86c26e380e7ddfb35662f3796fd84437b035af2c01a2ebba0dacc4ad9e2f +size 27104974 diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET index ad2276dc20c..88e3d3d1eab 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:5349ed9b851ef13cfd3b1fe18185472338452f0d35ebf788f8cce083660f16c1 -size 12575929 +oid sha256:53473df1c50d942df697ad1737f429075c4e2e90e398e5e6197f8c9b8c612c44 +size 13164346 diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.9.5_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.9.5_BTC_MAINNET new file mode 100644 index 00000000000..39e3fa044d3 --- /dev/null +++ b/p2p/src/main/resources/TradeStatistics3Store_1.9.5_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da6baa4c383bdf8be9c6034f82c271d11058b0f1574214be05108abbc27ef457 +size 478515 From 827ddb071fa063dd8149df35f1363314dc953d7c Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 22 Aug 2022 11:46:26 +0200 Subject: [PATCH 2/2] Update bitcoinj checkpoints for v1.9.5 --- core/src/main/resources/wallet/checkpoints.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt index 9b13bc128d2..049d2132228 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 -367 +371 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G @@ -368,3 +368,7 @@ LMlAvNK+QWKYHSQwAAsygAAA/z+SLf2543slU0zJfbgjLns6WsWvLkXBAgAAAAAAAAAAAONztdndIny+ LZ6oLGZ+LdD7/UUeAAs6YAQAACDiKnqJjobN73F94ZqE4fGLk93Ra2jHBQAAAAAAAAAAAFdidSeFJw1xm4LjZOuhn4o53kWJPr9Qnk11EUfoRJknHvh6YroBCRdN8kQe Ln58AJA6VdT+nCxHAAtCQACA3CuWPAoyIHk/pS5ghK/0e9JNYBuuoP+1CAAAAAAAAAAAAMenS+bextkWFv/eCBHoVsG7ou7sMmSjzhsOCfgcPTDvKUWOYiBqCRca3nwi L1SfU1wu9n0DvayGAAtKIADg/zdLLg0yQjDtKerrIG42tiAkpjw+qgQMBQAAAAAAAAAAAGqXJAH8CsjzOlDMhhfL3qpYTy4jNI4XvXhpmk4de31i8IKgYmpLCRehJqwD +MC2FMbzZ6GZ2PLQ0AAtSAASAACACCSnI6KhjOCAy9ARcgLWMtYhnMOeCCAAAAAAAAAAAAIahW96kcOfwSp+d4Ktwx5xb4QMCSSgd5PCFuOG0Zp9x8WqzYsyECRcXZ+rk +MQFPxJukU2VxMFdOAAtZ4AAAACApa4oHrXf6puy7j32rMvUjTGRrfJWLAQAAAAAAAAAAABKnBBe1oFke1naU3WG6h+4aDnIXwuoVwPZ1LCm3a+ZzTifGYq+nCRcq/XE0 +MdIcHeFGfAlbkVDqAAthwAAAoCDFNZi9ceOhJ3/+b+ZkrSX8vdeZaYcoBQAAAAAAAAAAAA1K6O4gwwsberuLWymXcc54s3bH+XatWywsa2B+QHinkpfZYgQqChcOvaUn +Mph0zCx2KAMI6InuAAtpoABAsyTjQA9eJiBMBDJ6IThPx4BPlifrbV8JAQAAAAAAAAAAAGfrz/SA8MEfTHiLB8tcShTk4rD1I/EjnHH066hcM5Czk8HrYn79CRc8AIO8