naeural-client 3.1.3__tar.gz → 3.1.5__tar.gz

{naeural_client-3.1.3 → naeural_client-3.1.5}/.gitignore

@@ -180,3 +180,5 @@ xperimental/petrica/
 xperimental/_checks/dauth_check_aid.py
 
 xperimental/eth/*.txt
+
+tutorials/mynodes.txt

{naeural_client-3.1.3 → naeural_client-3.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 3.1.3
+Version: 3.1.5
 Summary: `naeural_client` is the Python SDK required for client app development for the Naeural Edge Protocol Edge Protocol framework
 Project-URL: Homepage, https://github.com/NaeuralEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/NaeuralEdgeProtocol/naeural_client/issues

{naeural_client-3.1.3 → naeural_client-3.1.5}/naeural_client/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.1.3"
+__VER__ = "3.1.5"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{naeural_client-3.1.3 → naeural_client-3.1.5}/naeural_client/bc/base.py

@@ -7,7 +7,7 @@ import datetime
 import uuid
 import requests
 
-
+from collections import defaultdict
 from hashlib import sha256, md5
 from threading import Lock
 from copy import deepcopy
@@ -17,6 +17,7 @@ from cryptography.hazmat.primitives import serialization
 
 from ..utils.config import get_user_folder
 
+
 from ..const.base import (
   BCctbase, BCct, 
   DAUTH_SUBKEY, DAUTH_ENV_KEY,
@@ -305,9 +306,12 @@ class BaseBlockEngine(_EVMMixin):
     ):
 
     self.__name = name
-    assert log is not None, "Logger object was not provided!"
+    assert log is not None, "Logger object was not provided!"      
       
     self.log = log
+    
+    self._first_checks_done = defaultdict(lambda: False) # used to store the first check results
+    
     self.__private_key = None
     self.__verbosity = verbosity
     self.__public_key = None    
@@ -378,7 +382,7 @@ class BaseBlockEngine(_EVMMixin):
 
     if True:
       self.P("Initializing private blockchain:\n{}".format(
-        json.dumps(self.__config, indent=4)), verbosity=2
+        json.dumps(self.__config, indent=4)), verbosity=1
       )
     if self.__pem_file is not None:
       try:
@@ -1406,8 +1410,9 @@ class BaseBlockEngine(_EVMMixin):
     the status is still 200, an empty dictionary will be returned).
     """
     if EE_VPN_IMPL:
-      return {}
+      return None # must return None not empty dict for VPNs
     #endif EE_VPN_IMPL
+    
     from naeural_client._ver import __VER__ as sdk_version
     try:
       from ver import __VER__ as app_version
@@ -1443,13 +1448,13 @@ class BaseBlockEngine(_EVMMixin):
         url = network_data[dAuth.EvmNetData.DAUTH_URL_KEY]
       #endif not in env
       
-    if isinstance(url, str) and len(url) > 0:
+    if isinstance(url, str) and len(url) > MIN_LEN:
       # Valid URL
       if dauth_endp is None:
         if in_env:
-          self.P("Found dAuth URL in environment: '{}'".format(url), color='g')
+          self.P("Found dAuth URL in environment: '{}'".format(url))
         else:
-          self.P("Using default dAuth URL: '{}'".format(url), color='g')
+          self.P("Using default dAuth URL: '{}'".format(url))
       eth_short = self.eth_address[:6] + '...' + self.eth_address[-4:]
       while not done:
         self.P(f"<{eth_short}> ({network}) dAuth with `{url}`... (try {tries + 1} / {max_tries})")
@@ -1549,7 +1554,7 @@ class BaseBlockEngine(_EVMMixin):
       #end while
     else:
       # Invalid URL, thus dct_env will remain None
-      self.P(f"dAuth URL is not invalid: {url}", color='r')
+      self.P(f"dAuth URL is not valid: {url}", color='r')
     #end if url is valid
     if return_full_data:
       return dct_response

{naeural_client-3.1.3 → naeural_client-3.1.5}/naeural_client/bc/evm.py

@@ -190,6 +190,8 @@ class _EVMMixin:
         the network name.
 
       """
+      if EE_VPN_IMPL:
+        return "VPN"
       network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
       if not hasattr(self, "current_evm_network") or self.current_evm_network != network:
         self.current_evm_network = network
@@ -201,6 +203,8 @@ class _EVMMixin:
     
     @property
     def evm_network(self):
+      if EE_VPN_IMPL:
+        return "VPN"
       return self.get_evm_network()
 
     

{naeural_client-3.1.3 → naeural_client-3.1.5}/naeural_client/const/evm_net.py

@@ -41,7 +41,7 @@ EVM_NET_DATA = {
   'devnet' : {
     EvmNetData.DAUTH_URL_KEY                    : "https://devnet-dauth.ratio1.ai/get_auth_data",
     EvmNetData.DAUTH_ND_ADDR_KEY                : "0x9f49fc29366F1C8285d42e7E82cA0bb668B32CeA",
-    EvmNetData.DAUTH_R1_ADDR_KEY                : "0xEF38a3d84D3E3111fb7b794Ba3240187b8B32825",
+    EvmNetData.DAUTH_R1_ADDR_KEY                : "0xEF38a3d84D3E3111fb7b794Ba3240187b8B32825", 
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
     EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-12 16:00:00",
     EvmNetData.EE_EPOCH_INTERVALS_KEY           : 1,

{naeural_client-3.1.3 → naeural_client-3.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "3.1.3"
+version = "3.1.5"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },
   { name="Cristan Bleotiu", email="cristibleotiu@gmail.com" },

naeural_client-3.1.5/tutorials/ex14_wallets.py

@@ -0,0 +1,93 @@
+"""
+This demo showcases the SDK's ability to enable the sending and receiving of both ETH and $R1 tokens. 
+The script checks balances, waits until some ETH and $R1 are available for distribution, and then 
+proceeds to distribute randomized amounts of ETH and $R1 to multiple peers. 
+
+Along the way, it logs transaction details and updates the balances of both the client and the recipient 
+addresses, ensuring smooth interaction with the Ethereum network and $R1 token. for a few seconds
+This  demo showcases the SDK (and R1 Edge Node) ability  for managing ETH and $R1 tokens in a live environment. 
+
+With just a few lines of code, the tutorial demonstrates how to:
+ - Monitor Balances: Continuously check and wait for the client's ETH and $R1 balances to become available.
+ - Automate Distribution: Randomly calculate and distribute tokens to multiple peer addresses.
+ - Transaction Handling: Seamlessly send transactions with built-in logging, gas fee checks, and receipt 
+   verification on testnet or devnet networks.
+
+Its a hands-on, real-world example of how you can effortlessly integrate token transfers into 
+your R1 applications.
+
+"""
+import os
+import time
+import numpy as np
+
+from naeural_client.bc import DefaultBlockEngine
+from naeural_client import Logger
+
+
+
+if __name__ == '__main__' :
+  eng = DefaultBlockEngine(
+    name="default", 
+    log=Logger("BCTEST"),
+    user_config=True, # this is must to use the user config
+    verbosity=2
+  )
+  
+  eng.reset_network('devnet')
+  
+  file = os.path.join(os.path.dirname(__file__), "mynodes.txt")
+  with open(file, "rt") as fd:
+    lines = fd.readlines()
+    addresses = [line.strip() for line in lines]
+  
+  assert eng.evm_network in ['testnet', 'devnet']
+  client_eth = eng.web3_get_balance_eth()
+  client_r1 = eng.web3_get_balance_r1()
+  
+  timeout = 120
+  start = time.time()
+  while client_eth == 0 or client_r1 == 0:
+    remaining = 120 - (time.time() - start)
+    if remaining <= 0:
+      break
+    msg = f"Client has {client_eth:.4f} ETH and {client_r1:.4f} $R1"
+    msg += f"\nYou are supposed to have some ETH and $R1 in {eng.eth_address} to distribute to peers"
+    msg += f"\nPlease send some ETH and $R1 to {eng.eth_address} in max {remaining:.0f} seconds"
+    eng.P(msg, color='r')
+    time.sleep(10)
+    client_eth = eng.web3_get_balance_eth()
+    client_r1 = eng.web3_get_balance_r1()
+    
+
+  assert client_eth > 0 and client_r1 > 0, "Client has not enough ETH or $R1 to distribute"    
+  
+  n_peers = len(addresses)
+  amount_eth = (client_eth / 2) / n_peers
+  amount_r1 = (client_r1 / 2) / n_peers
+  eng.P(
+    f"Client {eng.eth_address}:\n  {client_eth:>10.4f} ETH\n  {client_r1:>10.4f} $R1\n  Will distribute (max) {amount_eth:.4f} ETH\n  Will distribute (MAX) {amount_r1:.4f} $R1 \n  to each of {n_peers} peers",
+    color='g'
+  )
+
+  for address in addresses:
+    random_amount_eth = np.random.uniform(0.7, 0.99) * amount_eth
+    random_amount_r1 = np.random.uniform(0.7, 1.1) * amount_r1
+    eng.P(f"  Sending {random_amount_eth:.4f} ETH to {address}", color='b')
+    tx_hash = eng.web3_send_eth(address, random_amount_eth, wait_for_tx=True, return_receipt=False)
+    time.sleep(2) # bit of extra sleep time
+    eng.P(f"  Executed tx: {tx_hash}", color='g')
+
+    eng.P(f"  Sending {random_amount_r1:.4f} $R1 to {address}", color='b')
+    tx_hash = eng.web3_send_r1(address, random_amount_r1, wait_for_tx=True, return_receipt=False)
+    time.sleep(2) # bit of extra sleep time
+    eng.P(f"  Executed tx: {tx_hash}", color='g')
+    eth_balance = eng.web3_get_balance_eth(address)
+    r1_balance = eng.web3_get_balance_r1(address)
+    eng.P(f"  ETH Balance of {address} is {eth_balance:.4f} ETH")
+    eng.P(f"  R1 Balance of {address} is {r1_balance:.4f} R1")
+  
+  time.sleep(5)
+  client_eth = eng.web3_get_balance_eth()
+  client_r1 = eng.web3_get_balance_r1()
+  eng.P(f"Client has {client_eth:.4f} ETH and {client_r1:.4f} $R1")  

{naeural_client-3.1.3 → naeural_client-3.1.5}/xperimental/eth/send_many.py

@@ -1,3 +1,22 @@
+"""
+This demo showcases the SDK's ability to enable the sending and receiving of both ETH and $R1 tokens. 
+The script checks balances, waits until some ETH and $R1 are available for distribution, and then 
+proceeds to distribute randomized amounts of ETH and $R1 to multiple peers. 
+
+Along the way, it logs transaction details and updates the balances of both the client and the recipient 
+addresses, ensuring smooth interaction with the Ethereum network and $R1 token. for a few seconds
+This  demo showcases the SDK (and R1 Edge Node) ability  for managing ETH and $R1 tokens in a live environment. 
+
+With just a few lines of code, the tutorial demonstrates how to:
+ - Monitor Balances: Continuously check and wait for the client's ETH and $R1 balances to become available.
+ - Automate Distribution: Randomly calculate and distribute tokens to multiple peer addresses.
+ - Transaction Handling: Seamlessly send transactions with built-in logging, gas fee checks, and receipt 
+   verification on testnet or devnet networks.
+
+Its a hands-on, real-world example of how you can effortlessly integrate token transfers into 
+your R1 applications.
+
+"""
 import os
 import time
 from copy import deepcopy
@@ -21,6 +40,24 @@ if __name__ == '__main__' :
   assert eng.evm_network in ['testnet', 'devnet']
   client_eth = eng.web3_get_balance_eth()
   client_r1 = eng.web3_get_balance_r1()
+  
+  timeout = 120
+  start = time.time()
+  while client_eth == 0 or client_r1 == 0:
+    remaining = 120 - (time.time() - start)
+    if remaining <= 0:
+      break
+    msg = f"Client has {client_eth:.4f} ETH and {client_r1:.4f} $R1"
+    msg += f"\nYou are supposed to have some ETH and $R1 in {eng.eth_address} to distribute to peers"
+    msg += f"\nPlease send some ETH and $R1 to {eng.eth_address} in max {remaining:.0f} seconds"
+    l.P(msg, color='r')
+    time.sleep(10)
+    client_eth = eng.web3_get_balance_eth()
+    client_r1 = eng.web3_get_balance_r1()
+    
+
+  assert client_eth > 0 and client_r1 > 0, "Client has not enough ETH or $R1 to distribute"    
+  
   n_peers = len(addresses)
   amount_eth = (client_eth / 2) / n_peers
   amount_r1 = (client_r1 / 2) / n_peers