xync-schema 0.0.34.dev1__tar.gz → 0.0.34.dev2__tar.gz

{xync_schema-0.0.34.dev1/xync_schema.egg-info → xync_schema-0.0.34.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.0.34.dev1
+Version: 0.0.34.dev2
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA

{xync_schema-0.0.34.dev1 → xync_schema-0.0.34.dev2}/xync_schema/models.py

@@ -301,7 +301,7 @@ class User(TgUser, TsTrait):
     async def balance_sum(self) -> int:
         return int(await self.free_assets()) + int(await self.fiats_sum())
 
-    async def balance_xp(self, cur_id: int = None) -> dict[int, int] | int:
+    async def balance_xp(self, cur_id: int = None) -> dict[int, int] | float:
         if cur_id:
             dbt = (
                 await Transaction.filter(receiver=self, cur_id=cur_id)  # , status=TransactionStatus.valid
@@ -315,20 +315,23 @@ class User(TgUser, TsTrait):
                 .annotate(credit=Sum("amount"))
                 .values_list("credit", flat=True)
             ) or [0]
-            return dbt[0] - crd[0]
+            scale = (await Cur[cur_id]).scale
+            return (dbt[0] - crd[0]) * 10 ** (-scale)
         dbt = {
-            c: v
-            for c, v in await Transaction.filter(receiver=self, status=TransactionStatus.valid)
-            .group_by("cur_id")
+            c: v * 10 ** (-s)
+            for c, v, s in await Transaction.filter(receiver=self, status=TransactionStatus.valid)
+            .prefetch_related("cur")
+            .group_by("cur_id", "cur__scale")
             .annotate(debit=Sum("amount"))
-            .values_list("cur_id", "debit")
+            .values_list("cur_id", "debit", "cur__scale")
         }
         crd = {
-            c: v
-            for c, v in await Transaction.filter(sender=self, status=TransactionStatus.valid)
-            .group_by("cur_id")
+            c: v * 10 ** (-s)
+            for c, v, s in await Transaction.filter(sender=self, status=TransactionStatus.valid)
+            .prefetch_related("cur")
+            .group_by("cur_id", "cur__scale")
             .annotate(credit=Sum("amount"))
-            .values_list("cur_id", "credit")
+            .values_list("cur_id", "credit", "cur__scale")
         }
         return {c: dbt.get(c, 0) - crd.get(c, 0) for c in dbt.keys() | crd.keys()}
 
@@ -1008,10 +1011,30 @@ class Transaction(Model):
         assert self.proof is None, "It is method for requests only"
         return self.sender_id is None or self.sender_id == sender_id
 
+    @property
     def pack(self) -> bytes:
-        """Упаковка транзакции(или запроса, если нет sent_at) в 4+4+8+2+4=22 байт"""
+        if self.status == TransactionStatus.request:
+            """Упаковка запроса в 4+4+4+8+2+4=22 байт"""
+            fmt = ">LLBL"
+            vals = self.id, self.receiver_id, self.cur_id, self.amount
+            if self.sender_id:
+                fmt += "L"
+                vals += (self.sender_id,)
+            if self.ts:
+                fmt += "L"
+                vals += (int((datetime.now() + timedelta(minutes=self.ts)).timestamp()),)
+            return struct.pack(fmt, *vals)
+        """Упаковка перевода в 4+4+8+2+4+(64/128)=86/150 байт"""
+        proof = self.proof or b""
         return struct.pack(
-            ">LLQHL", self.sender_id or 0, self.receiver_id, self.amount or 0, self.cur_id, int(self.ts.timestamp())
+            f">LLLQHL{len(proof)}s",
+            self.id,
+            self.sender_id,
+            self.receiver_id,
+            self.amount,
+            self.cur_id,
+            int(self.ts.timestamp()),
+            proof,
         )
 
     async def sender_sign(self):

{xync_schema-0.0.34.dev1 → xync_schema-0.0.34.dev2/xync_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.0.34.dev1
+Version: 0.0.34.dev2
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA