From 1cb52d7fcd7b50cf904290e2c90a1b5d88857d17 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@usody.com>
Date: Wed, 19 Jun 2024 16:19:04 +0200
Subject: [PATCH] add ether address

---
 ...006_did_ether_address_did_ether_privkey.py | 22 ++++++++++++
 idhub/models.py                               | 36 +++++++++++++++----
 idhub/views.py                                |  2 +-
 3 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 idhub/migrations/0006_did_ether_address_did_ether_privkey.py

diff --git a/idhub/migrations/0006_did_ether_address_did_ether_privkey.py b/idhub/migrations/0006_did_ether_address_did_ether_privkey.py
new file mode 100644
index 0000000..53a1d2b
--- /dev/null
+++ b/idhub/migrations/0006_did_ether_address_did_ether_privkey.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.5 on 2024-06-19 11:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('idhub', '0005_alter_file_datas_created_at_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='did',
+            name='ether_address',
+            field=models.CharField(max_length=250, null=True),
+        ),
+        migrations.AddField(
+            model_name='did',
+            name='ether_privkey',
+            field=models.CharField(max_length=250, null=True),
+        ),
+    ]
diff --git a/idhub/models.py b/idhub/models.py
index e68c905..430529d 100644
--- a/idhub/models.py
+++ b/idhub/models.py
@@ -16,6 +16,7 @@ from pyvckit.did import (
 )
 from pyvckit.sign import sign
 from pyvckit.verify import verify_vc
+from pyvckit.ether import generate_ether_address
 
 from oidc4vp.models import Organization
 from idhub_auth.models import User
@@ -442,6 +443,8 @@ class DID(models.Model):
     # Example key material:
     # '{"kty":"OKP","crv":"Ed25519","x":"oB2cPGFx5FX4dtS1Rtep8ac6B__61HAP_RtSzJdPxqs","d":"OJw80T1CtcqV0hUcZdcI-vYNBN1dlubrLaJa0_se_gU"}'
     key_material = models.TextField()
+    ether_address = models.CharField(max_length=250, null=True)
+    ether_privkey = models.CharField(max_length=250, null=True)
     eidas1 = models.BooleanField(default=False)
     user = models.ForeignKey(
         User,
@@ -463,15 +466,12 @@ class DID(models.Model):
         return user.decrypt_data(self.key_material)
 
     def set_key_material(self, value):
-        user = self.user or self.get_organization()
-        if not user.encrypted_sensitive_data:
-            user.set_encrypted_sensitive_data()
-            user.save()
-        self.key_material = user.encrypt_data(value)
+        self.key_material = self.encrypt_data(value)
 
     def set_did(self):
         new_key_material = generate_keys()
         self.set_key_material(new_key_material)
+        self.set_ether_address()
 
         if self.type == self.Types.KEY:
             self.did = generate_did(new_key_material)
@@ -485,7 +485,18 @@ class DID(models.Model):
 
             self.did = generate_did(new_key_material, url)
             key = json.loads(new_key_material)
-            url, self.didweb_document = gen_did_document(self.did, key)
+            url, didweb_document = gen_did_document(self.did, key)
+            if self.ether_address:
+                didweb_document = json.loads(didweb_document)
+                id_service = "{}#ethereum".format(self.did)
+                service = {
+                    "id": id_service,
+                    "type": "Ethereum",
+                    "address": self.ether_address
+                }
+                didweb_document['service'].append(service)
+                didweb_document = json.dumps(didweb_document)
+            self.didweb_document = didweb_document
 
     def get_key(self):
         return json.loads(self.key_material)
@@ -493,6 +504,19 @@ class DID(models.Model):
     def get_organization(self):
         return Organization.objects.get(main=True)
 
+    def set_ether_address(self):
+        priv, self.ether_address = generate_ether_address()
+        self.ether_privkey = self.encrypt_data(priv)
+
+    def encrypt_data(self, value):
+        user = self.user or self.get_organization()
+        if not user.encrypted_sensitive_data:
+            user.set_encrypted_sensitive_data()
+            user.save()
+        return user.encrypt_data(value)
+        
+        
+
 class Schemas(models.Model):
     type = models.CharField(max_length=250)
     file_schema = models.CharField(_('Schema'), max_length=250)
diff --git a/idhub/views.py b/idhub/views.py
index 5a43570..bc03300 100644
--- a/idhub/views.py
+++ b/idhub/views.py
@@ -115,7 +115,7 @@ def ServeDidView(request, did_id):
         "type": "RevocationBitmap2022",
         "serviceEndpoint": f"data:application/octet-stream;base64,{encoded_revocation_bitmap}"
     }]
-    document["service"] = revocation_service
+    document["service"][0] = revocation_service
     # Serialize the DID + Revocation list in preparation for sending
     document = json.dumps(document)
     retval = HttpResponse(document)