Merge pull request 'fix: update' (#29) from sangge/mimajingsai:main into main

Reviewed-on: dqy/mimajingsai#29

src/client.py

@@ -197,14 +197,15 @@ async def send_messages(
     # generate rk
     rk_list = GenerateReKey(sk, pk_B, len(node_ips), shreshold, tuple(id_list))  # type: ignore
 
-    capsule_ct = Encrypt(pk, message)  # type: ignore
+    capsule, ct = Encrypt(pk, message)  # type: ignore
+    capsule_ct = (capsule, int.from_bytes(ct))
 
     for i in range(len(node_ips)):
         url = "http://" + node_ips[i][0] + ":8001" + "/user_src"
         payload = {
             "source_ip": local_ip,
             "dest_ip": dest_ip,
-            "capsule_ct": base64.b64encode(str(capsule_ct)),
+            "capsule_ct": capsule_ct,
             "rk": rk_list[i],
         }
         print(payload)

src/node.py

@@ -76,7 +76,7 @@ async def send_heartbeat_internal() -> None:
 class Req(BaseModel):
     source_ip: str
     dest_ip: str
-    capsule_ct: Tuple[capsule, bytes]
+    capsule_ct: Tuple[capsule, int]
     rk: Any
 
 
@@ -94,8 +94,8 @@ async def user_src(message: Req):
     """
     source_ip = message.source_ip
     dest_ip = message.dest_ip
-    b64capsule_ct = message.capsule_ct
-    capsule_ct = base64.b64decode(b64capsule_ct)
+    capsule, ct = message.capsule_ct
+    capsule_ct = (capsule, ct.to_bytes())
     rk = message.rk
 
     processed_message = ReEncrypt(rk, capsule_ct)