Separate core into a standalone crate

Cargo.toml

@@ -12,6 +12,7 @@ members = [
     "diddoc",
     "agents/rust/aries-vcx-agent",
     "wrappers/vcx-napi-rs",
+    "aries_vcx_core",
     "uniffi_aries_vcx/core"
 ]
 

agents/rust/aries-vcx-agent/Cargo.toml

@@ -8,6 +8,7 @@ edition.workspace = true
 [dependencies]
 serde = "1.0.145"
 aries-vcx = { path = "../../../aries_vcx" }
+aries_vcx_core = { path = "../../../aries_vcx_core" }
 async-trait = "0.1.64"
 derive_builder = "0.11.2"
 serde_json = "1.0.85"

agents/rust/aries-vcx-agent/src/agent/agent_config.rs

@@ -1,7 +1,5 @@
-use aries_vcx::{
-    agency_client::configuration::AgencyClientConfig,
-    indy::wallet::{IssuerConfig, WalletConfig},
-};
+use aries_vcx::agency_client::configuration::AgencyClientConfig;
+use aries_vcx_core::indy::wallet::{IssuerConfig, WalletConfig};
 
 #[derive(Clone)]
 pub struct AgentConfig {

agents/rust/aries-vcx-agent/src/agent/agent_struct.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use aries_vcx::agency_client::agency_client::AgencyClient;
 use aries_vcx::core::profile::profile::Profile;
-use aries_vcx::plugins::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 
 use crate::agent::agent_config::AgentConfig;
 

agents/rust/aries-vcx-agent/src/agent/init.rs

@@ -4,12 +4,12 @@ use aries_vcx::{
     agency_client::{agency_client::AgencyClient, configuration::AgentProvisionConfig},
     core::profile::{profile::Profile, vdrtools_profile::VdrtoolsProfile},
     global::settings::init_issuer_config,
-    indy::{
-        ledger::pool::{create_pool_ledger_config, open_pool_ledger, PoolConfigBuilder},
-        wallet::{create_wallet_with_master_secret, open_wallet, wallet_configure_issuer, WalletConfig},
-    },
     utils::provision::provision_cloud_agent,
 };
+use aries_vcx_core::indy::{
+    ledger::pool::{create_pool_ledger_config, open_pool_ledger, PoolConfigBuilder},
+    wallet::{create_wallet_with_master_secret, open_wallet, wallet_configure_issuer, WalletConfig},
+};
 
 use crate::{
     agent::{agent_config::AgentConfig, agent_struct::Agent},
@@ -86,7 +86,7 @@ impl Agent {
             .await
             .unwrap();
 
-        let indy_profile = VdrtoolsProfile::new(wallet_handle, pool_handle);
+        let indy_profile = VdrtoolsProfile::new(wallet_handle, aries_vcx_core::PoolHandle(pool_handle));
         let profile: Arc<dyn Profile> = Arc::new(indy_profile);
         let wallet = profile.inject_wallet();
 

agents/rust/aries-vcx-agent/src/error/convertors.rs

@@ -1,6 +1,7 @@
 use std::convert::From;
 
 use aries_vcx::errors::error::{AriesVcxError, AriesVcxErrorKind};
+use aries_vcx_core::errors::error::AriesVcxCoreError;
 
 use crate::error::*;
 
@@ -23,3 +24,12 @@ impl From<serde_json::Error> for AgentError {
         AgentError { message, kind }
     }
 }
+
+// TODO
+impl From<AriesVcxCoreError> for AgentError {
+    fn from(err: AriesVcxCoreError) -> Self {
+        let kind = AgentErrorKind::GenericAriesVcxError;
+        let message = format!("AriesVcxCore Error; err: {:?}", err.to_string());
+        AgentError { message, kind }
+    }
+}

agents/rust/aries-vcx-agent/src/services/mediated_connection.rs

@@ -10,12 +10,12 @@ use aries_vcx::messages::protocols::connection::request::Request;
 use aries_vcx::messages::protocols::issuance::credential_offer::CredentialOffer;
 use aries_vcx::messages::protocols::issuance::credential_proposal::CredentialProposal;
 use aries_vcx::messages::protocols::proof_presentation::presentation_proposal::PresentationProposal;
-use aries_vcx::plugins::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 use aries_vcx::{
     agency_client::{agency_client::AgencyClient, configuration::AgencyClientConfig},
     handlers::connection::mediated_connection::{ConnectionState, MediatedConnection},
     messages::a2a::A2AMessage,
 };
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 
 pub struct ServiceMediatedConnections {
     profile: Arc<dyn Profile>,

aries_vcx/Cargo.toml

@@ -11,17 +11,14 @@ path = "src/lib.rs"
 doctest = false
 
 [features]
-# By default, vdrtools is enabled to allow aries_vcx usage with vdrtools-based wallets/anoncreds/ledgers
 default = ["vdrtools"]
-########################## DEP FLAGS ################################
-# Feature flag to include the libvdrtools dependency
-vdrtools = ["dep:libvdrtools"]
+vdrtools = ["aries_vcx_core/vdrtools"]
 # Feature flag to include the 'modular library' dependencies (vdrtools alternatives; indy-vdr, indy-credx)
-modular_libs = ["dep:indy-vdr", "dep:indy-credx"]
+modular_libs = ["aries_vcx_core/modular_libs"]
 ########################## TEST FLAGS ###############################
 # Feature flag for base requirments for running tests underneath the `test_utils` flag (most tests).
 # Both `vdrtools` and `modular_libs` are transitively enabled, so they can be used for tests (including interop tests).
-test_utils = [ "messages/test_utils", "vdrtools", "modular_libs" ]
+test_utils = [ "messages/test_utils", "aries_vcx_core/test_utils", "vdrtools", "modular_libs" ]
 # Feature flag for categorising tests which require a ledger to be running
 pool_tests = [ "test_utils" ]
 # Feature flag for categorising tests which require a ledger and messaging agency to be running
@@ -53,22 +50,6 @@ serde_derive = "1.0.97"
 regex = "1.1.0"
 base64 = "0.10"
 openssl = { version = "0.10.48" }
-libvdrtools = { path = "../libvdrtools", optional = true }
-# vdrtools alternatives ----
-indy-vdr = { version = "0.3.4", default-features = false, features = ["ffi", "log"], optional = true }
-# PATCH (TO MONITOR IN FUTURE): The following patch changes the `indy-data-types` (within indy-shared-rs) to depend on
-# `ursa "0.3.6"` rather than `ursa "=0.3.6"`. Currently, `libvdrtools` depends on `ursa "0.3.7"`, which causes a mismatch of
-# `indy-utils` versions, which causes some types within credx to fail. Details about the issue can be found here: https://github.com/hyperledger/indy-shared-rs/issues/20
-# `indy-data-types` depends on `ursa =0.3.6` due to a 'broken cl feature', see commmit: https://github.com/hyperledger/indy-shared-rs/commit/2403eed6449a3b5e347697b215a732fc33c014c0
-# however using ursa 0.3.7 does not seem to affect our usage of indy-credx currently. More testing would be ideal.
-# various combinations of indy-vdr and indy-credx have been tried to resolve the dependency mismatches, however this patch appears
-# to be the only quick solution.
-# Potential resolutions:
-# - wait for ursa 0.3.8+ to resolve the CL issue and update indy-shared-rs,
-# - monitor anoncred-rs (which will replace indy-credx) as the fix will likely go in here,
-# - monitor the issue for other fixes from the maintainers: https://github.com/hyperledger/indy-shared-rs/issues/20
-# - update libvdrtools to use =0.3.6 ursa
-indy-credx = { git = "https://github.com/anonyome/indy-shared-rs.git", rev = "7342bc624d23ece8845d1a701cd2cdc9cd401bb0", optional = true }
 # ----------------------
 futures = { version = "0.3", default-features = false }
 uuid = { version = "0.8", default-features = false, features = ["v4"] }
@@ -78,6 +59,7 @@ agency_client = { path = "../agency_client" }
 derive_builder = "0.10.2"
 tokio = { version = "1.20.4" }
 messages = { path  = "../messages" }
+aries_vcx_core = { path  = "../aries_vcx_core" }
 thiserror = "1.0.37"
 
 [target.'cfg(target_os = "android")'.dependencies]

aries_vcx/src/common/anoncreds.rs

@@ -3,8 +3,9 @@
 pub mod integration_tests {
     use std::sync::Arc;
 
+    use aries_vcx_core::errors::error::AriesVcxCoreErrorKind;
+
     use crate::common::test_utils::create_and_store_credential;
-    use crate::errors::error::AriesVcxErrorKind;
     use crate::utils::constants::TAILS_DIR;
     use crate::utils::devsetup::{init_holder_setup_in_indy_context, SetupProfile};
     use crate::utils::get_temp_dir_path;
@@ -15,7 +16,7 @@ pub mod integration_tests {
             let proof_req = "{";
             let anoncreds = Arc::clone(&setup.profile).inject_anoncreds();
             let result = anoncreds.prover_get_credentials_for_proof_req(&proof_req).await;
-            assert_eq!(result.unwrap_err().kind(), AriesVcxErrorKind::InvalidProofRequest);
+            assert_eq!(result.unwrap_err().kind(), AriesVcxCoreErrorKind::InvalidProofRequest);
         })
         .await;
     }
@@ -48,7 +49,7 @@ pub mod integration_tests {
             let result_malformed_json = anoncreds.prover_get_credentials_for_proof_req("{}").await.unwrap_err();
             assert_eq!(
                 result_malformed_json.kind(),
-                AriesVcxErrorKind::InvalidAttributesStructure
+                AriesVcxCoreErrorKind::InvalidAttributesStructure
             );
         })
         .await;

aries_vcx/src/common/keys.rs

@@ -31,7 +31,7 @@ pub async fn rotate_verkey_apply(profile: &Arc<dyn Profile>, did: &str, temp_vk:
     }
 
     let wallet = profile.inject_wallet();
-    wallet.replace_did_keys_apply(did).await
+    wallet.replace_did_keys_apply(did).await.map_err(|err| err.into())
 }
 
 pub async fn rotate_verkey(profile: &Arc<dyn Profile>, did: &str) -> VcxResult<()> {
@@ -75,7 +75,8 @@ pub async fn get_verkey_from_ledger(profile: &Arc<dyn Profile>, did: &str) -> Vc
 #[cfg(test)]
 #[cfg(feature = "pool_tests")]
 mod test {
-    use crate::indy::utils::mocks::pool_mocks::{enable_pool_mocks, PoolMocks};
+    use aries_vcx_core::indy::utils::mocks::pool_mocks::{enable_pool_mocks, PoolMocks};
+
     use crate::utils::devsetup::*;
     use crate::utils::mockdata::mockdata_pool;
 

aries_vcx/src/common/ledger/transactions.rs

@@ -253,6 +253,7 @@ pub async fn clear_attr(profile: &Arc<dyn Profile>, did: &str, attr_name: &str)
     ledger
         .add_attr(did, &json!({ attr_name: Value::Null }).to_string())
         .await
+        .map_err(|err| err.into())
 }
 
 pub(self) fn check_response(response: &str) -> VcxResult<()> {

aries_vcx/src/common/primitives/credential_definition.rs

@@ -1,6 +1,8 @@
+use aries_vcx_core::errors::error::AriesVcxCoreErrorKind;
+use aries_vcx_core::ledger::base_ledger::BaseLedger;
+
 use crate::core::profile::profile::Profile;
 use crate::errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult};
-use crate::plugins::ledger::base_ledger::BaseLedger;
 use crate::utils::constants::{CRED_DEF_ID, CRED_DEF_JSON, DEFAULT_SERIALIZE_VERSION};
 use crate::utils::mockdata::mock_settings::StatusCodeMock;
 use crate::utils::serialization::ObjectWithVersion;
@@ -114,7 +116,7 @@ async fn _try_get_cred_def_from_ledger(
     }
     match ledger.get_cred_def(cred_def_id, Some(issuer_did)).await {
         Ok(cred_def) => Ok(Some(cred_def)),
-        Err(err) if err.kind() == AriesVcxErrorKind::LedgerItemNotFound => Ok(None),
+        Err(err) if err.kind() == AriesVcxCoreErrorKind::LedgerItemNotFound => Ok(None),
         Err(err) => Err(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidLedgerResponse,
             format!(
@@ -269,6 +271,7 @@ pub async fn generate_cred_def(
     anoncreds
         .issuer_create_and_store_credential_def(issuer_did, schema_json, tag, sig_type, &config_json)
         .await
+        .map_err(|err| err.into())
 }
 
 #[cfg(test)]
@@ -344,7 +347,7 @@ pub mod integration_tests {
             .await
             .unwrap();
             ledger
-                .publish_rev_reg_def(&rev_reg_def_json, &setup.institution_did)
+                .publish_rev_reg_def(&json!(rev_reg_def_json).to_string(), &setup.institution_did)
                 .await
                 .unwrap();
             ledger

aries_vcx/src/common/primitives/revocation_registry.rs

@@ -1,5 +1,7 @@
 use std::sync::Arc;
 
+use aries_vcx_core::errors::error::AriesVcxCoreErrorKind;
+
 use crate::core::profile::profile::Profile;
 use crate::errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult};
 use crate::global::settings;
@@ -101,11 +103,11 @@ impl RevocationRegistry {
         self.rev_reg_def.value.tails_location = String::from(tails_url);
         let ledger = Arc::clone(profile).inject_ledger();
         ledger
-            .publish_rev_reg_def(&self.rev_reg_def, issuer_did)
+            .publish_rev_reg_def(&json!(self.rev_reg_def).to_string(), issuer_did)
             .await
             .map_err(|err| {
                 err.map(
-                    AriesVcxErrorKind::InvalidState,
+                    AriesVcxCoreErrorKind::InvalidState,
                     "Cannot publish revocation registry definition",
                 )
             })?;
@@ -123,7 +125,12 @@ impl RevocationRegistry {
         ledger
             .publish_rev_reg_delta(&self.rev_reg_id, &self.rev_reg_entry, issuer_did)
             .await
-            .map_err(|err| err.map(AriesVcxErrorKind::InvalidRevocationEntry, "Cannot post RevocationEntry"))?;
+            .map_err(|err| {
+                err.map(
+                    AriesVcxCoreErrorKind::InvalidRevocationEntry,
+                    "Cannot post RevocationEntry",
+                )
+            })?;
         self.rev_reg_delta_state = PublicEntityStateType::Published;
         Ok(())
     }
@@ -184,6 +191,7 @@ impl RevocationRegistry {
         anoncreds
             .revoke_credential_local(&self.tails_dir, &self.rev_reg_id, cred_rev_id)
             .await
+            .map_err(|err| err.into())
     }
 
     pub async fn publish_local_revocations(&self, profile: &Arc<dyn Profile>, submitter_did: &str) -> VcxResult<()> {
@@ -192,6 +200,7 @@ impl RevocationRegistry {
         anoncreds
             .publish_local_revocations(submitter_did, &self.rev_reg_id)
             .await
+            .map_err(|err| err.into())
     }
 }
 

aries_vcx/src/common/proofs/prover/prover_internal.rs

@@ -1,5 +1,6 @@
 use std::{collections::HashMap, sync::Arc};
 
+use aries_vcx_core::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind};
 use serde_json::Value;
 
 use crate::errors::error::prelude::*;
@@ -38,11 +39,11 @@ pub async fn build_schemas_json_prover(
             let schema_json = ledger
                 .get_schema(&cred_info.schema_id, None)
                 .await
-                .map_err(|err| err.map(AriesVcxErrorKind::InvalidSchema, "Cannot get schema"))?;
+                .map_err(|err| err.map(AriesVcxCoreErrorKind::InvalidSchema, "Cannot get schema"))?;
 
             let schema_json = serde_json::from_str(&schema_json).map_err(|err| {
-                AriesVcxError::from_msg(
-                    AriesVcxErrorKind::InvalidSchema,
+                AriesVcxCoreError::from_msg(
+                    AriesVcxCoreErrorKind::InvalidSchema,
                     format!("Cannot deserialize schema: {}", err),
                 )
             })?;
@@ -68,7 +69,7 @@ pub async fn build_cred_defs_json_prover(
         if rtn.get(&cred_info.cred_def_id).is_none() {
             let credential_def = ledger.get_cred_def(&cred_info.cred_def_id, None).await.map_err(|err| {
                 err.map(
-                    AriesVcxErrorKind::InvalidProofCredentialData,
+                    AriesVcxCoreErrorKind::InvalidProofCredentialData,
                     "Cannot get credential definition",
                 )
             })?;
@@ -319,6 +320,8 @@ pub mod pool_tests {
 #[cfg(test)]
 #[cfg(feature = "general_test")]
 pub mod unit_tests {
+    use aries_vcx_core::INVALID_POOL_HANDLE;
+
     use crate::common::test_utils::{indy_handles_to_profile, mock_profile};
     use crate::utils::devsetup::*;
     use crate::utils::{
@@ -386,7 +389,7 @@ pub mod unit_tests {
     #[tokio::test]
     async fn test_find_credential_def_fails() {
         SetupLibraryWallet::run(|setup| async move {
-            let profile = indy_handles_to_profile(setup.wallet_handle, 0);
+            let profile = indy_handles_to_profile(setup.wallet_handle, INVALID_POOL_HANDLE);
             let credential_ids = vec![CredInfoProver {
                 requested_attr: "1".to_string(),
                 referent: "2".to_string(),
@@ -411,7 +414,7 @@ pub mod unit_tests {
     #[tokio::test]
     async fn test_find_schemas_fails() {
         SetupLibraryWallet::run(|setup| async move {
-            let profile = indy_handles_to_profile(setup.wallet_handle, 0);
+            let profile = indy_handles_to_profile(setup.wallet_handle, INVALID_POOL_HANDLE);
             let credential_ids = vec![CredInfoProver {
                 requested_attr: "1".to_string(),
                 referent: "2".to_string(),

aries_vcx/src/common/proofs/verifier/verifier.rs

@@ -51,6 +51,7 @@ pub async fn validate_indy_proof(
             &rev_regs_json,
         )
         .await
+        .map_err(|err| err.into())
 }
 
 #[cfg(test)]

aries_vcx/src/common/proofs/verifier/verifier_internal.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use aries_vcx_core::errors::error::AriesVcxCoreErrorKind;
 use serde_json;
 use serde_json::Value;
 
@@ -137,7 +138,7 @@ pub async fn build_schemas_json_verifier(
             let schema_json = ledger
                 .get_schema(schema_id, None)
                 .await
-                .map_err(|err| err.map(AriesVcxErrorKind::InvalidSchema, "Cannot get schema"))?;
+                .map_err(|err| err.map(AriesVcxCoreErrorKind::InvalidSchema, "Cannot get schema"))?;
             let schema_val = serde_json::from_str(&schema_json).map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidSchema,