Revoke Installation Companion PR

.github/workflows/ci-image.yml

@@ -1,5 +1,4 @@
 name: Build Dev Image CI
-
 on:
   workflow_dispatch:
   pull_request:
@@ -8,21 +7,16 @@ on:
   push:
     branches:
       - "*"
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
       - name: Build and Push
         uses: docker/build-push-action@v3
         with:

.github/workflows/coverage.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Install cargo-llvm-cov
         run: curl -LsSf https://github.com/taiki-e/cargo-llvm-cov/releases/latest/download/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz | tar xzf - -C ~/.cargo/bin
       - name: Generate code coverage
-        run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
+        run: RUST_LOG=lib_didethresolver=trace cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:

.github/workflows/github-pages.yml

@@ -1,25 +1,21 @@
 name: GitHub Pages
-
 on:
   workflow_run:
     workflows: ["Build Dev Image CI"]
     branches: ["main"]
-    types: 
+    types:
       - completed
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
   contents: read
   pages: write
   id-token: write
-
 # Allow one concurrent deployment
 concurrency:
   group: "github-pages"
   cancel-in-progress: true
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -28,25 +24,21 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-
       - name: Setup Pages
         uses: actions/configure-pages@v2
       - uses: actions/setup-python@v2
-
       - name: Install rust
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           profile: minimal
           override: true
-
       - name: Run tests
         env:
           CARGO_INCREMENTAL: 0
         run: |
           cargo test --workspace --all-features --tests tests
         id: test
-
       - name: Invoke cargo doc
         run: |
           rm -rf ./_site
@@ -57,10 +49,8 @@ jobs:
           echo "Taking care of pedantic permissions requirements required by GitHub Pages"
           chmod -R +rX _site
         id: docgen
-
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2
-
   # Deployment job
   deploy:
     environment:

lib/Cargo.toml

@@ -38,6 +38,7 @@ smart-default = "0.7"
 sha3 = "0.10"
 peg = "0.8"
 rustc-hex = "2.1"
+tiny-keccak = { version = "2.0.2", default-features = false }
 
 [dev-dependencies]
 tracing-subscriber.workspace = true 
@@ -51,7 +52,6 @@ futures = "0.3"
 ctor = "0.2.5"
 surf = "2.3"
 
-
 [features]
 default = []
 client = ["jsonrpsee/client"]

lib/src/error.rs

@@ -1,4 +1,9 @@
-use ethers::{contract::ContractError, providers::Middleware};
+use ethers::{
+    abi::EncodePackedError,
+    contract::ContractError,
+    providers::{Middleware, ProviderError},
+    signers::WalletError,
+};
 use jsonrpsee::types::ErrorObjectOwned;
 use thiserror::Error;
 
@@ -14,7 +19,7 @@ pub enum ResolverError<M: Middleware> {
 }
 
 /// Errors originating from the parsing of a did url identifier, [`Did`](crate::types::DidUrl)
-#[derive(Error, Debug)]
+#[derive(Error, Debug, PartialEq)]
 pub enum DidError {
     #[error("Parsing of ethr:did failed, {0}")]
     Parse(#[from] peg::error::ParseError<peg::str::LineCol>),
@@ -23,7 +28,7 @@ pub enum DidError {
 }
 
 /// Errors originating during the construction of a ethr:did document [`EthrBuilder`](crate::types::EthrBuilder)
-#[derive(Error, Debug)]
+#[derive(Error, Debug, PartialEq)]
 pub enum EthrBuilderError {
     #[error(transparent)]
     Did(#[from] DidError),
@@ -33,10 +38,24 @@ pub enum EthrBuilderError {
     Hex(#[from] hex::FromHexError),
     #[error("Parsing part of ethr:did failed, {0}")]
     Parse(#[from] peg::error::ParseError<peg::str::LineCol>),
+    #[error("XMTP Key is missing key purpose metadata")]
+    MissingMetadata,
 }
 
 impl<M: Middleware> From<ResolverError<M>> for ErrorObjectOwned {
     fn from(err: ResolverError<M>) -> Self {
         ErrorObjectOwned::owned(-31000, err.to_string(), None::<()>)
     }
 }
+
+#[derive(Error, Debug)]
+pub enum RegistrySignerError<M: Middleware> {
+    #[error(transparent)]
+    Encode(#[from] EncodePackedError),
+    #[error("{0}")]
+    ContractError(#[from] ContractError<M>),
+    #[error(transparent)]
+    Provider(#[from] ProviderError),
+    #[error(transparent)]
+    Wallet(#[from] WalletError),
+}

lib/src/resolver.rs

@@ -24,13 +24,15 @@ pub struct Resolver<M> {
 }
 
 impl<M: Middleware + 'static> Resolver<M> {
+    /// Instantiate a new did:ethr resolver
     pub async fn new(middleware: M, registry: Address) -> Result<Self, ResolverError<M>> {
         let signer = Arc::new(middleware);
         let registry = DIDRegistry::new(registry, signer.clone());
         log::debug!("Using deployed registry at {}", registry.address());
         Ok(Self { signer, registry })
     }
 
+    /// Resolve a did:ethr identifier
     pub async fn resolve_did(
         &self,
         public_key: H160,
@@ -53,6 +55,8 @@ impl<M: Middleware + 'static> Resolver<M> {
             .as_u64()
             .into();
 
+        log::trace!("Previous Change for {}: {:?}", public_key, previous_change);
+
         let mut history = Vec::new();
 
         loop {
@@ -70,6 +74,7 @@ impl<M: Middleware + 'static> Resolver<M> {
                 .await?;
 
             for (event, meta) in events {
+                log::trace!("Adding {:?} event to history", event);
                 if event.previous_change() < previous_change {
                     previous_change = event.previous_change();
                 }
@@ -90,12 +95,15 @@ impl<M: Middleware + 'static> Resolver<M> {
     ) {
         let res = match event {
             DIDRegistryEvents::DiddelegateChangedFilter(delegate_changed) => {
+                log::trace!("Delegate Changed {:?}", delegate_changed);
                 doc.delegate_event(delegate_changed)
             }
             DIDRegistryEvents::DidattributeChangedFilter(attribute_event) => {
+                log::trace!("Attribute Changed {:?}", attribute_event);
                 doc.attribute_event(attribute_event)
             }
             DIDRegistryEvents::DidownerChangedFilter(owner_changed) => {
+                log::trace!("Owner Changed {:?}", owner_changed);
                 doc.owner_event(owner_changed)
             }
         };