ratio1 3.4.90__tar.gz → 3.4.92__tar.gz

{ratio1-3.4.90 → ratio1-3.4.92}/PKG-INFO

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

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

{ratio1-3.4.90 → ratio1-3.4.92}/ratio1/_ver.py

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

{ratio1-3.4.90 → ratio1-3.4.92}/ratio1/bc/evm.py

@@ -1561,6 +1561,41 @@ class _EVMMixin:
 
       return result
 
+    def web3_get_first_closable_job_id(
+      self,
+      network: str = None
+    ):
+      """
+      Retrieve the ID of the first job that can be closed using getFirstClosableJobId().
+
+      Parameters
+      ----------
+      network : str, optional
+          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.
+      """
+      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(
       self,
       network: str = None

{ratio1-3.4.90 → ratio1-3.4.92}/ratio1/const/evm_net.py

@@ -417,6 +417,19 @@ _POAI_MANAGER_ABI = [
     ],
     "stateMutability": "view",
     "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getFirstClosableJobId",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   }
 ]
 

{ratio1-3.4.90 → ratio1-3.4.92}/tutorials/ex21_telegram_community_bot.py

@@ -38,7 +38,7 @@ def loop_processing(plugin: CustomPluginTemplate):
   need_last_epoch_info = "need_last_epoch_info"
 
   def get_erc721_total_supply(contract_address: str) -> int:
