ratio1 3.4.115__py3-none-any.whl → 3.4.117__py3-none-any.whl

ratio1/_ver.py

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

ratio1/bc/evm.py

@@ -29,7 +29,6 @@ Web3Vars = namedtuple(
     "proxy_contract_address",  
     "controller_contract_address",
     "poai_manager_address",
-    "get_oracles_abi",
   ]
 )
 
@@ -238,7 +237,6 @@ class _EVMMixin:
       str_genesis_date = network_data[dAuth.EvmNetData.EE_GENESIS_EPOCH_DATE_KEY]
       controller_contract_address = network_data[dAuth.EvmNetData.DAUTH_CONTROLLER_ADDR_KEY]
       poai_manager_address = network_data[dAuth.EvmNetData.DAUTH_POAI_MANAGER_ADDR_KEY]
-      get_oracles_abi = network_data[dAuth.EvmNetData.DAUTH_GET_ORACLES_ABI]
       genesis_date = self.log.str_to_date(str_genesis_date).replace(tzinfo=timezone.utc)
       ep_sec = (
         network_data[dAuth.EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY] * 
@@ -261,7 +259,6 @@ class _EVMMixin:
         proxy_contract_address=proxy_contract_address, 
         controller_contract_address=controller_contract_address,
         poai_manager_address=poai_manager_address,
-        get_oracles_abi=get_oracles_abi,
       )
       return result
 
@@ -767,7 +764,7 @@ class _EVMMixin:
           
     def web3_is_node_licensed(self, address : str, network=None, debug=False) -> bool:
       """
-      Check if the address is allowed to send commands to the node
+      Check if the address has a valid license
 
       Parameters
       ----------
@@ -777,18 +774,15 @@ class _EVMMixin:
       if EE_VPN_IMPL:
         self.P("VPN implementation. Skipping Ethereum check.", color='r')
         return False
-      
-      w3vars = self._get_web3_vars(network)
-      
       assert self.is_valid_eth_address(address), "Invalid Ethereum address"
-      
-      if debug:
-        self.P(f"Checking if {address} ({network}) is allowed...")
-      
+
+      w3vars = self._get_web3_vars(network)
       contract = w3vars.w3.eth.contract(
         address=w3vars.controller_contract_address, 
-        abi=EVM_ABI_DATA.IS_NODE_ACTIVE,
+        abi=EVM_ABI_DATA.CONTROLLER_ABI,
       )
+      if debug:
+        self.P(f"Checking if {address} ({w3vars.network}) is allowed...")
 
       result = contract.functions.isNodeActive(address).call()
       return result
@@ -801,27 +795,22 @@ class _EVMMixin:
       Parameters
       ----------
       network : str, optional
-        the network to use. The default is None.
+        The network to use. The default is None.
 
       Returns
       -------
       list
-        the list of oracles addresses.
-
+        The list of oracles addresses.
       """
       w3vars = self._get_web3_vars(network)
-
-      func = w3vars.get_oracles_abi[0]["name"]
-      if debug:
-        self.P(f"Getting oracles for {w3vars.network} via {w3vars.rpc_url} using `{func}`...")
-      
       contract = w3vars.w3.eth.contract(
         address=w3vars.controller_contract_address, 
-        abi=w3vars.get_oracles_abi,
+        abi=EVM_ABI_DATA.CONTROLLER_ABI,
       )
+      if debug:
+        self.P(f"Getting oracles for {w3vars.network} via {w3vars.rpc_url}...")
 
-      get_oracles_func = getattr(contract.functions, func)
-      result = get_oracles_func().call()
+      result = contract.functions.getOracles().call()
       return result    
 
     
@@ -842,6 +831,7 @@ class _EVMMixin:
       if address is None:
         address = self.eth_address
       assert self.is_valid_eth_address(address), "Invalid Ethereum address"
+
       w3vars = self._get_web3_vars(network)
       balance_wei = w3vars.w3.eth.get_balance(address)
       balance_eth = w3vars.w3.from_wei(balance_wei, 'ether')
@@ -981,8 +971,8 @@ class _EVMMixin:
       if address is None:
         address = self.eth_address
       assert self.is_valid_eth_address(address), "Invalid Ethereum address"
-      w3vars = self._get_web3_vars(network)
 
+      w3vars = self._get_web3_vars(network)
       token_contract = w3vars.w3.eth.contract(
         address=w3vars.r1_contract_address, abi=EVM_ABI_DATA.ERC20_ABI
       )
@@ -991,7 +981,6 @@ class _EVMMixin:
         decimals = token_contract.functions.decimals().call()
       except Exception:
         decimals = 18  # default to 18 if the decimals call fails
-
       raw_balance = token_contract.functions.balanceOf(address).call()
       human_balance = raw_balance / (10 ** decimals)
       return float(human_balance)
@@ -1014,44 +1003,39 @@ class _EVMMixin:
       Parameters
       ----------
       to_address : str
