From 94a29671c6722d31688734447ee029455ab21542 Mon Sep 17 00:00:00 2001
From: "Charles E. Lehner" <charles.lehner@spruceid.com>
Date: Fri, 1 Apr 2022 14:43:24 -0400
Subject: [PATCH 1/2] Test CACAO DagCbor round-trip

---
 Cargo.toml |  2 +-
 src/lib.rs | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3adc9ff..ab9d104 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ zcap = ["ssi"]
 default = ["eip4361", "zcap"]
 
 [dependencies]
-siwe = { version = "0.2" }
+siwe = { path = "../siwe-rs" }
 iri-string = { version = "0.4", features = ["serde", "serde-std"] }
 chrono = "0.4"
 thiserror = "1.0"
diff --git a/src/lib.rs b/src/lib.rs
index 6143a86..db08002 100755
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -61,7 +61,7 @@ where
     }
 }
 
-#[derive(DagCbor)]
+#[derive(DagCbor, Clone, Debug, PartialEq)]
 pub struct Header {
     t: String,
 }
@@ -131,12 +131,12 @@ where
     }
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub enum Version {
     V1 = 1,
 }
 
-#[derive(Clone)]
+#[derive(Clone, PartialEq, Debug)]
 pub struct Payload {
     pub domain: Authority,
     pub iss: UriAbsoluteString,
@@ -282,7 +282,7 @@ mod payload_ipld {
     }
 }
 
-#[derive(DagCbor)]
+#[derive(DagCbor, Debug, PartialEq)]
 pub struct CACAOIpld {
     #[ipld(rename = "h")]
     header: Header,
@@ -295,10 +295,12 @@ pub struct CACAOIpld {
 #[cfg(test)]
 pub mod tests {
     use super::*;
+    use libipld::codec::assert_roundtrip;
+    use libipld::ipld;
     use std::io::Cursor;
     #[test]
     fn test_ipld() {
-        let _cacao = CACAOIpld::decode(
+        let cacao = CACAOIpld::decode(
             DagCborCodec,
             &mut Cursor::new([
                 163u8, 97u8, 104u8, 161u8, 97u8, 116u8, 103u8, 101u8, 105u8, 112u8, 52u8, 51u8,
@@ -348,5 +350,31 @@ pub mod tests {
             ]),
         )
         .unwrap();
+        assert_roundtrip(
+            DagCborCodec,
+            &cacao,
+            &ipld!({
+              "h": {
+                "t": "eip4361",
+              },
+              "p": {
+                "aud": "did:key:z6MkrBdNdwUPnXDVD1DCxedzVVBpaGi8aSmoXFAeKNgtAer8",
+                "domain": "service.org",
+                "iat": "2021-09-30T16:25:24.000Z",
+                "iss": "did:pkh:eip155:1:0xBd9D9c7DC389715a89fC8149E4a5Be91336B2796",
+                "nonce": "32891757",
+                "resources": [
+                  "ipfs://Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiu",
+                  "https://example.com/my-web2-claim.json",
+                ],
+                "statement": "I accept the ServiceOrg Terms of Service: https://service.org/tos",
+                "version": "1",
+              },
+              "s": {
+                "s": "0x109313e7525dea55ec9a3ccbb63ea8d68406366250cf0880d67032b457ab33c926c67ff3fcc66ac31baa6868a80a12fbe6b7638a89f4f6d51a0229590cf6676f1c",
+                "t": "eip191",
+              },
+            }),
+        );
     }
 }

From 98ca31d160df505b0e2e76098a2bdfd14c18b327 Mon Sep 17 00:00:00 2001
From: "Charles E. Lehner" <charles.lehner@spruceid.com>
Date: Fri, 1 Apr 2022 14:49:27 -0400
Subject: [PATCH 2/2] Use siwe git dependency URL

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index ab9d104..e40de62 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ zcap = ["ssi"]
 default = ["eip4361", "zcap"]
 
 [dependencies]
-siwe = { path = "../siwe-rs" }
+siwe = { git = "https://github.com/spruceid/siwe-rs/", rev = "d2066b3638adab31b6a6d11c21b828147b2d03fa" }
 iri-string = { version = "0.4", features = ["serde", "serde-std"] }
 chrono = "0.4"
 thiserror = "1.0"