diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java
index 775bacccc33..6e6a7a8c906 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<String> 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.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);
diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt
index 953f052eeed..76f44333e2e 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
-349
+351
 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv
 AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5
 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G
@@ -350,3 +350,5 @@ INJeT/7WHqcUv/ASAAqkwAQAACAW1bP3ULCb7l1WrnZh1Fhdtr5iEoiNCQAAAAAAAAAAAL+GJQD++FLt
 IVCJbIepFmtNRMOrAAqsoATg/z9jvkqOCEjsMXZ5NSTR70jjJY6jcMsZAAAAAAAAAAAAAJ3FfWBYz4SZErDMatFIMKICRh05en60mvmWrgW1GboLNQQ4YeRIDxfArM0V
 IdRva310VAL/1T6KAAq0gAQAACDYRNhykSZE0FCNDbMD3ep37sppeREVBQAAAAAAAAAAACQVT8noR4EQStMyf0BwxU7X1oXPSv4XXntyzNI2Pw9nfO1JYevQDhdFHdB6
 IlyBuc55IaovtRgZAAq8YAQAACAFDOUuzSPi2Pb5kdp+wxKBfvspFnUcDgAAAAAAAAAAADcc9lDs5JP/E+v1DrUxBRV/PfB8Sbd7hC7mhLrwNS5Rt49bYTImDheC4ukE
+Iur9LLlSLrMV2wj+AArEQAQAoCBYSe7YCzICc6c9OZM8A2DhJ9FQNqadAgAAAAAAAAAAAGzCUEgUUFu2hj2WBZnB0fdqR2gJCsFbCtUXL1pc2RihVdhtYQgEDhddqree
+I3rVMPIOKThn6cAlAArMIAQAoCBR8ft4+iRzKcX0u+ahG+N51fQzm83ABgAAAAAAAAAAAETUrMchRjFlfJPF1mfN1qicGLS0C7DCbgGbGkIs92o7ovV+Yc/+DBclxWqD
diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh
index 7ba52a87012..5cdde47cfcd 100755
--- a/desktop/package/macosx/copy_dbs.sh
+++ b/desktop/package/macosx/copy_dbs.sh
@@ -15,6 +15,7 @@ cp "$dbDir/TradeStatistics3Store" "$resDir/TradeStatistics3Store_${version}_BTC_
 cp "$dbDir/AccountAgeWitnessStore" "$resDir/AccountAgeWitnessStore_${version}_BTC_MAINNET"
 cp "$dbDir/DaoStateStore" "$resDir/DaoStateStore_BTC_MAINNET"
 cp "$dbDir/SignedWitnessStore" "$resDir/SignedWitnessStore_BTC_MAINNET"
+cp -a "$dbDir/BsqBlocks/." "$resDir/BsqBlocks_BTC_MAINNET/"
 
 # Only to be updated when required
 # cp "$dbDir/ProposalStore" "$resDir/ProposalStore_BTC_MAINNET"
diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_1.8.0_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.8.0_BTC_MAINNET
new file mode 100644
index 00000000000..dd07035c271
--- /dev/null
+++ b/p2p/src/main/resources/AccountAgeWitnessStore_1.8.0_BTC_MAINNET
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:834db67ea2400d096f11c3b8fadd8f536f5e7cc1102fbabf87d0b0a1399bcaa7
+size 231980
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_707001-708000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_707001-708000
index 991a06945e9..a827e7893b5 100644
--- a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_707001-708000
+++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_707001-708000
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38d6ded9d8e8b91de863b6954aad753270f37200dd67f6219a43db73f1a2e437
-size 1066877
+oid sha256:7c5fff190bd325424e01be79f886c138902d5cbc43f2e864d691b96fe6940804
+size 1181162
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_708001-709000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_708001-709000
new file mode 100644
index 00000000000..4fb2bd71b6d
--- /dev/null
+++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_708001-709000
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:821ff17e9660024dcfd140b0fc35b6323231982a3313c0a5fc062fc96cde6bf4
+size 1207518
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_709001-710000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_709001-710000
new file mode 100644
index 00000000000..79ea4164e8d
--- /dev/null
+++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_709001-710000
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2b79dca3a7f30a0ddebbdce1f04962b070ba655e422dbbec11448c4a7b38150
+size 1130139
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_710001-711000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_710001-711000
new file mode 100644
index 00000000000..447d23aa452
--- /dev/null
+++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_710001-711000
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:963b3eb3098d20a3d4fac9dcaeedc3c8af7eaffa420377b865a8296889b54cdb
+size 1335505
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_711001-712000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_711001-712000
new file mode 100644
index 00000000000..f6928d3695e
--- /dev/null
+++ b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_711001-712000
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27c554f78d1f1d7f0fb8d6dbe913bb7e430b7ed97cbb436e88a11e8f40ac3e77
+size 114727
diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET
index cc80393492f..24ce50d5a24 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:b60e45cc6bbd9e5369480e224ac93cee24eadfe77a68a0e5bff36a8bb48dd85d
-size 18742443
+oid sha256:35cf78ae87141984b3435d260263d03ab0a34652853748d7787921c4e34becf2
+size 19217841
diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET
index d7cb3117416..325d6608f4a 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:02e4d12b1d9e5d3d94bdb250b3e9b683ccccf51119e4dd6181f08b73ed4ff09c
-size 9245383
+oid sha256:7045f19be6a4757ee467a515d4b516a56dd062b99e4270ebb642208575eda39c
+size 9587199
diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.8.0_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.8.0_BTC_MAINNET
new file mode 100644
index 00000000000..761288ae253
--- /dev/null
+++ b/p2p/src/main/resources/TradeStatistics3Store_1.8.0_BTC_MAINNET
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6ee61092a0dddc75ef7c37768f75dbec902e4677b1e79f39cceca64fdd7ffab
+size 520137