-          The recipient's Ethereum address.
+        The recipient's Ethereum address.
           
       amount : float
-          The amount of R1 tokens to send (in human-readable units).
+        The amount of R1 tokens to send (in human-readable units).
           
       extra_buffer_eth : float, optional
-          Additional ETH (in Ether) as a buffer for gas fees. Default is 0.005 ETH.
+        Additional ETH (in Ether) as a buffer for gas fees. Default is 0.005 ETH.
           
       wait_for_tx : bool, optional
-          If True, waits for the transaction to be mined and returns the receipt.
-          If False, returns immediately with the transaction hash.
+        If True, waits for the transaction to be mined and returns the receipt.
+        If False, returns immediately with the transaction hash.
           
       timeout : int, optional
-          Maximum number of seconds to wait for the transaction receipt. Default is 120.
+        Maximum number of seconds to wait for the transaction receipt. Default is 120.
           
       network : str, optional
-          The network to use. If None, uses the default self.evm_network.
+        The network to use. If None, uses the default self.evm_network.
 
       return_receipt: bool, optional
-          If True, returns the transaction receipt instead of the transaction hash.
+        If True, returns the transaction receipt instead of the transaction hash.
           
       raise_if_error : bool, optional
-          If True, raises an exception if the transaction fails. Default is False.  
+        If True, raises an exception if the transaction fails. Default is False.  
           
       Returns
       -------
-          If wait_for_tx is False, returns the transaction hash as a string.
-          If wait_for_tx is True, returns the transaction receipt as a dict.
+        If wait_for_tx is False, returns the transaction hash as a string.
+        If wait_for_tx is True, returns the transaction receipt as a dict.
       """
-      # Validate the recipient address.
       assert self.is_valid_eth_address(to_address), "Invalid Ethereum address"
-      
-      # Retrieve the Web3 instance, RPC URL, and the R1 contract address.
-      # Note: This follows the same pattern as web3_get_balance_r1.
+
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-      
-      # Create the token contract instance.
       token_contract = w3vars.w3.eth.contract(
         address=w3vars.r1_contract_address, abi=EVM_ABI_DATA.ERC20_ABI
       )
@@ -1061,7 +1045,6 @@ class _EVMMixin:
         decimals = token_contract.functions.decimals().call()
       except Exception:
         decimals = 18
-
       # Convert the human-readable amount to the token's smallest unit.
       token_amount = int(amount * (10 ** decimals))
       
@@ -1076,23 +1059,20 @@ class _EVMMixin:
           return None
       
       # Estimate gas fees for the token transfer.
-      gas_price = w3vars.w3.to_wei('50', 'gwei')  # Adjust as needed or use a dynamic gas strategy.
+      gas_price = w3vars.w3.eth.gas_price  # This fetches the current suggested gas price from the network.
       estimated_gas = token_contract.functions.transfer(
         to_address, token_amount
       ).estimate_gas(
         {'from': self.eth_address}
       )
       gas_cost = estimated_gas * gas_price
-      
       # Check that the sender's ETH balance can cover gas costs plus an extra buffer.
       eth_balance = w3vars.w3.eth.get_balance(self.eth_address)
       extra_buffer = w3vars.w3.to_wei(extra_buffer_eth, 'ether')
       if eth_balance < gas_cost + extra_buffer:
         raise Exception("Insufficient ETH balance to cover gas fees and extra buffer.")
-      
       # Get the transaction count for the nonce.
       nonce = w3vars.w3.eth.get_transaction_count(self.eth_address)
-      
       # Programmatically determine the chainId.
       chain_id = w3vars.w3.eth.chain_id
 
@@ -1104,13 +1084,11 @@ class _EVMMixin:
         'gasPrice': gas_price,
         'chainId': chain_id,
       })
-      
       self.P(f"Executing transaction on {network} via {w3vars.rpc_url}:\n {json.dumps(dict(tx), indent=2)}", verbosity=2)
       
       # Sign the transaction using the internal account (via _get_eth_account).
       eth_account = self._get_eth_account()
       signed_tx = w3vars.w3.eth.account.sign_transaction(tx, eth_account.key)
-      
       # Broadcast the transaction.
       tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
       
@@ -1139,41 +1117,31 @@ class _EVMMixin:
       Parameters
       ----------
       node_address : str
-          The node address (must be a valid Ethereum address).
+        The node address (must be a valid Ethereum address).
           
       network : str, optional
-          The network to use. If None, defaults to self.evm_network.
+        The network to use. If None, defaults to self.evm_network.
           
       raise_if_issue : bool, optional
-          If True, raises an exception based on custom criteria (e.g., if node is banned).
-          Default is False.
-
+        If True, raises an exception based on custom criteria (e.g., if node is banned).
+        Default is False.
 
       Returns
       -------
       dict
-          A dictionary containing all license details returned by getNodeLicenseDetails.
+        A dictionary containing all license details returned by getNodeLicenseDetails.
       """
