lunalib 1.6.6__py3-none-any.whl → 1.7.3__py3-none-any.whl

lunalib/core/wallet_db.py

@@ -0,0 +1,67 @@
+import sqlite3
+import os
+from cryptography.fernet import Fernet
+import hashlib
+import base64
+import json
+import time
+
+class WalletDB:
+    def __init__(self, data_dir=None):
+        self.data_dir = data_dir or os.path.expanduser("~/.lunawallet")
+        os.makedirs(self.data_dir, exist_ok=True)
+        self.db_path = os.path.join(self.data_dir, "wallets.db")
+        self.conn = sqlite3.connect(self.db_path)
+        self._init_db()
+
+    def _init_db(self):
+        c = self.conn.cursor()
+        c.execute('''CREATE TABLE IF NOT EXISTS wallets (
+            address TEXT PRIMARY KEY,
+            label TEXT,
+            public_key TEXT,
+            encrypted_private_key BLOB,
+            is_locked INTEGER,
+            created REAL,
+            balance REAL,
+            available_balance REAL
+        )''')
+        self.conn.commit()
+
+    def save_wallet(self, address, label, public_key, encrypted_private_key, is_locked, created, balance, available_balance):
+        c = self.conn.cursor()
+        c.execute('''REPLACE INTO wallets (address, label, public_key, encrypted_private_key, is_locked, created, balance, available_balance)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?)''',
+            (address, label, public_key, encrypted_private_key, int(is_locked), created, balance, available_balance))
+        self.conn.commit()
+
+    def load_wallet(self, address):
+        c = self.conn.cursor()
+        c.execute('SELECT * FROM wallets WHERE address=?', (address,))
+        row = c.fetchone()
+        if row:
+            return {
+                'address': row[0],
+                'label': row[1],
+                'public_key': row[2],
+                'encrypted_private_key': row[3],
+                'is_locked': bool(row[4]),
+                'created': row[5],
+                'balance': row[6],
+                'available_balance': row[7],
+            }
+        return None
+
+    def list_wallets(self):
+        c = self.conn.cursor()
+        c.execute('SELECT address, label, is_locked, balance, available_balance FROM wallets')
+        return c.fetchall()
+
+    def close(self):
+        self.conn.close()
+
+# Example usage:
+if __name__ == "__main__":
+    db = WalletDB()
+    print("Wallets:", db.list_wallets())
+    db.close()

lunalib/mining/miner.py

@@ -687,16 +687,20 @@ class Miner:
             # Validate all transactions
             valid_transactions = self._validate_transactions(mempool)
             
-            # If no valid transactions, create a reward transaction
-            if not valid_transactions:
-                reward_tx = self._create_empty_block_reward(new_index)
-                valid_transactions = [reward_tx]
-
             # Calculate block difficulty based on transactions
             block_difficulty = self._calculate_block_difficulty(valid_transactions)
             
