hub/db/revertable.py

@@ -135,9 +135,11 @@ class RevertableOpStack:
         existing = {}
         if self._enforce_integrity and unique_keys:
             unique_keys = list(unique_keys)
-            existing.update({
+            for idx in range(0, len(unique_keys), 10000):
-                k: v for k, v in zip(unique_keys, self._multi_get(unique_keys))
+                batch = unique_keys[idx:idx+10000]
-            })
+                existing.update({
+                    k: v for k, v in zip(batch, self._multi_get(batch))
+                })
 
         for op in ops_to_apply:
             if op.key in self._items and len(self._items[op.key]) and self._items[op.key][-1] == op.invert():

hub/scribe/service.py

@@ -509,15 +509,53 @@ class BlockchainProcessorService(BlockchainService):
         self.pending_support_amount_change[supported_claim_hash] += txo.value
         self.future_effective_amount_delta[supported_claim_hash] += txo.value
 
-    def _add_claim_or_support(self, height: int, tx_hash: bytes, tx_num: int, nout: int, txo: 'TxOutput',
+    def add_txos(self, height: int, tx_hash: bytes, tx_num: int, txos: List[TxOutput],
-                              spent_claims: typing.Dict[bytes, Tuple[int, int, str]], first_input: 'TxInput') -> int:
+                 spent_claims: typing.Dict[bytes, Tuple[int, int, str]], first_input: 'TxInput') -> Tuple[int, int]:
-        if txo.is_claim or txo.is_update:
+        claim_cnt = 0
-            self._add_claim_or_update(height, txo, tx_hash, tx_num, nout, spent_claims, first_input)
+        support_cnt = 0
-            return 1
+        supported_claim_hashes = set()
-        elif txo.is_support:
+        for nout, txo in enumerate(txos):
-            self._add_support(height, txo, tx_num, nout)
+            # Get the hashX.  Ignore unspendable outputs
-            return 2
+            hashX = self.add_utxo(tx_hash, tx_num, nout, txo)
-        return 0
+            if hashX:
+                # self._set_hashX_cache(hashX)
+                if tx_num not in self.hashXs_by_tx[hashX]:
+                    self.hashXs_by_tx[hashX].append(tx_num)
+
+            if txo.is_support:
+                supported_claim_hashes.add(txo.support.claim_hash[::-1])
+        supported_claim_hashes = list(supported_claim_hashes)
+        supported_claims = {
+            claim_hash: txo for claim_hash, txo in zip(
+                supported_claim_hashes, self.db.prefix_db.claim_to_txo.multi_get(
+                    [(claim_hash,) for claim_hash in supported_claim_hashes]
+                )
+            )
+        }
+        for nout, txo in enumerate(txos):
+            if txo.is_claim or txo.is_update:
+                self._add_claim_or_update(height, txo, tx_hash, tx_num, nout, spent_claims, first_input)
+                claim_cnt += 1
+            elif txo.is_support:
+                supported_claim_hash = txo.support.claim_hash[::-1]
+                try:
+                    normalized_name = normalize_name(txo.support.name.decode())
+                except UnicodeDecodeError:
+                    normalized_name = ''.join(chr(x) for x in txo.support.name)
+                supported_claim = supported_claims[supported_claim_hash]
+                if supported_claim and supported_claim.normalized_name != normalized_name:
+                    continue
+                self.support_txos_by_claim[supported_claim_hash].append((tx_num, nout))
+                self.support_txo_to_claim[(tx_num, nout)] = supported_claim_hash, txo.value, normalized_name
+                # print(f"\tsupport claim {supported_claim_hash.hex()} +{txo.value}")
+                self.db.prefix_db.claim_to_support.stash_put((supported_claim_hash, tx_num, nout), (txo.value,))
+                self.db.prefix_db.support_to_claim.stash_put((tx_num, nout), (supported_claim_hash,))
+                self.pending_support_amount_change[supported_claim_hash] += txo.value
+                self.future_effective_amount_delta[supported_claim_hash] += txo.value
+                support_cnt += 1
+            else:
+                pass
+        return claim_cnt, support_cnt
 
     def _spend_claims_and_supports(self, txis: List[TxInput], spent_claims: Dict[bytes, Tuple[int, int, str]]):
         tx_nums = self.db.get_tx_nums(
@@ -1622,8 +1660,8 @@ class BlockchainProcessorService(BlockchainService):
         # Use local vars for speed in the loops
         tx_count = self.tx_count
         spend_utxos = self.spend_utxos
-        add_utxo = self.add_utxo
+        add_txos = self.add_txos
-        add_claim_or_support = self._add_claim_or_support
+
         # spend_claim_or_support = self._spend_claim_or_support_txo
         txs: List[Tuple[Tx, bytes]] = block.transactions
 
@@ -1659,21 +1697,11 @@ class BlockchainProcessorService(BlockchainService):
 
             # Add the new UTXOs
             txo_count += len(tx.outputs)
-            for nout, txout in enumerate(tx.outputs):
+            added_claims, added_supports = add_txos(
-                # Get the hashX.  Ignore unspendable outputs
+                height, tx_hash, tx_count, tx.outputs, spent_claims, tx.inputs[0]
-                hashX = add_utxo(tx_hash, tx_count, nout, txout)
+            )
-                if hashX:
+            claim_added_count += added_claims
-                    # self._set_hashX_cache(hashX)
+            support_added_count += added_supports
-                    if tx_count not in self.hashXs_by_tx[hashX]:
-                        self.hashXs_by_tx[hashX].append(tx_count)
-                # add claim/support txo
-                added_claim_or_support = add_claim_or_support(
-                    height, tx_hash, tx_count, nout, txout, spent_claims, tx.inputs[0]
-                )
-                if added_claim_or_support == 1:
-                    claim_added_count += 1
-                elif added_claim_or_support == 2:
-                    support_added_count += 1
 
             # Handle abandoned claims
             abandoned_channels = {}