ratio1 3.4.50__tar.gz → 3.4.52__tar.gz

{ratio1-3.4.50 → ratio1-3.4.52}/.devcontainer/devcontainer.json

@@ -5,10 +5,10 @@
   "runArgs": [
     //"--gpus=all",
     "--hostname",
-    "sdk_dev",
+    "r1sdk_dev",
     
     "--name",
-    "r1_sdk_devenv"
+    "r1r1_sdk"
   ],
 
   "customizations": {

{ratio1-3.4.50 → ratio1-3.4.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.50
+Version: 3.4.52
 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.50 → ratio1-3.4.52}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.50"
+version = "3.4.52"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.50 → ratio1-3.4.52}/ratio1/_ver.py

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

{ratio1-3.4.50 → ratio1-3.4.52}/ratio1/bc/evm.py

@@ -1327,7 +1327,7 @@ class _EVMMixin:
       network = w3vars.network
       contract = w3vars.w3.eth.contract(
         address=w3vars.poai_manager_address,
-        abi=EVM_ABI_DATA.GET_JOB_DETAILS
+        abi=EVM_ABI_DATA.POAI_MANAGER_ABI
       )
 
       self.P(f"`getJobDetails` on {network} via {w3vars.rpc_url}", verbosity=2)
@@ -1356,6 +1356,242 @@ class _EVMMixin:
 
       return details
 
