xmr: serialization schemes simplified

src/apps/monero/xmr/serialize_messages/base.py

@@ -27,7 +27,5 @@ class ECKey(BlobType):
 
 
 ECPoint = Hash
-SecretKey = ECKey
 ECPublicKey = ECPoint
 KeyImage = ECPoint
-KeyDerivation = ECPoint

src/apps/monero/xmr/serialize_messages/ct_keys.py

@@ -4,15 +4,6 @@
 from apps.monero.xmr.serialize_messages.base import ECKey
 
 _c0 = const(0)
-_c1 = const(1)
-_c32 = const(32)
-_c64 = const(64)
-
-
-class Key64(ContainerType):
-    FIX_SIZE = _c1
-    SIZE = _c64
-    ELEM_TYPE = ECKey
 
 
 class KeyV(ContainerType):
@@ -25,29 +16,9 @@ class KeyM(ContainerType):
     ELEM_TYPE = KeyV
 
 
-class KeyVFix(ContainerType):
-    FIX_SIZE = _c1
-    ELEM_TYPE = ECKey
-
-
-class KeyMFix(ContainerType):
-    FIX_SIZE = _c1
-    ELEM_TYPE = KeyVFix
-
-
 class CtKey(MessageType):
     __slots__ = ("dest", "mask")
 
     @classmethod
     def f_specs(cls):
         return (("dest", ECKey), ("mask", ECKey))
-
-
-class CtkeyV(ContainerType):
-    FIX_SIZE = 0
-    ELEM_TYPE = CtKey
-
-
-class CtkeyM(ContainerType):
-    FIX_SIZE = 0
-    ELEM_TYPE = CtkeyV

src/apps/monero/xmr/serialize_messages/tx_ecdh.py

@@ -1,14 +1,5 @@
-from apps.monero.xmr.serialize.message_types import ContainerType, MessageType
-from apps.monero.xmr.serialize_messages.base import ECKey
+from apps.monero.xmr.serialize.message_types import MessageType
 
 
 class EcdhTuple(MessageType):
     __slots__ = ("mask", "amount")
-
-    @classmethod
-    def f_specs(cls):
-        return (("mask", ECKey), ("amount", ECKey))
-
-
-class EcdhInfo(ContainerType):
-    ELEM_TYPE = EcdhTuple

src/apps/monero/xmr/serialize_messages/tx_extra.py

@@ -33,7 +33,3 @@ def f_specs(cls):
             ("tx_extra_nonce", TxExtraNonce),
             ("tx_extra_additional_pub_keys", TxExtraAdditionalPubKeys),
         )
-
-
-class TxExtraFields(ContainerType):
-    ELEM_TYPE = TxExtraField

src/apps/monero/xmr/serialize_messages/tx_full.py

@@ -1,11 +1,6 @@
-
-from apps.monero.xmr.serialize.base_types import UInt8, UVarintType
-from apps.monero.xmr.serialize.erefs import eref
 from apps.monero.xmr.serialize.message_types import MessageType
 from apps.monero.xmr.serialize_messages.base import ECKey
-from apps.monero.xmr.serialize_messages.ct_keys import CtKey, CtkeyM, CtkeyV, KeyM, KeyV
-from apps.monero.xmr.serialize_messages.tx_ecdh import EcdhInfo, EcdhTuple
-from apps.monero.xmr.serialize_messages.tx_rsig import RctType
+from apps.monero.xmr.serialize_messages.ct_keys import KeyM
 
 
 class MgSig(MessageType):
@@ -14,62 +9,3 @@ class MgSig(MessageType):
     @classmethod
     def f_specs(cls):
         return (("ss", KeyM), ("cc", ECKey))
-
-
-class RctSigBase(MessageType):
-    __slots__ = (
-        "type",
-        "txnFee",
-        "message",
-        "mixRing",
-        "pseudoOuts",
-        "ecdhInfo",
-        "outPk",
-    )
-
-    @classmethod
-    def f_specs(cls):
-        return (
-            ("type", UInt8),
-            ("txnFee", UVarintType),
-            ("message", ECKey),
-            ("mixRing", CtkeyM),
-            ("pseudoOuts", KeyV),
-            ("ecdhInfo", EcdhInfo),
-            ("outPk", CtkeyV),
-        )
-
-    def serialize_rctsig_base(self, ar, inputs, outputs):
-        self._msg_field(ar, idx=0)
-        if self.type == RctType.Null:
-            return
-        if (
-            self.type != RctType.Full
-            and self.type != RctType.FullBulletproof
-            and self.type != RctType.Simple
-            and self.type != RctType.SimpleBulletproof
-        ):
-            raise ValueError("Unknown type")
-
-        self._msg_field(ar, idx=1)
-        if self.type == RctType.Simple:
-            ar.prepare_container(inputs, eref(self, "pseudoOuts"), KeyV)
-            if ar.writing and len(self.pseudoOuts) != inputs:
-                raise ValueError("pseudoOuts size mismatch")
-
-            for i in range(inputs):
-                ar.field(eref(self.pseudoOuts, i), KeyV.ELEM_TYPE)
-
-        ar.prepare_container(outputs, eref(self, "ecdhInfo"), EcdhTuple)
-        if ar.writing and len(self.ecdhInfo) != outputs:
-            raise ValueError("EcdhInfo size mismatch")
-
-        for i in range(outputs):
-            ar.field(eref(self.ecdhInfo, i), EcdhInfo.ELEM_TYPE)
-
-        ar.prepare_container((outputs), eref(self, "outPk"), CtKey)
-        if ar.writing and len(self.outPk) != outputs:
-            raise ValueError("outPk size mismatch")
-
-        for i in range(outputs):
-            ar.field(eref(self.outPk[i], "mask"), ECKey)

src/apps/monero/xmr/serialize_messages/tx_prefix.py

@@ -2,7 +2,6 @@
 
 from apps.monero.xmr.serialize.base_types import UInt8, UVarintType
 from apps.monero.xmr.serialize.message_types import (
-    BlobType,
     ContainerType,
     MessageType,
     VariantType,
@@ -101,22 +100,3 @@ class TxOut(MessageType):
     @classmethod
     def f_specs(cls):
         return (("amount", UVarintType), ("target", TxoutTargetV))
-
-
-class TransactionPrefix(MessageType):
-    @classmethod
-    def f_specs(cls):
-        return (
-            ("version", UVarintType),
-            ("unlock_time", UVarintType),
-            ("vin", ContainerType, TxInV),
-            ("vout", ContainerType, TxOut),
-            ("extra", ContainerType, UInt8),
-        )
-
-
-class TransactionPrefixExtraBlob(TransactionPrefix):
-    # noinspection PyTypeChecker
-    @classmethod
-    def f_specs(cls):
-        return TransactionPrefix.f_specs()[:-1] + (("extra", BlobType),)