-    return int(plugin.requests.post("https://base-mainnet.public.blastapi.io", json={
+    return int(plugin.requests.post("https://base.drpc.org", json={
       "jsonrpc": "2.0",
       "method": "eth_call",
       "params": [
@@ -74,20 +74,6 @@ def loop_processing(plugin: CustomPluginTemplate):
         gnd_count += 1
     return (last_epoch_nd_mining / 10**18), nodes_count, nd_count, mnd_count, gnd_count
   
-  def get_burned_last_epoch(current_burn: int) -> int:
-    if plugin.obj_cache.get(epoch_review_cache_key) is None:
-      return current_burn
-    if plugin.obj_cache.get(epoch_review_cache_key).get(last_epoch - 1) is None:
-      return current_burn
-    return current_burn - plugin.obj_cache.get(epoch_review_cache_key).get(last_epoch - 1).get("burned")
-  
-  def get_poai_burned_last_epoch(current_burn: int) -> int:
-    if plugin.obj_cache.get(epoch_review_cache_key) is None:
-      return current_burn
-    if plugin.obj_cache.get(epoch_review_cache_key).get(last_epoch - 1) is None:
-      return current_burn
-    return current_burn - plugin.obj_cache.get(epoch_review_cache_key).get(last_epoch - 1).get("poai_burned", 0)
-
   # If it is the first run, we need to initialize the cache from diskapi
   if plugin.obj_cache.get(cache_already_read_key) is None:
     plugin.obj_cache[epoch_review_cache_key] = plugin.diskapi_load_pickle_from_data(diskapi_epoch_review_file_name) or {}
@@ -134,7 +120,7 @@ def loop_processing(plugin: CustomPluginTemplate):
     if plugin.obj_cache.get(epoch_review_cache_key).get(last_epoch) is not None and not need_info:
       return
     else:
-      plugin.P("Epoch review not processed for last epoch, continuing with processing.")
+      plugin.P("Epoch review not processed for last epoch or resend requested, continuing with processing.")
   else:
     plugin.P("No epoch review data found, initializing cache.")
     plugin.obj_cache[epoch_review_cache_key] = {}
@@ -142,24 +128,23 @@ def loop_processing(plugin: CustomPluginTemplate):
     
   plugin.obj_cache[need_last_epoch_info] = False # set false no matter wwhat as we display the info
 
+  # We get token details from the Ratio1 API
+  apiResponse = plugin.requests.get("https://dapp-api.ratio1.ai/token/bot-stats").json()
+  apiEpoch = apiResponse["epoch"]
+  if apiEpoch != last_epoch + 1:
+    plugin.P(f"API epoch {apiEpoch} does not match last epoch {last_epoch}, skipping epoch review processing.")
+    return
+
   # Get all the required data for the epoch review
   last_epoch_nd_mining, nodes_count, nd_count, mnd_count, gnd_count = get_nodes_details()
   plugin.P(f"Found {nd_count} ND, {mnd_count} MND, {gnd_count} GND. Last epoch mining: {last_epoch_nd_mining}")
 
-  # We get token details from the Ratio1 API
-  tokenDetails = plugin.requests.get("https://dapp-api.ratio1.ai/token/supply?withDecimals=true").json()
-  current_burn = float(tokenDetails["burned"])
-  nd_current_burn = float(tokenDetails["ndContractBurn"])
-  current_poai_burn = current_burn - nd_current_burn
-  circulating_supply = float(tokenDetails["circulatingSupply"])
-  total_supply = float(tokenDetails["totalSupply"])
-  burned_last_epoch = get_burned_last_epoch(current_burn)
-  burned_poai_last_epoch = get_poai_burned_last_epoch(current_poai_burn)
-  price_url = 'https://api.coingecko.com/api/v3/simple/price?ids=ratio1&vs_currencies=usd'
-  r1_usdc = plugin.requests.get(price_url).json().get("ratio1", {}).get("usd", 0)
-  poai_usdc_last_epoch = burned_poai_last_epoch / 0.15 * r1_usdc
-  burned_nd_last_epoch = burned_last_epoch - burned_poai_last_epoch
-  plugin.P(f"Burned last epoch: {burned_last_epoch}, ND burned last epoch: {burned_nd_last_epoch}, PoAI burned last epoch: {burned_poai_last_epoch}, Current burn: {current_burn}, Circulating supply: {circulating_supply}, Total supply: {total_supply}")
+  total_supply = float(apiResponse["totalSupply"])
+  circulating_supply = float(apiResponse["circulatingSupply"])
+  burned_nd_last_epoch = float(apiResponse["epochNdBurnR1"])
+  burned_poai_last_epoch = float(apiResponse["epochPoaiBurnR1"])
+  poai_usdc_last_epoch = float(apiResponse["epochPoaiRewardsUsdc"])
+  total_burn = float(apiResponse["totalBurn"])
 
   nd_supply = get_erc721_total_supply("0xE658DF6dA3FB5d4FBa562F1D5934bd0F9c6bd423")
   mnd_supply = get_erc721_total_supply("0x0C431e546371C87354714Fcc1a13365391A549E2")
@@ -178,14 +163,11 @@ def loop_processing(plugin: CustomPluginTemplate):
   if burned_poai_last_epoch > 0:
     message += f"🎁 Last Epoch PoAI Rewards: {(poai_usdc_last_epoch):,.2f} USDC\n"
     message += f"🔥 Last Epoch PoAI Burn: {(burned_poai_last_epoch):,.2f} R1\n"
-  message += f"🔥 Total Burn: {(current_burn):,.2f} R1\n"
+  message += f"🔥 Total Burn: {(total_burn):,.2f} R1\n"
   plugin.send_message_to_user(user_id=plugin.cfg_chat_id, text=message)
 
   # Save the epoch review data to the cache and diskapi
-  plugin.obj_cache[epoch_review_cache_key][last_epoch] = {
-    "burned": current_burn,
-    "poai_burned": current_poai_burn
-  }
+  plugin.obj_cache[epoch_review_cache_key][last_epoch] = True
   plugin.P(f"Saving epoch review data to diskapi file {diskapi_epoch_review_file_name}...")
   plugin.diskapi_save_pickle_to_data(plugin.obj_cache.get(epoch_review_cache_key), diskapi_epoch_review_file_name)
   return
@@ -345,6 +327,7 @@ if __name__ == "__main__":
         message_handler=reply,
         processing_handler=loop_processing,
         admins=['401110073', '683223680'],
+        process_delay=10,
       )
       pipeline.deploy()
     elif COMMAND == "STOP":

ratio1-3.4.92/xperimental/_checks/w3_first_closable_job_check.py

@@ -0,0 +1,22 @@
+from ratio1 import Logger
+from ratio1.bc import DefaultBlockEngine
+
+
+if __name__ == '__main__':
+  logger = Logger("ENC")
+  engine = DefaultBlockEngine(
+    log=logger,
+    name="default",
+    user_config=True,
+  )
+
+  engine.reset_network("devnet")
+
+  network = engine.evm_network
+  logger.P(f"Checking first closable job on {network}", color='b')
+
+  try:
+    job_id = engine.web3_get_first_closable_job_id()
+    logger.P(f"First closable job ID: {job_id}", color='g')
+  except Exception as exc:
+    logger.P(f"Failed to retrieve first closable job ID: {exc}", color='r')