+    def web3_submit_node_update(
+      self,
+      job_id: int,
+      nodes: list,
+      wait_for_tx: bool = False,
+      timeout: int = 120,
+      network: str = None,
+      return_receipt=False,
+    ):
+      """
+      Submit nodes update for a given job.
+
+      Parameters
+      ----------
+      job_id : int
+          The job ID to update.
+          
+      nodes : list
+          The list of new nodes running the job.
+          
+      network : str, optional
+          The network to use. If None, uses the default self.evm_network.
+
+      Returns
+      -------
+          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
+      )
+      
+      # Estimate gas fees for the token transfer.
+      gas_price = w3vars.w3.eth.gas_price  # This fetches the current suggested gas price from the network.
+      estimated_gas = poai_manager_contract.functions.submitNodeUpdate(job_id, nodes).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)
+      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
+
+      # Build the transaction for the ERC20 transfer.
+      tx = poai_manager_contract.functions.submitNodeUpdate(job_id, nodes).build_transaction({
+        'from': self.eth_address,
+        'nonce': nonce,
+        'gas': estimated_gas,
+        '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)
+      
+      if wait_for_tx:
+        # Wait for the transaction receipt if required.
+        tx_receipt = w3vars.w3.eth.wait_for_transaction_receipt(tx_hash, timeout=timeout)
+        tx_hash_hex = tx_receipt.transactionHash.hex()
+        self.P(f"Transaction mined: {tx_hash_hex}", color='g', verbosity=2)
+        if return_receipt:          
+          return tx_receipt
+        else:
+          return tx_hash_hex
+      else:
+        return tx_hash.hex()
+
+    def web3_allocate_rewards_across_all_escrows(
+      self,
+      network: str = None,
+      wait_for_tx=True,
+      timeout=120,
+      return_receipt=False,
+    ):
+      """
+      Allocate rewards across all escrows.
+
+      Parameters
+      ----------
+      network : str, optional
+          The network to use. If None, uses the default self.evm_network.
+
+      Returns
+      -------
+          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
+      )
+      
+      # Estimate gas fees for the token transfer.
+      gas_price = w3vars.w3.eth.gas_price  # This fetches the current suggested gas price from the network.
+      estimated_gas = poai_manager_contract.functions.allocateRewardsAcrossAllEscrows().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)
+      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
+
+      # Build the transaction for the ERC20 transfer.
+      tx = poai_manager_contract.functions.allocateRewardsAcrossAllEscrows().build_transaction({
+        'from': self.eth_address,
+        'nonce': nonce,
+        'gas': estimated_gas,
+        '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)
+      
+      if wait_for_tx:
+        # Wait for the transaction receipt if required.
+        tx_receipt = w3vars.w3.eth.wait_for_transaction_receipt(tx_hash, timeout=timeout)
+        tx_hash_hex = tx_receipt.transactionHash.hex()
+        self.P(f"Transaction mined: {tx_hash_hex}", color='g', verbosity=2)
+        if return_receipt:          
+          return tx_receipt
+        else:
+          return tx_hash_hex
+      else:
+        return tx_hash.hex()
+
+    def web3_get_unvalidated_job_ids(
+      self,
+      network: str = None
+    ):
+      """
+      Retrieve unvalidated job IDs using getUnvalidatedJobIds().
+
+      Parameters
+      ----------
+      network : str, optional
+          The network to use. If None, defaults to self.evm_network.
+
+      Returns
+      -------
+      list
+          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().call()
+      
+      self.P(f"Unvalidated Job IDs: {result}", verbosity=2)
+
+      return result
+
+    def web3_get_is_last_epoch_allocated(
+      self,
+      network: str = None
+    ):
+      """
+      Check if the last epoch has been allocated using getIsLastEpochAllocated().
+
+      Parameters
+      ----------
+      network : str, optional
+          The network to use. If None, defaults to self.evm_network.
+
+      Returns
+      -------
+      bool
+          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 get_deeploy_url(self):
     """
     Returns the deeploy URL from the environment or the network data

{ratio1-3.4.50 → ratio1-3.4.52}/ratio1/const/base.py

@@ -173,6 +173,7 @@ class CONFIG_STREAM:
   LAST_UPDATE_TIME = 'LAST_UPDATE_TIME'
 
   IS_DEEPLOYED = 'IS_DEEPLOYED'
+  DEEPLOY_SPECS = 'DEEPLOY_SPECS'
 
   URL = K_URL
   TYPE = K_TYPE

{ratio1-3.4.50 → ratio1-3.4.52}/ratio1/const/evm_net.py

@@ -220,7 +220,41 @@ _GET_ADDRESSES_BALANCES = [
   }
 ]
 
-_GET_JOB_DETAILS_ABI = [
+# A minimal ERC20 ABI for balanceOf, transfer, and decimals functions.
+_ERC20_ABI = [
+  {
+      "constant": True,
+      "inputs": [{"name": "_owner", "type": "address"}],
+      "name": "balanceOf",
+      "outputs": [{"name": "balance", "type": "uint256"}],
+      "payable": False,
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "constant": False,
+      "inputs": [
+          {"name": "_to", "type": "address"},
+          {"name": "_value", "type": "uint256"}
+      ],
+      "name": "transfer",
+      "outputs": [{"name": "success", "type": "bool"}],
+      "payable": False,
+      "stateMutability": "nonpayable",
+      "type": "function"
+  },
+  {
+      "constant": True,
+      "inputs": [],
+      "name": "decimals",
+      "outputs": [{"name": "", "type": "uint8"}],
+      "payable": False,
+      "stateMutability": "view",
+      "type": "function"
+  }
+]
+
+_POAI_MANAGER_ABI = [
   {
     "inputs": [
       {
@@ -306,44 +340,60 @@ _GET_JOB_DETAILS_ABI = [
     ],
     "stateMutability": "view",
     "type": "function"
-  }
-]
-
-# A minimal ERC20 ABI for balanceOf, transfer, and decimals functions.
-_ERC20_ABI = [
+  },
   {
-      "constant": True,
-      "inputs": [{"name": "_owner", "type": "address"}],
-      "name": "balanceOf",
-      "outputs": [{"name": "balance", "type": "uint256"}],
-      "payable": False,
-      "stateMutability": "view",
-      "type": "function"
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "jobId",
+        "type": "uint256"
+      },
+      {
+        "internalType": "address[]",
+        "name": "newActiveNodes",
+        "type": "address[]"
+      }
+    ],
+    "name": "submitNodeUpdate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-      "constant": False,
-      "inputs": [
-          {"name": "_to", "type": "address"},
-          {"name": "_value", "type": "uint256"}
-      ],
-      "name": "transfer",
-      "outputs": [{"name": "success", "type": "bool"}],
-      "payable": False,
-      "stateMutability": "nonpayable",
-      "type": "function"
+    "inputs": [],
+    "name": "allocateRewardsAcrossAllEscrows",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   },
   {
-      "constant": True,
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [{"name": "", "type": "uint8"}],
-      "payable": False,
-      "stateMutability": "view",
-      "type": "function"
+    "inputs": [],
+    "name": "getUnvalidatedJobIds",
+    "outputs": [
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getIsLastEpochAllocated",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   }
 ]
 
-
 # Here are all the constants used for blockchain interaction for each network.
 EVM_NET_DATA = {
   EvmNetData.MAINNET: {
@@ -390,7 +440,7 @@ EVM_NET_DATA = {
     EvmNetData.DAUTH_R1_ADDR_KEY                : "0x277CbD0Cf25F4789Bc04035eCd03d811FAf73691",
     EvmNetData.DAUTH_MND_ADDR_KEY               : "0x17B8934dc5833CdBa1eF42D13D65D677C4727748",
     EvmNetData.DAUTH_PROXYAPI_ADDR_KEY          : "0xFcF04c9A67330431Af75a546615E4881BD8bdC78",
-    EvmNetData.DAUTH_POAI_MANAGER_KEY           : "0x9A41f43494fCD592577228fE8E4014f2D75d2aa3",
+    EvmNetData.DAUTH_POAI_MANAGER_KEY           : "0xCc7C4e0f4f25b57807F34227Fb446E68c8c36ce5",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
     EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-06-30 07:00:00",
     EvmNetData.EE_EPOCH_INTERVALS_KEY           : 1,
@@ -439,6 +489,6 @@ class EVM_ABI_DATA:
   GET_WALLET_NODES = _GET_WALLET_NODES
   GET_ADDRESSES_BALANCES = _GET_ADDRESSES_BALANCES
   IS_NODE_ACTIVE = _DAUTH_ABI_IS_NODE_ACTIVE
-  GET_JOB_DETAILS = _GET_JOB_DETAILS_ABI
   ERC20_ABI = _ERC20_ABI
+  POAI_MANAGER_ABI = _POAI_MANAGER_ABI