hippius 0.2.51__tar.gz → 0.2.52__tar.gz

{hippius-0.2.51 → hippius-0.2.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hippius
-Version: 0.2.51
+Version: 0.2.52
 Summary: Python SDK and CLI for Hippius blockchain storage
 Home-page: https://github.com/thenervelab/hippius-sdk
 Author: Dubs

{hippius-0.2.51 → hippius-0.2.52}/hippius_sdk/__init__.py

@@ -26,7 +26,7 @@ from hippius_sdk.config import (
 from hippius_sdk.ipfs import IPFSClient, S3PublishResult, S3DownloadResult
 from hippius_sdk.utils import format_cid, format_size, hex_to_ipfs_cid
 
-__version__ = "0.2.51"
+__version__ = "0.2.52"
 __all__ = [
     "HippiusClient",
     "IPFSClient",

{hippius-0.2.51 → hippius-0.2.52}/hippius_sdk/cli_handlers.py

@@ -3744,53 +3744,61 @@ def handle_verify_node(
         # Get current account info
         account = get_active_account()
         if not account:
-            error("No active account. Please set up an account first with 'hippius account create' or 'hippius seed set'")
+            error(
+                "No active account. Please set up an account first with 'hippius account create' or 'hippius seed set'"
+            )
             return 1
-        
+
         account_address = get_account_address(account)
         if not account_address:
             error(f"Could not get address for account '{account}'")
             return 1
-        
-        info(f"Verifying existing node using account: [bold cyan]{account}[/bold cyan] ({account_address})")
-        
+
+        info(
+            f"Verifying existing node using account: [bold cyan]{account}[/bold cyan] ({account_address})"
+        )
+
         # Import and use incentives.py functionality
         from hippius_sdk.incentives import (
-            load_ipfs_seed, load_main_seed, encode_account_id, verify_peer_id,
-            blake2_256, manual_encode_challenge
+            load_ipfs_seed,
+            load_main_seed,
+            encode_account_id,
+            verify_peer_id,
+            blake2_256,
+            manual_encode_challenge,
         )
         from substrateinterface import SubstrateInterface, Keypair
         from nacl.signing import SigningKey
         import base58
         import secrets
         from binascii import hexlify
-        
+
         # Initialize SubstrateInterface
         substrate = SubstrateInterface(url=client.substrate_client.url)
-        
+
         # Get genesis hash and current block
         genesis_hash_hex = substrate.get_block_hash(0)
         genesis_hash = bytes.fromhex(genesis_hash_hex[2:])
         current_block_number = substrate.get_block_number(None)
-        
+
         log(f"Current block number: {current_block_number}")
-        
+
         # Process node_id
         if node_id.startswith("0x"):
             node_id_bytes = bytes.fromhex(node_id[2:])
         else:
             node_id_bytes = base58.b58decode(node_id)
-        
+
         # Load IPFS and main seeds
         ipfs_seed, peerid_from_config = load_ipfs_seed(ipfs_config, ipfs_priv_b64)
         main_seed = load_main_seed(node_priv_hex)
-        
+
         # Create signing keys
         main_sk = SigningKey(main_seed)
         main_pk = bytes(main_sk.verify_key)
         ipfs_sk = SigningKey(ipfs_seed)
         ipfs_pk = bytes(ipfs_sk.verify_key)
-        
+
         # Handle IPFS peer ID
         if ipfs_peer_id:
             ipfs_peer_id_bytes = base58.b58decode(ipfs_peer_id)
@@ -3798,116 +3806,124 @@ def handle_verify_node(
             ipfs_peer_id_bytes = base58.b58decode(peerid_from_config)
         else:
             # For verification, IPFS peer ID might not be required for all node types
-            ipfs_peer_id_bytes = b''
-        
+            ipfs_peer_id_bytes = b""
+
         # Verify keys match node IDs
         if not verify_peer_id(main_pk, node_id_bytes, "Ed25519"):
             error("Main public key does not match node ID")
             return 1
-        
-        if ipfs_peer_id_bytes and not verify_peer_id(ipfs_pk, ipfs_peer_id_bytes, "Ed25519"):
+
+        if ipfs_peer_id_bytes and not verify_peer_id(
+            ipfs_pk, ipfs_peer_id_bytes, "Ed25519"
+        ):
             error("IPFS public key does not match peer ID")
             return 1
-        
+
         # Create challenge data
         domain_bytes = domain.encode()
-        domain24 = b"HIPPIUS::REGISTER::v1" + b"\x00"*3
+        domain24 = b"HIPPIUS::REGISTER::v1" + b"\x00" * 3
         node_id_hash = blake2_256(node_id_bytes)
         ipfs_peer_id_hash = blake2_256(ipfs_peer_id_bytes)
-        
-        nonce = (bytes.fromhex(nonce_hex[2:]) if nonce_hex and nonce_hex.startswith("0x")
-                 else bytes.fromhex(nonce_hex) if nonce_hex
-                 else secrets.token_bytes(32))
-        
+
+        nonce = (
+            bytes.fromhex(nonce_hex[2:])
+            if nonce_hex and nonce_hex.startswith("0x")
+            else bytes.fromhex(nonce_hex)
+            if nonce_hex
+            else secrets.token_bytes(32)
+        )
+
         expires_at_block = current_block_number + expires_in
         account_bytes = encode_account_id(account_address)
-        
+
         challenge_data = {
-            'domain': domain24,
-            'genesis_hash': genesis_hash,
-            'account': account_bytes,
-            'node_id_hash': node_id_hash,
-            'ipfs_peer_id_hash': ipfs_peer_id_hash,
-            'block_number': current_block_number,
-            'nonce': nonce,
-            'expires_at': expires_at_block,
+            "domain": domain24,
+            "genesis_hash": genesis_hash,
+            "account": account_bytes,
+            "node_id_hash": node_id_hash,
+            "ipfs_peer_id_hash": ipfs_peer_id_hash,
+            "block_number": current_block_number,
+            "nonce": nonce,
+            "expires_at": expires_at_block,
         }
-        
+
         challenge_bytes = manual_encode_challenge(challenge_data, block_width)
-        
+
         # Sign challenge
         main_sig = main_sk.sign(challenge_bytes).signature
         ipfs_sig = ipfs_sk.sign(challenge_bytes).signature
-        
+
         # Build call parameters for verify_existing_node
         call_params = {
             "node_id": node_id,
-            "node_id_hex": "0x"+hexlify(node_id_bytes).decode(),
-            "ipfs_id_hex": "0x"+hexlify(ipfs_peer_id_bytes).decode(),
+            "node_id_hex": "0x" + hexlify(node_id_bytes).decode(),
+            "ipfs_id_hex": "0x" + hexlify(ipfs_peer_id_bytes).decode(),
             "main_key_type": "Ed25519",
-            "main_public_key": "0x"+main_pk.hex(),
-            "main_sig": "0x"+main_sig.hex(),
+            "main_public_key": "0x" + main_pk.hex(),
+            "main_sig": "0x" + main_sig.hex(),
             "ipfs_key_type": "Ed25519",
-            "ipfs_public_key": "0x"+ipfs_pk.hex(),
-            "ipfs_sig": "0x"+ipfs_sig.hex(),
-            "challenge_bytes": "0x"+challenge_bytes.hex(),
+            "ipfs_public_key": "0x" + ipfs_pk.hex(),
+            "ipfs_sig": "0x" + ipfs_sig.hex(),
+            "challenge_bytes": "0x" + challenge_bytes.hex(),
         }
-        
+
         if dry_run:
             log("Dry run mode - printing payload without submitting")
             payload = {
-                "genesis_hash_hex": "0x"+genesis_hash.hex(),
+                "genesis_hash_hex": "0x" + genesis_hash.hex(),
                 "current_block_number": current_block_number,
-                "challenge_bytes_hex": "0x"+challenge_bytes.hex(),
+                "challenge_bytes_hex": "0x" + challenge_bytes.hex(),
                 "call_module": "Registration",
                 "call_function": "verify_existing_node",
-                "call_params": call_params
+                "call_params": call_params,
             }
             console.print(json.dumps(payload, indent=2))
             return 0
-        
+
         # Get keypair for signing
         from hippius_sdk.config import get_seed_phrase
+
         seed_phrase = get_seed_phrase()
         if not seed_phrase:
             error("No seed phrase available for signing transaction")
             return 1
-            
+
         kp = Keypair.create_from_uri(seed_phrase)
-        
+
         # Submit transaction
         log("Submitting node verification transaction...")
         log(f"Using module: [bold cyan]Registration[/bold cyan]")
         call = substrate.compose_call(
             call_module="Registration",
             call_function="verify_existing_node",
-            call_params=call_params
+            call_params=call_params,
         )
         extrinsic = substrate.create_signed_extrinsic(call=call, keypair=kp)
         receipt = substrate.submit_extrinsic(extrinsic, wait_for_inclusion=True)
-        
+
         result = {
             "extrinsic_hash": receipt.extrinsic_hash,
             "is_success": receipt.is_success,
             "error_message": receipt.error_message,
-            "triggered_events": [str(event) for event in receipt.triggered_events]
+            "triggered_events": [str(event) for event in receipt.triggered_events],
         }
-        
+
         if receipt.is_success:
             success(f"Node verification successful!")
             success(f"Transaction hash: {receipt.extrinsic_hash}")
         else:
             error(f"Node verification failed: {receipt.error_message}")
-            
+
         log("Full result:")
         console.print(json.dumps(result, indent=2))
-        
+
         return 0 if receipt.is_success else 1
-        
+
     except Exception as e:
         error(f"Error verifying node: {e}")
-        if hasattr(e, '__traceback__'):
+        if hasattr(e, "__traceback__"):
             import traceback
+
             traceback.print_exc()
         return 1
 
@@ -3930,53 +3946,61 @@ def handle_verify_coldkey_node(
         # Get current account info
         account = get_active_account()
         if not account:
-            error("No active account. Please set up an account first with 'hippius account create' or 'hippius seed set'")
+            error(
+                "No active account. Please set up an account first with 'hippius account create' or 'hippius seed set'"
+            )
             return 1
-        
+
         account_address = get_account_address(account)
         if not account_address:
             error(f"Could not get address for account '{account}'")
             return 1
-        
-        info(f"Verifying existing coldkey node using account: [bold cyan]{account}[/bold cyan] ({account_address})")
-        
+
+        info(
+            f"Verifying existing coldkey node using account: [bold cyan]{account}[/bold cyan] ({account_address})"
+        )
+
         # Import and use incentives.py functionality
         from hippius_sdk.incentives import (
-            load_ipfs_seed, load_main_seed, encode_account_id, verify_peer_id,
-            blake2_256, manual_encode_challenge
+            load_ipfs_seed,
+            load_main_seed,
+            encode_account_id,
+            verify_peer_id,
+            blake2_256,
+            manual_encode_challenge,
         )
         from substrateinterface import SubstrateInterface, Keypair
         from nacl.signing import SigningKey
         import base58
         import secrets
         from binascii import hexlify
-        
+
         # Initialize SubstrateInterface
         substrate = SubstrateInterface(url=client.substrate_client.url)
-        
+
         # Get genesis hash and current block
         genesis_hash_hex = substrate.get_block_hash(0)
         genesis_hash = bytes.fromhex(genesis_hash_hex[2:])
         current_block_number = substrate.get_block_number(None)
-        
+
         log(f"Current block number: {current_block_number}")
-        
+
         # Process node_id
         if node_id.startswith("0x"):
             node_id_bytes = bytes.fromhex(node_id[2:])
         else:
             node_id_bytes = base58.b58decode(node_id)
-        
+
         # Load IPFS and main seeds
         ipfs_seed, peerid_from_config = load_ipfs_seed(ipfs_config, ipfs_priv_b64)
         main_seed = load_main_seed(node_priv_hex)
-        
+
         # Create signing keys
         main_sk = SigningKey(main_seed)
         main_pk = bytes(main_sk.verify_key)
         ipfs_sk = SigningKey(ipfs_seed)
         ipfs_pk = bytes(ipfs_sk.verify_key)
-        
+
         # Handle IPFS peer ID
         if ipfs_peer_id:
             ipfs_peer_id_bytes = base58.b58decode(ipfs_peer_id)
@@ -3984,115 +4008,123 @@ def handle_verify_coldkey_node(
             ipfs_peer_id_bytes = base58.b58decode(peerid_from_config)
         else:
             # For verification, IPFS peer ID might not be required for all node types
-            ipfs_peer_id_bytes = b''
-        
+            ipfs_peer_id_bytes = b""
+
         # Verify keys match node IDs
         if not verify_peer_id(main_pk, node_id_bytes, "Ed25519"):
             error("Main public key does not match node ID")
             return 1
-        
-        if ipfs_peer_id_bytes and not verify_peer_id(ipfs_pk, ipfs_peer_id_bytes, "Ed25519"):
+
+        if ipfs_peer_id_bytes and not verify_peer_id(
+            ipfs_pk, ipfs_peer_id_bytes, "Ed25519"
+        ):
             error("IPFS public key does not match peer ID")
             return 1
-        
+
         # Create challenge data
         domain_bytes = domain.encode()
-        domain24 = b"HIPPIUS::REGISTER::v1" + b"\x00"*3
+        domain24 = b"HIPPIUS::REGISTER::v1" + b"\x00" * 3
         node_id_hash = blake2_256(node_id_bytes)
         ipfs_peer_id_hash = blake2_256(ipfs_peer_id_bytes)
-        
-        nonce = (bytes.fromhex(nonce_hex[2:]) if nonce_hex and nonce_hex.startswith("0x")
-                 else bytes.fromhex(nonce_hex) if nonce_hex
-                 else secrets.token_bytes(32))
-        
+
+        nonce = (
+            bytes.fromhex(nonce_hex[2:])
+            if nonce_hex and nonce_hex.startswith("0x")
+            else bytes.fromhex(nonce_hex)
+            if nonce_hex
+            else secrets.token_bytes(32)
+        )
+
         expires_at_block = current_block_number + expires_in
         account_bytes = encode_account_id(account_address)
-        
+
         challenge_data = {
-            'domain': domain24,
-            'genesis_hash': genesis_hash,
-            'account': account_bytes,
-            'node_id_hash': node_id_hash,
-            'ipfs_peer_id_hash': ipfs_peer_id_hash,
-            'block_number': current_block_number,
-            'nonce': nonce,
-            'expires_at': expires_at_block,
+            "domain": domain24,
+            "genesis_hash": genesis_hash,
+            "account": account_bytes,
+            "node_id_hash": node_id_hash,
+            "ipfs_peer_id_hash": ipfs_peer_id_hash,
+            "block_number": current_block_number,
+            "nonce": nonce,
+            "expires_at": expires_at_block,
         }
-        
+
         challenge_bytes = manual_encode_challenge(challenge_data, block_width)
-        
+
         # Sign challenge
         main_sig = main_sk.sign(challenge_bytes).signature
         ipfs_sig = ipfs_sk.sign(challenge_bytes).signature
-        
+
         # Build call parameters for verify_existing_coldkey_node
         call_params = {
             "node_id": node_id,
-            "node_id_hex": "0x"+hexlify(node_id_bytes).decode(),
-            "ipfs_id_hex": "0x"+hexlify(ipfs_peer_id_bytes).decode(),
+            "node_id_hex": "0x" + hexlify(node_id_bytes).decode(),
+            "ipfs_id_hex": "0x" + hexlify(ipfs_peer_id_bytes).decode(),
             "main_key_type": "Ed25519",
-            "main_public_key": "0x"+main_pk.hex(),
-            "main_sig": "0x"+main_sig.hex(),
+            "main_public_key": "0x" + main_pk.hex(),
+            "main_sig": "0x" + main_sig.hex(),
             "ipfs_key_type": "Ed25519",
-            "ipfs_public_key": "0x"+ipfs_pk.hex(),
-            "ipfs_sig": "0x"+ipfs_sig.hex(),
-            "challenge_bytes": "0x"+challenge_bytes.hex(),
+            "ipfs_public_key": "0x" + ipfs_pk.hex(),
+            "ipfs_sig": "0x" + ipfs_sig.hex(),
+            "challenge_bytes": "0x" + challenge_bytes.hex(),
         }
-        
+
         if dry_run:
             log("Dry run mode - printing payload without submitting")
             payload = {
-                "genesis_hash_hex": "0x"+genesis_hash.hex(),
+                "genesis_hash_hex": "0x" + genesis_hash.hex(),
                 "current_block_number": current_block_number,
-                "challenge_bytes_hex": "0x"+challenge_bytes.hex(),
+                "challenge_bytes_hex": "0x" + challenge_bytes.hex(),
                 "call_module": "Registration",
                 "call_function": "verify_existing_coldkey_node",
-                "call_params": call_params
+                "call_params": call_params,
             }
             console.print(json.dumps(payload, indent=2))
             return 0
-        
+
         # Get keypair for signing
         from hippius_sdk.config import get_seed_phrase
+
         seed_phrase = get_seed_phrase()
         if not seed_phrase:
             error("No seed phrase available for signing transaction")
             return 1
-            
+
         kp = Keypair.create_from_uri(seed_phrase)
-        
+
         # Submit transaction
         log("Submitting coldkey node verification transaction...")
         log(f"Using module: [bold cyan]Registration[/bold cyan]")
         call = substrate.compose_call(
             call_module="Registration",
             call_function="verify_existing_coldkey_node",
-            call_params=call_params
+            call_params=call_params,
         )
         extrinsic = substrate.create_signed_extrinsic(call=call, keypair=kp)
         receipt = substrate.submit_extrinsic(extrinsic, wait_for_inclusion=True)
-        
+
         result = {
             "extrinsic_hash": receipt.extrinsic_hash,
             "is_success": receipt.is_success,
             "error_message": receipt.error_message,
-            "triggered_events": [str(event) for event in receipt.triggered_events]
+            "triggered_events": [str(event) for event in receipt.triggered_events],
         }
-        
+
         if receipt.is_success:
             success(f"Coldkey node verification successful!")
             success(f"Transaction hash: {receipt.extrinsic_hash}")
         else:
             error(f"Coldkey node verification failed: {receipt.error_message}")
-            
+
         log("Full result:")
         console.print(json.dumps(result, indent=2))
-        
+
         return 0 if receipt.is_success else 1
-        
+
     except Exception as e:
         error(f"Error verifying coldkey node: {e}")
-        if hasattr(e, '__traceback__'):
+        if hasattr(e, "__traceback__"):
             import traceback
+
             traceback.print_exc()
         return 1

{hippius-0.2.51 → hippius-0.2.52}/hippius_sdk/ipfs.py

@@ -2294,9 +2294,6 @@ class IPFSClient:
                         encrypted_data += chunk
                     return encrypted_data
 
-                # Stream and decrypt the content using hybrid buffered approach
-                import nacl.secret
-
                 # Collect all encrypted data first
                 logger.debug("Buffering encrypted content for decryption")
                 encrypted_data = b""
@@ -2344,16 +2341,16 @@ class IPFSClient:
                     os.path.dirname(os.path.abspath(output_path)), exist_ok=True
                 )
 
-            download_client = AsyncIPFSClient(api_url=download_node)
-
-            download_url = f"{download_node.rstrip('/')}/api/v0/cat?arg={cid}"
+            # Use gateway style instead of cat API for better HTTP semantics
+            download_url = f"{download_node.rstrip('/')}/ipfs/{cid}"
 
             # Download file into memory
             file_data = bytearray()
-            async with download_client.client.stream("POST", download_url) as response:
-                response.raise_for_status()
-                async for chunk in response.aiter_bytes(chunk_size=8192):
-                    file_data.extend(chunk)
+            async with httpx.AsyncClient() as client:
+                async with client.stream("GET", download_url) as response:
+                    response.raise_for_status()
+                    async for chunk in response.aiter_bytes(chunk_size=8192):
+                        file_data.extend(chunk)
 
             # Convert to bytes for consistency
             file_data = bytes(file_data)
@@ -2523,15 +2520,16 @@ class IPFSClient:
             HippiusIPFSError: If IPFS stream fails
         """
         try:
-            download_client = AsyncIPFSClient(api_url=download_node)
-            download_url = f"{download_node.rstrip('/')}/api/v0/cat?arg={cid}"
+            # Use gateway style instead of cat API for better HTTP semantics
+            download_url = f"{download_node.rstrip('/')}/ipfs/{cid}"
 
-            async with download_client.client.stream("POST", download_url) as response:
-                response.raise_for_status()
-                logger.info(f"Started streaming from {download_node} for CID: {cid}")
+            async with httpx.AsyncClient() as client:
+                async with client.stream("GET", download_url) as response:
+                    response.raise_for_status()
+                    logger.info(f"Started streaming from {download_node} for CID: {cid}")
 
-                async for chunk in response.aiter_bytes(chunk_size=8192):
-                    yield chunk
+                    async for chunk in response.aiter_bytes(chunk_size=8192):
+                        yield chunk
 
         except Exception as e:
             raise HippiusIPFSError(f"Failed to stream from {download_node}: {str(e)}")

{hippius-0.2.51 → hippius-0.2.52}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hippius"
-version = "0.2.51"
+version = "0.2.52"
 description = "Python SDK and CLI for Hippius blockchain storage"
 authors = ["Dubs <dubs@dubs.rs>"]
 readme = "README.md"