Ethereum redesign

seedemu/services/EthereumService/EthereumServer.py

@@ -3,7 +3,7 @@
 from .EthEnum import *
 from .EthUtil import *
 from typing import Tuple, List
-from seedemu.services import EthereumService
+from seedemu.services.EthereumService import *
 from .EthTemplates import EthServerFileTemplates, GethCommandTemplates
 from .EthTemplates.LighthouseCommandTemplates import *
 
@@ -110,6 +110,8 @@ def install(self, node: Node, eth: EthereumService):
         node.appendClassName('EthereumService')
         node.setLabel('node_id', self.getId())
         node.setLabel('consensus', self._consensus_mechanism.value)
+        node.setLabel('blockchain', self._blockchain.getChainName())
+        node.setLabel('chain_id', self._blockchain.getChainId())
 
         ifaces = node.getInterfaces()
         assert len(ifaces) > 0, 'EthereumServer::install: node as{}/{} has no interfaces'.format(node.getAsn(), node.getName())

seedemu/services/EthereumService/EthereumService.py

@@ -205,6 +205,13 @@ def addExternalAccount(self, address: str, balance: int) -> Blockchain:
 
         return self
 
+    def getChainName(self) -> str:
+        return self.__chain_name
+
+    def getChainId(self) -> int:
+        return self.__chain_id
+
+
     def _log(self, message: str) -> None:
         """!
         @brief Log to stderr.