consent: set synced to false if None (#51)

* consent: set synced to false if None

* save signature and address in Userkey table

* flake8 happy

* yapf has issues

Author: om26er

cfxdb/gen/xbrmm.bfbs

@@ -84,10 +84,70 @@ def OwnerIsNone(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
         return o == 0
 
-def UserKeyStart(builder): builder.StartObject(3)
+    # Wallet address of XBR network member this user key is owned by (foreign key to xbr.Member)
+    # UserKey
+    def WalletAddress(self, j):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
+        if o != 0:
+            a = self._tab.Vector(o)
+            return self._tab.Get(flatbuffers.number_types.Uint8Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 1))
+        return 0
+
+    # UserKey
+    def WalletAddressAsNumpy(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
+        if o != 0:
+            return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Uint8Flags, o)
+        return 0
+
+    # UserKey
+    def WalletAddressLength(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
+        if o != 0:
+            return self._tab.VectorLen(o)
+        return 0
+
+    # UserKey
+    def WalletAddressIsNone(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
+        return o == 0
+
+    # User key delegate signature
+    # UserKey
+    def Signature(self, j):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12))
+        if o != 0:
+            a = self._tab.Vector(o)
+            return self._tab.Get(flatbuffers.number_types.Uint8Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 1))
+        return 0
+
+    # UserKey
+    def SignatureAsNumpy(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12))
+        if o != 0:
+            return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Uint8Flags, o)
+        return 0
+
+    # UserKey
+    def SignatureLength(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12))
+        if o != 0:
+            return self._tab.VectorLen(o)
+        return 0
+
+    # UserKey
+    def SignatureIsNone(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12))
+        return o == 0
+
+def UserKeyStart(builder): builder.StartObject(5)
 def UserKeyAddPubkey(builder, pubkey): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pubkey), 0)
 def UserKeyStartPubkeyVector(builder, numElems): return builder.StartVector(1, numElems, 1)
 def UserKeyAddCreated(builder, created): builder.PrependUint64Slot(1, created, 0)
 def UserKeyAddOwner(builder, owner): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(owner), 0)
 def UserKeyStartOwnerVector(builder, numElems): return builder.StartVector(1, numElems, 1)
+def UserKeyAddWalletAddress(builder, walletAddress): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(walletAddress), 0)
+def UserKeyStartWalletAddressVector(builder, numElems): return builder.StartVector(1, numElems, 1)
+def UserKeyAddSignature(builder, signature): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(signature), 0)
+def UserKeyStartSignatureVector(builder, numElems): return builder.StartVector(1, numElems, 1)
 def UserKeyEnd(builder): return builder.EndObject()

cfxdb/gen/xbrmm/UserKey.py

@@ -358,7 +358,7 @@ def build(self, builder):
             ConsentGen.ConsentAddUpdated(builder, updated)
 
         ConsentGen.ConsentAddConsent(builder, self.consent)
-        ConsentGen.ConsentAddSynced(builder, self.synced)
+        ConsentGen.ConsentAddSynced(builder, self.synced or False)
 
         if service_prefix:
             ConsentGen.ConsentAddServicePrefix(builder, service_prefix)

cfxdb/xbr/consent.py

@@ -269,4 +269,10 @@ table UserKey {
 
     /// ID of XBR network member this user key is owned by (foreign key to xbr.Member)
     owner: [uint8] (uuid);
+
+    /// Wallet address of XBR network member this user key is owned by (foreign key to xbr.Member)
+    wallet_address: [uint8] (address);
+
+    /// User key delegate signature
+    signature: [uint8] (ethsig);
 }

cfxdb/xbrmm.fbs

@@ -43,6 +43,22 @@ def OwnerAsBytes(self):
             return memoryview(self._tab.Bytes)[_off:_off + _len]
         return None
 
+    def WalletAddressAsBytes(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
+        if o != 0:
+            _off = self._tab.Vector(o)
+            _len = self._tab.VectorLen(o)
+            return memoryview(self._tab.Bytes)[_off:_off + _len]
+        return None
+
+    def SignatureAsBytes(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12))
+        if o != 0:
+            _off = self._tab.Vector(o)
+            _len = self._tab.VectorLen(o)
+            return memoryview(self._tab.Bytes)[_off:_off + _len]
+        return None
+
 
 class UserKey:
     """
@@ -63,11 +79,21 @@ def __init__(self, from_fbs=None):
         # [uint8] (uuid)
         self._owner = None
 
+        # Wallet address of user account this key is owned by.
+        # [uint8] (address)
+        self._wallet_address = None
+
+        # Signature which resulted in this key being saved.
+        # [uint8] (ethsig)
+        self._signature = None
+
     def marshal(self):
         obj = {
             'pubkey': bytes(self.pubkey),
             'created': int(self.created),
             'owner': self.owner.bytes,
+            'wallet_address': self.wallet_address if self.wallet_address else None,
+            'signature': bytes(self.signature) if self.signature else None
         }
         return obj
 
@@ -121,6 +147,36 @@ def owner(self, value: uuid.UUID):
         assert value is None or isinstance(value, uuid.UUID)
         self._owner = value
 
+    @property
+    def wallet_address(self) -> bytes:
+        """
+        Wallet address of the member this key belong to.
+        """
+        if self._wallet_address is None and self._from_fbs:
+            if self._from_fbs.WalletAddressLength():
+                self._wallet_address = self._from_fbs.WalletAddressAsBytes()
+        return self._wallet_address
+
+    @wallet_address.setter
+    def wallet_address(self, value: bytes):
+        assert value is None or (type(value) == bytes and len(value) == 20)
+        self._wallet_address = value
+
+    @property
+    def signature(self) -> bytes:
+        """
+        market maker transaction signature.
+        """
+        if self._signature is None and self._from_fbs:
+            if self._from_fbs.SignatureLength():
+                self._signature = self._from_fbs.SignatureAsBytes()
+        return self._signature
+
+    @signature.setter
+    def signature(self, value: bytes):
+        assert value is None or (type(value) == bytes and len(value) == 65)
+        self._signature = value
+
     @staticmethod
     def cast(buf):
         return UserKey(_UserKeyGen.GetRootAsUserKey(buf, 0))
@@ -135,6 +191,14 @@ def build(self, builder):
         if pubkey:
             pubkey = builder.CreateString(pubkey)
 
+        wallet_address = self.wallet_address
+        if wallet_address:
+            wallet_address = builder.CreateString(wallet_address)
+
+        signature = self.signature
+        if signature:
+            signature = builder.CreateString(signature)
+
         UserKeyGen.UserKeyStart(builder)
 
         if pubkey:
@@ -146,6 +210,12 @@ def build(self, builder):
         if owner:
             UserKeyGen.UserKeyAddOwner(builder, owner)
 
+        if wallet_address:
+            UserKeyGen.UserKeyAddWalletAddress(builder, wallet_address)
+
+        if signature:
+            UserKeyGen.UserKeyAddSignature(builder, signature)
+
         final = UserKeyGen.UserKeyEnd(builder)
 
         return final