Updated indy-credx (#931)

* Updated indy-credx Signed-off-by: Bogdan Mircea <[email protected]> * Updated credx in migrator Signed-off-by: Bogdan Mircea <[email protected]> * Added feature flagged legacy proof verification Signed-off-by: Bogdan Mircea <[email protected]> --------- Signed-off-by: Bogdan Mircea <[email protected]>
hyperledger · Aug 14, 2023 · 51e61bb · 51e61bb
1 parent 3491f23
commit 51e61bb
Show file tree

Hide file tree

Showing 7 changed files with 139 additions and 91 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aries_vcx/Cargo.toml b/aries_vcx/Cargo.toml
@@ -18,8 +18,12 @@ modular_libs = ["aries_vcx_core/modular_libs"]
 # TODO: Remove using "vdrtools" feature flag for vdr_proxy_ledger once IndyCredxAnonCreds
 # is fully implemented
 vdr_proxy_ledger = ["aries_vcx_core/vdr_proxy_ledger", "vdrtools"]
+
+# Feature for allowing legacy proof verification
+legacy_proof = ["aries_vcx_core/legacy_proof"]
+
 # Used for testing the migrator
-migration = ["vdrtools", "modular_libs"]
+migration = ["vdrtools", "modular_libs", "legacy_proof"]
 
 [dependencies]
 agency_client = { path = "../agency_client" }

diff --git a/aries_vcx_core/Cargo.toml b/aries_vcx_core/Cargo.toml
@@ -11,23 +11,13 @@ vdrtools_wallet = ["dep:libvdrtools"]
 # Feature flag to include the 'modular library' dependencies (vdrtools alternatives; indy-vdr, indy-credx)
 modular_libs = ["dep:indy-credx"]
 vdr_proxy_ledger = ["modular_libs", "dep:indy-vdr-proxy-client"]
+# Feature flag to allow legacy proof verification
+legacy_proof = []
 
 [dependencies]
 agency_client = { path = "../agency_client" }
 indy-vdr = { git = "https://github.com/Patrik-Stas/indy-vdr.git", rev = "3cd499ad75", default-features = false, features = ["log"] }
-# 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 }
+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" }
 async-trait = "0.1.68"