Merge branch 'main' into gm/1300-did-cheqd-resolver

Signed-off-by: George Mulhearn <[email protected]>
hyperledger · Nov 25, 2024 · 65b1e9b · 65b1e9b
2 parents b39bc4c + 7fc8b79
commit 65b1e9b
Show file tree

Hide file tree

Showing 24 changed files with 643 additions and 56 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -148,7 +148,7 @@ jobs:
   build-docker-vdrproxy:
     runs-on: ubuntu-20.04
     permissions:
-      content: read
+      contents: read
       packages: write
     needs: [ workflow-setup ]
     if: ${{ needs.workflow-setup.outputs.SKIP_CI != 'true' }}
@@ -181,10 +181,10 @@ jobs:
   build-docker-aath-backchannel:
     runs-on: ubuntu-20.04
     permissions:
-      content: read
+      contents: read
       packages: write
     needs: [ workflow-setup ]
-    # if: ${{ needs.workflow-setup.outputs.IS_MAIN_BRANCH == 'true' }}
+    if: ${{ needs.workflow-setup.outputs.IS_MAIN_BRANCH == 'true' }}
     env:
       DOCKER_IMG_CACHED: ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_AATH }}
       BRANCH_NAME: ${{ needs.workflow-setup.outputs.BRANCH_NAME }}
@@ -216,7 +216,7 @@ jobs:
   publish-docker-vdrproxy:
     runs-on: ubuntu-20.04
     permissions:
-      content: read
+      contents: read
       packages: write
     needs: [ workflow-setup, build-docker-vdrproxy ]
     if: ${{ needs.workflow-setup.outputs.SKIP_CI != 'true' }}
@@ -247,7 +247,7 @@ jobs:
   publish-docker-aath-backchannel:
     runs-on: ubuntu-20.04
     permissions:
-      content: read
+      contents: read
       packages: write
     needs: [ workflow-setup, build-docker-aath-backchannel ]
     if: ${{ needs.workflow-setup.outputs.RELEASE == 'true' || needs.workflow-setup.outputs.PRERELEASE == 'true' }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,3 +75,13 @@ unused_import_braces = "warn"
 unused_lifetimes = "warn"
 unused_qualifications = "warn"
 let_underscore_drop = "allow"
+
+[workspace.dependencies]
+indy-vdr = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3", default-features = false, features = [
+    "log",
+] }
+indy-vdr-proxy-client = { git = "https://github.com/hyperledger/indy-vdr.git", tag = "v0.4.3" }
+indy-credx = { git = "https://github.com/hyperledger/indy-shared-rs", tag = "v1.1.0" }
+anoncreds = { git = "https://github.com/hyperledger/anoncreds-rs.git", tag = "v0.2.0" }
+aries-askar = { version = "0.3.1" }
+askar-crypto = { version = "0.3.1", default-features = false }
diff --git a/aries/agents/aries-vcx-agent/src/handlers/out_of_band.rs b/aries/agents/aries-vcx-agent/src/handlers/out_of_band.rs
@@ -52,7 +52,7 @@ impl<T: BaseWallet> ServiceOutOfBand<T> {
             GenericOutOfBand::Sender(sender.to_owned()),
         )?;
 
-        Ok(sender.to_aries_message())
+        Ok(sender.invitation_to_aries_message())
     }
 
     pub fn receive_invitation(&self, invitation: AriesMessage) -> AgentResult<String> {

diff --git a/aries/aries_vcx/src/errors/mapping_others.rs b/aries/aries_vcx/src/errors/mapping_others.rs
@@ -1,7 +1,9 @@
-use std::{num::ParseIntError, sync::PoisonError};
+use std::{num::ParseIntError, string::FromUtf8Error, sync::PoisonError};
 
+use base64::DecodeError;
 use did_doc::schema::{types::uri::UriWrapperError, utils::error::DidDocumentLookupError};
 use shared::errors::http_error::HttpError;
+use url::ParseError;
 
 use crate::{
     errors::error::{AriesVcxError, AriesVcxErrorKind},
@@ -92,3 +94,21 @@ impl From<ParseIntError> for AriesVcxError {
         AriesVcxError::from_msg(AriesVcxErrorKind::InvalidInput, err.to_string())
     }
 }
+
+impl From<DecodeError> for AriesVcxError {
+    fn from(err: DecodeError) -> Self {
+        AriesVcxError::from_msg(AriesVcxErrorKind::InvalidInput, err.to_string())
+    }
+}
+
+impl From<FromUtf8Error> for AriesVcxError {
+    fn from(err: FromUtf8Error) -> Self {
+        AriesVcxError::from_msg(AriesVcxErrorKind::InvalidInput, err.to_string())
+    }
+}
+
+impl From<ParseError> for AriesVcxError {
+    fn from(err: ParseError) -> Self {
+        AriesVcxError::from_msg(AriesVcxErrorKind::InvalidInput, err.to_string())
+    }
+}