-      # Validate the node address.
       assert self.is_valid_eth_address(node_address), "Invalid Ethereum address"
 
-      # Retrieve the necessary Web3 variables (pattern consistent with web3_send_r1).
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-
-      # Create the contract instance for retrieving node info.
-      # Assuming you have a specific contract address in w3vars (e.g. license_contract_address),
-      # or you may adapt this code if your contract address is stored differently.
       contract = w3vars.w3.eth.contract(
-        address=w3vars.proxy_contract_address,  # or the relevant address from your environment
-        abi=EVM_ABI_DATA.GET_NODE_INFO
+        address=w3vars.proxy_contract_address,
+        abi=EVM_ABI_DATA.PROXY_ABI,
       )
-
       self.P(f"`getNodeLicenseDetails` on {network} via {w3vars.rpc_url}", verbosity=2)
 
-      # Call the contract function to get details.
       result_tuple = contract.functions.getNodeLicenseDetails(node_address).call()
-
       # Unpack the tuple into a dictionary for readability.
       details = {
         "network": network,
@@ -1198,7 +1166,6 @@ class _EVMMixin:
       is_valid = not (
         no_owner or no_real_addr or is_banned
       )
-      
       details['isValid'] = is_valid
 
       self.P(f"Node Info:\n{json.dumps(details, indent=2)}", verbosity=2)
@@ -1220,35 +1187,27 @@ class _EVMMixin:
       Parameters
       ----------
       wallet_addr : str
-          The Ethereum wallet address to check.
+        The Ethereum wallet address to check.
           
       network : str, optional
-          The network to use. If None, defaults to self.evm_network.
+        The network to use. If None, defaults to self.evm_network.
 
       Returns
       -------
       list of dict
-          A list of dictionaries containing node details.
+        A list of dictionaries containing node details.
       """
       assert self.is_valid_eth_address(address), "Invalid Ethereum address"
 
-      # Retrieve the necessary Web3 variables (pattern consistent with web3_send_r1).
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-
-      # Create the contract instance for retrieving node info.
-      # Assuming you have a specific contract address in w3vars (e.g. license_contract_address),
-      # or you may adapt this code if your contract address is stored differently.
       contract = w3vars.w3.eth.contract(
-        address=w3vars.proxy_contract_address,  # or the relevant address from your environment
-        abi=EVM_ABI_DATA.GET_WALLET_NODES,
+        address=w3vars.proxy_contract_address,
+        abi=EVM_ABI_DATA.PROXY_ABI,
       )
-      
       self.P(f"`getWalletNodes` on {network} via {w3vars.rpc_url}", verbosity=2)
-      # Call the contract function to get details.
+
       result = contract.functions.getWalletNodes(address).call()
-      # Unpack the tuple into a dictionary for readability.
-      
       return result
     
     def web3_get_addresses_balances(
@@ -1262,32 +1221,28 @@ class _EVMMixin:
       Parameters
       ----------
       addresses : list of str
-          The list of Ethereum addresses to check.
+        The list of Ethereum addresses to check.
           
       network : str, optional
-          The network to use. If None, defaults to self.evm_network.
+        The network to use. If None, defaults to self.evm_network.
 
       Returns
       -------
       dict
-          A dictionary mapping each address to its balances.
+        A dictionary mapping each address to its balances.
       """
       assert isinstance(addresses, list), "Addresses must be a list"
       assert all(self.is_valid_eth_address(addr) for addr in addresses), "All addresses must be valid Ethereum addresses"
 
-      # Retrieve the necessary Web3 variables (pattern consistent with web3_send_r1).
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-
-      # Create the contract instance for the proxy contract.
       contract = w3vars.w3.eth.contract(
         address=w3vars.proxy_contract_address,
-        abi=EVM_ABI_DATA.GET_ADDRESSES_BALANCES
+        abi=EVM_ABI_DATA.PROXY_ABI,
       )
-
       self.P(f"`getAddressesBalances` on {network} via {w3vars.rpc_url}", verbosity=2)
+
       result = contract.functions.getAddressesBalances(addresses).call()
-      
       balances = {}
       for item in result:
         addr = item[0]
@@ -1297,7 +1252,6 @@ class _EVMMixin:
           "ethBalance": float(eth_balance),
           "r1Balance": float(r1_balance),
         }
