From a2207db3bab5f6963d2e1d9924451bd118c2a98b Mon Sep 17 00:00:00 2001 From: Benjamin Voiturier Date: Thu, 14 Dec 2023 16:55:00 +0100 Subject: [PATCH 01/13] fix: return the updated credential from process_credential() Signed-off-by: Benjamin Voiturier --- uniffi/src/anoncreds.udl | 2 +- uniffi/src/prover/mod.rs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/uniffi/src/anoncreds.udl b/uniffi/src/anoncreds.udl index eafe7635..d13b260d 100644 --- a/uniffi/src/anoncreds.udl +++ b/uniffi/src/anoncreds.udl @@ -298,7 +298,7 @@ interface Prover { ); [Throws=AnoncredsError] - void process_credential( + Credential process_credential( Credential credential, CredentialRequestMetadata cred_request_metadata, LinkSecret link_secret, diff --git a/uniffi/src/prover/mod.rs b/uniffi/src/prover/mod.rs index e3ddd776..632b3064 100644 --- a/uniffi/src/prover/mod.rs +++ b/uniffi/src/prover/mod.rs @@ -82,7 +82,7 @@ impl Prover { link_secret: Arc, cred_def: Arc, rev_reg_def: Option>, - ) -> Result<(), AnoncredsError> { + ) -> Result, AnoncredsError> { let mut mutable_credential = (*credential) .core .try_clone() @@ -94,7 +94,9 @@ impl Prover { &(*cred_def).core, rev_reg_def.as_ref().map(|def| &(*def).core), ) - .map_err(|err| AnoncredsError::ProcessCredential(format!("Error: {}", err))) + .map_err(|err| AnoncredsError::ProcessCredential(format!("Error: {}", err))); + + return Ok(Arc::new(Credential { core: mutable_credential })) } pub fn create_presentation( From 971085ba11eac01f345539a27682c8789723dc97 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 19:15:03 +0200 Subject: [PATCH 02/13] Update pull-request.yml Signed-off-by: Ahmed Moussa --- .github/workflows/pull-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 01fca233..36eec26f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -65,6 +65,7 @@ jobs: rm '/usr/local/bin/pydoc3.11' rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' + rm '/usr/local/bin/2to3-3.12' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From e81d9406763d2f17df6558010bc371bb9541071c Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 19:15:32 +0200 Subject: [PATCH 03/13] Update release.yml Signed-off-by: Ahmed Moussa --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e32ee8d0..47865d61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -106,6 +106,7 @@ jobs: rm '/usr/local/bin/pydoc3.11' rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' + rm '/usr/local/bin/2to3-3.12' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From a66d224f5f3bad0198bc8515df6e643b2665c819 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 19:40:44 +0200 Subject: [PATCH 04/13] Update pull-request.yml Signed-off-by: Ahmed Moussa --- .github/workflows/pull-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 36eec26f..db4dcded 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -66,6 +66,7 @@ jobs: rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' rm '/usr/local/bin/2to3-3.12' + rm '/usr/local/bin/idle3.12' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From a00a7e5be5549a6950de5963250cc0345c2a20f3 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 19:42:17 +0200 Subject: [PATCH 05/13] Update release.yml Signed-off-by: Ahmed Moussa --- .github/workflows/release.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47865d61..2b18d841 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,16 +97,20 @@ jobs: - name: "Install Linux GNU for x86_64" run: | rm '/usr/local/bin/2to3' + rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/2to3-3.12' rm '/usr/local/bin/python3' rm '/usr/local/bin/python3.11' - rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/python3.12' rm '/usr/local/bin/idle3' rm '/usr/local/bin/idle3.11' + rm '/usr/local/bin/idle3.12' rm '/usr/local/bin/pydoc3' rm '/usr/local/bin/pydoc3.11' + rm '/usr/local/bin/pydoc3.12' rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' - rm '/usr/local/bin/2to3-3.12' + rm '/usr/local/bin/python3.12-config' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From 8017d214f311df82aef74cafaf7bf8568d6d3794 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 19:42:35 +0200 Subject: [PATCH 06/13] Update pull-request.yml Signed-off-by: Ahmed Moussa --- .github/workflows/pull-request.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index db4dcded..edc2e707 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -56,17 +56,20 @@ jobs: - name: "Install Linux GNU for x86_64" run: | rm '/usr/local/bin/2to3' + rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/2to3-3.12' rm '/usr/local/bin/python3' rm '/usr/local/bin/python3.11' - rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/python3.12' rm '/usr/local/bin/idle3' rm '/usr/local/bin/idle3.11' + rm '/usr/local/bin/idle3.12' rm '/usr/local/bin/pydoc3' rm '/usr/local/bin/pydoc3.11' + rm '/usr/local/bin/pydoc3.12' rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' - rm '/usr/local/bin/2to3-3.12' - rm '/usr/local/bin/idle3.12' + rm '/usr/local/bin/python3.12-config' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From ca1271beb30636203d77962087028e9d1a362c5e Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 19:43:41 +0200 Subject: [PATCH 07/13] Update build.gradle.kts Signed-off-by: Ahmed Moussa --- anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts b/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts index 01d5bc94..0e536b09 100644 --- a/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts +++ b/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts @@ -202,10 +202,6 @@ val buildAnonCredWrapperForAndroidArch64 by tasks.register("buildAnonCredW "STRIP" to STRIP ) this.environment = localEnv - println("Show all environment variables") - for (entry in this.environment.entries) { - println("${entry.key} : ${entry.value}") - } inputs.files(fileTree(projectDir.resolve("src"))) outputs.files(fileTree(projectDir.resolve("target").resolve("aarch64-linux-android"))) commandLine("cargo", "ndk", "build", "--release", "--target", "aarch64-linux-android", "--target-dir", "${projectDir.resolve("target")}") From e8f5984a926463cf9492b0b58939c81ef715c9c1 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 21:31:08 +0200 Subject: [PATCH 08/13] Update pull-request.yml Signed-off-by: Ahmed Moussa --- .github/workflows/pull-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index edc2e707..7d7656c1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -70,6 +70,7 @@ jobs: rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' rm '/usr/local/bin/python3.12-config' + rm '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From f030c45550a99ca34a7d356f2f4dac48577f922c Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 21:31:26 +0200 Subject: [PATCH 09/13] Update release.yml Signed-off-by: Ahmed Moussa --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b18d841..f6b3bc9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,6 +111,7 @@ jobs: rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' rm '/usr/local/bin/python3.12-config' + rm '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From ddda343503a2ae5cc97760712842521ca590a61d Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 22:08:16 +0200 Subject: [PATCH 10/13] Update pull-request.yml Signed-off-by: Ahmed Moussa --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 7d7656c1..74671e3b 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -70,7 +70,7 @@ jobs: rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' rm '/usr/local/bin/python3.12-config' - rm '/usr/local/lib/node_modules' + rmdir '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From 61289530d9d73107e7cf70eb5ab0322466a82716 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 22:08:34 +0200 Subject: [PATCH 11/13] Update release.yml Signed-off-by: Ahmed Moussa --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6b3bc9b..e812cf59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,7 +111,7 @@ jobs: rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' rm '/usr/local/bin/python3.12-config' - rm '/usr/local/lib/node_modules' + rmdir '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From a54af57baa02472f68aba8aa135e27d1c714d033 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 22:22:54 +0200 Subject: [PATCH 12/13] Update pull-request.yml Signed-off-by: Ahmed Moussa --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 74671e3b..8510b0dc 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -70,7 +70,7 @@ jobs: rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' rm '/usr/local/bin/python3.12-config' - rmdir '/usr/local/lib/node_modules' + rm -r '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" From 27baa4dc83b7b184fcdb39a44c1e0c9861d77622 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Thu, 14 Dec 2023 23:08:54 +0200 Subject: [PATCH 13/13] Update release.yml Signed-off-by: Ahmed Moussa --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e812cf59..26d3cefb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,7 +111,7 @@ jobs: rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' rm '/usr/local/bin/python3.12-config' - rmdir '/usr/local/lib/node_modules' + rm -r '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64"