Bugs/fix ve allocate (#912)

* make sure nftAddress is checksumed

* improve performance

* safety checks

* Bump version: 4.5.2 → 4.5.3

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.5.2
+current_version = 4.5.3
 commit = True
 tag = True
 

aquarius/__init__.py

@@ -9,5 +9,5 @@
 __author__ = """OceanProtocol"""
 # fmt: off
 # bumpversion needs single quotes
-__version__ = '4.5.2'
+__version__ = '4.5.3'
 # fmt: on

aquarius/events/events_monitor.py

@@ -106,17 +106,17 @@ def __init__(self, web3, config_file):
             VeAllocate(self._es_instance) if (os.getenv("VEALLOCATE_URL")) else None
         )
         allocate_message = (
-            "Enabling veAllocate" if self.purgatory else "veAllocate is disabled"
+            "VeAllocate enabled" if self.ve_allocate else "VeAllocate disabled"
         )
-        logger.info("PURGATORY: " + allocate_message)
+        logger.info(allocate_message)
         self.retry_mechanism = RetryMechanism(
             config_file, self._es_instance, self._retries_db_index, self.purgatory
         )
 
         purgatory_message = (
-            "Enabling purgatory" if self.purgatory else "Purgatory is disabled"
+            "Purgatory enabled" if self.purgatory else "Purgatory disabled"
         )
-        logger.info("PURGATORY: " + purgatory_message)
+        logger.info(purgatory_message)
 
     @property
     def block_envvar(self):

aquarius/events/ve_allocate.py

@@ -9,6 +9,7 @@
 
 import elasticsearch
 import requests
+from web3 import Web3
 
 from aquarius.events.util import make_did
 
@@ -28,9 +29,6 @@ def retrieve_new_list(self, env_var):
         response = requests.post(os.getenv(env_var))
 
         if response.status_code == requests.codes.ok:
-            logger.info(
-                f"veAllocate: Successfully retrieved list from {env_var} env var."
-            )
             return {
                 (a["nft_addr"], a["ve_allocated"], a["chainID"])
                 for a in response.json()
@@ -46,16 +44,24 @@ def update_asset(self, asset, veAllocated):
         """
         did = asset["id"]
         if "stats" not in asset:
-            asset["stats"] = {}
-
-        asset["stats"]["allocated"] = veAllocated
-        logger.info(
-            f"veAllocate: updating asset {did} with state.allocated={veAllocated}."
-        )
-        try:
-            self._es_instance.update(json.dumps(asset), did)
-        except Exception as e:
-            logger.warning(f"updating ddo {did} stats.allocated attribute failed: {e}")
+            asset["stats"] = {"allocated": 0}
+        if "allocated" not in asset["stats"]:
+            asset["stats"]["allocated"] = 0
+        if asset["stats"]["allocated"] != veAllocated:
+            asset["stats"]["allocated"] = veAllocated
+            logger.info(
+                f"veAllocate: updating asset {did} with state.allocated={veAllocated}."
+            )
+            try:
+                self._es_instance.update(json.dumps(asset), did)
+            except Exception as e:
+                logger.warning(
+                    f"updating ddo {did} stats.allocated attribute failed: {e}"
+                )
+        else:
+            logger.debug(
+                f"veAllocate: asset {did} has unchanged state.allocated ({veAllocated})."
+            )
 
     def update_lists(self):
         """
@@ -72,11 +78,13 @@ def update_lists(self):
         self.update_time = now
 
         ve_list = self.retrieve_new_list("VEALLOCATE_URL")
+        logger.info(f"veAllocate: Retrieved list of {len(ve_list)} assets to update")
 
         for nft, ve_allocated, chain_id in ve_list:
+            did = make_did(Web3.toChecksumAddress(nft), chain_id)
             try:
-                did = make_did(nft, chain_id)
                 asset = self._es_instance.read(did)
                 self.update_asset(asset, ve_allocated)
             except elasticsearch.exceptions.NotFoundError:
+                logger.debug(f"Cannot find asset {did} for veAllocate update")
                 continue

setup.py

@@ -95,7 +95,7 @@
     url="https://github.com/oceanprotocol/aquarius",
     # fmt: off
     # bumpversion needs single quotes
-    version='4.5.2',
+    version='4.5.3',
     # fmt: on
     zip_safe=False,
 )