-
       return balances
 
     def web3_get_job_details(
@@ -1311,31 +1265,26 @@ class _EVMMixin:
       Parameters
       ----------
       job_id : int
-          The job ID to retrieve details for.
+        The job ID to retrieve details for.
 
       network : str, optional
-          The network to use. If None, defaults to self.evm_network.
-
+        The network to use. If None, defaults to self.evm_network.
 
       Returns
       -------
       dict
-          A dictionary containing all job details returned by getJobDetails.
+        A dictionary containing all job details returned by getJobDetails.
       """
-      # Validate the job ID.
       assert isinstance(job_id, int), "Invalid job ID"
 
-      # Retrieve the necessary Web3 variables (pattern consistent with web3_send_r1).
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
       contract = w3vars.w3.eth.contract(
         address=w3vars.poai_manager_address,
         abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
-
       self.P(f"`getJobDetails` on {network} via {w3vars.rpc_url}", verbosity=2)
 
-      # Call the contract function to get details.
       result_tuple = contract.functions.getJobDetails(job_id).call()
       details = self._format_job_details(result_tuple, network)
       self.P(f"Job Details:\n{json.dumps(details, indent=2)}", verbosity=2)
@@ -1351,12 +1300,12 @@ class _EVMMixin:
       Parameters
       ----------
       network : str, optional
-          The network to use. Defaults to the current engine network.
+        The network to use. Defaults to the current engine network.
 
       Returns
       -------
       list[dict]
-          A list with the job details for every active job.
+        A list with the job details for every active job.
       """
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
@@ -1364,8 +1313,8 @@ class _EVMMixin:
         address=w3vars.poai_manager_address,
         abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
-
       self.P(f"`getAllActiveJobs` on {network} via {w3vars.rpc_url}", verbosity=2)
+
       raw_jobs = contract.functions.getAllActiveJobs().call()
       jobs = [self._format_job_details(job, network) for job in raw_jobs]
       self.P(f"Active jobs found: {len(jobs)}", verbosity=2)
@@ -1386,28 +1335,23 @@ class _EVMMixin:
       Parameters
       ----------
       job_id : int
-          The job ID to update.
+        The job ID to update.
           
       nodes : list
-          The list of new nodes running the job.
+        The list of new nodes running the job.
           
       network : str, optional
-          The network to use. If None, uses the default self.evm_network.
+        The network to use. If None, uses the default self.evm_network.
 
       Returns
       -------
-          The transaction hash.
+        The transaction hash.
       """
-      # Validate the input parameters.
       assert isinstance(job_id, int), "Invalid job ID"
       assert isinstance(nodes, list), "Nodes must be a list"
-      
-      # Retrieve the Web3 instance, RPC URL, and the R1 contract address.
-      # Note: This follows the same pattern as web3_get_balance_r1.
+
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-      
-      # Create the token contract instance.
       poai_manager_contract = w3vars.w3.eth.contract(
         address=w3vars.poai_manager_address, abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
@@ -1416,15 +1360,12 @@ class _EVMMixin:
       gas_price = w3vars.w3.eth.gas_price  # This fetches the current suggested gas price from the network.
       estimated_gas = 1_000_000 # Have enough gas to cover all the actions if consensus is reached
       gas_cost = estimated_gas * gas_price
-      
       # Check that the sender's ETH balance can cover gas costs plus an extra buffer.
       eth_balance = w3vars.w3.eth.get_balance(self.eth_address)
       if eth_balance < gas_cost:
         raise Exception("Insufficient ETH balance to cover gas fees.")
-      
       # Get the transaction count for the nonce.
       nonce = w3vars.w3.eth.get_transaction_count(self.eth_address)
-      
       # Programmatically determine the chainId.
       chain_id = w3vars.w3.eth.chain_id
 
@@ -1436,13 +1377,11 @@ class _EVMMixin:
         'gasPrice': gas_price,
         'chainId': chain_id,
       })
-      
       self.P(f"Executing transaction on {network} via {w3vars.rpc_url}:\n {json.dumps(dict(tx), indent=2)}", verbosity=2)
       
       # Sign the transaction using the internal account (via _get_eth_account).
       eth_account = self._get_eth_account()
       signed_tx = w3vars.w3.eth.account.sign_transaction(tx, eth_account.key)
-      
       # Broadcast the transaction.
       tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
       
@@ -1471,18 +1410,14 @@ class _EVMMixin:
       Parameters
       ----------
       network : str, optional
-          The network to use. If None, uses the default self.evm_network.
+        The network to use. If None, uses the default self.evm_network.
 
       Returns
       -------
-          The transaction hash.
+        The transaction hash.
       """
-      # Retrieve the Web3 instance, RPC URL, and the R1 contract address.
-      # Note: This follows the same pattern as web3_get_balance_r1.
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-      
-      # Create the token contract instance.
       poai_manager_contract = w3vars.w3.eth.contract(
         address=w3vars.poai_manager_address, abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
@@ -1493,15 +1428,12 @@ class _EVMMixin:
         {'from': self.eth_address}
       )
       gas_cost = estimated_gas * gas_price
-      
       # Check that the sender's ETH balance can cover gas costs plus an extra buffer.
       eth_balance = w3vars.w3.eth.get_balance(self.eth_address)
       if eth_balance < gas_cost:
         raise Exception("Insufficient ETH balance to cover gas fees.")
-      
       # Get the transaction count for the nonce.
       nonce = w3vars.w3.eth.get_transaction_count(self.eth_address)
-      
       # Programmatically determine the chainId.
       chain_id = w3vars.w3.eth.chain_id
 
@@ -1513,13 +1445,11 @@ class _EVMMixin:
         'gasPrice': gas_price,
         'chainId': chain_id,
       })
