diff --git a/README.md b/README.md
index a3990e205..b84ec1823 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
+
+
+
-# Pocketnet CORE
+ Pocketnet Core
+
![GitHub](https://img.shields.io/github/license/pocketnetteam/pocketnet.api)
![contributors](https://img.shields.io/github/contributors/pocketnetteam/pocketnet.core)
![last_commit](https://img.shields.io/github/last-commit/pocketnetteam/pocketnet.core)
diff --git a/share/pixmaps/logo_color/blue_250.png b/share/pixmaps/logo_color/blue_250.png
new file mode 100644
index 000000000..7943c8cf1
Binary files /dev/null and b/share/pixmaps/logo_color/blue_250.png differ
diff --git a/share/pixmaps/logo_color/blue_pad_100.png b/share/pixmaps/logo_color/blue_pad_100.png
new file mode 100644
index 000000000..464430cf0
Binary files /dev/null and b/share/pixmaps/logo_color/blue_pad_100.png differ
diff --git a/share/pixmaps/logo_color/blue_pad_250.png b/share/pixmaps/logo_color/blue_pad_250.png
new file mode 100644
index 000000000..4c0545aaa
Binary files /dev/null and b/share/pixmaps/logo_color/blue_pad_250.png differ
diff --git a/share/pixmaps/logo_color/red_250.png b/share/pixmaps/logo_color/red_250.png
new file mode 100644
index 000000000..c2ac6d2b5
Binary files /dev/null and b/share/pixmaps/logo_color/red_250.png differ
diff --git a/share/pixmaps/logo_color/red_pad_100.png b/share/pixmaps/logo_color/red_pad_100.png
new file mode 100644
index 000000000..1be43c623
Binary files /dev/null and b/share/pixmaps/logo_color/red_pad_100.png differ
diff --git a/share/pixmaps/logo_color/red_pad_250.png b/share/pixmaps/logo_color/red_pad_250.png
new file mode 100644
index 000000000..1552ccd8c
Binary files /dev/null and b/share/pixmaps/logo_color/red_pad_250.png differ
diff --git a/share/pixmaps/logo_color/sky_250.png b/share/pixmaps/logo_color/sky_250.png
new file mode 100644
index 000000000..122e467c4
Binary files /dev/null and b/share/pixmaps/logo_color/sky_250.png differ
diff --git a/share/pixmaps/logo_color/sky_pad_100.png b/share/pixmaps/logo_color/sky_pad_100.png
new file mode 100644
index 000000000..413aff7dc
Binary files /dev/null and b/share/pixmaps/logo_color/sky_pad_100.png differ
diff --git a/share/pixmaps/logo_color/sky_pad_250.png b/share/pixmaps/logo_color/sky_pad_250.png
new file mode 100644
index 000000000..e42f55d52
Binary files /dev/null and b/share/pixmaps/logo_color/sky_pad_250.png differ
diff --git a/src/pocketdb/repositories/ChainRepository.cpp b/src/pocketdb/repositories/ChainRepository.cpp
index bdf136029..a44472f6b 100644
--- a/src/pocketdb/repositories/ChainRepository.cpp
+++ b/src/pocketdb/repositories/ChainRepository.cpp
@@ -383,6 +383,7 @@ namespace PocketDb
and ut.String1 in (select b.String2 union select value from json_each(b.String3))
and ut.Height > 0
where b.Type in (305) and b.Hash = ?
+ and not exists (select 1 from BlockingLists bl where bl.IdSource = us.Id and bl.IdTarget = ut.Id)
)sql");
TryBindStatementText(insListStmt, 1, txHash);
TryStepStatement(insListStmt);
diff --git a/src/pocketdb/repositories/ConsensusRepository.cpp b/src/pocketdb/repositories/ConsensusRepository.cpp
index aaa063dda..2acf893bd 100644
--- a/src/pocketdb/repositories/ConsensusRepository.cpp
+++ b/src/pocketdb/repositories/ConsensusRepository.cpp
@@ -221,7 +221,7 @@ namespace PocketDb
FROM BlockingLists b
JOIN Transactions us indexed by Transactions_Type_Last_String1_Height_Id
ON us.Last = 1 and us.Id = b.IdSource and us.Type = 100 and us.Height is not null
- JOIN Transactions ut indexed by Transactions_Type_Last_String2_Height
+ JOIN Transactions ut indexed by Transactions_Type_Last_String1_Height_Id
ON ut.Last = 1 and ut.Id = b.IdTarget and ut.Type = 100 and ut.Height is not null
WHERE us.String1 = ?
and ut.String1 in (select ? union select value from json_each(?))
diff --git a/src/pocketdb/repositories/MigrationRepository.cpp b/src/pocketdb/repositories/MigrationRepository.cpp
index b240b0c62..2afc13902 100644
--- a/src/pocketdb/repositories/MigrationRepository.cpp
+++ b/src/pocketdb/repositories/MigrationRepository.cpp
@@ -48,8 +48,7 @@ namespace PocketDb
and not exists (select 1 from Transactions bc indexed by Transactions_Type_Last_String1_String2_Height
where bc.Type in (306) and bc.Last = 1 and bc.String1 = b.String1
and bc.String2 in (select b.String2 union select value from json_each(b.String3))
- and bc.Height > 0
- and bc.Id >= b.Id)
+ and bc.Height >= b.Height)
and not exists (select 1 from BlockingLists bl where bl.IdSource = us.Id and bl.IdTarget = ut.Id)
)sql")
@@ -82,8 +81,7 @@ namespace PocketDb
and not exists (select 1 from Transactions bc indexed by Transactions_Type_Last_String1_String2_Height
where bc.Type in (306) and bc.Last = 1 and bc.String1 = b.String1
and bc.String2 in (select b.String2 union select value from json_each(b.String3))
- and bc.Height > 0
- and bc.Id >= b.Id)
+ and bc.Height >= b.Height)
and not exists (select 1 from BlockingLists bl where bl.IdSource = us.Id and bl.IdTarget = ut.Id)
limit 1
)sql");