[AuxPow] Add Support for individual block headers instead of a combin…

…ed hex string

electrumx/server/session.py

@@ -1562,6 +1562,8 @@ async def block_headers(self, start_height, count, cp_height=0):
         start_height and count must be non-negative integers.  At most
         MAX_CHUNK_SIZE headers will be returned.
         '''
+        if self.protocol_tuple >= (1, 5):
+            return await self.block_headers_array(start_height, count, cp_height)
         start_height = non_negative_integer(start_height)
         count = non_negative_integer(count)
         cp_height = non_negative_integer(cp_height)
@@ -1578,6 +1580,38 @@ async def block_headers(self, start_height, count, cp_height=0):
         self.bump_cost(cost)
         return result
 
+    async def block_headers_array(self, start_height, count, cp_height=0):
+        '''Return block headers in an array for the main chain;
+        starting at start_height.
+        start_height and count must be non-negative integers.  At most
+        MAX_CHUNK_SIZE headers will be returned.
+        '''
+        start_height = non_negative_integer(start_height)
+        count = non_negative_integer(count)
+        cp_height = non_negative_integer(cp_height)
+        cost = count / 50
+
+        max_size = self.MAX_CHUNK_SIZE
+        count = min(count, max_size)
+        headers, count = await self.db.read_headers(start_height, count)
+        cursor = 0
+        result = {'count': count, 'max': max_size, 'headers': []}
+        if count and cp_height:
+            cost += 1.0
+            last_height = start_height + count - 1
+            result.update(await self._merkle_proof(cp_height, last_height))
+
+        height = 0
+        while cursor < len(headers):
+            next_cursor = self.db.header_offset(height + 1)
+            header = headers[cursor:next_cursor]
+            result['headers'].append(header)
+            cursor = next_cursor
+            height += 1
+
+        self.bump_cost(cost)
+        return result
+
     def is_tor(self):
         '''Try to detect if the connection is to a tor hidden service we are
         running.'''
@@ -2128,9 +2162,19 @@ async def block_headers(self, start_height, count, cp_height=0):
             return result
 
         # Covered by a checkpoint; truncate AuxPoW data
+        if self.protocol_tuple >= (1, 5):
+            result['headers'] = self.truncate_auxpow_headers(result['headers'])
+            return
+
         result['hex'] = self.truncate_auxpow(result['hex'], start_height)
         return result
 
+    def truncate_auxpow_headers(self, headers):
+        result = []
+        for header in headers:
+            result.append(header[:self.coin.TRUNCATED_HEADER_SIZE])
+        return result
+
     def truncate_auxpow(self, headers_full_hex, start_height):
         height = start_height
         headers_full = util.hex_to_bytes(headers_full_hex)