-      
       self.P(f"Executing transaction on {network} via {w3vars.rpc_url}:\n {json.dumps(dict(tx), indent=2)}", verbosity=2)
       
       # Sign the transaction using the internal account (via _get_eth_account).
       eth_account = self._get_eth_account()
       signed_tx = w3vars.w3.eth.account.sign_transaction(tx, eth_account.key)
-      
       # Broadcast the transaction.
       tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
       
@@ -1547,32 +1477,26 @@ class _EVMMixin:
       Parameters
       ----------
       oracle_address : str
-          The oracle address to check for.
+        The oracle address to check for.
           
       network : str, optional
-          The network to use. If None, defaults to self.evm_network.
+        The network to use. If None, defaults to self.evm_network.
 
       Returns
       -------
       list
-          A list of unvalidated job IDs.
+        A list of unvalidated job IDs.
       """
-      # Retrieve the necessary Web3 variables (pattern consistent with web3_get_job_details).
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-      
       contract = w3vars.w3.eth.contract(
         address=w3vars.poai_manager_address,
         abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
-
       self.P(f"`getUnvalidatedJobIds` on {network} via {w3vars.rpc_url}", verbosity=2)
 
-      # Call the contract function to get unvalidated job IDs.
       result = contract.functions.getUnvalidatedJobIds(oracle_address).call()
-      
       self.P(f"Unvalidated Job IDs: {result}", verbosity=2)
-
       return result
 
     def web3_get_first_closable_job_id(
@@ -1585,29 +1509,25 @@ class _EVMMixin:
       Parameters
       ----------
       network : str, optional
-          The network to use. If None, defaults to self.evm_network.
+        The network to use. If None, defaults to self.evm_network.
 
       Returns
       -------
       int or None
-          The ID of the first closable job, or None if no such job exists.
+        The ID of the first closable job, or None if no such job exists.
       """
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-
       contract = w3vars.w3.eth.contract(
         address=w3vars.poai_manager_address,
         abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
-
       self.P(f"`getFirstClosableJobId` on {network} via {w3vars.rpc_url}", verbosity=2)
 
-      # Call the contract function to get the first closable job ID.
       result = contract.functions.getFirstClosableJobId().call()
       if result == 0:
         result = None
       self.P(f"First closable job ID: {result}", verbosity=2)
-
       return result
 
     def web3_get_is_last_epoch_allocated(
@@ -1620,31 +1540,62 @@ class _EVMMixin:
       Parameters
       ----------
       network : str, optional
-          The network to use. If None, defaults to self.evm_network.
+        The network to use. If None, defaults to self.evm_network.
 
       Returns
       -------
       bool
-          True if the last epoch has been allocated, False otherwise.
+        True if the last epoch has been allocated, False otherwise.
       """
-      # Retrieve the necessary Web3 variables (pattern consistent with web3_get_unvalidated_job_ids).
       w3vars = self._get_web3_vars(network)
       network = w3vars.network
-      
       contract = w3vars.w3.eth.contract(
         address=w3vars.poai_manager_address,
         abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
-
       self.P(f"`getIsLastEpochAllocated` on {network} via {w3vars.rpc_url}", verbosity=2)
 
-      # Call the contract function to check if last epoch is allocated.
       result = contract.functions.getIsLastEpochAllocated().call()
-      
       self.P(f"Last epoch allocated: {result}", verbosity=2)
-
       return result
     
+    def web3_get_user_escrow_details(self, address: str, network: str = None):
+      """
+      Retrieve escrow details for a given wallet address.
+
+      Parameters
+      ----------
+      address : str
+        The Ethereum wallet address to check.
+          
+      network : str, optional
+        The network to use. If None, defaults to self.evm_network.
+
+      Returns
+      -------
+      dict
+        A dictionary containing the user escrow details.
+      """
+      assert self.is_valid_eth_address(address), "Invalid Ethereum address"
+
+      w3vars = self._get_web3_vars(network)
+      network = w3vars.network
+      contract = w3vars.w3.eth.contract(
+        address=w3vars.proxy_contract_address,
+        abi=EVM_ABI_DATA.PROXY_ABI,
+      )
+      self.P(f"`getUserEscrowDetails` on {network} via {w3vars.rpc_url}", verbosity=2)
+
+      result = contract.functions.getUserEscrowDetails(address).call()
+      details = {
+        "network": network,
+        "isActive": result[0],
+        "escrowAddress": result[1],
+        "escrowOwner": result[2],
+        "permissions": result[3],
+      }
+      return details
+    
     def _format_job_details(self, raw_job_details, network: str):
       """
       Normalize the job details tuple returned by the PoAI Manager contract.

ratio1/const/evm_net.py

@@ -10,9 +10,7 @@ class EvmNetData:
   DAUTH_MND_ADDR_KEY = 'EE_DAUTH_MND_ADDR'
   DAUTH_PROXYAPI_ADDR_KEY = 'EE_DAUTH_PROXYAPI_ADDR'
   DAUTH_POAI_MANAGER_ADDR_KEY = 'EE_DAUTH_POAI_MANAGER_ADDR'
-  
-  DAUTH_CONTROLLER_ADDR_KEY = 'EE_DAUTH_CONTROLLER_ADDR'  
-  DAUTH_GET_ORACLES_ABI = 'EE_DAUTH_GET_ORACLES_ABI'
+  DAUTH_CONTROLLER_ADDR_KEY = 'EE_DAUTH_CONTROLLER_ADDR'
   
   EE_GENESIS_EPOCH_DATE_KEY = 'EE_GENESIS_EPOCH_DATE'
   EE_EPOCH_INTERVALS_KEY = 'EE_EPOCH_INTERVALS'
@@ -41,165 +39,142 @@ class EvmNetConstants:
 # endclass EvmNetConstants
 
 
-_DAUTH_ABI_IS_NODE_ACTIVE = [{
-  "inputs": [
-    {
-      "internalType": "address",
-      "name": "nodeAddress",
-      "type": "address"
-    }
-  ],
-  "name": "isNodeActive",
-  "outputs": [
-    {
-      "internalType": "bool",
-      "name": "",
-      "type": "bool"
-    }
-  ],
-  "stateMutability": "view",
-  "type": "function"
-}]
-
-
-_DAUTH_ABI_GET_ORACLES = [{
-  "inputs": [],
-  "name": "getOracles",
-  "outputs": [
-    {
-      "internalType": "address[]",
-      "name": "",
-      "type": "address[]"
-    }
-  ],
-  "stateMutability": "view",
-  "type": "function"
-}]
-
-
-_DAUTH_ABI_GET_SIGNERS_deprecated = [{
-  "inputs": [],
-  "name": "getSigners",
-  "outputs": [
-    {
-      "internalType": "address[]",
-      "name": "",
-      "type": "address[]"
-    }
-  ],
-  "stateMutability": "view",
-  "type": "function"
-}]
-
-
-_GET_NODE_INFO_ABI = [
+_CONTROLLER_ABI = [
   {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "node",
-          "type": "address"
-        }
-      ],
-      "name": "getNodeLicenseDetails",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "enum LicenseType",
-              "name": "licenseType",
-              "type": "uint8"
-            },
-            {
-              "internalType": "uint256",
-              "name": "licenseId",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "owner",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "nodeAddress",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "totalAssignedAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "totalClaimedAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "lastClaimEpoch",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "assignTimestamp",
-              "type": "uint256"
-            },
-            {
-              "internalType": "address",
-              "name": "lastClaimOracle",
-              "type": "address"
-            },
-            {
-              "internalType": "bool",
-              "name": "isBanned",
-              "type": "bool"
-            },
-            {
-              "internalType": "uint256",
-              "name": "usdcPoaiRewards",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "r1PoaiRewards",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct LicenseDetails",
-          "name": "",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-]
-
-
-_GET_WALLET_NODES = [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "wallet",
-          "type": "address"
-        }
-      ],
-      "name": "getWalletNodes",
-      "outputs": [
-        {
-          "internalType": "address[]",
-          "name": "nodes",
-          "type": "address[]"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "nodeAddress",
+        "type": "address"
+      }
+    ],
+    "name": "isNodeActive",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getOracles",
+    "outputs": [
+      {
+        "internalType": "address[]",
+        "name": "",
+        "type": "address[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
 ]
 
-_GET_ADDRESSES_BALANCES = [
+_PROXY_ABI = [
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "node",
+        "type": "address"
+      }
+    ],
+    "name": "getNodeLicenseDetails",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "enum LicenseType",
+            "name": "licenseType",
+            "type": "uint8"
+          },
+          {
+            "internalType": "uint256",
+            "name": "licenseId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "nodeAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "totalAssignedAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "totalClaimedAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "lastClaimEpoch",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "assignTimestamp",
+            "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "lastClaimOracle",
+            "type": "address"
+          },
+          {
+            "internalType": "bool",
+            "name": "isBanned",
+            "type": "bool"
+          },
+          {
+            "internalType": "uint256",
+            "name": "usdcPoaiRewards",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "r1PoaiRewards",
+            "type": "uint256"
+          }
+        ],
+        "internalType": "struct LicenseDetails",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "wallet",
+        "type": "address"
+      }
+    ],
+    "name": "getWalletNodes",
+    "outputs": [
+      {
+        "internalType": "address[]",
+        "name": "nodes",
+        "type": "address[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -235,6 +210,47 @@ _GET_ADDRESSES_BALANCES = [
     ],
     "stateMutability": "view",
     "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "user",
+        "type": "address"
+      }
+    ],
+    "name": "getUserEscrowDetails",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "bool",
+            "name": "isActive",
+            "type": "bool"
+          },
+          {
+            "internalType": "address",
+            "name": "escrowAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "escrowOwner",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "permissions",
+            "type": "uint256"
+          }
+        ],
+        "internalType": "struct UserEscrowDetails",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   }
 ]
 
