From ff9f51dcf648b376f5ba2b3e310a6ab66d9e8c94 Mon Sep 17 00:00:00 2001 From: Bogdan Mircea Date: Thu, 10 Aug 2023 17:42:38 +0300 Subject: [PATCH] Updated credx in migrator Signed-off-by: Bogdan Mircea --- Cargo.lock | 69 +++----------------------------------- aries_vcx_core/Cargo.toml | 12 ------- wallet_migrator/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3746e170fe..cc6f3cfc77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -469,7 +469,7 @@ dependencies = [ "derive_builder 0.12.0", "futures", "indy-api-types", - "indy-credx 1.0.1", + "indy-credx", "indy-ledger-response-parser", "indy-vdr", "indy-vdr-proxy-client", @@ -2623,27 +2623,6 @@ dependencies = [ "zmq", ] -[[package]] -name = "indy-credx" -version = "0.3.1" -source = "git+https://github.com/anonyome/indy-shared-rs.git?rev=7342bc624d23ece8845d1a701cd2cdc9cd401bb0#7342bc624d23ece8845d1a701cd2cdc9cd401bb0" -dependencies = [ - "env_logger 0.7.1", - "ffi-support", - "indy-data-types 0.5.1 (git+https://github.com/anonyome/indy-shared-rs.git?rev=7342bc624d23ece8845d1a701cd2cdc9cd401bb0)", - "indy-utils 0.5.1", - "log", - "once_cell", - "rand 0.7.3", - "regex", - "serde", - "serde_json", - "sha2 0.9.9", - "tempfile", - "thiserror", - "zeroize", -] - [[package]] name = "indy-credx" version = "1.0.1" @@ -2679,21 +2658,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "indy-data-types" -version = "0.5.1" -source = "git+https://github.com/anonyome/indy-shared-rs.git?rev=7342bc624d23ece8845d1a701cd2cdc9cd401bb0#7342bc624d23ece8845d1a701cd2cdc9cd401bb0" -dependencies = [ - "hex", - "indy-utils 0.5.1", - "once_cell", - "regex", - "serde", - "serde_json", - "ursa", - "zeroize", -] - [[package]] name = "indy-data-types" version = "0.6.1" @@ -2754,7 +2718,7 @@ dependencies = [ "curve25519-dalek", "ed25519-dalek", "hex", - "indy-wql 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indy-wql", "once_cell", "rand 0.8.5", "regex", @@ -2766,22 +2730,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "indy-utils" -version = "0.5.1" -source = "git+https://github.com/anonyome/indy-shared-rs.git?rev=7342bc624d23ece8845d1a701cd2cdc9cd401bb0#7342bc624d23ece8845d1a701cd2cdc9cd401bb0" -dependencies = [ - "bs58 0.4.0", - "indy-wql 0.4.0 (git+https://github.com/anonyome/indy-shared-rs.git?rev=7342bc624d23ece8845d1a701cd2cdc9cd401bb0)", - "once_cell", - "regex", - "serde", - "serde_json", - "sha2 0.10.6", - "thiserror", - "zeroize", -] - [[package]] name = "indy-utils" version = "0.6.0" @@ -2808,7 +2756,7 @@ dependencies = [ "futures-executor", "futures-util", "hex", - "indy-data-types 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "indy-data-types 0.5.1", "indy-utils 0.5.0", "log", "once_cell", @@ -2867,15 +2815,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "indy-wql" -version = "0.4.0" -source = "git+https://github.com/anonyome/indy-shared-rs.git?rev=7342bc624d23ece8845d1a701cd2cdc9cd401bb0#7342bc624d23ece8845d1a701cd2cdc9cd401bb0" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "instant" version = "0.1.12" @@ -5488,7 +5427,7 @@ name = "wallet_migrator" version = "0.1.0" dependencies = [ "aries_vcx_core", - "indy-credx 0.3.1", + "indy-credx", "libvdrtools", "log", "serde_json", diff --git a/aries_vcx_core/Cargo.toml b/aries_vcx_core/Cargo.toml index d7372bafa4..13c9f2951f 100644 --- a/aries_vcx_core/Cargo.toml +++ b/aries_vcx_core/Cargo.toml @@ -16,18 +16,6 @@ vdr_proxy_ledger = ["modular_libs", "dep:indy-vdr-proxy-client"] [dependencies] agency_client = { path = "../agency_client" } 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/hyperledger/indy-shared-rs", tag = "v1.0.1", optional = true } libvdrtools = { path = "../libvdrtools", optional = true } indy-api-types = { path = "../libvdrtools/indy-api-types" } diff --git a/wallet_migrator/Cargo.toml b/wallet_migrator/Cargo.toml index b8bc66b50a..cb7a498798 100644 --- a/wallet_migrator/Cargo.toml +++ b/wallet_migrator/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] aries_vcx_core = { path = "../aries_vcx_core", features = ["modular_libs"] } -credx = { package = "indy-credx", git = "https://github.com/anonyome/indy-shared-rs.git", rev = "7342bc624d23ece8845d1a701cd2cdc9cd401bb0" } +credx = { package = "indy-credx", git = "https://github.com/hyperledger/indy-shared-rs", tag = "v1.0.1" } vdrtools = { package = "libvdrtools", path = "../libvdrtools" } serde_json = "1.0.96" thiserror = "1.0.40"