Merge remote-tracking branch 'origin/fixes/multiplelocks' into featur…

…e/events

README.md

@@ -1,5 +1,9 @@
+<p align="center">
+   <img src="./share/pixmaps/logo_color/sky_250.png" width="150px">
+ </p>
 
-# Pocketnet CORE
+ <h1 align="center">Pocketnet Core</h1>
+
 ![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)

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);

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(?))

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");