@@ -542,7 +558,6 @@ EVM_NET_DATA = {
     EvmNetData.EE_DAPP_APP_URL_KEY              : "https://app.ratio1.ai",
     EvmNetData.EE_EXPLORER_APP_URL_KEY          : "https://explorer.ratio1.ai",
     EvmNetData.EE_DEEPLOY_APP_URL_KEY           : "https://deeploy.ratio1.ai",
-    EvmNetData.DAUTH_GET_ORACLES_ABI            : _DAUTH_ABI_GET_ORACLES,
   },
 
   EvmNetData.TESTNET: {
@@ -564,7 +579,6 @@ EVM_NET_DATA = {
     EvmNetData.EE_DAPP_APP_URL_KEY              : "https://testnet-app.ratio1.ai",
     EvmNetData.EE_EXPLORER_APP_URL_KEY          : "https://testnet-explorer.ratio1.ai",
     EvmNetData.EE_DEEPLOY_APP_URL_KEY           : "https://testnet-deeploy.ratio1.ai",
-    EvmNetData.DAUTH_GET_ORACLES_ABI            : _DAUTH_ABI_GET_ORACLES,
   },
 
   
@@ -587,7 +601,6 @@ EVM_NET_DATA = {
     EvmNetData.EE_DAPP_APP_URL_KEY              : "https://devnet-app.ratio1.ai",
     EvmNetData.EE_EXPLORER_APP_URL_KEY          : "https://devnet-explorer.ratio1.ai",
     EvmNetData.EE_DEEPLOY_APP_URL_KEY           : "https://devnet-deeploy.ratio1.ai",
-    EvmNetData.DAUTH_GET_ORACLES_ABI            : _DAUTH_ABI_GET_ORACLES,
   },
 }
 
