Merge pull request #266 from kwek20/v2.0/did-verification-method2

[V2.0] DID fragments instead of MethodID

Cargo.toml

@@ -6,5 +6,7 @@ members = [
   "streams",
 ]
 
+resolver = "2"
+
 [profile.dev]
 incremental = true

lets/Cargo.toml

@@ -20,7 +20,7 @@ tangle-client = ["iota-client/async", "futures", "iota-crypto/blake2b"]
 # Enable the wasm-compatible IOTA-Tangle transport client (incompatile with `tangle-client` feature due to `iota-client/async` using `tokio`. Implies `std` feature)
 tangle-client-wasm = ["iota-client/wasm", "futures"]
 # Enable Iota Identity for use with Streams
-did = ["identity", "serde"]
+did = ["identity_iota", "serde"]
 
 [dependencies]
 # Local dependencies
@@ -37,6 +37,6 @@ hex = {version = "0.4", default-features = false}
 
 # Optional dependencies
 futures = {version = "0.3.8", default-features = false, optional = true}
-identity = {git = "https://github.com/iotaledger/identity.rs", rev = "86edaad", default-features = false, features = ["async"], optional = true}
+identity_iota = {git = "https://github.com/iotaledger/identity.rs", rev = "d3920c2", default-features = false, optional = true}
 iota-client = {version = "1.1.1", default-features = false, optional = true}
 serde = {version = "1.0", default-features = false, features = ["derive"], optional = true}

lets/src/address.rs

@@ -142,14 +142,11 @@ impl AppAddr {
     }
 
     pub fn gen(identifier: &Identifier, base_topic: &Topic) -> AppAddr {
-        let mut addr = [0u8; 40];
-        let id_bytes = identifier.as_bytes();
-        // Create spongos to squeeze topic into final 8 bytes
-        let squeezed_topic: [u8; 8] = Spongos::<KeccakF1600>::init().sponge(base_topic);
-        assert_eq!(id_bytes.len(), 32, "identifier must be 32 bytes long");
-        addr[..32].copy_from_slice(id_bytes);
-        addr[32..].copy_from_slice(&squeezed_topic);
-        Self::new(addr)
+        let mut spongos = Spongos::<KeccakF1600>::init();
+        spongos.absorb(base_topic);
+        spongos.absorb(identifier);
+        spongos.commit();
+        spongos.squeeze()
     }
 
     /// Get the hexadecimal representation of the appaddr

lets/src/id/did/data_wrapper.rs

@@ -0,0 +1,50 @@
+// 3rd-party
+use serde::Serialize;
+
+use identity_iota::{
+    crypto::{GetSignature, GetSignatureMut, Proof, SetSignature},
+    did::{MethodUriType, TryMethod},
+};
+
+#[derive(Serialize)]
+pub(crate) struct DataWrapper<'a> {
+    data: &'a [u8],
+    signature: Option<Proof>,
+}
+
+impl<'a> DataWrapper<'a> {
+    pub(crate) fn new(data: &'a [u8]) -> Self {
+        Self { data, signature: None }
+    }
+
+    pub(crate) fn with_signature(mut self, signature: Proof) -> Self {
+        self.signature = Some(signature);
+        self
+    }
+
+    pub(crate) fn into_signature(self) -> Option<Proof> {
+        self.signature
+    }
+}
+
+impl<'a> GetSignature for DataWrapper<'a> {
+    fn signature(&self) -> Option<&Proof> {
+        self.signature.as_ref()
+    }
+}
+
+impl<'a> GetSignatureMut for DataWrapper<'a> {
+    fn signature_mut(&mut self) -> Option<&mut Proof> {
+        self.signature.as_mut()
+    }
+}
+
+impl<'a> SetSignature for DataWrapper<'a> {
+    fn set_signature(&mut self, signature: Proof) {
+        self.signature = Some(signature)
+    }
+}
+
+impl<'a> TryMethod for DataWrapper<'a> {
+    const TYPE: MethodUriType = MethodUriType::Absolute;
+}