Fix: Applied some code review suggestions

packaging/Makefile

@@ -16,7 +16,7 @@ debian-package-code:
 	cp -r ../examples/data ./aleph-vm/opt/aleph-vm/examples/data
 	mkdir -p ./aleph-vm/opt/aleph-vm/examples/volumes
 	# Fixing this protobuf dependency version to avoid getting CI errors as version 5.29.0 have this compilation issue
-	pip3 install --progress-bar off --target ./aleph-vm/opt/aleph-vm/ 'aleph-message@git+https://github.com/aleph-im/aleph-message@andres-feature-add_gpu_requirement' 'eth-account==0.10' 'sentry-sdk==1.31.0' 'qmp==1.1.0' 'aleph-superfluid~=0.2.1' 'sqlalchemy[asyncio]>=2.0' 'aiosqlite==0.19.0' 'alembic==1.13.1' 'aiohttp_cors==0.7.0' 'pyroute2==0.7.12' 'python-cpuid==0.1.0' 'solathon==1.0.2' 'protobuf==5.28.3'
+	pip3 install --progress-bar off --target ./aleph-vm/opt/aleph-vm/ 'aleph-message==0.6' 'eth-account==0.10' 'sentry-sdk==1.31.0' 'qmp==1.1.0' 'aleph-superfluid~=0.2.1' 'sqlalchemy[asyncio]>=2.0' 'aiosqlite==0.19.0' 'alembic==1.13.1' 'aiohttp_cors==0.7.0' 'pyroute2==0.7.12' 'python-cpuid==0.1.0' 'solathon==1.0.2' 'protobuf==5.28.3'
 	python3 -m compileall ./aleph-vm/opt/aleph-vm/
 
 debian-package-resources: firecracker-bins vmlinux download-ipfs-kubo  target/bin/sevctl

pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
   "aioredis==1.3.1",
   "aiosqlite==0.19",
   "alembic==1.13.1",
-  "aleph-message @ git+https://github.com/aleph-im/aleph-message@andres-feature-add_gpu_requirement",
+  "aleph-message==0.6",
   "aleph-superfluid~=0.2.1",
   "dbus-python==1.3.2",
   "eth-account~=0.10",

src/aleph/vm/hypervisors/qemu/qemuvm.py

@@ -104,10 +104,6 @@ async def start(
             # Tell to put the output to std fd, so we can include them in the log
             "-serial",
             "stdio",
-            # Use host-phys-bits-limit argument for GPU support. TODO: Investigate how to get the correct bits size
-            #
-            "-cpu",
-            "host,host-phys-bits-limit=0x28",
             # Uncomment for debug
             # "-serial", "telnet:localhost:4321,server,nowait",
             # "-snapshot",  # Do not save anything to disk
@@ -145,7 +141,11 @@ def _get_host_volumes_args(self):
         return args
 
     def _get_gpu_args(self):
-        args = []
+        args = [
+            # Use host-phys-bits-limit argument for GPU support. TODO: Investigate how to get the correct bits size
+            "-cpu",
+            "host,host-phys-bits-limit=0x28",
+        ]
         for gpu in self.gpus:
             args += [
                 "-device",

src/aleph/vm/orchestrator/chain.py

@@ -60,9 +60,13 @@ def check_tokens(cls, values):
 }
 
 
+class InvalidChainError(ValueError):
+    pass
+
+
 def get_chain(chain: str) -> ChainInfo:
     try:
         return STREAM_CHAINS[chain]
     except KeyError:
         msg = f"Unknown chain id for chain {chain}"
-        raise ValueError(msg)
+        raise InvalidChainError(msg)

src/aleph/vm/orchestrator/payment.py

@@ -13,7 +13,7 @@
 from aleph.vm.models import VmExecution
 from aleph.vm.utils import to_normalized_address
 
-from .chain import ChainInfo, get_chain
+from .chain import ChainInfo, InvalidChainError, get_chain
 
 logger = logging.getLogger(__name__)
 
@@ -91,22 +91,14 @@ class InvalidAddressError(ValueError):
     pass
 
 
-class InvalidChainError(ValueError):
-    pass
-
-
 async def get_stream(sender: str, receiver: str, chain: str) -> Decimal:
     """
     Get the stream of the user from the Superfluid API.
     See https://community.aleph.im/t/pay-as-you-go-using-superfluid/98/11
     """
-    try:
-        chain_info: ChainInfo = get_chain(chain=chain)
-        if not chain_info.active:
-            msg = f"Chain : {chain} is not active for superfluid"
-            raise InvalidChainError(msg)
-    except ValueError:
-        msg = f"Chain : {chain} is invalid"
+    chain_info: ChainInfo = get_chain(chain=chain)
+    if not chain_info.active:
+        msg = f"Chain : {chain} is not active for superfluid"
         raise InvalidChainError(msg)
 
     superfluid_instance = CFA_V1(chain_info.rpc, chain_info.chain_id)

src/aleph/vm/orchestrator/tasks.py

@@ -183,7 +183,7 @@ async def monitor_payments(app: web.Application):
                     )
                 except ValueError as error:
                     logger.error(f"Error found getting stream for chain {chain} and sender {sender}: {error}")
-                    stream = Decimal(0)
+                    continue
 
                 required_stream = await compute_required_flow(executions)
                 logger.debug(f"Required stream for Sender {sender} executions: {required_stream}")