@@ -633,10 +646,7 @@ EVM_NET_CONSTANTS = {
 }
 
 class EVM_ABI_DATA:
-  GET_NODE_INFO = _GET_NODE_INFO_ABI
-  GET_WALLET_NODES = _GET_WALLET_NODES
-  GET_ADDRESSES_BALANCES = _GET_ADDRESSES_BALANCES
-  IS_NODE_ACTIVE = _DAUTH_ABI_IS_NODE_ACTIVE
   ERC20_ABI = _ERC20_ABI
   POAI_MANAGER_ABI = _POAI_MANAGER_ABI
-  
+  PROXY_ABI = _PROXY_ABI
+  CONTROLLER_ABI = _CONTROLLER_ABI

ratio1/ipfs/r1fs.py

@@ -919,6 +919,9 @@ class R1FSEngine:
       >>> print(cid)
       QmFolder123ABC
       """
+      add_time, remove_time, pin_time = 0.0, 0.0, 0.0
+      start_time = time.time()
+
       if secret in ["", None]:
         secret = self.__DEFAULT_SECRET
       
@@ -954,7 +957,6 @@ class R1FSEngine:
       tmp_cipher_path = os.path.join(tempfile.gettempdir(), uuid.uuid4().hex + ".bin")
       
       folder_cid = None
-      start_time = time.time()
       try:
         encryptor = Cipher(algorithms.AES(key), modes.GCM(nonce_bytes)).encryptor()
 
@@ -996,11 +998,16 @@ class R1FSEngine:
         else:
           self.P(msg, color='r')
       #end try
-      elapsed_time = time.time() - start_time
+      add_time = time.time() - start_time
+      
+      remove_start_time = time.time()
       # Cleanup temp file
       os.remove(tmp_cipher_path)
+      remove_time = time.time() - remove_start_time
       
       if folder_cid is not None:
+        # Now we notify the relay (if any) about the new CID
+        pin_start_time = time.time()
         if self.__ipfs_relay_api is not None:
           #  Notifying the Relay about a new CID.
           try:
@@ -1028,10 +1035,14 @@ class R1FSEngine:
         self.__uploaded_files[folder_cid] = file_path
         # now we pin the folder
         res = self.__pin_add(folder_cid)
-        if show_logs:
-          self.P(f"Added file {file_path} as <{folder_cid}> in {elapsed_time:.1f}s")      
+        pin_time = time.time() - pin_start_time
         #end if show_logs
       #end if folder_cid is not None
+      total_time = time.time() - start_time
+      if show_logs:
+        self.P("Added file {} as <{}> in {.2f}s: add_time={.2f}s, remove_time={.2f}s, pin_time={.2f}s".format(
+          file_path, folder_cid, total_time, add_time, remove_time, pin_time
+        ))      
       return folder_cid
 
 

{ratio1-3.4.115.dist-info → ratio1-3.4.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.115
+Version: 3.4.117
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.115.dist-info → ratio1-3.4.117.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=TcvwWT3qPxu-5upy5uGiWtfAW8JJ04ELehgywqeI1Pw,332
+ratio1/_ver.py,sha256=d5GaaIQCUfy5PSr-k2MpkZjU4dkFGmzUk5O_ZF9UnAE,332
 ratio1/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 ratio1/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 ratio1/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -17,7 +17,7 @@ ratio1/bc/__init__.py,sha256=BI5pcqHdhwnMdbWTYDLW1cVP_844VtLra-lz7xprgsk,171
 ratio1/bc/base.py,sha256=g7tARNgi_0N1p9HpvqRDWDVYxuqU7W6S0q3ARC6oxKk,45870
 ratio1/bc/chain.py,sha256=HCTQGnmuKqTvUo95OKdg8rL2jhKfSMwrich2e_7Nyms,2336
 ratio1/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
-ratio1/bc/evm.py,sha256=JH2l9kZq7nEOilY4ZP5SOvxpqP7yaheZPR9LuTNui6I,53792
+ratio1/bc/evm.py,sha256=iMLdm_rtQFqmt44zTE_UA0OKSTmuH7sCSI2iKvFI1_k,52013
 ratio1/certs/141.136.35.100.crt,sha256=DQ0GEz-CeTU_n2o3B6SeNqANWVVWu8m5a4OQ8FnYzvc,1866
 ratio1/certs/195.35.29.4.crt,sha256=5aODzjC_mffZ8pl26LkE-nUHj6Ih8UWajmvd2paVwVY,1159
 ratio1/certs/31.97.72.187.crt,sha256=2aY-YhlupUFCYldPsoOlhU_OYdFDTOmBSXa7gQOLB60,1858
@@ -48,7 +48,7 @@ ratio1/const/apps.py,sha256=MD4SRTNId663D3SX78_GJa40BI_H1mdcNbL2gy_Hio0,827
 ratio1/const/base.py,sha256=QIeRH6X-u8DbezQCGipI3isL1LGComBQC5hLedO1jrQ,6042
 ratio1/const/comms.py,sha256=qEYX4ciYg8SYWSDZZTUYxzpR1--2a7UusrWzAq0hxo8,2259
 ratio1/const/environment.py,sha256=632L5GrcNqF3-JhvrC6kXzXwLMcihRgMlOkLurnOwGY,1031
-ratio1/const/evm_net.py,sha256=mCFvb2GXke0EaAWNKMVKWxXmDcqWxgqNnK5xK-5Qxg8,20021
+ratio1/const/evm_net.py,sha256=5Hs5JVIO5WZqMuxzSyKjAAXDlMUMkxZ1CqVio_ueuZQ,20049
 ratio1/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 ratio1/const/heartbeat.py,sha256=eVWuGIP5sAIYzQjOJUehmKlYHetoquSw-sTJwSKrHk8,3223
 ratio1/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
@@ -74,7 +74,7 @@ ratio1/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz5lgrQWo7
 ratio1/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 ratio1/ipfs/__init__.py,sha256=vXEDLUNUO6lOTMGa8iQ9Zf7ajIQq9GZuvYraAHt3meE,38
 ratio1/ipfs/ifps_keygen,sha256=PcoYuo4c89_C9FWrKq9K_28ruhKqnxNn1s3nLHiF1tc,879
-ratio1/ipfs/r1fs.py,sha256=dm52iGY2yEZBLThKsi632aMf1dOmyXAwmNzzYKue7_k,91598
+ratio1/ipfs/r1fs.py,sha256=eNHDEG15CNc32PD-yoSTCwLhuOuyolZxqiYVrz_UkSA,92048
 ratio1/ipfs/ipfs_setup/ipfs.service,sha256=isTJQsktPy4i1yaDA9AC1OKdlTYvsCCRRAVX-EmGqAs,248
 ratio1/ipfs/ipfs_setup/launch_service.sh,sha256=GWhZyNqtohLxJg8Q_c8YnNZduu1ddXDU-IFRRMaEyiY,141
 ratio1/ipfs/ipfs_setup/restart.sh,sha256=9xHMgkUoAMI25jeaoDVFbCa_LjojYm3ubljW58RatKE,22
@@ -109,8 +109,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=Elfkl7W4aDMvB5WZLiYlPXrecBncgTxb4hcKhQedMzI,10111
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.115.dist-info/METADATA,sha256=7Hv0xaGwucb_ayVGCvOF_xeTjN8cKnqpZjT2YWS4WCs,12256
-ratio1-3.4.115.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ratio1-3.4.115.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.115.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.115.dist-info/RECORD,,
+ratio1-3.4.117.dist-info/METADATA,sha256=3I7LyVPKgPy0h5kpherF6b4QKxtjCLY5gMOjJ8xAygI,12256
+ratio1-3.4.117.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ratio1-3.4.117.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.117.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.117.dist-info/RECORD,,