Merge remote-tracking branch 'origin/0.20' into 0.21

pocketnetteam · Aug 11, 2022 · 11a03b6 · 11a03b6
2 parents ffc9247 + 3a490c2
commit 11a03b6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/pocketdb/repositories/ChainRepository.cpp b/src/pocketdb/repositories/ChainRepository.cpp
@@ -676,7 +676,7 @@ namespace PocketDb
                     and ut.Height > 0
                 join BlockingLists bl on bl.IdSource = us.Id and bl.IdTarget = ut.Id
                 where b.Type in (305)
-                  and b.Height > ?
+                  and b.Height >= ?
             )
         )sql");
         TryBindStatementInt(delListStmt, 1, height);
@@ -701,7 +701,7 @@ namespace PocketDb
                 and ut.Height > 0
             where b.Type in (305)
               -- and b.Last = 1
-              and b.Height > ?
+              and b.Height >= ?
               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))