From bce7eb3fea74f6ec0813c8d6ff85355538a264a1 Mon Sep 17 00:00:00 2001 From: vineet pant <10172895+vineetpant@users.noreply.github.com> Date: Fri, 12 May 2023 13:16:14 +0200 Subject: [PATCH 1/6] update vade-evan helper and test for new vade-bbs structs --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/api/vade_evan_api.rs | 13 +++++++++++-- src/c_lib.rs | 2 ++ src/helpers/credential.rs | 15 ++++++++++----- src/main.rs | 10 ++++++++++ src/wasm_lib.rs | 8 ++++++++ 7 files changed, 43 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5cae7b..d9798a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4922,7 +4922,7 @@ dependencies = [ [[package]] name = "vade-evan-bbs" version = "0.3.0" -source = "git+https://github.com/evannetwork/vade-evan-bbs.git?branch=feature/remove-credential-subject-id#1c524d4b259f6bee74f4efc71fe71542a62778b6" +source = "git+https://github.com/evannetwork/vade-evan-bbs.git?branch=feature/implement-correct-handling-for-required-reveal-statements-in-vade#b6daca0b55fa93ceefd199f2a01f7c68a5397a61" dependencies = [ "async-trait", "base64 0.13.1", diff --git a/Cargo.toml b/Cargo.toml index e38756d..0434172 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -146,7 +146,7 @@ optional = true [dependencies.vade-evan-bbs] git = "https://github.com/evannetwork/vade-evan-bbs.git" -branch = "feature/remove-credential-subject-id" +branch = "feature/implement-correct-handling-for-required-reveal-statements-in-vade" version = "0.3.0" optional = true default-features = false diff --git a/src/api/vade_evan_api.rs b/src/api/vade_evan_api.rs index 040d997..ce3487f 100644 --- a/src/api/vade_evan_api.rs +++ b/src/api/vade_evan_api.rs @@ -285,6 +285,7 @@ impl VadeEvan { /// * `use_valid_until` - true if `validUntil` will be present in credential /// * `issuer_did` - DID of issuer /// * `is_credential_status_included` - true if credentialStatus is included in credential + /// * `required_reveal_statements` - required_revealed_statements indices array in searialized form /// /// # Returns /// * credential offer as JSON serialized [`BbsCredentialOffer`](https://docs.rs/vade_evan_bbs/*/vade_evan_bbs/struct.BbsCredentialOffer.html) @@ -307,6 +308,7 @@ impl VadeEvan { /// false, /// ISSUER_DID, /// true, + /// "[1]", /// ) /// .await?; /// @@ -324,6 +326,7 @@ impl VadeEvan { use_valid_until: bool, issuer_did: &str, is_credential_status_included: bool, + required_reveal_statements: &str, ) -> Result { let mut credential = Credential::new(self)?; credential @@ -332,6 +335,7 @@ impl VadeEvan { use_valid_until, issuer_did, is_credential_status_included, + required_reveal_statements, ) .await .map_err(|err| err.into()) @@ -853,7 +857,8 @@ impl VadeEvan { /// * `credential_revocation_did` - revocation list DID /// * `credential_revocation_id` - index in revocation list /// * `exp_date` - expiration date, string, e.g. "1722-12-03T14:23:42.120Z" (or `None` if no expiration date is used) - /// + /// * `required_revealed_statements` - required_revealed_statements indices array in searialized form + /// /// # Returns /// * credential as JSON serialized [`BbsCredential`](https://docs.rs/vade_evan_bbs/*/vade_evan_bbs/struct.BbsCredential.html) /// @@ -875,6 +880,7 @@ impl VadeEvan { /// const BBS_SECRET: &str = "GRsdzRB0pf/8MKP/ZBOM2BEV1A8DIDfmLh8T3b1hPKc="; /// const BBS_PRIVATE_KEY: &str = "WWTZW8pkz35UnvsUCEsof2CJmNHaJQ/X+B5xjWcHr/I="; /// const SUBJECT_DID: &str = "did:evan:EiAee4ixDnSP0eWyp0YFV7Wt9yrZ3w841FNuv9NSLFSCVA"; + /// /// async fn example() -> Result<()> { /// let mut vade_evan = VadeEvan::new(VadeEvanConfig { target: DEFAULT_TARGET, signer: DEFAULT_SIGNER })?; /// let offer_str = vade_evan @@ -886,7 +892,8 @@ impl VadeEvan { /// Some("did:revoc:12345"), /// Some("1"), /// None, - /// SUBJECT_DID + /// SUBJECT_DID, + /// "[1]", /// ) /// .await?; /// @@ -908,6 +915,7 @@ impl VadeEvan { credential_revocation_id: Option<&str>, exp_date: Option<&str>, subject_did: &str, + required_reveal_statements: &str, ) -> Result { let mut credential = Credential::new(self)?; credential @@ -920,6 +928,7 @@ impl VadeEvan { credential_revocation_id, exp_date, subject_did, + required_reveal_statements, ) .await .map_err(|err| err.into()) diff --git a/src/c_lib.rs b/src/c_lib.rs index 7a18b9b..6f250b3 100644 --- a/src/c_lib.rs +++ b/src/c_lib.rs @@ -547,6 +547,7 @@ pub extern "C" fn execute_vade( use_valid_until, arguments_vec.get(2).unwrap_or_else(|| &no_args), is_credential_status_included, + arguments_vec.get(4).unwrap_or_else(|| &no_args), ) .await .map_err(stringify_vade_evan_error) @@ -640,6 +641,7 @@ pub extern "C" fn execute_vade( arguments_vec.get(5).map(|v| v.as_str()), arguments_vec.get(6).map(|v| v.as_str()), arguments_vec.get(7).unwrap_or_else(|| &no_args), + arguments_vec.get(8).unwrap_or_else(|| &no_args), ) .await .map_err(stringify_vade_evan_error) diff --git a/src/helpers/credential.rs b/src/helpers/credential.rs index d802894..a74dc53 100644 --- a/src/helpers/credential.rs +++ b/src/helpers/credential.rs @@ -128,9 +128,10 @@ impl<'a> Credential<'a> { use_valid_until: bool, issuer_did: &str, is_credential_status_included: bool, + required_reveal_statements: &str, ) -> Result { let schema: CredentialSchema = self.get_did_document(schema_did).await?; - + let required_reveal_statements: Vec = serde_json::from_str(required_reveal_statements).map_err(|err| CredentialError::JsonDeSerialization(err))?; let payload = OfferCredentialPayload { draft_credential: schema.to_draft_credential(CredentialDraftOptions { issuer_did: issuer_did.to_string(), @@ -145,6 +146,7 @@ impl<'a> Credential<'a> { true => LdProofVcDetailOptionsCredentialStatusType::RevocationList2021Status, false => LdProofVcDetailOptionsCredentialStatusType::None, }, + required_reveal_statements, }; let result = self @@ -347,11 +349,13 @@ impl<'a> Credential<'a> { credential_revocation_id: Option<&str>, exp_date: Option<&str>, subject_did: &str, + required_reveal_statements: &str, ) -> Result { let credential_revocation_did = check_for_optional_empty_params(credential_revocation_did); let credential_revocation_id = check_for_optional_empty_params(credential_revocation_id); let exp_date = check_for_optional_empty_params(exp_date); let credential_subject: CredentialSubject = serde_json::from_str(credential_subject_str)?; + let required_reveal_statements: Vec = serde_json::from_str(required_reveal_statements).map_err(|err| CredentialError::JsonDeSerialization(err))?; let issuer_public_key = self .get_issuer_public_key(&subject_did, "#bbs-key-1") .await?; @@ -399,6 +403,7 @@ impl<'a> Credential<'a> { true => LdProofVcDetailOptionsCredentialStatusType::RevocationList2021Status, false => LdProofVcDetailOptionsCredentialStatusType::None, }, + required_reveal_statements, }; let offer_str = self @@ -423,7 +428,6 @@ impl<'a> Credential<'a> { .await?; let (request, blinding_key): (BbsCredentialRequest, String) = serde_json::from_str(request_str.as_str())?; - let indices = vec![0, 1]; // Issue credentials let payload = IssueCredentialPayload { @@ -431,7 +435,6 @@ impl<'a> Credential<'a> { issuer_public_key: issuer_public_key.clone(), issuer_secret_key: bbs_private_key.to_string(), credential_request: request.clone(), - required_indices: indices, credential_status, }; let payload_str = serde_json::to_string(&payload)?; @@ -699,7 +702,7 @@ mod tests { let mut credential = Credential::new(&mut vade_evan)?; let offer_str = credential - .create_credential_offer(SCHEMA_DID, false, ISSUER_DID, true) + .create_credential_offer(SCHEMA_DID, false, ISSUER_DID, true, "[1]") .await?; let offer_obj: BbsCredentialOffer = serde_json::from_str(&offer_str)?; @@ -717,7 +720,7 @@ mod tests { signer: "remote|http://127.0.0.1:7070/key/sign", })?; let credential_offer = vade_evan - .helper_create_credential_offer(SCHEMA_DID, false, ISSUER_DID, true) + .helper_create_credential_offer(SCHEMA_DID, false, ISSUER_DID, true, "[1]") .await?; let bbs_secret = r#"OASkVMA8q6b3qJuabvgaN9K1mKoqptCv4SCNvRmnWuI="#; @@ -994,6 +997,7 @@ mod tests { Some("1"), None, subject_id, + "[1]", ) .await { @@ -1036,6 +1040,7 @@ mod tests { None, None, subject_id, + "[1]" ) .await { diff --git a/src/main.rs b/src/main.rs index 11d4073..178ee3b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -189,6 +189,7 @@ async fn main() -> Result<()> { use_valid_until, get_argument_value(sub_m, "issuer_did", None), include_credential_status, + get_argument_value(sub_m, "required_reveal_statements", None), ) .await? } @@ -260,6 +261,7 @@ async fn main() -> Result<()> { get_optional_argument_value(sub_m, "credential_revocation_id"), get_optional_argument_value(sub_m, "exp_date"), get_argument_value(sub_m, "subject_did", None), + get_argument_value(sub_m, "required_reveal_statements", None), ) .await?; "".to_string() @@ -329,6 +331,7 @@ fn add_subcommand_helper<'a>(app: App<'a, 'a>) -> Result> { .arg(get_clap_argument("use_valid_until")?) .arg(get_clap_argument("issuer_did")?) .arg(get_clap_argument("include_credential_status")?) + .arg(get_clap_argument("required_reveal_statements")?) ); } else {} } @@ -416,6 +419,7 @@ fn add_subcommand_helper<'a>(app: App<'a, 'a>) -> Result> { .arg(get_clap_argument("credential_revocation_id")?) .arg(get_clap_argument("exp_date")?) .arg(get_clap_argument("subject_did")?) + .arg(get_clap_argument("required_reveal_statements")?) ); } else {} } @@ -978,6 +982,12 @@ fn get_clap_argument(arg_name: &str) -> Result { .value_name("revealed_attributes") .help("list of names of revealed attributes in specified schema, reveals all if omitted") .takes_value(true), + "required_reveal_statements" => Arg::with_name("required_reveal_statements") + .long("required_reveal_statements") + .value_name("required_reveal_statements") + .help("list of indices to be made as revealed mandatorily in credential presentation") + .takes_value(true) + .required(true), "proof_request" => Arg::with_name("proof_request") .long("proof_request") .value_name("proof_request") diff --git a/src/wasm_lib.rs b/src/wasm_lib.rs index b3dbc1f..73f07be 100644 --- a/src/wasm_lib.rs +++ b/src/wasm_lib.rs @@ -108,6 +108,7 @@ struct HelperCreateCredentialOfferPayload { pub issuer_did: String, pub subject_did: Option, pub is_credential_status_included: bool, + pub required_reveal_statements: String, } #[derive(Serialize, Deserialize)] @@ -146,6 +147,7 @@ struct HelperCreateSelfIssuedCredentialPayload { pub credential_revocation_id: Option, pub exp_date: Option, pub subject_did: String, + pub required_reveal_statements: String, } #[derive(Serialize, Deserialize)] @@ -317,6 +319,7 @@ cfg_if::cfg_if! { use_valid_until: bool, issuer_did: String, is_credential_status_included: bool, + required_reveal_statements: String, ) -> Result { let mut vade_evan = get_vade_evan(None).map_err(jsify_generic_error)?; let offer = vade_evan @@ -325,6 +328,7 @@ cfg_if::cfg_if! { use_valid_until, &issuer_did, is_credential_status_included, + &required_reveal_statements, ).await .map_err(jsify_vade_evan_error)?; Ok(offer) @@ -395,6 +399,7 @@ cfg_if::cfg_if! { credential_revocation_id: Option, exp_date: Option, subject_did: String, + required_reveal_statements: String, ) -> Result { let mut vade_evan = get_vade_evan(None).map_err(jsify_generic_error)?; Ok(vade_evan @@ -407,6 +412,7 @@ cfg_if::cfg_if! { credential_revocation_id.as_deref(), exp_date.as_deref(), &subject_did, + &required_reveal_statements, ).await .map_err(jsify_vade_evan_error)?) } @@ -663,6 +669,7 @@ pub async fn execute_vade( payload.use_valid_until, payload.issuer_did, payload.is_credential_status_included, + payload.required_reveal_statements ) .await } @@ -725,6 +732,7 @@ pub async fn execute_vade( payload.credential_revocation_id, payload.exp_date, payload.subject_did, + payload.required_reveal_statements ) .await } From 2177c33337e9684edeab59e7c936c5d825bf2730 Mon Sep 17 00:00:00 2001 From: vineet pant <10172895+vineetpant@users.noreply.github.com> Date: Fri, 12 May 2023 13:17:21 +0200 Subject: [PATCH 2/6] update versions.md --- VERSIONS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSIONS.md b/VERSIONS.md index bde77c2..d454161 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -30,6 +30,7 @@ - refactor features to use target specific(c-lib, c-sdk, wasm, cli, java) builds - adjust functions to remove `credential_subject.id` from `BbsCredential` and other types - add `helper_verify_presentation` +- add support for `required_reveal_statements` in `vade-evan-bbs` ### Fixes From 2008826661031ae74862f15d8aa77fed435e6ab7 Mon Sep 17 00:00:00 2001 From: vineet pant <10172895+vineetpant@users.noreply.github.com> Date: Fri, 12 May 2023 13:17:37 +0200 Subject: [PATCH 3/6] format code --- src/api/vade_evan_api.rs | 4 ++-- src/helpers/credential.rs | 8 +++++--- src/wasm_lib.rs | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/api/vade_evan_api.rs b/src/api/vade_evan_api.rs index ce3487f..977f206 100644 --- a/src/api/vade_evan_api.rs +++ b/src/api/vade_evan_api.rs @@ -858,7 +858,7 @@ impl VadeEvan { /// * `credential_revocation_id` - index in revocation list /// * `exp_date` - expiration date, string, e.g. "1722-12-03T14:23:42.120Z" (or `None` if no expiration date is used) /// * `required_revealed_statements` - required_revealed_statements indices array in searialized form - /// + /// /// # Returns /// * credential as JSON serialized [`BbsCredential`](https://docs.rs/vade_evan_bbs/*/vade_evan_bbs/struct.BbsCredential.html) /// @@ -880,7 +880,7 @@ impl VadeEvan { /// const BBS_SECRET: &str = "GRsdzRB0pf/8MKP/ZBOM2BEV1A8DIDfmLh8T3b1hPKc="; /// const BBS_PRIVATE_KEY: &str = "WWTZW8pkz35UnvsUCEsof2CJmNHaJQ/X+B5xjWcHr/I="; /// const SUBJECT_DID: &str = "did:evan:EiAee4ixDnSP0eWyp0YFV7Wt9yrZ3w841FNuv9NSLFSCVA"; - /// + /// /// async fn example() -> Result<()> { /// let mut vade_evan = VadeEvan::new(VadeEvanConfig { target: DEFAULT_TARGET, signer: DEFAULT_SIGNER })?; /// let offer_str = vade_evan diff --git a/src/helpers/credential.rs b/src/helpers/credential.rs index a74dc53..e1d755e 100644 --- a/src/helpers/credential.rs +++ b/src/helpers/credential.rs @@ -131,7 +131,8 @@ impl<'a> Credential<'a> { required_reveal_statements: &str, ) -> Result { let schema: CredentialSchema = self.get_did_document(schema_did).await?; - let required_reveal_statements: Vec = serde_json::from_str(required_reveal_statements).map_err(|err| CredentialError::JsonDeSerialization(err))?; + let required_reveal_statements: Vec = serde_json::from_str(required_reveal_statements) + .map_err(|err| CredentialError::JsonDeSerialization(err))?; let payload = OfferCredentialPayload { draft_credential: schema.to_draft_credential(CredentialDraftOptions { issuer_did: issuer_did.to_string(), @@ -355,7 +356,8 @@ impl<'a> Credential<'a> { let credential_revocation_id = check_for_optional_empty_params(credential_revocation_id); let exp_date = check_for_optional_empty_params(exp_date); let credential_subject: CredentialSubject = serde_json::from_str(credential_subject_str)?; - let required_reveal_statements: Vec = serde_json::from_str(required_reveal_statements).map_err(|err| CredentialError::JsonDeSerialization(err))?; + let required_reveal_statements: Vec = serde_json::from_str(required_reveal_statements) + .map_err(|err| CredentialError::JsonDeSerialization(err))?; let issuer_public_key = self .get_issuer_public_key(&subject_did, "#bbs-key-1") .await?; @@ -1040,7 +1042,7 @@ mod tests { None, None, subject_id, - "[1]" + "[1]", ) .await { diff --git a/src/wasm_lib.rs b/src/wasm_lib.rs index 73f07be..c5cee29 100644 --- a/src/wasm_lib.rs +++ b/src/wasm_lib.rs @@ -669,7 +669,7 @@ pub async fn execute_vade( payload.use_valid_until, payload.issuer_did, payload.is_credential_status_included, - payload.required_reveal_statements + payload.required_reveal_statements, ) .await } @@ -732,7 +732,7 @@ pub async fn execute_vade( payload.credential_revocation_id, payload.exp_date, payload.subject_did, - payload.required_reveal_statements + payload.required_reveal_statements, ) .await } From c344bf3977f762893233e323d522c09f63cc2689 Mon Sep 17 00:00:00 2001 From: vineet pant <10172895+vineetpant@users.noreply.github.com> Date: Mon, 15 May 2023 12:39:09 +0200 Subject: [PATCH 4/6] fix git ci workflow --- .github/workflows/ci_pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_pull_request.yml b/.github/workflows/ci_pull_request.yml index 931ffbe..7e21858 100644 --- a/.github/workflows/ci_pull_request.yml +++ b/.github/workflows/ci_pull_request.yml @@ -24,7 +24,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - - x86_64-pc-windows-gnu, + - x86_64-pc-windows-gnu toolchain: - stable From 17b82926c25f70053ca12ba19552039bf1e8129b Mon Sep 17 00:00:00 2001 From: vineet pant <10172895+vineetpant@users.noreply.github.com> Date: Tue, 23 May 2023 18:18:49 +0200 Subject: [PATCH 5/6] add extra asserts for required_revealed_Statement tests --- src/helpers/credential.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/helpers/credential.rs b/src/helpers/credential.rs index e1d755e..70bebd5 100644 --- a/src/helpers/credential.rs +++ b/src/helpers/credential.rs @@ -708,6 +708,13 @@ mod tests { .await?; let offer_obj: BbsCredentialOffer = serde_json::from_str(&offer_str)?; + assert_eq!( + offer_obj + .ld_proof_vc_detail + .options + .required_reveal_statements, + vec![1] + ); assert_eq!(offer_obj.ld_proof_vc_detail.credential.issuer, ISSUER_DID); assert!(!offer_obj.nonce.is_empty()); @@ -1003,7 +1010,11 @@ mod tests { ) .await { - Ok(_) => assert!(true, "credential should have been successfully self issued"), + Ok(issued_credential) => { + assert!(true, "credential should have been successfully self issued"); + let issue_credential: BbsCredential = serde_json::from_str(&issued_credential)?; + assert_eq!(issue_credential.proof.required_reveal_statements, vec![1]); + } Err(_) => assert!( false, "error occured when creating the self issued credential" @@ -1053,6 +1064,7 @@ mod tests { issue_credential.credential_status.is_none(), "credential_status should not be present" ); + assert_eq!(issue_credential.proof.required_reveal_statements, vec![1]); } Err(_) => assert!( false, From 271f35a1567dd030703ebdb1ae953f22b699dea8 Mon Sep 17 00:00:00 2001 From: wulfraem Date: Thu, 1 Jun 2023 12:07:06 +0200 Subject: [PATCH 6/6] update dependencies - use `develop` branches for vade-* dependencies --- Cargo.lock | 45 ++++++++++++++------------------------------- Cargo.toml | 10 ++++++---- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 25911ff..c7f6420 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -934,16 +934,6 @@ dependencies = [ "subtle 2.4.1", ] -[[package]] -name = "ctor" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "ctr" version = "0.8.0" @@ -2430,11 +2420,10 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" dependencies = [ - "cfg-if 1.0.0", "value-bag", ] @@ -4849,7 +4838,7 @@ dependencies = [ [[package]] name = "vade-didcomm" version = "0.3.0" -source = "git+https://github.com/evannetwork/vade-didcomm.git?branch=develop#cb755022da866b8cc62fb41976377ae2d679ff16" +source = "git+https://github.com/evannetwork/vade-didcomm.git?branch=develop#edd2e0d1c3d767b91f186aee762062860b04d741" dependencies = [ "async-trait", "bs58", @@ -4921,8 +4910,8 @@ dependencies = [ [[package]] name = "vade-evan-bbs" -version = "0.3.0" -source = "git+https://github.com/evannetwork/vade-evan-bbs.git?branch=feature/implement-correct-handling-for-required-reveal-statements-in-vade#b6daca0b55fa93ceefd199f2a01f7c68a5397a61" +version = "0.4.0" +source = "git+https://github.com/evannetwork/vade-evan-bbs.git?branch=develop#1acb8202500c0bc86bd837775bcfe43b28351d84" dependencies = [ "async-trait", "base64 0.13.1", @@ -4931,7 +4920,7 @@ dependencies = [ "flate2", "hex", "js-sys", - "libsecp256k1 0.3.5", + "libsecp256k1 0.5.0", "regex", "serde", "serde_json", @@ -4946,8 +4935,7 @@ dependencies = [ [[package]] name = "vade-evan-substrate" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc4b84f68dbdaa8cb0aa0aad215b72f7a7cff99d8abd0e13413de7173555773" +source = "git+https://github.com/evannetwork/vade-evan-substrate.git?branch=develop#e147e7b23e748f755d424cd629a8841ee48ec7aa" dependencies = [ "async-trait", "blake2-rfc", @@ -4988,7 +4976,7 @@ dependencies = [ [[package]] name = "vade-jwt-vc" version = "0.2.0" -source = "git+https://github.com/evannetwork/vade-jwt-vc.git?branch=develop#505e58b046a0e2f041dc2887e5a5a8a445778e16" +source = "git+https://github.com/evannetwork/vade-jwt-vc.git?branch=develop#3ae247e6d689053126427099bb6f35291c20bc28" dependencies = [ "async-trait", "base64 0.13.1", @@ -5011,7 +4999,7 @@ dependencies = [ [[package]] name = "vade-sidetree" version = "0.0.4" -source = "git+https://github.com/evannetwork/vade-sidetree.git?branch=develop#b308cbb013cb4d6e3468e07b3baf810458e98714" +source = "git+https://github.com/evannetwork/vade-sidetree.git?branch=develop#60bb27d3413fe7e1d74add1a45b4fdea8126d44f" dependencies = [ "async-std", "async-trait", @@ -5034,14 +5022,13 @@ dependencies = [ [[package]] name = "vade-signer" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321884ca81c3ab83d696899142b55892c5e1072b1f457af7883a9b16ddeb2a9c" +version = "0.0.2" +source = "git+https://github.com/evannetwork/vade-signer.git?branch=develop#18ff5c6a2b08974e52748e3b34351e8ba53eb7c9" dependencies = [ "async-trait", "byteorder", "hex", - "libsecp256k1 0.3.5", + "libsecp256k1 0.5.0", "log", "rand 0.7.3", "reqwest", @@ -5068,13 +5055,9 @@ dependencies = [ [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" [[package]] name = "vcpkg" diff --git a/Cargo.toml b/Cargo.toml index fc745cf..a6d370c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,8 @@ optional = true # did-substrate [dependencies.vade-evan-substrate] -version = "0.2.0" +git = "https://github.com/evannetwork/vade-evan-substrate.git" +branch = "develop" optional = true # didcomm @@ -114,7 +115,8 @@ optional = true # signer [dependencies.vade-signer] -version = "0.0.1" +git = "https://github.com/evannetwork/vade-signer.git" +branch = "develop" optional = true # universal-resolver @@ -146,8 +148,8 @@ optional = true [dependencies.vade-evan-bbs] git = "https://github.com/evannetwork/vade-evan-bbs.git" -branch = "feature/implement-correct-handling-for-required-reveal-statements-in-vade" -version = "0.3.0" +branch = "develop" +version = "0.4.0" optional = true default-features = false