From a8947fe6b68f8290f2d6706fdf22d09b0d55661c Mon Sep 17 00:00:00 2001 From: alberto-instnt <113043904+alberto-instnt@users.noreply.github.com> Date: Mon, 8 Jul 2024 19:09:13 -0400 Subject: [PATCH 1/3] Updated unffi README.md new sh command with the new folder structure Signed-off-by: alberto-instnt <113043904+alberto-instnt@users.noreply.github.com> --- aries/wrappers/uniffi-aries-vcx/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aries/wrappers/uniffi-aries-vcx/README.md b/aries/wrappers/uniffi-aries-vcx/README.md index f5fdfcb93a..22c06d00bd 100644 --- a/aries/wrappers/uniffi-aries-vcx/README.md +++ b/aries/wrappers/uniffi-aries-vcx/README.md @@ -47,7 +47,7 @@ More documentation can be found [here](https://rust-lang.github.io/rustup/cross- 5. Run the helper build script. ```bash -sh uniffi_aries_vcx/scripts/android.build.cargo.ndk.sh +sh aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh ``` NB: Before running the demo application you need to generate the language bindings. From ae2607c78191fd9afc24a241fb068cf446a58634 Mon Sep 17 00:00:00 2001 From: Alberto Leon Date: Sat, 20 Jul 2024 13:17:14 -0400 Subject: [PATCH 2/3] adjusted android script and added askar implementation on kotlin mobile demo Signed-off-by: Alberto Leon --- aries/agents/mobile_demo/app/build.gradle | 2 +- .../uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aries/agents/mobile_demo/app/build.gradle b/aries/agents/mobile_demo/app/build.gradle index f8810767b2..33dbef9bd7 100644 --- a/aries/agents/mobile_demo/app/build.gradle +++ b/aries/agents/mobile_demo/app/build.gradle @@ -37,7 +37,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.3.2' + kotlinCompilerExtensionVersion '1.5.14' } packagingOptions { resources { diff --git a/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh b/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh index b1ededbc58..9bb9f81727 100644 --- a/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh +++ b/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh @@ -66,7 +66,7 @@ setup_linked_dependencies() { build_uniffi_for_demo() { export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries/wrappers/uniffi-aries-vcx" - export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/rust/mobile_demo" + export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/mobile_demo" export ABI_PATH=${ANDROID_DEMO_DIR}/app/src/main/jniLibs/${ABI} mkdir -p ${ABI_PATH} From c5438cc23be124a1909a6e2753b8caf6652adeab Mon Sep 17 00:00:00 2001 From: Alberto Leon Date: Mon, 22 Jul 2024 18:24:43 -0400 Subject: [PATCH 3/3] added AskarWalletConfig on mobile demo Signed-off-by: Alberto Leon --- .../hyperledger/ariesvcx/AppDemoController.kt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt index 7dbe66122e..525dfe886a 100644 --- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt +++ b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt @@ -48,16 +48,11 @@ class AppDemoController : ViewModel() { return profile!! } - private val walletConfig = WalletConfig( - walletName = "test_create_wallet_add_uuid_here", - walletKey = "8dvfYSt5d1taSd6yJdpjq4emkwsPDDLYxkNFysFD2cZY", - walletKeyDerivation = "RAW", - walletType = null, - storageConfig = null, - storageCredentials = null, - rekey = null, - rekeyDerivationMethod = null - ) + private val walletConfig = AskarWalletConfig( + dbUrl = "sqlite://:memory:", + keyMethod = KeyMethod.DeriveKey(AskarKdfMethod.Argon2i(ArgonLevel.INTERACTIVE)), + passKey = "test", + profile = "profile") suspend fun setupProfile(genesisFilePath: String) { withContext(Dispatchers.IO) { @@ -102,8 +97,10 @@ class AppDemoController : ViewModel() { delay(500) val relayResponse = httpClient.newCall(pollRelayRequest).await() if (relayResponse.code == 200) { + Log.d("RELAY RESPONSE", "RELAY RESPONDED WITH 200") val message = relayResponse.body!!.string() Log.d("MESSAGE", "awaitConnectionCompletion: $message") + Log.d("PROFILE", "profile: ${profile.toString()}") val unpackedMessage = unpackMessage( profile!!, message