-            # Calculate block reward using exponential difficulty system
-            total_reward = self._calculate_exponential_block_reward(block_difficulty)
+            # Calculate block reward:
+            # - Empty blocks use LINEAR system: difficulty 1 = 1 LKC, difficulty 2 = 2 LKC, etc.
+            # - Blocks with transactions use EXPONENTIAL system: 10^(difficulty-1)
+            if not valid_transactions:
+                # Empty block: linear reward
+                total_reward = float(block_difficulty)
+                reward_tx = self._create_empty_block_reward(new_index, block_difficulty, total_reward)
+                valid_transactions = [reward_tx]
+            else:
+                # Regular block: exponential reward
+                total_reward = self._calculate_exponential_block_reward(block_difficulty)
 
             # Create block data
             block_data = {
@@ -843,17 +847,19 @@ class Miner:
         """
         return self.difficulty_system.calculate_block_reward(difficulty)
 
-    def _create_empty_block_reward(self, block_index: int) -> Dict:
-        """Create reward transaction for empty blocks"""
+    def _create_empty_block_reward(self, block_index: int, difficulty: int, reward_amount: float) -> Dict:
+        """Create reward transaction for empty blocks using LINEAR reward system (difficulty = reward)"""
         return {
             'type': 'reward',
             'from': 'network',
             'to': self.config.miner_address,
-            'amount': 1.0,
+            'amount': reward_amount,
             'timestamp': time.time(),
             'block_height': block_index,
+            'difficulty': difficulty,
             'hash': f"reward_{block_index}_{int(time.time())}",
-            'description': 'Empty block mining reward'
+            'description': f'Empty block mining reward (Linear: Difficulty {difficulty} = {reward_amount} LKC)',
+            'is_empty_block': True
         }
 
     def _cuda_mine(self, block_data: Dict, difficulty: int) -> Optional[Dict]:
@@ -1021,14 +1027,27 @@ class Miner:
             safe_print(f"⚠️  Could not validate previous hash: {e}")
         
         # Validate reward matches difficulty
-        expected_reward = self.difficulty_system.calculate_block_reward(difficulty)
+        # Empty blocks use LINEAR system (difficulty = reward)
+        # Regular blocks use EXPONENTIAL system (10^(difficulty-1))
+        transactions = block.get('transactions', [])
+        is_empty_block = len(transactions) == 1 and transactions[0].get('is_empty_block', False)
+        
+        if is_empty_block:
+            # Empty block: linear reward
+            expected_reward = float(difficulty)
+        else:
+            # Regular block: exponential reward
+            expected_reward = self.difficulty_system.calculate_block_reward(difficulty)
+        
         actual_reward = block.get('reward', 0)
         
         # Allow some tolerance for floating point comparison
         if abs(actual_reward - expected_reward) > 0.01:
-            return False, f"Reward mismatch: expected {expected_reward} LKC for difficulty {difficulty}, got {actual_reward} LKC"
+            reward_type = "Linear" if is_empty_block else "Exponential"
+            return False, f"Reward mismatch ({reward_type}): expected {expected_reward} LKC for difficulty {difficulty}, got {actual_reward} LKC"
         
-        safe_print(f"✅ Block validation passed: Hash meets difficulty {difficulty}, Reward: {actual_reward} LKC")
+        reward_type = "Linear" if is_empty_block else "Exponential"
+        safe_print(f"✅ Block validation passed ({reward_type}): Hash meets difficulty {difficulty}, Reward: {actual_reward} LKC")
         return True, ""
     
     def _clear_transactions_from_mempool(self, transactions: List[Dict]):

{lunalib-1.6.6.dist-info → lunalib-1.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lunalib
-Version: 1.6.6
+Version: 1.7.3
 Summary: Cryptocurrency Ecosystem library (LunaLib)
 Home-page: 
 Author: Ling Lin
@@ -15,6 +15,7 @@ Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: pytest
 Requires-Dist: pandas
+Requires-Dist: base58
 Dynamic: author
 Dynamic: classifier
 Dynamic: description

{lunalib-1.6.6.dist-info → lunalib-1.7.3.dist-info}/RECORD

@@ -2,13 +2,14 @@ lunalib/__init__.py,sha256=fEvoHvfcC6ilDGQrhXaVmcdB4yDmuijxz6YZHkjbuBg,527
 lunalib/cli.py,sha256=SyuJIhvqld-XL9ks9XFOuyqVb44qyBUbahlqE_RDVkM,524
 lunalib/luna_lib.py,sha256=ue9Bs93xjpg7_GHSUJPKBhf8nF5YcbCIdoMIu-jDgG4,2748
 lunalib/core/__init__.py,sha256=V86B0jI8snFIg8yCyd_Qoi2Tl6elQn_1cT-oeR6Ig3s,361
-lunalib/core/blockchain.py,sha256=dY_zQXzT8wufrinN8rGlpDTHM_M1yejfKEIm6_s78io,36564
+lunalib/core/blockchain.py,sha256=yhK_PcyYuH5rAAbRZar-8DbF2kMWde7Ku2TOa1FIbrE,44530
 lunalib/core/crypto.py,sha256=R_f2sj7ASNnMW8Dtf2LIWTw-vCUjXD33zJPqPcPQVB8,10684
-lunalib/core/daemon.py,sha256=h8I68axWR78I8w5eOrBBQwfTeAxGqOKKW0RtLoQ52yM,16189
+lunalib/core/daemon.py,sha256=VhEky7-h-mwCBVFJp7DtoMkpvmGbdcbuoG9qNkbEvbg,21048
 lunalib/core/mempool.py,sha256=itYFGQEuUde0Xh6WXcEz_n8hDsNhxkEAlRQ5g_Qiygg,14845
-lunalib/core/p2p.py,sha256=TQ44vQk1aak4hu1Q7jAXfsynS0Eu0xfTjlK06r066ek,13081
+lunalib/core/p2p.py,sha256=cj3dda05oL6W5oMsvJ_HT3U0qr1FL6DR-YI78k3InKg,13784
 lunalib/core/sm2.py,sha256=Eq8Er3XQW5rYJXwaPT5vw5NoVXbSWhyuvjoG1LMo-NQ,23454
-lunalib/core/wallet.py,sha256=RNrEI7_tsaJOLcCJoTy_lLj22bc_bJtoO7iR3C3u7Ls,57435
+lunalib/core/wallet.py,sha256=jgiFW_jBEgz5FwD-Q3ouPboU7nxcZ5nTHBa55izWXW8,64060
+lunalib/core/wallet_db.py,sha256=6iefUlIilnsdh94G3PXIta579QDY_SMdagjdZG4SvJY,2300
 lunalib/core/wallet_manager.py,sha256=KK58hrr_xF1vZ4qI6x_BJqrs9XXh5m0XbZYnZmi9yoU,26031
 lunalib/core/wallet_sync_helper.py,sha256=CGfSBXvf8vg4SGsLaxsjGwHVbD9dmfcuMrZ_CO0J5lE,6282
 lunalib/gtx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,7 +19,7 @@ lunalib/gtx/genesis.py,sha256=dDiLz-jW0zr5WUifYo9lzsrafQGOuZ9oakv_TX6QdPg,16028
 lunalib/mining/__init__.py,sha256=kOwXt_fwjHLUvV3XxieG2LZyKMW316brXLF8V8lHBUo,193
 lunalib/mining/cuda_manager.py,sha256=VjVx9KLhT2F1jOOhva8ioGP32oQIAciZjf1irWl1jJY,5136
 lunalib/mining/difficulty.py,sha256=hKCtvEovb4le5Fnhz6Mm8-Cugjm_CduJnZA2aNC2eyU,5326
-lunalib/mining/miner.py,sha256=nGzfv4oK1evDXeYyS6lzaAWc8IolFrO99F0ZucBH3Ec,47715
+lunalib/mining/miner.py,sha256=WP5UBOajLYT9JzAjLAshwq-f8CsLKYdLJpUX9kY2PdI,48898
 lunalib/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lunalib/storage/cache.py,sha256=U-riY8OTzxCOpl8yvhpbU3YUysEKgrPlmhO4F4cI9FM,5352
 lunalib/storage/database.py,sha256=2f3Ie6JnuK7L0YGtAdZt5mgj90pokneXhSQKUyvx8Pc,8219
@@ -27,7 +28,7 @@ lunalib/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 lunalib/transactions/security.py,sha256=cQJRasJ37Z8mJo8gt0JJOb0_M9CQ0QScr67y3M_NP4Q,10309
 lunalib/transactions/transactions.py,sha256=3PgyW8gDQwY-gAPGY_T3m7RE_9HzEIOjTf6CWCsOKFY,18151
 lunalib/transactions/validator.py,sha256=FQ-jVjj8VoVTlq65blB_hprAwJOtpc2peYdQk_L2xmg,2730
-lunalib-1.6.6.dist-info/METADATA,sha256=fn5JvUFlgnjjR3vqMOeP-ojwd255pdlWymqnMqa6Pys,774
-lunalib-1.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lunalib-1.6.6.dist-info/top_level.txt,sha256=eLcoOCtOwfvoqUu5g5CNBZB9bdhGXbTwmjuOM7i8ylw,8
-lunalib-1.6.6.dist-info/RECORD,,
+lunalib-1.7.3.dist-info/METADATA,sha256=fIuJMB5peqbLQwWN3JOWQBC5ppz8vjC2lP5P79Dx1O0,797
+lunalib-1.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lunalib-1.7.3.dist-info/top_level.txt,sha256=eLcoOCtOwfvoqUu5g5CNBZB9bdhGXbTwmjuOM7i8ylw,8
+lunalib-1.7.3.dist-info/RECORD,,