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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.0.34.dev1
+Version: 0.0.34.dev3
 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.dev3}/xync_schema/models.py

@@ -304,31 +304,34 @@ class User(TgUser, TsTrait):
     async def balance_xp(self, cur_id: int = None) -> dict[int, int] | int:
         if cur_id:
             dbt = (
-                await Transaction.filter(receiver=self, cur_id=cur_id)  # , status=TransactionStatus.valid
+                await Transaction.filter(receiver=self, cur_id=cur_id, status__gt=TransactionStatus.request)
                 .group_by("cur_id")
                 .annotate(debit=Sum("amount"))
                 .values_list("debit", flat=True)
             ) or [0]
             crd = (
-                await Transaction.filter(sender=self, cur_id=cur_id)  # , status=TransactionStatus.valid
+                await Transaction.filter(sender=self, cur_id=cur_id, status__gt=TransactionStatus.request)
                 .group_by("cur_id")
                 .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__gt=TransactionStatus.request)
+            .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__gt=TransactionStatus.request)
+            .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()}
 
@@ -380,11 +383,12 @@ class User(TgUser, TsTrait):
 
     async def send(self, amount: int, cur_id: int, receiver_id: int) -> "Transaction":
         b = await self.balance_xp(cur_id=cur_id)
-        assert b >= amount, "not enough balance"
+        if b < amount:
+            return b
         transaction = await Transaction.create(
             sender=self,
             receiver_id=receiver_id,
-            amount=amount,
+            amount=amount * 10**2,
             cur_id=cur_id,
             validator_id=await self.get_val_id(amount, cur_id, receiver_id),
             status=TransactionStatus.transfer,
@@ -403,7 +407,7 @@ class User(TgUser, TsTrait):
         req.validator_id = await self.get_val_id(req.amount, req.cur_id, req.receiver_id)
         req.status = TransactionStatus.transfer
         req.ts = datetime.now()
-        req.proof = sender_prv.sign(req.pack())
+        req.proof = sender_prv.sign(req.pack)
         await req.save()
         return req
         # async with in_transaction():
@@ -1008,10 +1012,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):
@@ -1022,7 +1046,7 @@ class Transaction(Model):
         ):  # todo: remove check
             await self.sender.keygen()
         sender_prv = Ed25519PrivateKey.from_private_bytes(self.sender.prv)
-        self.proof = sender_prv.sign(self.pack())
+        self.proof = sender_prv.sign(self.pack)
         await self.save(update_fields=["proof"])
 
     async def vld_sign(self):
@@ -1032,7 +1056,7 @@ class Transaction(Model):
             await self.validator.keygen()
         # 1. Проверяем подпись отправителя
         snd_pub = Ed25519PublicKey.from_public_bytes(self.sender.pub)
-        snd_pub.verify(self.proof, (trans_packed := self.pack()))
+        snd_pub.verify(self.proof, (trans_packed := self.pack))
         # 2. Подписываем
         pk = Ed25519PrivateKey.from_private_bytes(self.validator.prv)
         self.proof += pk.sign(trans_packed + self.proof)
@@ -1048,7 +1072,7 @@ class Transaction(Model):
         try:
             # Проверяем подпись валидатора
             vld_pub = Ed25519PublicKey.from_public_bytes(self.validator.pub)
-            vld_pub.verify(vld_sig, self.pack() + sender_sig)
+            vld_pub.verify(vld_sig, self.pack + sender_sig)
             return True
         except InvalidSignature as _:
             return False  # wring sign

{xync_schema-0.0.34.dev1 → xync_schema-0.0.34.dev3/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.dev3
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA