Fix: stay using eth_account instead of EthAccount from sdk

Author: 1yam

src/aleph/sdk/client/vmclient.py

@@ -7,30 +7,32 @@
 from eth_account.messages import encode_defunct
 from jwcrypto import jwk
 from jwcrypto.jwa import JWA
+from eth_account import Account
 
 logger = logging.getLogger(__name__)
 
+
 class VmClient:
     def __init__(
-        self, account, domain: str = ""
+            self, account: Account, domain: str = ""
     ):
-        self.account = account
+        self.account: Account = account
         self.ephemeral_key = jwk.JWK.generate(kty="EC", crv="P-256")
         self.expected_domain = domain
         self.pubkey_payload = self._generate_pubkey_payload()
-        self.pubkey_signature_header = self._generate_pubkey_signature_header()
+        self.pubkey_signature_header = None
         self.session = aiohttp.ClientSession()
 
     def _generate_pubkey_payload(self):
         return {
             "pubkey": json.loads(self.ephemeral_key.export_public()),
             "alg": "ECDSA",
             "domain": self.expected_domain,
-            "address": self.account.get_address(),
+            "address": self.account.address,
             "expires": (
-                datetime.datetime.utcnow() + datetime.timedelta(days=1)
-            ).isoformat()
-            + "Z",
+                               datetime.datetime.utcnow() + datetime.timedelta(days=1)
+                       ).isoformat()
+                       + "Z",
         }
 
     def _generate_pubkey_signature_header(self):
@@ -40,6 +42,7 @@ def _generate_pubkey_signature_header(self):
         pubkey_signature = self.to_0x_hex(signed_message.signature)
         return json.dumps(
             {
+                "sender": self.account.address,
                 "payload": pubkey_payload,
                 "signature": pubkey_signature,
                 "content": {"domain": self.expected_domain},
@@ -60,6 +63,9 @@ def on_message(content):
             logger.error(f"Unable to parse content: {content}, Error: {str(e)}")
 
     async def perform_operation(self, vm_id, operation):
+        if self.pubkey_signature_header is None:
+            self.pubkey_signature_header = self._generate_pubkey_signature_header()
+
         hostname = f"https://{self.expected_domain}"
         path = f"/control/machine/{vm_id}/{operation}"
 
@@ -91,6 +97,9 @@ async def perform_operation(self, vm_id, operation):
             return None, str(e)
 
     async def get_logs(self, vm_id):
+        if self.pubkey_signature_header is None:
+            self.pubkey_signature_header = self._generate_pubkey_signature_header()
+
         ws_url = f"https://{self.expected_domain}/control/machine/{vm_id}/logs"
 
         payload = {
@@ -165,7 +174,7 @@ async def expire_instance(self, vm_id):
     async def notify_allocation(self, vm_id) -> Tuple[Any, str]:
         json_data = {"instance": vm_id}
         async with self.session.post(
-            f"https://{self.expected_domain}/control/allocation/notify", json=json_data
+                f"https://{self.expected_domain}/control/allocation/notify", json=json_data
         ) as s:
             form_response_text = await s.text()
             return s.status, form_response_text