lunalib 1.7.9__py3-none-any.whl → 1.8.0__py3-none-any.whl

lunalib/core/blockchain.py

@@ -1,3 +1,4 @@
+from tqdm import tqdm
 # blockchain.py - Updated version
 
 from ..storage.cache import BlockchainCache
@@ -267,12 +268,12 @@ class BlockchainManager:
     def get_blocks_range(self, start_height: int, end_height: int) -> List[Dict]:
         """Get range of blocks"""
         blocks = []
-        
+
         # Check cache first
         cached_blocks = self.cache.get_block_range(start_height, end_height)
         if len(cached_blocks) == (end_height - start_height + 1):
             return cached_blocks
-            
+
         try:
             response = requests.get(
                 f'{self.endpoint_url}/blockchain/range?start={start_height}&end={end_height}',
@@ -286,15 +287,15 @@ class BlockchainManager:
                     self.cache.save_block(height, block.get('hash', ''), block)
             else:
                 # Fallback: get blocks individually
-                for height in range(start_height, end_height + 1):
+                for height in tqdm(range(start_height, end_height + 1), desc="Get Blocks", leave=False):
                     block = self.get_block(height)
                     if block:
                         blocks.append(block)
                     time.sleep(0.01)  # Be nice to the API
-                        
+
         except Exception as e:
             print(f"Get blocks range error: {e}")
-            
+
         return blocks
     
     def get_mempool(self) -> List[Dict]:
@@ -322,22 +323,19 @@ class BlockchainManager:
         """Scan blockchain for transactions involving an address"""
         if end_height is None:
             end_height = self.get_blockchain_height()
-        
+
         print(f"[SCAN] Scanning transactions for {address} from block {start_height} to {end_height}")
-            
+
         transactions = []
-        
-        # Scan in batches for efficiency
         batch_size = 100
-        for batch_start in range(start_height, end_height + 1, batch_size):
+        total_batches = ((end_height - start_height) // batch_size) + 1
+        for batch_start in tqdm(range(start_height, end_height + 1, batch_size), desc=f"Scan {address}", total=total_batches):
             batch_end = min(batch_start + batch_size - 1, end_height)
-            print(f"[SCAN] Processing batch {batch_start}-{batch_end}...")
             blocks = self.get_blocks_range(batch_start, batch_end)
-            
             for block in blocks:
                 block_transactions = self._find_address_transactions(block, address)
                 transactions.extend(block_transactions)
-        
+
         print(f"[SCAN] Found {len(transactions)} total transactions for {address}")
         return transactions
     
@@ -389,11 +387,10 @@ class BlockchainManager:
         results: Dict[str, List[Dict]] = {addr: [] for addr in addresses}
 
         batch_size = 100
-        for batch_start in range(start_height, end_height + 1, batch_size):
+        total_batches = ((end_height - start_height) // batch_size) + 1
+        for batch_start in tqdm(range(start_height, end_height + 1, batch_size), desc="Multi-Scan", total=total_batches):
             batch_end = min(batch_start + batch_size - 1, end_height)
-            print(f"[MULTI-SCAN] Processing batch {batch_start}-{batch_end}...")
             blocks = self.get_blocks_range(batch_start, batch_end)
-
             for block in blocks:
                 collected = self._collect_transactions_for_addresses(block, normalized_map)
                 for original_addr, txs in collected.items():

lunalib/core/wallet.py

@@ -493,8 +493,9 @@ class LunaWallet:
                     confirmations = None
 
             if tx_type == "reward" or tx.get("from") == "network":
-                # Only count as confirmed if confirmations >= 6
-                if confirmations is not None and confirmations >= 6:
+                print(f"[DEBUG] reward tx: {tx}, confirmations={confirmations}")
+                # block_heightやcurrent_heightがNoneならとりあえず加算
+                if confirmations is None or confirmations >= 6:
                     total_balance += amount
             elif direction == "incoming":
                 total_balance += amount
@@ -503,6 +504,7 @@ class LunaWallet:
                 total_balance -= amount
                 total_balance -= fee
 
+        print(f"[DEBUG] computed confirmed balance: {total_balance}")
         return max(0.0, total_balance)
 
     def _compute_pending_totals(

{lunalib-1.7.9.dist-info → lunalib-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lunalib
-Version: 1.7.9
+Version: 1.8.0
 Summary: Cryptocurrency Ecosystem library (LunaLib)
 Home-page: 
 Author: Ling Lin

{lunalib-1.7.9.dist-info → lunalib-1.8.0.dist-info}/RECORD

@@ -4,13 +4,13 @@ lunalib/cli.py,sha256=SyuJIhvqld-XL9ks9XFOuyqVb44qyBUbahlqE_RDVkM,524
 lunalib/luna_lib.py,sha256=ue9Bs93xjpg7_GHSUJPKBhf8nF5YcbCIdoMIu-jDgG4,2748
 lunalib/__pycache__/__init__.cpython-310.pyc,sha256=7ltg-tl9NKRuAZE6SZHaS9jPUJRdoOnQcHnCxsRznGo,638
 lunalib/core/__init__.py,sha256=V86B0jI8snFIg8yCyd_Qoi2Tl6elQn_1cT-oeR6Ig3s,361
-lunalib/core/blockchain.py,sha256=yhK_PcyYuH5rAAbRZar-8DbF2kMWde7Ku2TOa1FIbrE,44530
+lunalib/core/blockchain.py,sha256=9upZViBmDNmEk_pbjnsGy8NJKRklrOaHAcgxsw3bnRA,44524
 lunalib/core/crypto.py,sha256=R_f2sj7ASNnMW8Dtf2LIWTw-vCUjXD33zJPqPcPQVB8,10684
 lunalib/core/daemon.py,sha256=VhEky7-h-mwCBVFJp7DtoMkpvmGbdcbuoG9qNkbEvbg,21048
 lunalib/core/mempool.py,sha256=IfFvDUe6YRLefUqA3T0xx2ynnNh43x5RA-hdxAbTcMQ,14947
 lunalib/core/p2p.py,sha256=cj3dda05oL6W5oMsvJ_HT3U0qr1FL6DR-YI78k3InKg,13784
 lunalib/core/sm2.py,sha256=Eq8Er3XQW5rYJXwaPT5vw5NoVXbSWhyuvjoG1LMo-NQ,23454
-lunalib/core/wallet.py,sha256=HD5AtRQG2yFSlEdXorkNC0_mFOrPT3205PcPvYuT7q4,68927
+lunalib/core/wallet.py,sha256=bXVwMEJabTXPp3KsJe-rA9Gvd0GjLlImjfYvtoxkEzY,69093
 lunalib/core/wallet_db.py,sha256=xhkhNbXPntHdb1tWXQJOlwxWBnWG5TVSFKUbvQM9YZg,2628
 lunalib/core/wallet_manager.py,sha256=KK58hrr_xF1vZ4qI6x_BJqrs9XXh5m0XbZYnZmi9yoU,26031
 lunalib/core/wallet_sync_helper.py,sha256=CGfSBXvf8vg4SGsLaxsjGwHVbD9dmfcuMrZ_CO0J5lE,6282
@@ -71,7 +71,7 @@ lunalib/transactions/__pycache__/__init__.cpython-310.pyc,sha256=BH0ASAygaGe0V88
 lunalib/transactions/__pycache__/security.cpython-310.pyc,sha256=MWrZ8pb-ybBPWNzmOjRvnikbX9miSN1M1o3AH8hh1DA,5380
 lunalib/transactions/__pycache__/transactions.cpython-310.pyc,sha256=Bq4g-Cg6YSg_xooorKorv_I56TZiTCJU713xaM29eWU,13242
 lunalib/transactions/__pycache__/validator.cpython-310.pyc,sha256=Vw9NJXbKCFROQx0hF5nMWN42kbBE4ilyHQrRrNkochE,2539
-lunalib-1.7.9.dist-info/METADATA,sha256=nD3w2UY6HcRSF90UPzvLZvrcL3dz6kGaNZBM_-1gaNA,797
-lunalib-1.7.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lunalib-1.7.9.dist-info/top_level.txt,sha256=eLcoOCtOwfvoqUu5g5CNBZB9bdhGXbTwmjuOM7i8ylw,8
-lunalib-1.7.9.dist-info/RECORD,,
+lunalib-1.8.0.dist-info/METADATA,sha256=2o56WoFRyuTd4IBEOAIkXWUTOpd_UWAYT1CILCjtr8k,797
+lunalib-1.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lunalib-1.8.0.dist-info/top_level.txt,sha256=eLcoOCtOwfvoqUu5g5CNBZB9bdhGXbTwmjuOM7i8ylw,8
+lunalib-1.8.0.dist-info/RECORD,,