From a9de1ce8e0ae427fdc1d5fec73996b2ee0a19ad1 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Wed, 18 Nov 2020 14:38:15 -0500
Subject: [PATCH] fix fs_transactions

---
 lbry/wallet/server/leveldb.py                 |  5 ++-
 .../test_blockchain_reorganization.py         | 36 +++++++++++++++----
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/lbry/wallet/server/leveldb.py b/lbry/wallet/server/leveldb.py
index 437240072..99cf84675 100644
--- a/lbry/wallet/server/leveldb.py
+++ b/lbry/wallet/server/leveldb.py
@@ -464,10 +464,9 @@ class LevelDB:
                     block_txs[tx_height] = list(tx_iterator(
                         start=TX_HASH_PREFIX + pack_be_uint64(tx_counts[tx_height - 1]),
                         stop=None if tx_height + 1 == len(tx_counts) else
-                        TX_HASH_PREFIX + pack_be_uint64(tx_counts[tx_height]),
-                        include_key=False
+                        TX_HASH_PREFIX + pack_be_uint64(tx_counts[tx_height] + 1), include_key=False
                     ))
-                tx_pos = tx_counts[tx_height] - tx_num
+                tx_pos = tx_num - tx_counts[tx_height - 1]
                 branch, root = branch_and_root(block_txs[tx_height], tx_pos)
                 merkle = {
                     'block_height': tx_height,
diff --git a/tests/integration/blockchain/test_blockchain_reorganization.py b/tests/integration/blockchain/test_blockchain_reorganization.py
index af9349e67..9ae915062 100644
--- a/tests/integration/blockchain/test_blockchain_reorganization.py
+++ b/tests/integration/blockchain/test_blockchain_reorganization.py
@@ -9,17 +9,32 @@ class BlockchainReorganizationTests(CommandTestCase):
     VERBOSITY = logging.WARN
 
     async def assertBlockHash(self, height):
-        self.assertEqual(
-            (await self.ledger.headers.hash(height)).decode(),
-            await self.blockchain.get_block_hash(height)
-        )
+        bp = self.conductor.spv_node.server.bp
+
+        def get_txids():
+            return [
+                bp.db.fs_tx_hash(tx_num)[0][::-1].hex()
+                for tx_num in range(bp.db.tx_counts[height - 1], bp.db.tx_counts[height])
+            ]
+
+        block_hash = await self.blockchain.get_block_hash(height)
+
+        self.assertEqual(block_hash, (await self.ledger.headers.hash(height)).decode())
+        self.assertEqual(block_hash, (await bp.db.fs_block_hashes(height, 1))[0][::-1].hex())
+
+        txids = await asyncio.get_event_loop().run_in_executor(bp.db.executor, get_txids)
+        txs = await bp.db.fs_transactions(txids)
+        block_txs = (await bp.daemon.deserialised_block(block_hash))['tx']
+        self.assertSetEqual(set(block_txs), set(txs.keys()), msg='leveldb/lbrycrd is missing transactions')
+        self.assertListEqual(block_txs, list(txs.keys()), msg='leveldb/lbrycrd transactions are of order')
 
     async def test_reorg(self):
         bp = self.conductor.spv_node.server.bp
         bp.reorg_count_metric.set(0)
         # invalidate current block, move forward 2
-        self.assertEqual(self.ledger.headers.height, 206)
-        await self.assertBlockHash(206)
+        height = 206
+        self.assertEqual(self.ledger.headers.height, height)
+        await self.assertBlockHash(height)
         await self.blockchain.invalidate_block((await self.ledger.headers.hash(206)).decode())
         await self.blockchain.generate(2)
         await self.ledger.on_header.where(lambda e: e.height == 207)
@@ -37,6 +52,11 @@ class BlockchainReorganizationTests(CommandTestCase):
         await self.assertBlockHash(207)
         await self.assertBlockHash(208)
         self.assertEqual(2, bp.reorg_count_metric._samples()[0][2])
+        await self.blockchain.generate(3)
+        await self.ledger.on_header.where(lambda e: e.height == 211)
+        await self.assertBlockHash(209)
+        await self.assertBlockHash(210)
+        await self.assertBlockHash(211)
 
     async def test_reorg_change_claim_height(self):
         # sanity check
@@ -51,6 +71,8 @@ class BlockchainReorganizationTests(CommandTestCase):
 
         # create a claim and verify it's returned by claim_search
         self.assertEqual(self.ledger.headers.height, 207)
+        await self.assertBlockHash(207)
+
         broadcast_tx = await self.daemon.jsonrpc_stream_create(
             'hovercraft', '1.0', file_path=self.create_upload_file(data=b'hi!')
         )
@@ -58,6 +80,8 @@ class BlockchainReorganizationTests(CommandTestCase):
         await self.generate(1)
         await self.ledger.wait(broadcast_tx, self.blockchain.block_expected)
         self.assertEqual(self.ledger.headers.height, 208)
+        await self.assertBlockHash(208)
+
         txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft')
         self.assertEqual(1, len(txos))
         txo = txos[0]