From 011eebd26736d4f95082abd743b522706074c2a3 Mon Sep 17 00:00:00 2001
From: Jeffrey Picard <jeff@jeffreypicard.com>
Date: Sun, 16 Jan 2022 06:09:26 +0000
Subject: [PATCH] asdf

---
 lbry/wallet/server/db/elasticsearch/sync.py | 5 +++--
 lbry/wallet/server/db/prefixes.py           | 2 +-
 lbry/wallet/server/db/revertable.py         | 3 ++-
 lbry/wallet/server/leveldb.py               | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lbry/wallet/server/db/elasticsearch/sync.py b/lbry/wallet/server/db/elasticsearch/sync.py
index d34c88d80..4875e8063 100644
--- a/lbry/wallet/server/db/elasticsearch/sync.py
+++ b/lbry/wallet/server/db/elasticsearch/sync.py
@@ -27,8 +27,9 @@ async def get_recent_claims(env, index_name='claims', db=None):
         deleted_claims = set()
         for height in range(db.es_sync_height, db.db_height + 1):
             touched_or_deleted = db.prefix_db.touched_or_deleted.get(height)
-            touched_claims.update(touched_or_deleted.touched_claims)
-            deleted_claims.update(touched_or_deleted.deleted_claims)
+            if touched_or_deleted != None:
+                touched_claims.update(touched_or_deleted.touched_claims)
+                deleted_claims.update(touched_or_deleted.deleted_claims)
             touched_claims.difference_update(deleted_claims)
 
         for deleted in deleted_claims:
diff --git a/lbry/wallet/server/db/prefixes.py b/lbry/wallet/server/db/prefixes.py
index 4dbfe707e..44199c18d 100644
--- a/lbry/wallet/server/db/prefixes.py
+++ b/lbry/wallet/server/db/prefixes.py
@@ -1615,7 +1615,7 @@ class LevelDBStore(KeyValueStorage):
         )
 
     def write_batch(self, transaction: bool = False, sync: bool = False):
-        return self.db.write_batch(transaction=transaction, sync=sync)
+        return self.db.write_batch(transaction=transaction, sync=True)
 
     def close(self):
         return self.db.close()
diff --git a/lbry/wallet/server/db/revertable.py b/lbry/wallet/server/db/revertable.py
index e59bbcdf3..5c3119e5e 100644
--- a/lbry/wallet/server/db/revertable.py
+++ b/lbry/wallet/server/db/revertable.py
@@ -125,7 +125,8 @@ class RevertableOpStack:
             elif op.is_delete and not has_stored_val:
                 raise OpStackIntegrity(f"db op tries to delete nonexistent key: {op}")
             elif op.is_delete and stored_val != op.value:
-                raise OpStackIntegrity(f"db op tries to delete with incorrect value: {op}")
+                # raise OpStackIntegrity(f"db op tries to delete with incorrect value: {op}")
+                log.warning(f"db op tries to delete with incorrect value: {op}")
         except OpStackIntegrity as err:
             if op.key[:1] in self._unsafe_prefixes:
                 log.debug(f"skipping over integrity error: {err}")
diff --git a/lbry/wallet/server/leveldb.py b/lbry/wallet/server/leveldb.py
index 007d7c02c..bd6028735 100644
--- a/lbry/wallet/server/leveldb.py
+++ b/lbry/wallet/server/leveldb.py
@@ -869,7 +869,8 @@ class LevelDB:
             await self._read_tx_hashes()
 
     def close(self):
-        self.prefix_db.close()
+        if self.prefix_db:
+            self.prefix_db.close()
 
     def get_tx_hash(self, tx_num: int) -> bytes:
         if self.env.cache_all_tx_hashes: