diff --git a/.github/ci/vdrproxy.dockerfile b/.github/ci/vdrproxy.dockerfile
index 3ffd1ed3f6..af3b8b0ec0 100644
--- a/.github/ci/vdrproxy.dockerfile
+++ b/.github/ci/vdrproxy.dockerfile
@@ -18,7 +18,7 @@ RUN apk update && apk upgrade && \
 USER indy
 WORKDIR /home/indy
 
-ARG RUST_VER="1.84.1"
+ARG RUST_VER="1.88.0"
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER --default-host x86_64-unknown-linux-musl
 
 ENV PATH="/home/indy/.cargo/bin:$PATH"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e2be0551eb..5419971729 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ env:
   DOCKER_REPO_LOCAL_VDRPROXY: vdrproxy
   DOCKER_REPO_LOCAL_AATH: aath-backchannel
 
-  RUST_TOOLCHAIN_VERSION: 1.84.1
+  RUST_TOOLCHAIN_VERSION: 1.88.0
   NODE_VERSION: 18.x
 
 jobs:
diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml
index 6d3dc4f242..d402672431 100644
--- a/.github/workflows/mediator.pr.yml
+++ b/.github/workflows/mediator.pr.yml
@@ -15,7 +15,7 @@ env:
   DOCKER_BUILDKIT: 1
   MAIN_BRANCH: main
 
-  RUST_TOOLCHAIN_VERSION: 1.84.1
+  RUST_TOOLCHAIN_VERSION: 1.88.0
 
 jobs:
   setup-variables:
diff --git a/Cargo.lock b/Cargo.lock
index 954f05fc5e..abf8c67bab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,7 +8,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "bytes",
  "futures-core",
  "futures-sink",
@@ -21,16 +21,16 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.10.0"
+version = "3.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9"
+checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
  "base64 0.22.1",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "brotli",
  "bytes",
  "bytestring",
@@ -39,7 +39,7 @@ dependencies = [
  "flate2",
  "foldhash",
  "futures-core",
- "h2 0.3.26",
+ "h2 0.3.27",
  "http 0.2.12",
  "httparse",
  "httpdate",
@@ -49,7 +49,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rand 0.9.0",
+ "rand 0.9.2",
  "sha1",
  "smallvec",
  "tokio",
@@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "actix-rt"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208"
+checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63"
 dependencies = [
  "futures-core",
  "tokio",
@@ -95,17 +95,17 @@ dependencies = [
 
 [[package]]
 name = "actix-server"
-version = "2.5.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6398974fd4284f4768af07965701efbbb5fdc0616bff20cade1bb14b77675e24"
+checksum = "a65064ea4a457eaf07f2fba30b4c695bf43b721790e9530d26cb6f9019ff7502"
 dependencies = [
  "actix-rt",
  "actix-service",
  "actix-utils",
  "futures-core",
  "futures-util",
- "mio 1.0.3",
- "socket2",
+ "mio 1.1.0",
+ "socket2 0.5.10",
  "tokio",
  "tracing",
 ]
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.10.2"
+version = "4.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d"
+checksum = "1654a77ba142e37f049637a3e5685f864514af11fcbc51cb51eb6596afe5b8d6"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -167,7 +167,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2",
+ "socket2 0.6.1",
  "time",
  "tracing",
  "url",
@@ -182,23 +182,23 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aead"
@@ -237,22 +237,22 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.3.4",
  "once_cell",
  "version_check",
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -284,29 +284,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee5cca1ddc8b9dceb55b7f1272a9d1e643d73006f350a20ab4926d24e33f0f0d"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_log-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
-
-[[package]]
-name = "android_logger"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
-dependencies = [
- "android_log-sys",
- "env_filter",
- "log",
-]
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -386,7 +363,7 @@ dependencies = [
  "bitvec",
  "log",
  "once_cell",
- "rand 0.9.0",
+ "rand 0.9.2",
  "regex",
  "serde",
  "serde_json",
@@ -396,9 +373,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -411,44 +388,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
- "once_cell",
- "windows-sys 0.59.0",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arc-swap"
@@ -470,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "aries-askar"
-version = "0.4.0"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f5c3a110d33351aea93dade55f57447035afe44426bf0ff3366e66641011479"
+checksum = "17f26462dffcad927db37fc36ef2c49741b222f81aa9f624935c1989d69f72b7"
 dependencies = [
  "askar-crypto",
  "askar-storage",
@@ -507,7 +484,7 @@ dependencies = [
  "serde",
  "serde_json",
  "shared",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "url",
  "uuid",
 ]
@@ -519,13 +496,13 @@ dependencies = [
  "actix-web",
  "anoncreds_types",
  "aries-vcx-agent",
- "clap 4.5.35",
+ "clap",
  "derive_more",
  "display_as_json",
  "env_logger 0.11.8",
  "log",
- "rand 0.9.0",
- "reqwest 0.12.15",
+ "rand 0.9.2",
+ "reqwest 0.12.24",
  "serde",
  "serde_json",
  "uuid",
@@ -568,7 +545,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "test_utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "time",
  "tokio",
  "url",
@@ -587,7 +564,7 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "time",
  "uuid",
 ]
@@ -613,7 +590,7 @@ dependencies = [
  "public_key",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "time",
  "tokio",
  "url",
@@ -631,65 +608,20 @@ dependencies = [
  "bs58",
  "log",
  "public_key",
- "rand 0.9.0",
+ "rand 0.9.2",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "typed-builder",
  "uuid",
 ]
 
-[[package]]
-name = "askama"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139"
-dependencies = [
- "askama_derive",
- "askama_escape",
- "askama_shared",
-]
-
-[[package]]
-name = "askama_derive"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71"
-dependencies = [
- "askama_shared",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "askama_escape"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
-
-[[package]]
-name = "askama_shared"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0"
-dependencies = [
- "askama_escape",
- "mime",
- "mime_guess",
- "nom",
- "proc-macro2",
- "quote",
- "serde",
- "syn 1.0.109",
- "toml 0.5.11",
-]
-
 [[package]]
 name = "askar-crypto"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d255aff23de1a29a20693af155dc83079b174bd48b04d6304519ed0ffeb119"
+checksum = "e7d90615b21b55b7650ff4d277d607ac376213bc2d82ce6db593d22b1e6bf02c"
 dependencies = [
  "aead",
  "aes",
@@ -726,9 +658,9 @@ dependencies = [
 
 [[package]]
 name = "askar-storage"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f1b140bb825ffca253f218db81b548b246e2e325b2eba7a84941ba08640eb6"
+checksum = "a0df217d82a77c6f2ae7f5ff3bb194502409b63f8d028a9222d2963710379bb5"
 dependencies = [
  "arc-swap",
  "askar-crypto",
@@ -758,9 +690,9 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.4.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
 dependencies = [
  "event-listener",
  "event-listener-strategy",
@@ -786,18 +718,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.88"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -828,24 +760,24 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288"
+checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425"
 dependencies = [
  "axum-core",
  "bytes",
  "form_urlencoded",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.8.1",
  "hyper-util",
  "itoa",
  "matchit",
@@ -853,8 +785,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rustversion",
- "serde",
+ "serde_core",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
@@ -868,18 +799,17 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
+checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
  "mime",
  "pin-project-lite",
- "rustversion",
  "sync_wrapper 1.0.2",
  "tower-layer",
  "tower-service",
@@ -888,9 +818,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -898,7 +828,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -913,6 +843,16 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
+[[package]]
+name = "base256emoji"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e9430d9a245a77c92176e649af6e275f20839a48389859d1661e9a128d077c"
+dependencies = [
+ "const-str",
+ "match-lookup",
+]
+
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -927,18 +867,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 
 [[package]]
 name = "bitflags"
@@ -948,11 +879,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1016,9 +947,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "7.0.0"
+version = "8.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -1027,9 +958,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "4.0.2"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -1046,9 +977,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "byteorder"
@@ -1058,51 +989,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
 [[package]]
 name = "bytestring"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f"
+checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289"
 dependencies = [
  "bytes",
 ]
 
-[[package]]
-name = "camino"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -1114,10 +1013,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.17"
+version = "1.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
+checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -1125,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chacha20"
@@ -1162,11 +1062,10 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
@@ -1215,82 +1114,43 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_derive 3.2.25",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "once_cell",
- "strsim 0.10.0",
- "termcolor",
- "textwrap",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.35"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
 dependencies = [
  "clap_builder",
- "clap_derive 4.5.32",
+ "clap_derive",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.4",
- "strsim 0.11.1",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "clap_lex",
+ "strsim",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "client-tui"
@@ -1302,7 +1162,7 @@ dependencies = [
  "log",
  "mediator",
  "messages",
- "reqwest 0.12.15",
+ "reqwest 0.12.24",
  "serde_json",
  "tokio",
 ]
@@ -1318,9 +1178,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "concurrent-queue"
@@ -1337,6 +1197,21 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
+[[package]]
+name = "const-str"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3"
+
+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cookie"
 version = "0.16.2"
@@ -1384,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.2.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
 dependencies = [
  "crc-catalog",
 ]
@@ -1399,18 +1274,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1449,7 +1324,7 @@ dependencies = [
  "crossterm_winapi",
  "libc",
  "mio 0.8.11",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.5",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -1466,9 +1341,9 @@ dependencies = [
 
 [[package]]
 name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-bigint"
@@ -1484,9 +1359,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -1597,7 +1472,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1606,8 +1481,18 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -1620,8 +1505,21 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.11.1",
- "syn 2.0.100",
+ "strsim",
+ "syn 2.0.111",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1630,22 +1528,33 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.111",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f9724adfcf41f45bf652b3995837669d73c4d49a1b5ac1ff82905ac7d9b5558"
+checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -1653,19 +1562,19 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e4fdb82bd54a12e42fb58a800dcae6b9e13982238ce2296dc3570b92148e1f"
+checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
 dependencies = [
  "data-encoding",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "der"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1674,9 +1583,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.1"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
 ]
@@ -1696,10 +1605,10 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1709,27 +1618,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "derive_more"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b"
 dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "rustc_version",
+ "syn 2.0.111",
  "unicode-xid",
 ]
 
@@ -1748,7 +1659,7 @@ dependencies = [
  "prost",
  "prost-types",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
  "url",
@@ -1769,7 +1680,7 @@ dependencies = [
  "public_key",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "typed-builder",
  "uniresid",
  "url",
@@ -1787,7 +1698,7 @@ dependencies = [
  "public_key",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
 ]
 
@@ -1799,7 +1710,7 @@ dependencies = [
  "public_key",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -1833,7 +1744,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "typed-builder",
  "url",
@@ -1880,7 +1791,7 @@ dependencies = [
  "serde",
  "serde_json",
  "test_utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "url",
 ]
@@ -1892,11 +1803,11 @@ dependencies = [
  "async-trait",
  "did_resolver",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.8.1",
  "hyper-tls",
  "hyper-util",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-test",
 ]
@@ -1909,7 +1820,7 @@ dependencies = [
  "serde",
  "serde_json",
  "shared",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "url",
 ]
 
@@ -1938,7 +1849,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1949,7 +1860,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1988,9 +1899,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
@@ -2059,35 +1970,35 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "enumset"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
+checksum = "25b07a8dfbbbfc0064c0a6bdf9edcf966de6b1c33ce344bdeca3b41615452634"
 dependencies = [
  "enumset_derive",
 ]
 
 [[package]]
 name = "enumset_derive"
-version = "0.10.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
+checksum = "f43e744e4ea338060faee68ed933e46e722fb7f3617e722a5772d7e856d8b3ce"
 dependencies = [
- "darling",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
 dependencies = [
  "log",
  "regex",
@@ -2140,12 +2051,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2185,9 +2096,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "5.4.0"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -2236,6 +2147,12 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+
 [[package]]
 name = "fixedbitset"
 version = "0.5.7"
@@ -2244,9 +2161,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2292,9 +2209,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -2305,15 +2222,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
 
-[[package]]
-name = "fs-err"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -2380,7 +2288,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
  "lock_api",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.5",
 ]
 
 [[package]]
@@ -2391,9 +2299,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2410,7 +2318,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -2465,25 +2373,25 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
 ]
 
 [[package]]
@@ -2498,15 +2406,15 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "glass_pumpkin"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c7192ec6aa88ce6bcc2375ddcbf0df89a4f63e4b5b36ffe4ecf8277323cb69"
+checksum = "41923edfeadce2964192d185f7f9f9e5d8737e6f5b8ee2580b0f02f717e81bd0"
 dependencies = [
  "core2",
  "num-bigint",
@@ -2516,23 +2424,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "glob"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
-[[package]]
-name = "goblin"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
-dependencies = [
- "log",
- "plain",
- "scroll",
-]
-
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -2546,9 +2437,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
 dependencies = [
  "bytes",
  "fnv",
@@ -2556,7 +2447,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.8.0",
+ "indexmap 2.12.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -2565,17 +2456,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.8"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
- "indexmap 2.8.0",
+ "http 1.4.0",
+ "indexmap 2.12.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -2584,12 +2475,13 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
  "cfg-if",
  "crunchy",
+ "zerocopy",
 ]
 
 [[package]]
@@ -2600,30 +2492,30 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+
 [[package]]
 name = "hashlink"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.5",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -2641,9 +2533,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -2671,11 +2563,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2691,12 +2583,11 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
@@ -2718,7 +2609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.3.1",
+ "http 1.4.0",
 ]
 
 [[package]]
@@ -2729,7 +2620,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
@@ -2748,9 +2639,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
+checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
 
 [[package]]
 name = "hyper"
@@ -2762,14 +2653,14 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.26",
+ "h2 0.3.27",
  "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -2778,20 +2669,22 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
- "h2 0.4.8",
- "http 1.3.1",
+ "futures-core",
+ "h2 0.4.12",
+ "http 1.4.0",
  "http-body 1.0.1",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -2799,13 +2692,12 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "futures-util",
- "http 1.3.1",
- "hyper 1.6.0",
+ "http 1.4.0",
+ "hyper 1.8.1",
  "hyper-util",
  "rustls",
  "rustls-pki-types",
@@ -2820,7 +2712,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
- "hyper 1.6.0",
+ "hyper 1.8.1",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -2835,7 +2727,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.8.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2845,29 +2737,35 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
- "hyper 1.6.0",
+ "hyper 1.8.1",
+ "ipnet",
  "libc",
+ "percent-encoding",
  "pin-project-lite",
- "socket2",
+ "socket2 0.6.1",
+ "system-configuration 0.6.1",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2889,21 +2787,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -2912,99 +2811,61 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 dependencies = [
- "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
+ "icu_locale_core",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -3013,9 +2874,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -3024,9 +2885,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -3050,12 +2911,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
@@ -3101,7 +2962,7 @@ dependencies = [
  "indy-vdr",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3174,22 +3035,32 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
+[[package]]
+name = "iri-string"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "is-terminal"
-version = "0.4.16"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
- "hermit-abi 0.5.0",
+ "hermit-abi 0.5.2",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "isolang"
@@ -3217,43 +3088,43 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.5"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
+checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
 dependencies = [
  "jiff-static",
  "log",
  "portable-atomic",
  "portable-atomic-util",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "jiff-static"
-version = "0.2.5"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
+checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -3297,15 +3168,26 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
 [[package]]
 name = "libm"
-version = "0.2.11"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[package]]
+name = "libredox"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+dependencies = [
+ "bitflags 2.10.0",
+ "libc",
+ "redox_syscall 0.5.18",
+]
 
 [[package]]
 name = "libsqlite3-sys"
@@ -3320,15 +3202,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.3"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "local-channel"
@@ -3349,19 +3231,18 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lru"
@@ -3369,7 +3250,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.5",
 ]
 
 [[package]]
@@ -3378,6 +3259,17 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
+[[package]]
+name = "match-lookup"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1265724d8cb29dbbc2b0f06fffb8bf1a8c0cf73a78eede9ba73a4a66c52a981e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "matchit"
 version = "0.8.4"
@@ -3411,12 +3303,12 @@ dependencies = [
  "futures",
  "log",
  "messages",
- "reqwest 0.12.15",
+ "reqwest 0.12.24",
  "serde",
  "serde_json",
  "sqlx",
  "test_utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tower-http",
  "url",
@@ -3425,9 +3317,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "messages"
@@ -3442,11 +3334,12 @@ dependencies = [
  "lazy_static",
  "messages_macros",
  "serde",
+ "serde-value",
  "serde_json",
  "shared",
  "strum",
  "strum_macros",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "transitive",
  "typed-builder",
  "url",
@@ -3456,11 +3349,11 @@ dependencies = [
 name = "messages_macros"
 version = "0.1.0"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "proc-macro2",
  "quote",
  "shared",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -3471,7 +3364,7 @@ checksum = "73b122901b3a675fac8cecf68dcb2f0d3036193bc861d1ac0e1c337f7d5254c2"
 dependencies = [
  "error-chain",
  "pkg-config",
- "toml 0.2.1",
+ "toml",
 ]
 
 [[package]]
@@ -3498,11 +3391,12 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -3513,20 +3407,20 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3552,25 +3446,26 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "multibase"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404"
+checksum = "8694bb4835f452b0e3bb06dbebb1d6fc5385b6ca1caf2e55fd165c042390ec77"
 dependencies = [
  "base-x",
+ "base256emoji",
  "data-encoding",
  "data-encoding-macro",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
 [[package]]
 name = "native-tls"
@@ -3636,11 +3531,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
 dependencies = [
- "byteorder",
  "lazy_static",
  "libm",
  "num-integer",
@@ -3717,9 +3611,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
@@ -3730,6 +3624,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
 [[package]]
 name = "opaque-debug"
 version = "0.3.1"
@@ -3738,11 +3638,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.71"
+version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
+checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -3759,7 +3659,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -3770,9 +3670,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.106"
+version = "0.9.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
+checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
 dependencies = [
  "cc",
  "libc",
@@ -3781,10 +3681,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "os_str_bytes"
-version = "6.6.1"
+name = "ordered-float"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits",
+]
 
 [[package]]
 name = "owning_ref"
@@ -3838,12 +3741,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.10",
+ "parking_lot_core 0.9.12",
 ]
 
 [[package]]
@@ -3862,15 +3765,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.10",
+ "redox_syscall 0.5.18",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -3892,12 +3795,12 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pem"
-version = "3.0.5"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
 dependencies = [
  "base64 0.22.1",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -3911,9 +3814,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "petgraph"
@@ -3922,7 +3825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
  "fixedbitset",
- "indexmap 2.8.0",
+ "indexmap 2.12.1",
 ]
 
 [[package]]
@@ -3940,7 +3843,7 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
- "siphasher 1.0.1",
+ "siphasher",
 ]
 
 [[package]]
@@ -3960,7 +3863,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -4002,12 +3905,6 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -4033,9 +3930,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "portable-atomic-util"
@@ -4046,6 +3943,15 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "potential_utf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -4058,7 +3964,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.8.24",
+ "zerocopy",
 ]
 
 [[package]]
@@ -4099,12 +4005,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.31"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -4116,35 +4022,11 @@ dependencies = [
  "elliptic-curve",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -4165,7 +4047,7 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "itertools",
  "log",
  "multimap",
@@ -4175,7 +4057,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.100",
+ "syn 2.0.111",
  "tempfile",
 ]
 
@@ -4189,7 +4071,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -4211,24 +4093,24 @@ dependencies = [
  "multibase",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "unsigned-varint",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "radium"
@@ -4249,13 +4131,12 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "zerocopy 0.8.24",
 ]
 
 [[package]]
@@ -4284,7 +4165,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -4293,7 +4174,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
@@ -4307,18 +4188,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4328,9 +4209,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4339,15 +4220,15 @@ dependencies = [
 
 [[package]]
 name = "regex-lite"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "reqwest"
@@ -4360,7 +4241,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.26",
+ "h2 0.3.27",
  "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.32",
@@ -4387,9 +4268,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.15"
+version = "0.12.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4397,38 +4278,35 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.8",
- "http 1.3.1",
+ "h2 0.4.12",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.8.1",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
  "mime_guess",
  "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
- "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
  "tower 0.5.2",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-registry",
 ]
 
 [[package]]
@@ -4449,7 +4327,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -4479,9 +4357,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
+checksum = "40a0376c50d0358279d9d643e4bf7b7be212f1f4ff1da9070a7b54d22ef75c88"
 dependencies = [
  "const-oid",
  "digest",
@@ -4499,9 +4377,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
 
 [[package]]
 name = "rustc_version"
@@ -4514,22 +4392,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.25"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "once_cell",
  "ring",
@@ -4540,25 +4418,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
+name = "rustls-pki-types"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c"
 dependencies = [
- "rustls-pki-types",
+ "zeroize",
 ]
 
-[[package]]
-name = "rustls-pki-types"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
-
 [[package]]
 name = "rustls-webpki"
-version = "0.103.1"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4567,9 +4439,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -4588,11 +4460,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4601,26 +4473,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "scroll"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
-]
-
 [[package]]
 name = "sec1"
 version = "0.7.3"
@@ -4640,7 +4492,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -4649,9 +4501,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4659,19 +4511,17 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
-dependencies = [
- "serde",
-]
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -4685,37 +4535,58 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+dependencies = [
+ "ordered-float",
+ "serde",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.17"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
 dependencies = [
  "itoa",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4752,9 +4623,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4779,10 +4650,10 @@ dependencies = [
  "lazy_static",
  "log",
  "regex",
- "reqwest 0.12.15",
+ "reqwest 0.12.24",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -4793,9 +4664,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -4803,9 +4674,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
+checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
 dependencies = [
  "libc",
  "mio 0.8.11",
@@ -4814,9 +4685,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
 dependencies = [
  "libc",
 ]
@@ -4831,6 +4702,12 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "simple_message_relay"
 version = "0.1.0"
@@ -4838,12 +4715,6 @@ dependencies = [
  "actix-web",
 ]
 
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -4852,12 +4723,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "sled"
@@ -4877,23 +4745,33 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -4915,9 +4793,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4410e73b3c0d8442c5f99b425d7a435b5ee0ae4167b3196771dd3f7a01be745f"
+checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4928,10 +4806,11 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a007b6936676aa9ab40207cde35daab0a04b823be8ae004368c0793b96a61e0"
+checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "chrono",
  "crc",
@@ -4942,49 +4821,48 @@ dependencies = [
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.5",
  "hashlink",
- "indexmap 2.8.0",
+ "indexmap 2.12.1",
  "log",
  "memchr",
  "once_cell",
  "percent-encoding",
  "rustls",
- "rustls-pemfile",
  "serde",
  "serde_json",
  "sha2",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tracing",
  "url",
- "webpki-roots",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3112e2ad78643fef903618d78cf0aec1cb3134b019730edb039b69eaf531f310"
+checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
 dependencies = [
  "proc-macro2",
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9f90acc5ab146a99bf5061a7eb4976b573f560bc898ef3bf8435448dd5e7ad"
+checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
- "heck 0.5.0",
+ "heck",
  "hex",
  "once_cell",
  "proc-macro2",
@@ -4996,21 +4874,20 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.100",
- "tempfile",
+ "syn 2.0.111",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4560278f0e00ce64938540546f59f590d60beee33fffbd3b9cd47851e5fff233"
+checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -5040,20 +4917,20 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tracing",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613"
+checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "byteorder",
  "chrono",
  "crc",
@@ -5078,16 +4955,16 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tracing",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85ca71d3a5b24e64e1d08dd8fe36c6c95c339a896cc33068148906784620540"
+checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
  "chrono",
@@ -5103,21 +4980,16 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sqlx-core",
+ "thiserror 2.0.17",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "stringprep"
@@ -5130,12 +5002,6 @@ dependencies = [
  "unicode-properties",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -5144,21 +5010,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 
 [[package]]
 name = "strum_macros"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
- "rustversion",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5180,9 +5045,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5206,13 +5071,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5232,7 +5097,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "core-foundation",
  "system-configuration-sys 0.6.0",
 ]
@@ -5265,15 +5130,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
  "fastrand",
- "getrandom 0.3.2",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5317,18 +5182,12 @@ dependencies = [
  "indy-vdr-proxy-client",
  "log",
  "public_key",
- "rand 0.9.0",
+ "rand 0.9.2",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "uuid",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -5340,11 +5199,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -5355,25 +5214,25 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
  "itoa",
@@ -5388,15 +5247,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -5404,9 +5263,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -5414,9 +5273,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -5429,31 +5288,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.1"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
- "mio 1.0.3",
- "parking_lot 0.12.3",
+ "mio 1.1.0",
+ "parking_lot 0.12.5",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.6.1",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5468,9 +5326,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -5502,9 +5360,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.14"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 dependencies = [
  "bytes",
  "futures-core",
@@ -5519,15 +5377,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4"
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "tonic"
 version = "0.12.3"
@@ -5537,10 +5386,10 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "bytes",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.8.1",
  "hyper-timeout",
  "hyper-util",
  "percent-encoding",
@@ -5565,7 +5414,7 @@ dependencies = [
  "prost-build",
  "prost-types",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5606,17 +5455,19 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.2"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
+checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "bytes",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
+ "iri-string",
  "pin-project-lite",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -5636,9 +5487,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -5648,33 +5499,33 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "transitive"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39b89a3bbc020b12f4086cc84ed4ef348ffad0f7ddfa6134d026678217b6de1c"
+checksum = "baf33f1e1fefdc7c6539d9bd9313296b58618e683606e8df7bd4e3a6758cc6dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5700,14 +5551,14 @@ checksum = "3c36781cc0e46a83726d9879608e4cf6c2505237e263a8eb8c24502989cfdb28"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "unicase"
@@ -5723,24 +5574,24 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 
 [[package]]
 name = "unicode-segmentation"
@@ -5760,148 +5611,6 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
-[[package]]
-name = "uniffi"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f71cc01459bc34cfe43fabf32b39f1228709bc6db1b3a664a92940af3d062376"
-dependencies = [
- "anyhow",
- "camino",
- "clap 3.2.25",
- "uniffi_bindgen",
- "uniffi_build",
- "uniffi_core",
- "uniffi_macros",
-]
-
-[[package]]
-name = "uniffi_aries_vcx"
-version = "0.67.0"
-dependencies = [
- "android_logger",
- "aries_vcx",
- "aries_vcx_anoncreds",
- "aries_vcx_ledger",
- "async-trait",
- "did_parser_nom",
- "indy-vdr",
- "log",
- "once_cell",
- "serde_json",
- "shared",
- "thiserror 2.0.12",
- "tokio",
- "uniffi",
- "url",
-]
-
-[[package]]
-name = "uniffi_bindgen"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbbba5103051c18f10b22f80a74439ddf7100273f217a547005d2735b2498994"
-dependencies = [
- "anyhow",
- "askama",
- "bincode",
- "camino",
- "fs-err",
- "glob",
- "goblin",
- "heck 0.4.1",
- "once_cell",
- "paste",
- "serde",
- "serde_json",
- "toml 0.5.11",
- "uniffi_meta",
- "uniffi_testing",
- "weedle2",
-]
-
-[[package]]
-name = "uniffi_build"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1a28368ff3d83717e3d3e2e15a66269c43488c3f036914131bb68892f29fb"
-dependencies = [
- "anyhow",
- "camino",
- "uniffi_bindgen",
-]
-
-[[package]]
-name = "uniffi_checksum_derive"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03de61393a42b4ad4984a3763c0600594ac3e57e5aaa1d05cede933958987c03"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "uniffi_core"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2b4852d638d74ca2d70e450475efb6d91fe6d54a7cd8d6bd80ad2ee6cd7daa"
-dependencies = [
- "anyhow",
- "bytes",
- "camino",
- "cargo_metadata",
- "log",
- "once_cell",
- "paste",
- "static_assertions",
-]
-
-[[package]]
-name = "uniffi_macros"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa03394de21e759e0022f1ea8d992d2e39290d735b9ed52b1f74b20a684f794e"
-dependencies = [
- "bincode",
- "camino",
- "fs-err",
- "once_cell",
- "proc-macro2",
- "quote",
- "serde",
- "syn 1.0.109",
- "toml 0.5.11",
- "uniffi_build",
- "uniffi_meta",
-]
-
-[[package]]
-name = "uniffi_meta"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fdab2c436aed7a6391bec64204ec33948bfed9b11b303235740771f85c4ea6"
-dependencies = [
- "serde",
- "siphasher 0.3.11",
- "uniffi_checksum_derive",
-]
-
-[[package]]
-name = "uniffi_testing"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b0570953ec41d97ce23e3b92161ac18231670a1f97523258a6d2ab76d7f76c"
-dependencies = [
- "anyhow",
- "camino",
- "cargo_metadata",
- "fs-err",
- "once_cell",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "uniresid"
 version = "0.1.5"
@@ -5937,9 +5646,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -5947,12 +5656,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -5967,12 +5670,14 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
 dependencies = [
- "getrandom 0.3.2",
- "serde",
+ "getrandom 0.3.4",
+ "js-sys",
+ "serde_core",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -5998,17 +5703,17 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -6019,35 +5724,22 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.100",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6058,9 +5750,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6068,31 +5760,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
- "wasm-bindgen-backend",
+ "syn 2.0.111",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6100,29 +5792,29 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.8"
+version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "rustls-pki-types",
+ "webpki-roots 1.0.4",
 ]
 
 [[package]]
-name = "weedle2"
-version = "4.0.0"
+name = "webpki-roots"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e79c5206e1f43a2306fd64bdb95025ee4228960f2e6c5a8b173f3caaf807741"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
 dependencies = [
- "nom",
+ "rustls-pki-types",
 ]
 
 [[package]]
 name = "whoami"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
+checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
 dependencies = [
- "redox_syscall 0.5.10",
+ "libredox",
  "wasite",
 ]
 
@@ -6144,11 +5836,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6159,79 +5851,70 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.61.0"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
  "windows-link",
  "windows-result",
- "windows-strings 0.4.0",
+ "windows-strings",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-registry"
-version = "0.4.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
+ "windows-link",
  "windows-result",
- "windows-strings 0.3.1",
- "windows-targets 0.53.0",
+ "windows-strings",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
  "windows-link",
 ]
@@ -6256,11 +5939,20 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
 ]
 
 [[package]]
@@ -6296,18 +5988,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -6324,9 +6017,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -6342,9 +6035,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -6360,9 +6053,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -6372,9 +6065,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -6390,9 +6083,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -6408,9 +6101,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -6426,9 +6119,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -6444,9 +6137,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winreg"
@@ -6459,25 +6152,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.0",
-]
-
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "wyz"
@@ -6513,11 +6197,10 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -6525,54 +6208,34 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
 dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
-dependencies = [
- "zerocopy-derive 0.8.24",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.24"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
+checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -6592,15 +6255,15 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 dependencies = [
  "zeroize_derive",
 ]
@@ -6613,7 +6276,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -6625,11 +6288,22 @@ dependencies = [
  "cmake",
 ]
 
+[[package]]
+name = "zerotrie"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
 [[package]]
 name = "zerovec"
-version = "0.10.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -6638,13 +6312,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -6690,9 +6364,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.16+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 88a2965f0a..bd8a926208 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,6 @@ members = [
     "aries/agents/mediator/client-tui",
     "aries/agents/aries-vcx-agent",
     "aries/agents/aath-backchannel",
-    "aries/wrappers/uniffi-aries-vcx/core",
     "aries/aries_vcx_anoncreds",
     "aries/aries_vcx_wallet",
     "aries/aries_vcx_ledger",
@@ -93,6 +92,7 @@ hex = "0.4.3"
 pem = "3.0.4"
 serde = { version = "1.0.217", default-features = false }
 serde_json = "1.0.134"
+serde-value = "0.7"
 derive_more = "2.0.1"
 async-trait = "0.1.83"
 futures = { version = "0.3.31", default-features = false }
@@ -151,7 +151,6 @@ prost-types = "0.13.3"
 # common dev
 mockall = "0.13.1"
 env_logger = "0.11.6"
-uniffi = "0.23.0"
 pretty_assertions = "1.4.0"
 dotenvy = "0.15"
 serde_test = "1.0.176"
diff --git a/README.md b/README.md
index b6e6bc295f..199fc5e1a3 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Contributions are very welcome! If you have questions or issues, please let us k
 
 Install Rust: https://www.rust-lang.org/tools/install
 
-We recommend using rustup, as VCX is currently targeting Rust v1.84.1 (this maintains consistency between local and CI environments). 
+We recommend using rustup, as VCX is currently targeting Rust v1.88.0 (this maintains consistency between local and CI environments). 
 
 Anoncreds and Indy require the use of openssl and zmq. These may be vendored by consuming applications, but for development installation is required. 
 
diff --git a/aries/README.md b/aries/README.md
index 4ae7cef009..f53013054d 100644
--- a/aries/README.md
+++ b/aries/README.md
@@ -7,8 +7,3 @@
 - [`aries_vcx_core`](aries_vcx_core) - Interfaces for interaction with ledgers, wallets and credentials.
 - [`aries-vcx-agent`](agents/rust/aries-vcx-agent) - simple aries agent framework built on top of `aries_vcx` library. Not intended for production use. A new Aries VCX Framework is in development to provide simple, easy to use, and production ready functions for use.
 - [`mediator`](agents/rust/mediator) - Aries message mediator service
-
-## Aries mobile 📱 components
-
-- [`uniffi-aries-vcx`](wrappers/uniffi-aries-vcx) - UniFFI wrapper for `aries_vcx`.
-- [`mobile-demo`](agents/mobile_demo/) - Sample Android App using UniFFI wrapper.
diff --git a/aries/agents/README.md b/aries/agents/README.md
index 42e95a2ae1..a6da700ee6 100644
--- a/aries/agents/README.md
+++ b/aries/agents/README.md
@@ -4,4 +4,3 @@ This directory contains some of Rust agents built on top of the `aries_vcx` crat
 
 - [`aries-vcx-agent`](./aries-vcx-agent) - aries agent library used to build our cross-framework testing [backchannel](https://github.com/openwallet-foundation/owl-agent-test-harness/tree/main/aries-backchannels/aries-vcx). Not intended for production use. A new VCX Framework is in development to provide simple, easy to use, and production ready functions for use.
 - [`mediator`](./mediator) - didcomm mediator service
-- [`mobile-demo`](./mobile_demo) - android mobile app demo created using UniFFI bindings for aries-vcx library
diff --git a/aries/agents/aath-backchannel/Dockerfile.aries-vcx b/aries/agents/aath-backchannel/Dockerfile.aries-vcx
index e95583e6f4..47720b921a 100644
--- a/aries/agents/aath-backchannel/Dockerfile.aries-vcx
+++ b/aries/agents/aath-backchannel/Dockerfile.aries-vcx
@@ -14,7 +14,7 @@ RUN apk update && apk upgrade && \
 USER aries
 WORKDIR /home/aries
 
-ARG RUST_VER="1.84.1"
+ARG RUST_VER="1.88.0"
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER --default-host x86_64-unknown-linux-musl
 ENV PATH="/home/aries/.cargo/bin:$PATH" RUSTFLAGS="-C target-feature=-crt-static"
 
diff --git a/aries/agents/aath-backchannel/src/controllers/connection.rs b/aries/agents/aath-backchannel/src/controllers/connection.rs
index b85947656e..e8bcdd4eb2 100644
--- a/aries/agents/aath-backchannel/src/controllers/connection.rs
+++ b/aries/agents/aath-backchannel/src/controllers/connection.rs
@@ -154,7 +154,7 @@ pub async fn get_connection_state(
         .unwrap()
         .get_connection_state(&path.into_inner())
         .await;
-    info!("Connection state: {:?}", connection_state);
+    info!("Connection state: {connection_state:?}");
     connection_state
 }
 
diff --git a/aries/agents/aath-backchannel/src/controllers/credential_definition.rs b/aries/agents/aath-backchannel/src/controllers/credential_definition.rs
index 54e2605e03..6806ae7f5c 100644
--- a/aries/agents/aath-backchannel/src/controllers/credential_definition.rs
+++ b/aries/agents/aath-backchannel/src/controllers/credential_definition.rs
@@ -21,7 +21,7 @@ pub struct CredentialDefinition {
 }
 
 async fn upload_tails_file(tails_url: &str, tails_file: &str) -> HarnessResult<()> {
-    info!("Going to upload tails file {} to {}", tails_file, tails_url);
+    info!("Going to upload tails file {tails_file} to {tails_url}");
     let client = reqwest::Client::new();
     let genesis_file = std::env::var("GENESIS_FILE").unwrap_or(
         std::env::current_dir()
@@ -79,7 +79,7 @@ impl HarnessAgent {
                     .rev_regs()
                     .create_rev_reg(&CredentialDefinitionId::new(cred_def_id.clone())?, 50)
                     .await?;
-                let tails_url = format!("{}/{}", tails_base_url, rev_reg_id);
+                let tails_url = format!("{tails_base_url}/{rev_reg_id}");
                 self.aries_agent
                     .rev_regs()
                     .publish_rev_reg(&rev_reg_id, &tails_url)
diff --git a/aries/agents/aath-backchannel/src/controllers/did_exchange.rs b/aries/agents/aath-backchannel/src/controllers/did_exchange.rs
index 41337c19c8..11d73adfc1 100644
--- a/aries/agents/aath-backchannel/src/controllers/did_exchange.rs
+++ b/aries/agents/aath-backchannel/src/controllers/did_exchange.rs
@@ -65,10 +65,7 @@ impl HarnessAgent {
         request: AnyRequest,
         recipient_verkey: String,
     ) -> HarnessResult<()> {
-        info!(
-            "queue_didexchange_request >> request: {:?} for recipient {}",
-            request, recipient_verkey
-        );
+        info!("queue_didexchange_request >> request: {request:?} for recipient {recipient_verkey}");
 
         let thid = request
             .inner()
@@ -166,10 +163,7 @@ impl HarnessAgent {
     //       connection using pthread_id instead (if one exists; eg. connection was bootstrapped
     // from invitation)       That's why we need pthid -> thid translation on AATH layer.
     fn store_mapping_pthid_thid(&self, pthid: String, thid: String) {
-        info!(
-            "store_mapping_pthid_thid >> pthid: {}, thid: {}",
-            pthid, thid
-        );
+        info!("store_mapping_pthid_thid >> pthid: {pthid}, thid: {thid}");
         self.didx_pthid_to_thid
             .lock()
             .unwrap()
@@ -257,8 +251,7 @@ impl HarnessAgent {
         let thid = match self.didx_pthid_to_thid.lock().unwrap().get(connection_id) {
             Some(thid) => {
                 debug!(
-                    "didx_get_state >> connection_id {} (pthid) was mapped to {} (thid)",
-                    connection_id, thid
+                    "didx_get_state >> connection_id {connection_id} (pthid) was mapped to {thid} (thid)"
                 );
                 thid.clone() // connection_id was in fact pthread_id, mapping pthid -> thid exists
             }
diff --git a/aries/agents/aath-backchannel/src/controllers/didcomm.rs b/aries/agents/aath-backchannel/src/controllers/didcomm.rs
index 5596076678..51aceee691 100644
--- a/aries/agents/aath-backchannel/src/controllers/didcomm.rs
+++ b/aries/agents/aath-backchannel/src/controllers/didcomm.rs
@@ -67,7 +67,7 @@ impl HarnessAgent {
                     .await?;
             }
             m => {
-                warn!("Received unexpected connection protocol message: {:?}", m);
+                warn!("Received unexpected connection protocol message: {m:?}");
             }
         };
         Ok(())
@@ -121,7 +121,7 @@ impl HarnessAgent {
                     .await?;
             }
             m => {
-                warn!("Received unexpected issuance protocol message: {:?}", m);
+                warn!("Received unexpected issuance protocol message: {m:?}");
             }
         };
         Ok(())
@@ -160,7 +160,7 @@ impl HarnessAgent {
             }
             m => {
                 // todo: use {} display formatter
-                warn!("Received unexpected presentation protocol message: {:?}", m);
+                warn!("Received unexpected presentation protocol message: {m:?}");
             }
         };
         Ok(())
@@ -185,7 +185,7 @@ impl HarnessAgent {
                     .handle_msg_response(response.into())
                     .await;
                 if let Err(err) = res {
-                    error!("Error sending complete: {:?}", err);
+                    error!("Error sending complete: {err:?}");
                 };
             }
             DidExchange::V1_1(DidExchangeV1_1::Response(response)) => {
@@ -195,7 +195,7 @@ impl HarnessAgent {
                     .handle_msg_response(response.into())
                     .await;
                 if let Err(err) = res {
-                    error!("Error sending complete: {:?}", err);
+                    error!("Error sending complete: {err:?}");
                 };
             }
             DidExchange::V1_0(DidExchangeV1_0::Complete(complete))
@@ -228,7 +228,7 @@ impl HarnessAgent {
             )
         })?;
 
-        info!("Received message: {}", message);
+        info!("Received message: {message}");
         match message {
             AriesMessage::Notification(msg) => {
                 match msg {
@@ -239,7 +239,7 @@ impl HarnessAgent {
                             .await?;
                     }
                     Notification::ProblemReport(err) => {
-                        error!("Received problem report: {:?}", err);
+                        error!("Received problem report: {err:?}");
                         // todo: we should reflect this in the status of connection so aath won't
                         // keep polling
                     }
@@ -275,7 +275,7 @@ impl HarnessAgent {
                 self.handle_presentation_msg(msg, &connection_id).await?
             }
             m => {
-                warn!("Received message of unexpected type: {}", m);
+                warn!("Received message of unexpected type: {m}");
             }
         };
         Ok(HttpResponse::Ok().finish())
diff --git a/aries/agents/aath-backchannel/src/controllers/general.rs b/aries/agents/aath-backchannel/src/controllers/general.rs
index 0007af8a6c..d24d93ad2d 100644
--- a/aries/agents/aath-backchannel/src/controllers/general.rs
+++ b/aries/agents/aath-backchannel/src/controllers/general.rs
@@ -41,7 +41,7 @@ pub async fn get_start(
     agent: web::Data<RwLock<HarnessAgent>>,
     payload: web::Json<Value>,
 ) -> impl Responder {
-    info!("Payload: {:?}", payload);
+    info!("Payload: {payload:?}");
     HttpResponse::Ok().body(agent.read().unwrap().get_start().unwrap())
 }
 
diff --git a/aries/agents/aath-backchannel/src/controllers/issuance.rs b/aries/agents/aath-backchannel/src/controllers/issuance.rs
index 34a27d5a03..68ee894daa 100644
--- a/aries/agents/aath-backchannel/src/controllers/issuance.rs
+++ b/aries/agents/aath-backchannel/src/controllers/issuance.rs
@@ -89,11 +89,10 @@ async fn download_tails_file(
     tails_hash: &str,
 ) -> HarnessResult<()> {
     info!(
-        "issuance::download_tails_file >> tails_base_url: {:?}, rev_reg_id: {:?}, tails_hash: {:?}",
-        tails_base_url, rev_reg_id, tails_hash
+        "issuance::download_tails_file >> tails_base_url: {tails_base_url:?}, rev_reg_id: {rev_reg_id:?}, tails_hash: {tails_hash:?}"
     );
     let url = match tails_base_url.to_string().matches('/').count() {
-        0 => format!("{}/{}", tails_base_url, rev_reg_id),
+        0 => format!("{tails_base_url}/{rev_reg_id}"),
         1.. => tails_base_url.to_string(),
     };
     let client = reqwest::Client::new();
@@ -146,14 +145,14 @@ impl HarnessAgent {
             .send_credential_proposal(&cred_proposal.connection_id, proposal_data)
             .await?;
         let state = to_backchannel_state_holder(self.aries_agent.holder().get_state(&id)?);
-        info!("issuance::send_credential_proposal << id: {:?}", id);
+        info!("issuance::send_credential_proposal << id: {id:?}");
 
         // todo: we are not saving (or creating) the holder
         Ok(json!({ "state": state, "thread_id": id }).to_string())
     }
 
     pub async fn send_credential_request(&self, thread_id: &str) -> HarnessResult<String> {
-        info!("issuance::send_credential_request >> id: {:?}", thread_id);
+        info!("issuance::send_credential_request >> id: {thread_id:?}");
         self.aries_agent
             .holder()
             .send_credential_request(thread_id)
@@ -168,8 +167,7 @@ impl HarnessAgent {
         thread_id: &str,
     ) -> HarnessResult<String> {
         info!(
-            "issuance::send_credential_offer >> cred_offer: {}, thread_id: {}",
-            cred_offer, thread_id
+            "issuance::send_credential_offer >> cred_offer: {cred_offer}, thread_id: {thread_id}"
         );
         let get_tails_rev_id =
             |cred_def_id: &str| -> HarnessResult<(Option<String>, Option<String>)> {
@@ -200,8 +198,7 @@ impl HarnessAgent {
                 serde_json::to_string(&cred_offer.credential_preview.0.attributes)?;
             info!(
                 "issuance::send_credential_offer >> no thread_id provided, this offer initiates \
-                 new didcomm conversation, using credential_preview: {:?}",
-                credential_preview
+                 new didcomm conversation, using credential_preview: {credential_preview:?}"
             );
             let (tails_file, rev_reg_id) = get_tails_rev_id(&cred_offer.cred_def_id)?;
             (
@@ -217,8 +214,7 @@ impl HarnessAgent {
             let proposal = self.aries_agent.issuer().get_proposal(thread_id)?;
             info!(
                 "issuance::send_credential_offer >> thread_id is available, this offer will be \
-                 built based on previous proposal: {:?}",
-                proposal
+                 built based on previous proposal: {proposal:?}"
             );
             let (tails_file, rev_reg_id) = get_tails_rev_id(&proposal.content.cred_def_id)?;
             (
@@ -234,10 +230,7 @@ impl HarnessAgent {
                 Some(thread_id),
             )
         };
-        info!(
-            "issuance::send_credential_offer >> offer_info: {:?}",
-            offer_info
-        );
+        info!("issuance::send_credential_offer >> offer_info: {offer_info:?}");
         let id = self
             .aries_agent
             .issuer()
@@ -252,14 +245,14 @@ impl HarnessAgent {
         id: &str,
         _credential: &Credential,
     ) -> HarnessResult<String> {
-        info!("issuance::issue_credential >> id: {:?}", id);
+        info!("issuance::issue_credential >> id: {id:?}");
         self.aries_agent.issuer().send_credential(id).await?;
         let state = to_backchannel_state_issuer(self.aries_agent.issuer().get_state(id)?);
         Ok(json!({ "state": state }).to_string())
     }
 
     pub async fn store_credential(&self, id: &str) -> HarnessResult<String> {
-        info!("issuance::store_credential >> id: {:?}", id);
+        info!("issuance::store_credential >> id: {id:?}");
         let state = self.aries_agent.holder().get_state(id)?;
         if self.aries_agent.holder().is_revokable(id).await? {
             let rev_reg_id = self.aries_agent.holder().get_rev_reg_id(id).await?;
@@ -271,7 +264,7 @@ impl HarnessAgent {
     }
 
     pub async fn get_issuer_state(&self, id: &str) -> HarnessResult<String> {
-        info!("issuance::get_issuer_state >> id: {:?}", id);
+        info!("issuance::get_issuer_state >> id: {id:?}");
         let state = if self.aries_agent.issuer().exists_by_id(id) {
             to_backchannel_state_issuer(self.aries_agent.issuer().get_state(id)?)
         } else if self.aries_agent.holder().exists_by_id(id) {
diff --git a/aries/agents/aath-backchannel/src/controllers/out_of_band.rs b/aries/agents/aath-backchannel/src/controllers/out_of_band.rs
index ee04aa9f4b..579cbffae4 100644
--- a/aries/agents/aath-backchannel/src/controllers/out_of_band.rs
+++ b/aries/agents/aath-backchannel/src/controllers/out_of_band.rs
@@ -12,12 +12,12 @@ use crate::{
 impl HarnessAgent {
     pub async fn create_oob_invitation(&self) -> HarnessResult<String> {
         let invitation = self.aries_agent.out_of_band().create_invitation().await?;
-        info!("Created out-of-band invitation: {}", invitation);
+        info!("Created out-of-band invitation: {invitation}");
         Ok(json!({ "invitation": invitation, "state": "invitation-sent" }).to_string())
     }
 
     pub async fn receive_oob_invitation(&self, invitation: AriesMessage) -> HarnessResult<String> {
-        info!("Received out-of-band invitation: {}", invitation);
+        info!("Received out-of-band invitation: {invitation}");
         let id = self
             .aries_agent
             .out_of_band()
diff --git a/aries/agents/aath-backchannel/src/controllers/schema.rs b/aries/agents/aath-backchannel/src/controllers/schema.rs
index 94239b877c..3f1cf5bec0 100644
--- a/aries/agents/aath-backchannel/src/controllers/schema.rs
+++ b/aries/agents/aath-backchannel/src/controllers/schema.rs
@@ -23,7 +23,7 @@ impl HarnessAgent {
             schema_version,
             ..
         } = &schema;
-        format!("{}:2:{}:{}", did, schema_name, schema_version)
+        format!("{did}:2:{schema_name}:{schema_version}")
     }
 
     async fn schema_published(&self, id: &str) -> bool {
diff --git a/aries/agents/aath-backchannel/src/error.rs b/aries/agents/aath-backchannel/src/error.rs
index 97f4a932cc..75cb6be45d 100644
--- a/aries/agents/aath-backchannel/src/error.rs
+++ b/aries/agents/aath-backchannel/src/error.rs
@@ -39,7 +39,7 @@ pub struct HarnessError {
 
 impl error::ResponseError for HarnessError {
     fn error_response(&self) -> HttpResponse {
-        error!("{}", self.to_string());
+        error!("{self}");
         HttpResponseBuilder::new(self.status_code()).body(self.to_string())
     }
 
@@ -96,7 +96,7 @@ impl std::convert::From<aries_vcx::aries_vcx_anoncreds::errors::error::VcxAnoncr
 impl std::convert::From<serde_json::Error> for HarnessError {
     fn from(serde_err: serde_json::Error) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
-        let message = format!("(De)serialization failed; err: {}", serde_err);
+        let message = format!("(De)serialization failed; err: {serde_err}");
         HarnessError { message, kind }
     }
 }
@@ -104,7 +104,7 @@ impl std::convert::From<serde_json::Error> for HarnessError {
 impl std::convert::From<std::io::Error> for HarnessError {
     fn from(io_err: std::io::Error) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
-        let message = format!("I/O error: {}", io_err);
+        let message = format!("I/O error: {io_err}");
         HarnessError { message, kind }
     }
 }
@@ -112,7 +112,7 @@ impl std::convert::From<std::io::Error> for HarnessError {
 impl std::convert::From<reqwest::Error> for HarnessError {
     fn from(rw_err: reqwest::Error) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
-        let message = format!("Reqwest error: {}", rw_err);
+        let message = format!("Reqwest error: {rw_err}");
         HarnessError { message, kind }
     }
 }
@@ -120,7 +120,7 @@ impl std::convert::From<reqwest::Error> for HarnessError {
 impl std::convert::From<AgentError> for HarnessError {
     fn from(err: AgentError) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
-        let message = format!("AgentError: {}", err);
+        let message = format!("AgentError: {err}");
         HarnessError { message, kind }
     }
 }
@@ -128,7 +128,7 @@ impl std::convert::From<AgentError> for HarnessError {
 impl std::convert::From<MsgTypeError> for HarnessError {
     fn from(err: MsgTypeError) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
-        let message = format!("MsgTypeError: {}", err);
+        let message = format!("MsgTypeError: {err}");
         HarnessError { message, kind }
     }
 }
@@ -136,7 +136,7 @@ impl std::convert::From<MsgTypeError> for HarnessError {
 impl std::convert::From<ParseError> for HarnessError {
     fn from(err: ParseError) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
-        let message = format!("MsgTypeError: {}", err);
+        let message = format!("MsgTypeError: {err}");
         HarnessError { message, kind }
     }
 }
@@ -144,7 +144,7 @@ impl std::convert::From<ParseError> for HarnessError {
 impl std::convert::From<anoncreds_types::Error> for HarnessError {
     fn from(err: anoncreds_types::Error) -> HarnessError {
         let kind = HarnessErrorType::InternalServerError;
-        let message = format!("MsgTypeError: {}", err);
+        let message = format!("MsgTypeError: {err}");
         HarnessError { message, kind }
     }
 }
diff --git a/aries/agents/aath-backchannel/src/setup.rs b/aries/agents/aath-backchannel/src/setup.rs
index 944da02dd9..1111d7b617 100644
--- a/aries/agents/aath-backchannel/src/setup.rs
+++ b/aries/agents/aath-backchannel/src/setup.rs
@@ -22,7 +22,7 @@ struct WriterSeed {
 /// If not available, then default to using the local ledger Trustee seed.
 async fn get_writer_seed() -> WriterSeed {
     if let Ok(ledger_url) = std::env::var("LEDGER_URL") {
-        let url = format!("{}/register", ledger_url);
+        let url = format!("{ledger_url}/register");
         let mut rng = rng();
         let client = reqwest::Client::new();
         let body = json!({
@@ -56,16 +56,16 @@ async fn download_genesis_file() -> std::result::Result<String, String> {
     match std::env::var("GENESIS_FILE").ok() {
         Some(genesis_file) => {
             if !std::path::Path::new(&genesis_file).exists() {
-                Err(format!("The file {} does not exist", genesis_file))
+                Err(format!("The file {genesis_file} does not exist"))
             } else {
-                info!("Using genesis file {}", genesis_file);
+                info!("Using genesis file {genesis_file}");
                 Ok(genesis_file)
             }
         }
         None => match std::env::var("LEDGER_URL").ok() {
             Some(ledger_url) => {
-                info!("Downloading genesis file from {}", ledger_url);
-                let genesis_url = format!("{}/genesis", ledger_url);
+                info!("Downloading genesis file from {ledger_url}");
+                let genesis_url = format!("{ledger_url}/genesis");
                 let body = reqwest::get(&genesis_url)
                     .await
                     .expect("Failed to get genesis file from ledger")
@@ -76,7 +76,7 @@ async fn download_genesis_file() -> std::result::Result<String, String> {
                     .expect("Failed to obtain the current directory path")
                     .join("resource")
                     .join("genesis_file.txn");
-                info!("Storing genesis file to {:?}", path);
+                info!("Storing genesis file to {path:?}");
                 let mut f = std::fs::OpenOptions::new()
                     .write(true)
                     .create(true)
@@ -84,7 +84,7 @@ async fn download_genesis_file() -> std::result::Result<String, String> {
                     .open(path.clone())
                     .expect("Unable to open file");
                 f.write_all(body.as_bytes()).expect("Unable to write data");
-                debug!("Genesis file downloaded and saved to {:?}", path);
+                debug!("Genesis file downloaded and saved to {path:?}");
                 path.to_str()
                     .map(|s| s.to_string())
                     .ok_or("Failed to convert genesis file path to string".to_string())
@@ -106,7 +106,7 @@ pub async fn initialize(port: u32) -> AriesAgent<AskarWallet> {
         .await
         .expect("Failed to download the genesis file");
     let dockerhost = std::env::var("DOCKERHOST").unwrap_or("localhost".to_string());
-    let service_endpoint = Url::parse(&format!("http://{}:{}/didcomm", dockerhost, port)).unwrap();
+    let service_endpoint = Url::parse(&format!("http://{dockerhost}:{port}/didcomm")).unwrap();
 
     let wallet_config = WalletInitConfig {
         wallet_name: format!("rust_agent_{}", uuid::Uuid::new_v4()),
diff --git a/aries/agents/aries-vcx-agent/src/agent/init.rs b/aries/agents/aries-vcx-agent/src/agent/init.rs
index 01e0a39af5..9e64a53e34 100644
--- a/aries/agents/aries-vcx-agent/src/agent/init.rs
+++ b/aries/agents/aries-vcx-agent/src/agent/init.rs
@@ -105,8 +105,7 @@ impl<W: BaseWallet> Agent<W> {
             .set_types(Some(vec![ServiceType::DIDCommV1.to_string()]));
         write_endpoint(wallet.as_ref(), &ledger_write, &public_did, &endpoint).await?;
         info!(
-            "Agent::setup_ledger >> wrote data on ledger, public_did: {}, endpoint: {}",
-            public_did, service_endpoint
+            "Agent::setup_ledger >> wrote data on ledger, public_did: {public_did}, endpoint: {service_endpoint}"
         );
         Ok(public_did)
     }
diff --git a/aries/agents/aries-vcx-agent/src/error/convertors.rs b/aries/agents/aries-vcx-agent/src/error/convertors.rs
index 6786035a57..596889f7cc 100644
--- a/aries/agents/aries-vcx-agent/src/error/convertors.rs
+++ b/aries/agents/aries-vcx-agent/src/error/convertors.rs
@@ -16,8 +16,8 @@ impl From<AriesVcxError> for AgentError {
             AriesVcxErrorKind::CredDefAlreadyCreated => AgentErrorKind::CredDefAlreadyCreated,
             _ => AgentErrorKind::GenericAriesVcxError,
         };
-        error!("AriesVCX Error: {}", err.to_string());
-        let message = format!("AriesVCX Error: {}", err);
+        error!("AriesVCX Error: {err}");
+        let message = format!("AriesVCX Error: {err}");
         AgentError { message, kind }
     }
 }
diff --git a/aries/agents/aries-vcx-agent/src/handlers/connection.rs b/aries/agents/aries-vcx-agent/src/handlers/connection.rs
index ca667bb886..f3cb7db42b 100644
--- a/aries/agents/aries-vcx-agent/src/handlers/connection.rs
+++ b/aries/agents/aries-vcx-agent/src/handlers/connection.rs
@@ -57,8 +57,7 @@ impl<T: BaseWallet> ServiceConnections<T> {
         let connection = self.get_by_id(connection_id)?;
         let wallet = self.wallet.as_ref();
         info!(
-            "Sending message to connection identified by id {}. Plaintext message payload: {}",
-            connection_id, message
+            "Sending message to connection identified by id {connection_id}. Plaintext message payload: {message}"
         );
         connection
             .send_message(wallet, message, &VcxHttpClient)
@@ -116,8 +115,7 @@ impl<T: BaseWallet> ServiceConnections<T> {
             s => Err(AgentError::from_msg(
                 AgentErrorKind::GenericAriesVcxError,
                 &format!(
-                    "Connection with handle {} cannot process a request; State: {:?}",
-                    thread_id, s
+                    "Connection with handle {thread_id} cannot process a request; State: {s:?}"
                 ),
             )),
         }?;
@@ -199,8 +197,7 @@ impl<T: BaseWallet> ServiceConnections<T> {
                 return Err(AgentError::from_msg(
                     AgentErrorKind::GenericAriesVcxError,
                     &format!(
-                        "Connection with handle {} cannot process a trust ping; State: {:?}",
-                        connection_id, s
+                        "Connection with handle {connection_id} cannot process a trust ping; State: {s:?}"
                     ),
                 ))
             }
@@ -241,15 +238,12 @@ impl<T: BaseWallet> ServiceConnections<T> {
         if conns.len() > 1 {
             return Err(AgentError::from_msg(
                 AgentErrorKind::InvalidState,
-                &format!(
-                    "Found multiple connections by sender's verkey {}",
-                    sender_vk
-                ),
+                &format!("Found multiple connections by sender's verkey {sender_vk}"),
             ));
         }
         conns.into_iter().next().ok_or(AgentError::from_msg(
             AgentErrorKind::InvalidState,
-            &format!("Found no connections by sender's verkey {}", sender_vk),
+            &format!("Found no connections by sender's verkey {sender_vk}"),
         ))
     }
 
diff --git a/aries/agents/aries-vcx-agent/src/handlers/did_exchange.rs b/aries/agents/aries-vcx-agent/src/handlers/did_exchange.rs
index 101b508110..0621c39d90 100644
--- a/aries/agents/aries-vcx-agent/src/handlers/did_exchange.rs
+++ b/aries/agents/aries-vcx-agent/src/handlers/did_exchange.rs
@@ -88,7 +88,7 @@ impl<T: BaseWallet> DidcommHandlerDidExchange<T> {
         // /agent/command/did-exchange/{id} where {id} is actually {pthid}.
         // We should have internal strategy to manage threads ourselves, and build necessary
         // extensions/mappings/accommodations in AATH backchannel
-        warn!("send_request >>> request: {:?}", request);
+        warn!("send_request >>> request: {request:?}");
         let req_thread = request.inner().decorators.thread.as_ref().ok_or_else(|| {
             AgentError::from_msg(
                 AgentErrorKind::InvalidState,
@@ -186,7 +186,7 @@ impl<T: BaseWallet> DidcommHandlerDidExchange<T> {
     // todo: perhaps injectable transports? Or just return the message let the caller send it?
     //       The transports abstraction could understand https, wss, didcomm etc.
     pub async fn send_response(&self, thid: String) -> AgentResult<String> {
-        info!("ServiceDidExchange::send_response >>> thid: {}", thid);
+        info!("ServiceDidExchange::send_response >>> thid: {thid}");
         let (responder, aries_msg) = self.did_exchange.get(&thid)?;
         let aries_msg: AriesMessage = aries_msg.unwrap();
         debug!(
@@ -301,7 +301,7 @@ pub async fn pairwise_encrypt(
     .map_err(|err| {
         AgentError::from_msg(
             AgentErrorKind::InvalidState,
-            &format!("Failed to pairwise encrypt message due err: {}", err),
+            &format!("Failed to pairwise encrypt message due err: {err}"),
         )
     })
 }
diff --git a/aries/agents/aries-vcx-agent/src/handlers/issuer.rs b/aries/agents/aries-vcx-agent/src/handlers/issuer.rs
index 50238216fa..4a6d7832ef 100644
--- a/aries/agents/aries-vcx-agent/src/handlers/issuer.rs
+++ b/aries/agents/aries-vcx-agent/src/handlers/issuer.rs
@@ -76,10 +76,7 @@ impl<T: BaseWallet> ServiceCredentialsIssuer<T> {
         let thread_id = issuer.get_thread_id()?;
         self.creds_issuer
             .insert(&thread_id, IssuerWrapper::new(issuer, connection_id))?;
-        info!(
-            "Created new IssuerCredential with resource id: {}",
-            thread_id
-        );
+        info!("Created new IssuerCredential with resource id: {thread_id}");
         Ok(thread_id)
     }
 
diff --git a/aries/agents/aries-vcx-agent/src/storage/agent_storage_inmem.rs b/aries/agents/aries-vcx-agent/src/storage/agent_storage_inmem.rs
index 44dbcd07c0..9a97670c21 100644
--- a/aries/agents/aries-vcx-agent/src/storage/agent_storage_inmem.rs
+++ b/aries/agents/aries-vcx-agent/src/storage/agent_storage_inmem.rs
@@ -43,7 +43,7 @@ where
         match self.store.write() {
             Ok(g) => Ok(g),
             Err(e) => {
-                error!("Unable to write-lock Object Store: {:?}", e);
+                error!("Unable to write-lock Object Store: {e:?}");
                 Err(AgentError::from_msg(
                     AgentErrorKind::LockError,
                     &format!(
diff --git a/aries/agents/mediator/Dockerfile b/aries/agents/mediator/Dockerfile
index 2cddeb671f..e732edf42c 100644
--- a/aries/agents/mediator/Dockerfile
+++ b/aries/agents/mediator/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.84.1 as builder
+FROM rust:1.88.0 as builder
 RUN apt update && apt install -y libssl-dev libzmq3-dev cmake 
 
 WORKDIR /usr/src/aries-vcx
diff --git a/aries/agents/mediator/client-tui/src/tui.rs b/aries/agents/mediator/client-tui/src/tui.rs
index 5670abc450..342efab3f6 100644
--- a/aries/agents/mediator/client-tui/src/tui.rs
+++ b/aries/agents/mediator/client-tui/src/tui.rs
@@ -88,19 +88,19 @@ pub fn client_register_connect_cb<T: BaseWallet + 'static, P: MediatorPersistenc
     let oob_text_area = s.find_name::<TextArea>("oob_text_area").unwrap();
     let mut output = s.find_name::<TextView>("client_register_result").unwrap();
     let oob_text = oob_text_area.get_content();
-    info!("{:#?}", oob_text);
+    info!("{oob_text:#?}");
 
     let oob_invite = match serde_json::from_str::<OOBInvitation>(oob_text) {
         Ok(oob_invite) => oob_invite,
         Err(err) => {
-            output.set_content(format!("{:?}", err));
+            output.set_content(format!("{err:?}"));
             return;
         }
     };
-    info!("{:#?}", oob_invite);
+    info!("{oob_invite:#?}");
     let agent: &mut Arc<Agent<T, P>> = s.user_data().expect("Userdata should contain Agent");
 
-    output.set_content(format!("{:#?}", oob_invite));
+    output.set_content(format!("{oob_invite:#?}"));
     match block_on(handle_register(agent.to_owned(), oob_invite)) {
         Ok(res_json) => output.set_content(serde_json::to_string_pretty(&res_json).unwrap()),
         Err(err) => output.set_content(err),
diff --git a/aries/agents/mediator/src/aries_agent/client/mod.rs b/aries/agents/mediator/src/aries_agent/client/mod.rs
index 14e240500a..faae1bf9bc 100644
--- a/aries/agents/mediator/src/aries_agent/client/mod.rs
+++ b/aries/agents/mediator/src/aries_agent/client/mod.rs
@@ -62,7 +62,7 @@ impl<T: BaseWallet, P: MediatorPersistence> Agent<T, P> {
             .unwrap();
         // Extract the actual connection request message to be sent
         let msg_connection_request = client_conn.get_request().clone();
-        info!("Client Connection Request: {:#?}", msg_connection_request);
+        info!("Client Connection Request: {msg_connection_request:#?}");
         let req_msg = client_conn.get_request();
         debug!(
             "Connection Request: {},",
@@ -140,7 +140,7 @@ impl<T: BaseWallet, P: MediatorPersistence> Agent<T, P> {
         let AriesMessage::Connection(Connection::Response(connection_response)) = response_message
         else {
             return Err(GenericStringError {
-                msg: format!("Expected connection response, got {:?}", response_message),
+                msg: format!("Expected connection response, got {response_message:?}"),
             }
             .into());
         };
diff --git a/aries/agents/mediator/src/aries_agent/client/transports.rs b/aries/agents/mediator/src/aries_agent/client/transports.rs
index b5b22be9cd..b4a303deab 100644
--- a/aries/agents/mediator/src/aries_agent/client/transports.rs
+++ b/aries/agents/mediator/src/aries_agent/client/transports.rs
@@ -53,7 +53,7 @@ impl AriesTransport for reqwest::Client {
             .json()
             .await
             .map_err(AriesTransportError::from_std_error)?;
-        debug!("Received response envelope {:?}", res_json);
+        debug!("Received response envelope {res_json:?}");
         Ok(res_json)
     }
 }
diff --git a/aries/agents/mediator/src/aries_agent/mod.rs b/aries/agents/mediator/src/aries_agent/mod.rs
index 2b1312bfea..98c66b4ccc 100644
--- a/aries/agents/mediator/src/aries_agent/mod.rs
+++ b/aries/agents/mediator/src/aries_agent/mod.rs
@@ -124,7 +124,7 @@ impl<T: BaseWallet, P: MediatorPersistence> Agent<T, P> {
             .unpack_message(didcomm_msg)
             .await
             .expect("Valid didcomm?");
-        info!("{:#?}", unpacked);
+        info!("{unpacked:#?}");
         Ok(unpacked)
     }
 
@@ -164,7 +164,7 @@ impl<T: BaseWallet, P: MediatorPersistence> Agent<T, P> {
         request: Request,
     ) -> Result<EncryptionEnvelope, String> {
         if let Err(err) = request.content.connection.did_doc.validate() {
-            return Err(format!("Request DidDoc validation failed! {:?}", err));
+            return Err(format!("Request DidDoc validation failed! {err:?}"));
         }
 
         let thread_id = request
@@ -267,7 +267,7 @@ mod test {
             .await
             .unwrap();
         let unpacked = agent.unpack_didcomm(&packed).await.unwrap();
-        info!("{:?}", unpacked);
-        print!("{:?}", unpacked);
+        info!("{unpacked:?}");
+        print!("{unpacked:?}");
     }
 }
diff --git a/aries/agents/mediator/src/bin/mediator.rs b/aries/agents/mediator/src/bin/mediator.rs
index 05734c6db2..ab26233311 100644
--- a/aries/agents/mediator/src/bin/mediator.rs
+++ b/aries/agents/mediator/src/bin/mediator.rs
@@ -11,7 +11,7 @@ async fn main() {
     setup_logging();
     info!("Starting up mediator! ⚙️⚙️");
     let endpoint_root = std::env::var("ENDPOINT_ROOT").unwrap_or("127.0.0.1:8005".into());
-    info!("Mediator endpoint root address: {}", endpoint_root);
+    info!("Mediator endpoint root address: {endpoint_root}");
     // default wallet config for a dummy in-memory wallet
     let default_wallet_config = AskarWalletConfig::new(
         "sqlite://:memory:",
@@ -25,7 +25,7 @@ async fn main() {
         .map_or(default_wallet_config, |json| {
             serde_json::from_str(&json).unwrap()
         });
-    info!("Wallet Config: {:?}", wallet_config);
+    info!("Wallet Config: {wallet_config:?}");
     let mut agent = AgentBuilder::<AskarWallet>::new_from_wallet_config(wallet_config)
         .await
         .unwrap();
diff --git a/aries/agents/mediator/src/didcomm_handlers/forward.rs b/aries/agents/mediator/src/didcomm_handlers/forward.rs
index 4d4cdbd9d9..8ae7495fbe 100644
--- a/aries/agents/mediator/src/didcomm_handlers/forward.rs
+++ b/aries/agents/mediator/src/didcomm_handlers/forward.rs
@@ -8,7 +8,7 @@ pub async fn handle_routing_forward(
     agent: ArcAgent<impl BaseWallet, impl MediatorPersistence>,
     forward: Forward,
 ) -> Result<Ack, String> {
-    info!("{:?}", forward);
+    info!("{forward:?}");
     let ack = handle_forward(agent.get_persistence_ref(), forward).await;
 
     Ok(ack)
diff --git a/aries/agents/mediator/src/didcomm_handlers/mod.rs b/aries/agents/mediator/src/didcomm_handlers/mod.rs
index 1eff01104d..54e16e40c1 100644
--- a/aries/agents/mediator/src/didcomm_handlers/mod.rs
+++ b/aries/agents/mediator/src/didcomm_handlers/mod.rs
@@ -24,7 +24,7 @@ enum GeneralAriesMessage {
     AriesVCXSupported(AriesMessage),
 }
 pub fn unhandled_aries_message(message: impl Debug) -> String {
-    format!("Don't know how to handle this message type {:#?}", message)
+    format!("Don't know how to handle this message type {message:#?}")
 }
 
 pub async fn handle_aries<T: BaseWallet, P: MediatorPersistence>(
diff --git a/aries/agents/mediator/src/mediation/forward.rs b/aries/agents/mediator/src/mediation/forward.rs
index 4981fcfcab..a3548e182a 100644
--- a/aries/agents/mediator/src/mediation/forward.rs
+++ b/aries/agents/mediator/src/mediation/forward.rs
@@ -33,7 +33,7 @@ where
             AckStatus::Ok
         }
         Err(e) => {
-            info!("Error when persisting forward: {}", e);
+            info!("Error when persisting forward: {e}");
             AckStatus::Pending
         }
     };
diff --git a/aries/agents/mediator/src/persistence/database/mysql.rs b/aries/agents/mediator/src/persistence/database/mysql.rs
index d395d80018..68a71a6b43 100644
--- a/aries/agents/mediator/src/persistence/database/mysql.rs
+++ b/aries/agents/mediator/src/persistence/database/mysql.rs
@@ -58,7 +58,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
         .execute(self)
         .await;
         if let Err(err) = insert_result {
-            info!("Error during creating new account, {:#?}", err);
+            info!("Error during creating new account, {err:#?}");
             return Err(StorageBackendError {
                 source: Box::new(err),
             }
@@ -181,13 +181,13 @@ impl MediatorPersistence for sqlx::MySqlPool {
         message_data: &str,
     ) -> Result<(), PersistForwardMessageError> {
         // Fetch recipient with given recipient_key
-        info!("Fetching recipient with recipient_key {:#?}", recipient_key);
+        info!("Fetching recipient with recipient_key {recipient_key:#?}");
         let recipient_row = sqlx::query("SELECT * FROM recipients WHERE recipient_key = ?")
             .bind(recipient_key)
             .fetch_one(self)
             .await;
         if let Err(err) = recipient_row {
-            info!("Error while finding target recipient, {:#}", err);
+            info!("Error while finding target recipient, {err:#}");
             let mapped_err = match err {
                 sqlx::Error::RowNotFound => PersistForwardMessageError::AccountNotFound(
                     AccountNotFound(format!("reipient_key={}", recipient_key.to_owned())),
@@ -198,7 +198,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
         }
         let account_id: Vec<u8> = recipient_row.unwrap().get("account_id");
         // Save message for recipient
-        info!("Persisting message for account {:x?}", account_id);
+        info!("Persisting message for account {account_id:x?}");
         let insert_result = sqlx::query(
             "INSERT INTO messages (account_id, recipient_key, message_data) VALUES (?, ?, ?)",
         )
@@ -208,10 +208,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
         .execute(self)
         .await;
         if let Err(err) = insert_result {
-            info!(
-                "Error while saving message for recipient {:x?}, {:#}",
-                recipient_key, err
-            );
+            info!("Error while saving message for recipient {recipient_key:x?}, {err:#}");
             return Err(PersistForwardMessageError::StorageBackendError(
                 StorageBackendError { source: err.into() },
             ));
@@ -271,8 +268,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
         recipient_key: Option<&VerKey>,
     ) -> Result<Vec<(String, Vec<u8>)>, RetrievePendingMessagesError> {
         info!(
-            "Processing retrieve for messages to recipient_key {:#?} of auth_pubkey {:#?}",
-            recipient_key, auth_pubkey
+            "Processing retrieve for messages to recipient_key {recipient_key:#?} of auth_pubkey {auth_pubkey:#?}"
         );
         let account_id: Vec<u8> = self
             .get_account_id(auth_pubkey)
@@ -305,7 +301,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
             // debug!("message {:x?}", msg);
             messages.push((id, msg));
             if u32::try_from(messages.len()).map_err(|e| anyhow!(e))? >= limit {
-                info!("Found enough messages {:#?}", limit);
+                info!("Found enough messages {limit:#?}");
                 break;
             }
         }
@@ -320,10 +316,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
         auth_pubkey: &str,
         recipient_key: &str,
     ) -> Result<(), AddRecipientError> {
-        info!(
-            "Adding recipient_key to account with auth_pubkey {:#?}",
-            auth_pubkey
-        );
+        info!("Adding recipient_key to account with auth_pubkey {auth_pubkey:#?}");
         let account_id: Vec<u8> = self
             .get_account_id(auth_pubkey)
             .await
@@ -335,9 +328,8 @@ impl MediatorPersistence for sqlx::MySqlPool {
                 ),
             })?;
         info!(
-            "Found matching account {:x?}. Proceeding with attempt to add recipient recipient_key \
-             {:#?} ",
-            account_id, recipient_key
+            "Found matching account {account_id:x?}. Proceeding with attempt to add recipient recipient_key \
+             {recipient_key:#?} "
         );
         sqlx::query("INSERT INTO recipients (account_id, recipient_key) VALUES (?, ?);")
             .bind(&account_id)
@@ -354,10 +346,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
         auth_pubkey: &str,
         recipient_key: &str,
     ) -> Result<(), RemoveRecipientError> {
-        info!(
-            "Removing recipient_key from account with auth_pubkey {:#?}",
-            auth_pubkey
-        );
+        info!("Removing recipient_key from account with auth_pubkey {auth_pubkey:#?}");
         let account_id: Vec<u8> = self
             .get_account_id(auth_pubkey)
             .await
@@ -371,9 +360,8 @@ impl MediatorPersistence for sqlx::MySqlPool {
                 }
             })?;
         info!(
-            "Found matching account {:x?}. Proceeding with attempt to remove recipient \
-             recipient_key {:#?} ",
-            account_id, recipient_key
+            "Found matching account {account_id:x?}. Proceeding with attempt to remove recipient \
+             recipient_key {recipient_key:#?} "
         );
         sqlx::query("DELETE FROM recipients WHERE (account_id = ?) AND (recipient_key = ?);")
             .bind(&account_id)
@@ -389,10 +377,7 @@ impl MediatorPersistence for sqlx::MySqlPool {
         &self,
         auth_pubkey: &str,
     ) -> Result<Vec<VerKey>, ListRecipientKeysError> {
-        info!(
-            "Retrieving recipient_keys for account with auth_pubkey {:#?}",
-            auth_pubkey
-        );
+        info!("Retrieving recipient_keys for account with auth_pubkey {auth_pubkey:#?}");
         let account_id: Vec<u8> = self
             .get_account_id(auth_pubkey)
             .await
diff --git a/aries/agents/mediator/tests/common/agent_and_transport_utils.rs b/aries/agents/mediator/tests/common/agent_and_transport_utils.rs
index 5320d97076..1a8476ce86 100644
--- a/aries/agents/mediator/tests/common/agent_and_transport_utils.rs
+++ b/aries/agents/mediator/tests/common/agent_and_transport_utils.rs
@@ -44,7 +44,7 @@ pub async fn didcomm_connection(
         .error_for_status()?
         .json()
         .await?;
-    info!("Got invitation {:?}", oobi);
+    info!("Got invitation {oobi:?}");
 
     let state: InviteeConnection<Completed> =
         agent.establish_connection(oobi, aries_transport).await?;
@@ -166,12 +166,9 @@ pub async fn get_mediator_grant_data(
     if let AriesMessage::CoordinateMediation(CoordinateMediation::MediateGrant(grant_data)) =
         serde_json::from_str(&response_message).unwrap()
     {
-        info!("Grant Data {:?}", grant_data);
+        info!("Grant Data {grant_data:?}");
         grant_data.content
     } else {
-        panic!(
-            "Should get response that is of type Mediator Grant. Found {:?}",
-            response_message
-        )
+        panic!("Should get response that is of type Mediator Grant. Found {response_message:?}")
     }
 }
diff --git a/aries/agents/mediator/tests/mediator-coord-protocol.rs b/aries/agents/mediator/tests/mediator-coord-protocol.rs
index c9f5fa62f0..0ca570b07b 100644
--- a/aries/agents/mediator/tests/mediator-coord-protocol.rs
+++ b/aries/agents/mediator/tests/mediator-coord-protocol.rs
@@ -47,15 +47,14 @@ async fn test_mediate_grant() -> Result<()> {
     if let AriesMessage::CoordinateMediation(CoordinateMediation::MediateGrant(grant_data)) =
         serde_json::from_str(&response_message).unwrap()
     {
-        info!("Grant Data {:?}", grant_data);
+        info!("Grant Data {grant_data:?}");
     } else if let AriesMessage::CoordinateMediation(CoordinateMediation::MediateDeny(deny_data)) =
         serde_json::from_str(&response_message).unwrap()
     {
-        info!("Deny Data {:?}", deny_data);
+        info!("Deny Data {deny_data:?}");
     } else {
         panic!(
-            "Should get response that is of type Mediator Grant / Deny. Found {:?}",
-            response_message
+            "Should get response that is of type Mediator Grant / Deny. Found {response_message:?}"
         )
     };
 
@@ -102,12 +101,9 @@ async fn test_mediate_keylist_update_add() -> Result<()> {
         update_response_data,
     )) = serde_json::from_str(&response_message)?
     {
-        info!("Received update response {:?}", update_response_data);
+        info!("Received update response {update_response_data:?}");
     } else {
-        panic!(
-            "Expected message of type KeylistUpdateResponse. Found {:?}",
-            response_message
-        )
+        panic!("Expected message of type KeylistUpdateResponse. Found {response_message:?}")
     }
 
     Ok(())
@@ -172,10 +168,7 @@ async fn test_mediate_keylist_query() -> Result<()> {
     {
         info!("Keylist mediator sent {:?}", keylist.content)
     } else {
-        panic!(
-            "Expected message of type Keylist. Found {:?}",
-            response_message
-        )
+        panic!("Expected message of type Keylist. Found {response_message:?}")
     }
 
     Ok(())
@@ -245,12 +238,9 @@ async fn test_mediate_keylist_update_remove() -> Result<()> {
         update_response_data,
     )) = serde_json::from_str(&response_message)?
     {
-        info!("Received update response {:?}", update_response_data);
+        info!("Received update response {update_response_data:?}");
     } else {
-        panic!(
-            "Expected message of type KeylistUpdateResponse. Found {:?}",
-            response_message
-        )
+        panic!("Expected message of type KeylistUpdateResponse. Found {response_message:?}")
     }
     Ok(())
 }
diff --git a/aries/agents/mediator/tests/mediator-oob-invitation.rs b/aries/agents/mediator/tests/mediator-oob-invitation.rs
index 03b4b930b8..e67c924b93 100644
--- a/aries/agents/mediator/tests/mediator-oob-invitation.rs
+++ b/aries/agents/mediator/tests/mediator-oob-invitation.rs
@@ -23,7 +23,7 @@ async fn endpoint_invitation_returns_oob() -> Result<()> {
         .send()
         .await?
         .error_for_status()?;
-    info!("{:?}", res);
+    info!("{res:?}");
 
     let _oob: OOBInvitation = res.json().await?;
 
diff --git a/aries/agents/mediator/tests/mediator-protocol-pickup.rs b/aries/agents/mediator/tests/mediator-protocol-pickup.rs
index dcd4e5d086..75b99b8ea6 100644
--- a/aries/agents/mediator/tests/mediator-protocol-pickup.rs
+++ b/aries/agents/mediator/tests/mediator-protocol-pickup.rs
@@ -57,11 +57,11 @@ async fn forward_basic_anoncrypt_message(
     .await?;
     // Send forward message to provided endpoint
     let packed_json = serde_json::from_slice(&packed_message)?;
-    info!("Sending anoncrypt packed message{}", packed_json);
+    info!("Sending anoncrypt packed message{packed_json}");
     let response_envelope = agent_f_aries_transport
         .send_aries_envelope(packed_json, agent_diddoc)
         .await?;
-    info!("Response of forward{:?}", response_envelope);
+    info!("Response of forward{response_envelope:?}");
     Ok(())
 }
 
@@ -115,13 +115,10 @@ async fn test_pickup_flow() -> Result<()> {
     .await?;
     // Verify expected
     if let AriesMessage::Pickup(Pickup::Status(status)) = serde_json::from_str(&response_message)? {
-        info!("Received status as expected {:?}", status);
+        info!("Received status as expected {status:?}");
         assert_eq!(status.content.message_count, 2)
     } else {
-        panic!(
-            "Expected status with message count = 2, received {:?}",
-            response_message
-        )
+        panic!("Expected status with message count = 2, received {response_message:?}")
     }
     // // Delivery
     let pickup_delivery_req = Pickup::DeliveryRequest(
@@ -146,14 +143,11 @@ async fn test_pickup_flow() -> Result<()> {
     let delivery = if let AriesMessage::Pickup(Pickup::Delivery(delivery)) =
         serde_json::from_str(&response_message)?
     {
-        info!("Received delivery as expected {:?}", delivery);
+        info!("Received delivery as expected {delivery:?}");
         assert_eq!(delivery.content.attach.len(), 2);
         delivery
     } else {
-        panic!(
-            "Expected delivery with num_attachment = 2, received {:?}",
-            response_message
-        )
+        panic!("Expected delivery with num_attachment = 2, received {response_message:?}")
     };
     // verify valid attachment
     if let AttachmentType::Base64(base64message) =
@@ -165,7 +159,7 @@ async fn test_pickup_flow() -> Result<()> {
             String::from_utf8(message_bytes.clone())?
         );
         let unpack = agent.unpack_didcomm(&encrypted_message_bytes).await;
-        info!("Decoded attachment 1 {:?}", unpack);
+        info!("Decoded attachment 1 {unpack:?}");
     }
 
     Ok(())
diff --git a/aries/agents/mediator/tests/mediator-readme.rs b/aries/agents/mediator/tests/mediator-readme.rs
index d8ce821d9d..a20040bdee 100644
--- a/aries/agents/mediator/tests/mediator-readme.rs
+++ b/aries/agents/mediator/tests/mediator-readme.rs
@@ -25,7 +25,7 @@ async fn base_path_returns_readme() -> Result<()> {
         .send()
         .await?
         .error_for_status()?;
-    info!("{:?}", res);
+    info!("{res:?}");
 
     let _: ReadmeInfo = res.json().await?;
 
diff --git a/aries/agents/mediator/tests/mediator-routing-forward.rs b/aries/agents/mediator/tests/mediator-routing-forward.rs
index 17d017ecf8..3c9eed636c 100644
--- a/aries/agents/mediator/tests/mediator-routing-forward.rs
+++ b/aries/agents/mediator/tests/mediator-routing-forward.rs
@@ -70,7 +70,7 @@ async fn test_forward_flow() -> Result<()> {
     let response = agent_f_aries_transport
         .send_aries_envelope(packed_json, &agent_diddoc)
         .await?;
-    info!("Response of forward{:?}", response);
+    info!("Response of forward{response:?}");
 
     Ok(())
 }
diff --git a/aries/agents/mobile_demo/.gitignore b/aries/agents/mobile_demo/.gitignore
deleted file mode 100644
index 0b3c816503..0000000000
--- a/aries/agents/mobile_demo/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
-*.so
-/app/src/main/java/org/hyperledger/ariesvcx/vcx.kt
diff --git a/aries/agents/mobile_demo/app/.gitignore b/aries/agents/mobile_demo/app/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/aries/agents/mobile_demo/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/build.gradle b/aries/agents/mobile_demo/app/build.gradle
deleted file mode 100644
index 33dbef9bd7..0000000000
--- a/aries/agents/mobile_demo/app/build.gradle
+++ /dev/null
@@ -1,87 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace 'org.hyperledger.ariesvcx'
-    compileSdk 34
-
-    defaultConfig {
-        applicationId "org.hyperledger.ariesvcx"
-        minSdk 26
-        targetSdk 33
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.9.24')
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.9.0'
-    implementation platform('androidx.compose:compose-bom:2022.12.00')
-    implementation 'androidx.compose.ui:ui'
-    implementation 'androidx.compose.ui:ui-graphics'
-    implementation 'androidx.compose.ui:ui-tooling-preview'
-    implementation 'androidx.compose.material3:material3'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation platform('androidx.compose:compose-bom:2022.12.00')
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
-    debugImplementation 'androidx.compose.ui:ui-tooling'
-    debugImplementation 'androidx.compose.ui:ui-test-manifest'
-
-    // JNA
-    implementation "net.java.dev.jna:jna:5.14.0@aar"
-
-    // Navigation
-    implementation "androidx.navigation:navigation-compose:2.7.1"
-
-    // Camera
-    implementation "androidx.camera:camera-camera2:1.3.4"
-    implementation "androidx.camera:camera-lifecycle:1.2.3"
-    implementation "androidx.camera:camera-view:1.2.3"
-
-    // QR
-    implementation 'com.google.zxing:core:3.5.2'
-
-    // HTTP requests
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-
-    // JSON
-    implementation "com.google.code.gson:gson:2.11.0"
-}
diff --git a/aries/agents/mobile_demo/app/proguard-rules.pro b/aries/agents/mobile_demo/app/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/aries/agents/mobile_demo/app/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/androidTest/java/org/hyperledger/ariesvcx/ExampleInstrumentedTest.kt b/aries/agents/mobile_demo/app/src/androidTest/java/org/hyperledger/ariesvcx/ExampleInstrumentedTest.kt
deleted file mode 100644
index d94d1467ab..0000000000
--- a/aries/agents/mobile_demo/app/src/androidTest/java/org/hyperledger/ariesvcx/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("org.hyperledger.ariesvcx", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/AndroidManifest.xml b/aries/agents/mobile_demo/app/src/main/AndroidManifest.xml
deleted file mode 100644
index cd4f593e74..0000000000
--- a/aries/agents/mobile_demo/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:allowBackup="true"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Demo"
-        tools:targetApi="31">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.Demo">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
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
deleted file mode 100644
index 525dfe886a..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/AppDemoController.kt
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import android.util.Log
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.hyperledger.ariesvcx.utils.await
-
-data class AppUiState(
-    val profileReady: Boolean = false,
-    val connectionInvitationReceived: Boolean = false,
-    val connectionCompleted: Boolean = false,
-    val offerReceived: Boolean = false
-)
-
-class AppDemoController : ViewModel() {
-    private val httpClient = OkHttpClient()
-
-    private var profile: ProfileHolder? = null
-    private var connection: Connection? = null
-    private var holder: Holder? = null
-
-    private var onConnectionComplete: (connection: Connection) -> Unit = {}
-    private var onOfferReceived: () -> Unit = {}
-
-    // Expose screen UI state
-    private val _state = MutableStateFlow(AppUiState())
-    val states: StateFlow<AppUiState> = _state.asStateFlow()
-
-    fun getHolder (): Holder? {
-        return holder
-    }
-
-    fun getProfileHolder (): ProfileHolder {
-        return profile!!
-    }
-
-    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) {
-            val newProfile = newIndyProfile(walletConfig, genesisFilePath)
-            profile = newProfile
-            connection = createInvitee(newProfile)
-        }
-        _state.update { current ->
-            current.copy(profileReady = true)
-        }
-    }
-
-    suspend fun acceptConnectionInvitation(invitation: String) {
-        if (connection == null || profile == null) {
-            throw Exception("Connection or Profile is null")
-        }
-        withContext(Dispatchers.IO) {
-            connection!!.acceptInvitation(
-                profile = profile!!,
-                invitation = invitation
-            )
-            _state.update { it.copy(connectionInvitationReceived = true) }
-
-            connection!!.sendRequest(
-                profile!!,
-                "$BASE_RELAY_ENDPOINT/send_user_message/$RELAY_USER_ID",
-                emptyList()
-            )
-
-            // use viewmodel scope to finish off this work
-            viewModelScope.launch(Dispatchers.IO) {
-                awaitConnectionCompletion()
-            }
-        }
-    }
-
-    private suspend fun awaitConnectionCompletion() {
-        val pollRelayRequest = Request.Builder()
-            .url("$BASE_RELAY_ENDPOINT/pop_user_message/$RELAY_USER_ID")
-            .build()
-        while (true) {
-            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
-                )
-
-                Log.d("AppDemoController", unpackedMessage.message)
-                connection!!.handleResponse(profile!!, unpackedMessage.message)
-                connection!!.sendAck(profile!!)
-
-                Log.d("AppDemoController", "connection state: ${connection!!.getState()}")
-
-                _state.update { it.copy(connectionCompleted = true) }
-                onConnectionComplete.invoke(connection!!)
-                break
-            }
-        }
-    }
-
-    fun subscribeToConnectionComplete(onComplete: (connection: Connection) -> Unit) {
-        onConnectionComplete = onComplete
-    }
-
-    suspend fun processOfferRequest() {
-        withContext(Dispatchers.IO) {
-            holder?.prepareCredentialRequest(profile!!, "4xE68b6S5VRFrKMMG1U95M")
-            Log.d("HOLDER", "processOfferRequest: ${holder?.getState()}")
-            val message = holder?.getMsgCredentialRequest()
-            connection?.sendMessage(profile!!, message!!)
-        }
-    }
-
-    suspend fun awaitCredentialPolling() {
-        val pollRelayRequest = Request.Builder()
-            .url("$BASE_RELAY_ENDPOINT/pop_user_message/$RELAY_USER_ID")
-            .build()
-        while(true) {
-            delay(2000)
-            val relayResponse = httpClient.newCall(pollRelayRequest).await()
-            if (relayResponse.code == 200) {
-                val message = relayResponse.body!!.string()
-
-                val unpackedMessage = unpackMessage(
-                    profile!!,
-                    message
-                )
-
-                Log.d("MESSAGE", "$unpackedMessage.message")
-
-                if (!_state.value.offerReceived) {
-                    Log.d("OFFER", "awaitCredentialPolling: received OFFER")
-                    holder = createFromOffer("", unpackedMessage.message)
-
-                    _state.update { it.copy(offerReceived = true) }
-                    onOfferReceived.invoke()
-                } else {
-                    Log.d("CREDENTIAL", "awaitCredentialPolling: received CREDENTIAL")
-                    holder?.processCredential(profile!!, unpackedMessage.message)
-
-                    _state.update { it.copy(offerReceived = false) }
-                }
-            }
-        }
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/Constants.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/Constants.kt
deleted file mode 100644
index a0f89e5bb8..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/Constants.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.hyperledger.ariesvcx
-
-// Set your public IP address here, this endpoint will be used while communicating with the peer(agent).
-const val BASE_RELAY_ENDPOINT = "https://8200-122-164-109-164.ngrok-free.app";
-const val RELAY_USER_ID = "demo-user-1";
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/CredentialScreen.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/CredentialScreen.kt
deleted file mode 100644
index 2056506170..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/CredentialScreen.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Card
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.navigation.NavHostController
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-
-@Composable
-fun CredentialScreen(
-    demoController: AppDemoController,
-    navController: NavHostController,
-) {
-    val jsonString = getCredentials(demoController.getProfileHolder());
-    val gson = Gson()
-    val typeToken = object : TypeToken<List<Credential>>() {}.type
-    val credentialList: List<Credential> = gson.fromJson(jsonString, typeToken)
-    val credentialAttrs = credentialList.map { it.attrs }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize(),
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
-        Text(
-            text = "Received Credentials",
-            textAlign = TextAlign.Center,
-            fontSize = 30.sp
-        )
-        LazyColumn (verticalArrangement = Arrangement.spacedBy(12.dp)) {
-            items(credentialAttrs) { attrs ->
-                Card(Modifier.fillMaxWidth()) {
-                    Column(Modifier.padding(16.dp)) {
-                        attrs.forEach { (attributeName, attributeValue) ->
-                            Text(
-                                text = "$attributeName : $attributeValue",
-                                textAlign = TextAlign.Center
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/Credentials.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/Credentials.kt
deleted file mode 100644
index ceffa85f36..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/Credentials.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.hyperledger.ariesvcx
-
-data class Credential(
-    val attrs: Map<String, String>,
-    val cred_def_id: String,
-    val cred_rev_id: Any?,
-    val referent: String,
-    val rev_reg_id: Any?,
-    val schema_id: String
-)
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/HolderScreen.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/HolderScreen.kt
deleted file mode 100644
index dd1255605c..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/HolderScreen.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavHostController
-import kotlinx.coroutines.launch
-
-@Composable
-fun HolderScreen(
-    demoController: AppDemoController,
-    navController: NavHostController,
-) {
-    val demoState by demoController.states.collectAsState()
-    val scope = rememberCoroutineScope()
-
-    LaunchedEffect(Unit) {
-        demoController.awaitCredentialPolling()
-    }
-
-    if (demoState.offerReceived) {
-        AlertDialog(
-            onDismissRequest = { },
-            title = { Text("Accept this credential?") },
-            text = { Text(demoController.getHolder()?.getAttributes()!!) },
-            confirmButton = {
-                TextButton(onClick = {
-                    scope.launch {
-                        demoController.processOfferRequest()
-                        navController.navigate(Destination.Credential.route)
-                    }
-                }) {
-                    Text("Accept")
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { }) {
-                    Text("Cancel")
-                }
-            },
-        )
-    }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(50.dp),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        Text(text = "Waiting for credential offer")
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/HomeScreen.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/HomeScreen.kt
deleted file mode 100644
index 30e34450f0..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/HomeScreen.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import android.widget.Toast
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.navigation.NavHostController
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.hyperledger.ariesvcx.utils.prepareGenesisFile
-import java.io.BufferedWriter
-import java.io.File
-import java.io.FileWriter
-
-
-@Composable
-fun HomeScreen(
-    demoController: AppDemoController,
-    navController: NavHostController,
-) {
-
-    val demoState by demoController.states.collectAsState()
-
-    val scope = rememberCoroutineScope()
-    val context = LocalContext.current
-    val file = prepareGenesisFile(context)
-
-    LaunchedEffect(key1 = Unit) {
-        demoController.subscribeToConnectionComplete {
-            scope.launch(Dispatchers.Main) {
-                Toast.makeText(
-                    context,
-                    "New Connection Created",
-                    Toast.LENGTH_LONG
-                ).show()
-            }
-        }
-    }
-
-    Column(
-        modifier = Modifier.fillMaxSize(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Button(
-            enabled = (!demoState.profileReady),
-            onClick = {
-                scope.launch {
-                    demoController.setupProfile(file.absolutePath)
-                    withContext(Dispatchers.Main) {
-                        Toast.makeText(
-                            context,
-                            "New Profile Created",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
-                }
-            }) {
-            Text(text = "New Indy Profile")
-        }
-        Button(enabled = (demoState.profileReady && !demoState.connectionInvitationReceived),
-            onClick = {
-                navController.navigate(Destination.QRScan.route)
-            }) {
-            Text(text = "Scan QR Code")
-        }
-        Button(enabled = (demoState.connectionCompleted),
-            onClick = {
-                navController.navigate(Destination.Holder.route)
-            }) {
-            Text(text = "Receive a credential")
-        }
-        Button(enabled = (demoState.connectionCompleted),
-            onClick = {
-                navController.navigate(Destination.Credential.route)
-            }) {
-            Text(text = "Show credentials")
-        }
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/MainActivity.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/MainActivity.kt
deleted file mode 100644
index de45e3f078..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/MainActivity.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import android.os.Bundle
-import android.system.Os
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import org.hyperledger.ariesvcx.ui.theme.DemoTheme
-
-
-sealed class Destination(val route: String) {
-    object Home : Destination("home")
-    object QRScan : Destination("scan")
-    object Holder : Destination("holder")
-    object Credential : Destination("credential")
-}
-
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Os.setenv("EXTERNAL_STORAGE", this.filesDir.absolutePath, true)
-        setContent {
-            DemoTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    val navController = rememberNavController()
-                    NavigationAppHost(
-                        demoController = AppDemoController(),
-                        navController = navController,
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun NavigationAppHost(
-    demoController: AppDemoController,
-    navController: NavHostController,
-) {
-    NavHost(navController = navController, startDestination = "home") {
-        composable(Destination.Home.route) {
-            HomeScreen(
-                demoController = demoController,
-                navController = navController,
-            )
-        }
-
-        composable(Destination.QRScan.route) {
-            ScanScreen(
-                demoController = demoController,
-                navController = navController,
-            )
-        }
-
-        composable(Destination.Holder.route) {
-            HolderScreen(
-                demoController = demoController,
-                navController = navController,
-            )
-        }
-
-        composable(Destination.Credential.route) {
-            CredentialScreen(
-                demoController = demoController,
-                navController = navController,
-            )
-        }
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/QrCodeAnalyzer.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/QrCodeAnalyzer.kt
deleted file mode 100644
index 09e686e3be..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/QrCodeAnalyzer.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import android.graphics.ImageFormat
-import androidx.camera.core.ImageAnalysis
-import androidx.camera.core.ImageProxy
-import com.google.zxing.*
-import com.google.zxing.common.HybridBinarizer
-import java.nio.ByteBuffer
-
-class QrCodeAnalyzer(
-    private val onQrCodeScanned: (String) -> Unit
-): ImageAnalysis.Analyzer {
-
-    private val supportedImageFormats = listOf(
-        ImageFormat.YUV_420_888,
-        ImageFormat.YUV_422_888,
-        ImageFormat.YUV_444_888,
-    )
-
-    override fun analyze(image: ImageProxy) {
-        if(image.format in supportedImageFormats) {
-            val bytes = image.planes.first().buffer.toByteArray()
-            val source = PlanarYUVLuminanceSource(
-                bytes,
-                image.width,
-                image.height,
-                0,
-                0,
-                image.width,
-                image.height,
-                false
-            )
-            val binaryBmp = BinaryBitmap(HybridBinarizer(source))
-            try {
-                val result = MultiFormatReader().apply {
-                    setHints(
-                        mapOf(
-                            DecodeHintType.POSSIBLE_FORMATS to arrayListOf(
-                                BarcodeFormat.QR_CODE
-                            )
-                        )
-                    )
-                }.decode(binaryBmp)
-                onQrCodeScanned(result.text)
-            } catch(e: Exception) {
-                e.printStackTrace()
-            } finally {
-                image.close()
-            }
-        }
-    }
-
-    private fun ByteBuffer.toByteArray(): ByteArray {
-        rewind()
-        return ByteArray(remaining()).also {
-            get(it)
-        }
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ScanScreen.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ScanScreen.kt
deleted file mode 100644
index a98c329b47..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ScanScreen.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import android.Manifest
-import android.content.pm.PackageManager
-import android.net.Uri
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.camera.core.CameraSelector
-import androidx.camera.core.ImageAnalysis
-import androidx.camera.core.Preview
-import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.camera.view.PreviewView
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.content.ContextCompat
-import android.util.Base64
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.navigation.NavHostController
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-@Composable
-fun ScanScreen(
-    demoController: AppDemoController,
-    navController: NavHostController,
-) {
-    var scannedQRCodeText by remember {
-        mutableStateOf<String?>(null)
-    }
-    val scope = rememberCoroutineScope()
-
-    val context = LocalContext.current
-    val lifecycleOwner = LocalLifecycleOwner.current
-    val cameraProviderFuture = remember {
-        ProcessCameraProvider.getInstance(context)
-    }
-
-    scannedQRCodeText?.let { text ->
-        val encoded = Uri.parse(text)?.getQueryParameter("c_i")
-        if (encoded == null) {
-            scannedQRCodeText = null
-            return@let
-        }
-        val decoded = String(Base64.decode(encoded, Base64.DEFAULT))
-
-        AlertDialog(
-            onDismissRequest = { scannedQRCodeText = null },
-            title = { Text("Accept this invitation?") },
-            text = { Text(decoded) },
-            confirmButton = {
-                TextButton(onClick = {
-                    scope.launch {
-                        demoController.acceptConnectionInvitation(decoded)
-                        withContext(Dispatchers.Main) {
-                            navController.navigate("home")
-                        }
-                    }
-                }) {
-                    Text("Accept")
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { scannedQRCodeText = null }) {
-                    Text("Cancel")
-                }
-            },
-        )
-    }
-
-    var hasCamPermission by remember {
-        mutableStateOf(
-            ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.CAMERA
-            ) == PackageManager.PERMISSION_GRANTED
-        )
-    }
-
-    val launcher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.RequestPermission(),
-        onResult = { granted ->
-            hasCamPermission = granted
-        }
-    )
-
-    LaunchedEffect(key1 = true) {
-        launcher.launch(Manifest.permission.CAMERA)
-    }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(50.dp),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        if (hasCamPermission) {
-            AndroidView(
-                factory = { context ->
-                    val previewView = PreviewView(context)
-                    val preview = Preview.Builder().build()
-                    val selector = CameraSelector.Builder()
-                        .requireLensFacing(CameraSelector.LENS_FACING_BACK)
-                        .build()
-                    preview.setSurfaceProvider(previewView.surfaceProvider)
-                    val imageAnalysis = ImageAnalysis.Builder()
-                        .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-                        .build()
-                    imageAnalysis.setAnalyzer(
-                        ContextCompat.getMainExecutor(context),
-                        QrCodeAnalyzer { result ->
-                            scannedQRCodeText = result
-                        }
-                    )
-                    try {
-                        cameraProviderFuture.get().bindToLifecycle(
-                            lifecycleOwner,
-                            selector,
-                            preview,
-                            imageAnalysis
-                        )
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                    previewView
-                },
-            )
-        }
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Color.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Color.kt
deleted file mode 100644
index 410d9313d1..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Color.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.hyperledger.ariesvcx.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Theme.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Theme.kt
deleted file mode 100644
index f5276ecb61..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Theme.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.hyperledger.ariesvcx.ui.theme
-
-import android.app.Activity
-import android.os.Build
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
-
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
-)
-
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
-)
-
-@Composable
-fun DemoTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
-) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
-        }
-    }
-
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content
-    )
-}
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Type.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Type.kt
deleted file mode 100644
index 17f38335d6..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/ui/theme/Type.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.hyperledger.ariesvcx.ui.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/utils/OkHttpAwait.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/utils/OkHttpAwait.kt
deleted file mode 100644
index e37fe4a9bb..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/utils/OkHttpAwait.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-@file:Suppress("RedundantVisibilityModifier")
-
-package org.hyperledger.ariesvcx.utils
-
-
-import kotlinx.coroutines.suspendCancellableCoroutine
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Response
-import java.io.IOException
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-
-/**
- * Suspend extension that allows suspend [Call] inside coroutine.
- *
- * [recordStack] enables track recording, so in case of exception stacktrace will contain call stacktrace, may be useful for debugging
- *      Not free! Creates exception on each request so disabled by default, but may be enabled using system properties:
- *
- *      ```
- *      System.setProperty(OKHTTP_STACK_RECORDER_PROPERTY, OKHTTP_STACK_RECORDER_ON)
- *      ```
- *      see [README.md](https://github.com/gildor/kotlin-coroutines-okhttp/blob/master/README.md#Debugging) with details about debugging using this feature
- *
- * @return Result of request or throw exception
- */
-public suspend fun Call.await(recordStack: Boolean = true): Response {
-    val callStack = if (recordStack) {
-        IOException().apply {
-            // Remove unnecessary lines from stacktrace
-            // This doesn't remove await$default, but better than nothing
-            stackTrace = stackTrace.copyOfRange(1, stackTrace.size)
-        }
-    } else {
-        null
-    }
-    return suspendCancellableCoroutine { continuation ->
-        enqueue(object : Callback {
-            override fun onResponse(call: Call, response: Response) {
-                continuation.resume(response)
-            }
-
-            override fun onFailure(call: Call, e: IOException) {
-                // Don't bother with resuming the continuation if it is already cancelled.
-                if (continuation.isCancelled) return
-                callStack?.initCause(e)
-                continuation.resumeWithException(callStack ?: e)
-            }
-        })
-
-        continuation.invokeOnCancellation {
-            try {
-                cancel()
-            } catch (ex: Throwable) {
-                //Ignore cancel exception
-            }
-        }
-    }
-}
diff --git a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/utils/PrepareGenesisFile.kt b/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/utils/PrepareGenesisFile.kt
deleted file mode 100644
index b9f929d861..0000000000
--- a/aries/agents/mobile_demo/app/src/main/java/org/hyperledger/ariesvcx/utils/PrepareGenesisFile.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.hyperledger.ariesvcx.utils
-
-import android.content.Context
-import android.util.Log
-import org.hyperledger.ariesvcx.R
-import java.io.BufferedWriter
-import java.io.File
-import java.io.FileWriter
-
-fun prepareGenesisFile(context: Context): File {
-    val file = File(context.filesDir, "genesis")
-    if (!file.exists()) {
-        val transactions = context.resources.openRawResource(R.raw.bcovrin_transactions).bufferedReader()
-            .use { it.readText() }
-        val bufferedWriter = BufferedWriter(FileWriter(file))
-        bufferedWriter.write(transactions)
-        bufferedWriter.close()
-        Log.d("GENESIS", "transactions written")
-    }
-    return file
-}
diff --git a/aries/agents/mobile_demo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/aries/agents/mobile_demo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1146..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/res/drawable/ic_launcher_background.xml b/aries/agents/mobile_demo/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9cbf..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/aries/agents/mobile_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 6f3b755bf5..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/aries/agents/mobile_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 6f3b755bf5..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78ecd..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d1ba..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d64e5..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611da08..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a3070fe..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a6956b3..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77f9f..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50836..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d6427e6..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/aries/agents/mobile_demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae37cb..0000000000
Binary files a/aries/agents/mobile_demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/aries/agents/mobile_demo/app/src/main/res/raw/bcovrin_transactions b/aries/agents/mobile_demo/app/src/main/res/raw/bcovrin_transactions
deleted file mode 100644
index 0f1e4fa10d..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/raw/bcovrin_transactions
+++ /dev/null
@@ -1,4 +0,0 @@
-{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node1","blskey":"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba","blskey_pop":"RahHYiCvoNCtPTrVtP7nMC5eTYrsUA8WjXbdhNc8debh1agE9bGiJxWBXYNFbnJXoXhWFMvyqhqhRoq737YQemH5ik9oL7R4NTTCz2LEZhkgLJzB3QRQqJyBNyv7acbdHrAT8nQ9UkLbaVL9NBpnWXBTw4LEMePaSHEw66RzPNdAX1","client_ip":"138.197.138.255","client_port":9702,"node_ip":"138.197.138.255","node_port":9701,"services":["VALIDATOR"]},"dest":"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv"},"metadata":{"from":"Th7MpTaRZVRYnPiabds81Y"},"type":"0"},"txnMetadata":{"seqNo":1,"txnId":"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62"},"ver":"1"}
-{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node2","blskey":"37rAPpXVoxzKhz7d9gkUe52XuXryuLXoM6P6LbWDB7LSbG62Lsb33sfG7zqS8TK1MXwuCHj1FKNzVpsnafmqLG1vXN88rt38mNFs9TENzm4QHdBzsvCuoBnPH7rpYYDo9DZNJePaDvRvqJKByCabubJz3XXKbEeshzpz4Ma5QYpJqjk","blskey_pop":"Qr658mWZ2YC8JXGXwMDQTzuZCWF7NK9EwxphGmcBvCh6ybUuLxbG65nsX4JvD4SPNtkJ2w9ug1yLTj6fgmuDg41TgECXjLCij3RMsV8CwewBVgVN67wsA45DFWvqvLtu4rjNnE9JbdFTc1Z4WCPA3Xan44K1HoHAq9EVeaRYs8zoF5","client_ip":"138.197.138.255","client_port":9704,"node_ip":"138.197.138.255","node_port":9703,"services":["VALIDATOR"]},"dest":"8ECVSk179mjsjKRLWiQtssMLgp6EPhWXtaYyStWPSGAb"},"metadata":{"from":"EbP4aYNeTHL6q385GuVpRV"},"type":"0"},"txnMetadata":{"seqNo":2,"txnId":"1ac8aece2a18ced660fef8694b61aac3af08ba875ce3026a160acbc3a3af35fc"},"ver":"1"}
-{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node3","blskey":"3WFpdbg7C5cnLYZwFZevJqhubkFALBfCBBok15GdrKMUhUjGsk3jV6QKj6MZgEubF7oqCafxNdkm7eswgA4sdKTRc82tLGzZBd6vNqU8dupzup6uYUf32KTHTPQbuUM8Yk4QFXjEf2Usu2TJcNkdgpyeUSX42u5LqdDDpNSWUK5deC5","blskey_pop":"QwDeb2CkNSx6r8QC8vGQK3GRv7Yndn84TGNijX8YXHPiagXajyfTjoR87rXUu4G4QLk2cF8NNyqWiYMus1623dELWwx57rLCFqGh7N4ZRbGDRP4fnVcaKg1BcUxQ866Ven4gw8y4N56S5HzxXNBZtLYmhGHvDtk6PFkFwCvxYrNYjh","client_ip":"138.197.138.255","client_port":9706,"node_ip":"138.197.138.255","node_port":9705,"services":["VALIDATOR"]},"dest":"DKVxG2fXXTU8yT5N7hGEbXB3dfdAnYv1JczDUHpmDxya"},"metadata":{"from":"4cU41vWW82ArfxJxHkzXPG"},"type":"0"},"txnMetadata":{"seqNo":3,"txnId":"7e9f355dffa78ed24668f0e0e369fd8c224076571c51e2ea8be5f26479edebe4"},"ver":"1"}
-{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node4","blskey":"2zN3bHM1m4rLz54MJHYSwvqzPchYp8jkHswveCLAEJVcX6Mm1wHQD1SkPYMzUDTZvWvhuE6VNAkK3KxVeEmsanSmvjVkReDeBEMxeDaayjcZjFGPydyey1qxBHmTvAnBKoPydvuTAqx5f7YNNRAdeLmUi99gERUU7TD8KfAa6MpQ9bw","blskey_pop":"RPLagxaR5xdimFzwmzYnz4ZhWtYQEj8iR5ZU53T2gitPCyCHQneUn2Huc4oeLd2B2HzkGnjAff4hWTJT6C7qHYB1Mv2wU5iHHGFWkhnTX9WsEAbunJCV2qcaXScKj4tTfvdDKfLiVuU2av6hbsMztirRze7LvYBkRHV3tGwyCptsrP","client_ip":"138.197.138.255","client_port":9708,"node_ip":"138.197.138.255","node_port":9707,"services":["VALIDATOR"]},"dest":"4PS3EDQ3dW1tci1Bp6543CfuuebjFrg36kLAUcskGfaA"},"metadata":{"from":"TWwCRQRZ2ZHMJFn9TzLp7W"},"type":"0"},"txnMetadata":{"seqNo":4,"txnId":"aa5e817d7cc626170eca175822029339a444eb0ee8f0bd20d3b0b76e566fb008"},"ver":"1"}
diff --git a/aries/agents/mobile_demo/app/src/main/res/values/colors.xml b/aries/agents/mobile_demo/app/src/main/res/values/colors.xml
deleted file mode 100644
index f8c6127d32..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/res/values/strings.xml b/aries/agents/mobile_demo/app/src/main/res/values/strings.xml
deleted file mode 100644
index ad12620a2e..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">demo</string>
-</resources>
diff --git a/aries/agents/mobile_demo/app/src/main/res/values/themes.xml b/aries/agents/mobile_demo/app/src/main/res/values/themes.xml
deleted file mode 100644
index f8dcc514d4..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.Demo" parent="android:Theme.Material.Light.NoActionBar" />
-</resources>
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/res/xml/backup_rules.xml b/aries/agents/mobile_demo/app/src/main/res/xml/backup_rules.xml
deleted file mode 100644
index fa0f996d2c..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/xml/backup_rules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample backup rules file; uncomment and customize as necessary.
-   See https://developer.android.com/guide/topics/data/autobackup
-   for details.
-   Note: This file is ignored for devices older that API 31
-   See https://developer.android.com/about/versions/12/backup-restore
--->
-<full-backup-content>
-    <!--
-   <include domain="sharedpref" path="."/>
-   <exclude domain="sharedpref" path="device.xml"/>
--->
-</full-backup-content>
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/main/res/xml/data_extraction_rules.xml b/aries/agents/mobile_demo/app/src/main/res/xml/data_extraction_rules.xml
deleted file mode 100644
index 9ee9997b0b..0000000000
--- a/aries/agents/mobile_demo/app/src/main/res/xml/data_extraction_rules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
-<data-extraction-rules>
-    <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
-        <include .../>
-        <exclude .../>
-        -->
-    </cloud-backup>
-    <!--
-    <device-transfer>
-        <include .../>
-        <exclude .../>
-    </device-transfer>
-    -->
-</data-extraction-rules>
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/app/src/test/java/org/hyperledger/ariesvcx/ExampleUnitTest.kt b/aries/agents/mobile_demo/app/src/test/java/org/hyperledger/ariesvcx/ExampleUnitTest.kt
deleted file mode 100644
index 6dbe1d97c4..0000000000
--- a/aries/agents/mobile_demo/app/src/test/java/org/hyperledger/ariesvcx/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.hyperledger.ariesvcx
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/build.gradle b/aries/agents/mobile_demo/build.gradle
deleted file mode 100644
index 30f61b88fc..0000000000
--- a/aries/agents/mobile_demo/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    id 'com.android.application' version '8.1.1' apply false
-    id 'com.android.library' version '8.1.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
-}
diff --git a/aries/agents/mobile_demo/gradle.properties b/aries/agents/mobile_demo/gradle.properties
deleted file mode 100644
index 3c5031eb7d..0000000000
--- a/aries/agents/mobile_demo/gradle.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/aries/agents/mobile_demo/gradle/wrapper/gradle-wrapper.jar b/aries/agents/mobile_demo/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index e708b1c023..0000000000
Binary files a/aries/agents/mobile_demo/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/aries/agents/mobile_demo/gradle/wrapper/gradle-wrapper.properties b/aries/agents/mobile_demo/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 4ad5365bd5..0000000000
--- a/aries/agents/mobile_demo/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Jul 06 08:44:12 IST 2023
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/aries/agents/mobile_demo/gradlew b/aries/agents/mobile_demo/gradlew
deleted file mode 100755
index 4f906e0c81..0000000000
--- a/aries/agents/mobile_demo/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/aries/agents/mobile_demo/gradlew.bat b/aries/agents/mobile_demo/gradlew.bat
deleted file mode 100644
index ac1b06f938..0000000000
--- a/aries/agents/mobile_demo/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/aries/agents/mobile_demo/settings.gradle b/aries/agents/mobile_demo/settings.gradle
deleted file mode 100644
index fbd0ce94b5..0000000000
--- a/aries/agents/mobile_demo/settings.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-rootProject.name = "demo"
-include ':app'
diff --git a/aries/aries_vcx/README.md b/aries/aries_vcx/README.md
index abdf207be6..6168e61682 100644
--- a/aries/aries_vcx/README.md
+++ b/aries/aries_vcx/README.md
@@ -31,7 +31,6 @@ It's also advisable to follow these [instructions](TUTORIAL.md) to check your en
 # Projects built with aries-vcx
 
 - [mediator](../agents/rust/mediator) - Message mediator web service, useful for mobile device to receive messages while the device is offline.
-- [unifii_aries_vcx](../../uniffi_aries_vcx) - Mobile wrapper to autogenerate Swift and Kotlin wrappers. Also comes with sample native mobile app.
 - [aries-vcx-agent](../agents/rust/aries-vcx-agent) - Sample agent framework adding persistence and message matching on top of `aries_vcx`. Used for cross-compatibility testing with other aries implementations.
 
 ## Implemented Aries protocols
diff --git a/aries/aries_vcx/src/common/credentials/encoding.rs b/aries/aries_vcx/src/common/credentials/encoding.rs
index a65fd6f36a..d652add3e5 100644
--- a/aries/aries_vcx/src/common/credentials/encoding.rs
+++ b/aries/aries_vcx/src/common/credentials/encoding.rs
@@ -53,7 +53,7 @@ pub fn encode_attributes(attributes: &str) -> VcxResult<String> {
                 warn!("Invalid Json for Attribute data");
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidJson,
-                    format!("Invalid Json for Attribute data: {}", err),
+                    format!("Invalid Json for Attribute data: {err}"),
                 )
             })
         }
@@ -64,15 +64,15 @@ pub fn encode_attributes(attributes: &str) -> VcxResult<String> {
                     for cred_value in attributes.iter_mut() {
                         let name = cred_value.get("name").ok_or(AriesVcxError::from_msg(
                             AriesVcxErrorKind::InvalidAttributesStructure,
-                            format!("No 'name' field in cred_value: {:?}", cred_value),
+                            format!("No 'name' field in cred_value: {cred_value:?}"),
                         ))?;
                         let value = cred_value.get("value").ok_or(AriesVcxError::from_msg(
                             AriesVcxErrorKind::InvalidAttributesStructure,
-                            format!("No 'value' field in cred_value: {:?}", cred_value),
+                            format!("No 'value' field in cred_value: {cred_value:?}"),
                         ))?;
                         let encoded = encode(value.as_str().ok_or(AriesVcxError::from_msg(
                             AriesVcxErrorKind::InvalidAttributesStructure,
-                            format!("Failed to convert value {:?} to string", value),
+                            format!("Failed to convert value {value:?} to string"),
                         ))?)?;
                         let attrib_values = json!({
                             "raw": value,
@@ -83,8 +83,7 @@ pub fn encode_attributes(attributes: &str) -> VcxResult<String> {
                             .ok_or(AriesVcxError::from_msg(
                                 AriesVcxErrorKind::InvalidAttributesStructure,
                                 format!(
-                                    "Failed to convert attribute name {:?} to string",
-                                    cred_value
+                                    "Failed to convert attribute name {cred_value:?} to string"
                                 ),
                             ))?
                             .to_string();
@@ -94,13 +93,13 @@ pub fn encode_attributes(attributes: &str) -> VcxResult<String> {
                         warn!("Invalid Json for Attribute data");
                         AriesVcxError::from_msg(
                             AriesVcxErrorKind::InvalidJson,
-                            format!("Invalid Json for Attribute data: {}", err),
+                            format!("Invalid Json for Attribute data: {err}"),
                         )
                     })
                 }
                 Err(err) => Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidAttributesStructure,
-                    format!("Attribute value not found: {:?}", err),
+                    format!("Attribute value not found: {err:?}"),
                 )),
             }
         }
diff --git a/aries/aries_vcx/src/common/keys.rs b/aries/aries_vcx/src/common/keys.rs
index fe7cb6105c..7c7ef11fc2 100644
--- a/aries/aries_vcx/src/common/keys.rs
+++ b/aries/aries_vcx/src/common/keys.rs
@@ -26,10 +26,7 @@ pub async fn rotate_verkey_apply(
     let nym_result_json: Value = serde_json::from_str(&nym_result).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::SerializationError,
-            format!(
-                "Cannot deserialize {:?} into Value, err: {:?}",
-                nym_result, err
-            ),
+            format!("Cannot deserialize {nym_result:?} into Value, err: {err:?}"),
         )
     })?;
     let response_type: String = nym_result_json["op"]
@@ -45,7 +42,7 @@ pub async fn rotate_verkey_apply(
     if response_type != "REPLY" {
         return Err(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidLedgerResponse,
-            format!("Obained non-success ledger response: {}", nym_result_json),
+            format!("Obained non-success ledger response: {nym_result_json}"),
         ));
     }
 
@@ -69,10 +66,7 @@ pub async fn get_verkey_from_ledger(
     let nym_json: Value = serde_json::from_str(&nym_response).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::SerializationError,
-            format!(
-                "Cannot deserialize {:?} into Value, err: {:?}",
-                nym_response, err
-            ),
+            format!("Cannot deserialize {nym_response:?} into Value, err: {err:?}"),
         )
     })?;
     let nym_data: String = nym_json["result"]["data"]
@@ -88,10 +82,7 @@ pub async fn get_verkey_from_ledger(
     let nym_data: Value = serde_json::from_str(&nym_data).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::SerializationError,
-            format!(
-                "Cannot deserialize {:?} into Value, err: {:?}",
-                nym_data, err
-            ),
+            format!("Cannot deserialize {nym_data:?} into Value, err: {err:?}"),
         )
     })?;
     let unparsed_verkey = nym_data["verkey"]
@@ -115,16 +106,13 @@ fn expand_abbreviated_verkey(nym: &str, verkey: &str) -> VcxResult<String> {
     let mut decoded_nym = bs58::decode(nym).into_vec().map_err(|e| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidLedgerResponse,
-            format!("Failed to decode did from base58: {} (error: {})", nym, e),
+            format!("Failed to decode did from base58: {nym} (error: {e})"),
         )
     })?;
     let decoded_stripped_verkey = bs58::decode(stripped_verkey).into_vec().map_err(|e| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidLedgerResponse,
-            format!(
-                "Failed to decode verkey from base58: {} (error: {})",
-                stripped_verkey, e
-            ),
+            format!("Failed to decode verkey from base58: {stripped_verkey} (error: {e})"),
         )
     })?;
     decoded_nym.extend(&decoded_stripped_verkey);
diff --git a/aries/aries_vcx/src/common/ledger/transactions.rs b/aries/aries_vcx/src/common/ledger/transactions.rs
index f8a82a37f0..a23bbeb90a 100644
--- a/aries/aries_vcx/src/common/ledger/transactions.rs
+++ b/aries/aries_vcx/src/common/ledger/transactions.rs
@@ -135,10 +135,7 @@ pub async fn parse_legacy_endpoint_attrib(
     serde_json::from_str(&ser_service).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::SerializationError,
-            format!(
-                "Failed to deserialize service read from the ledger: {:?}",
-                err
-            ),
+            format!("Failed to deserialize service read from the ledger: {err:?}"),
         )
     })
 }
@@ -275,16 +272,10 @@ fn parse_response(response: &str) -> VcxResult<Response> {
 
 fn get_data_from_response(resp: &str) -> VcxResult<serde_json::Value> {
     let resp: serde_json::Value = serde_json::from_str(resp).map_err(|err| {
-        AriesVcxError::from_msg(
-            AriesVcxErrorKind::InvalidLedgerResponse,
-            format!("{:?}", err),
-        )
+        AriesVcxError::from_msg(AriesVcxErrorKind::InvalidLedgerResponse, format!("{err:?}"))
     })?;
     serde_json::from_str(resp["result"]["data"].as_str().unwrap_or("{}")).map_err(|err| {
-        AriesVcxError::from_msg(
-            AriesVcxErrorKind::InvalidLedgerResponse,
-            format!("{:?}", err),
-        )
+        AriesVcxError::from_msg(AriesVcxErrorKind::InvalidLedgerResponse, format!("{err:?}"))
     })
 }
 
diff --git a/aries/aries_vcx/src/common/primitives/credential_definition.rs b/aries/aries_vcx/src/common/primitives/credential_definition.rs
index 3378377293..1d237eae89 100644
--- a/aries/aries_vcx/src/common/primitives/credential_definition.rs
+++ b/aries/aries_vcx/src/common/primitives/credential_definition.rs
@@ -83,9 +83,8 @@ async fn _try_get_cred_def_from_ledger(
             _ => Err(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidLedgerResponse,
                 format!(
-                    "Failed to check presence of credential definition id {} on the \
-                     ledger\nError: {}",
-                    cred_def_id, err
+                    "Failed to check presence of credential definition id {cred_def_id} on the \
+                     ledger\nError: {err}"
                 ),
             )),
         },
@@ -104,7 +103,7 @@ impl CredentialDef {
         tag: String,
         support_revocation: bool,
     ) -> VcxResult<Self> {
-        trace!("CredentialDef::create >>> source_id: {}", source_id);
+        trace!("CredentialDef::create >>> source_id: {source_id}");
         let schema_json = ledger_read
             .get_schema(&schema_id, Some(&issuer_did))
             .await?;
@@ -181,7 +180,7 @@ impl CredentialDef {
             .map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidJson,
-                    format!("Cannot deserialize CredentialDefinition: {}", err),
+                    format!("Cannot deserialize CredentialDefinition: {err}"),
                 )
             })
     }
@@ -246,13 +245,8 @@ pub async fn generate_cred_def(
     support_revocation: Option<bool>,
 ) -> VcxResult<CredentialDefinition> {
     trace!(
-        "generate_cred_def >>> issuer_did: {}, schema_json: {:?}, tag: {}, sig_type: {:?}, \
-         support_revocation: {:?}",
-        issuer_did,
-        schema_json,
-        tag,
-        sig_type,
-        support_revocation
+        "generate_cred_def >>> issuer_did: {issuer_did}, schema_json: {schema_json:?}, tag: {tag}, sig_type: {sig_type:?}, \
+         support_revocation: {support_revocation:?}"
     );
 
     let config_json = CredentialDefinitionConfig {
diff --git a/aries/aries_vcx/src/common/primitives/credential_schema.rs b/aries/aries_vcx/src/common/primitives/credential_schema.rs
index d057885782..3d1ed09ed6 100644
--- a/aries/aries_vcx/src/common/primitives/credential_schema.rs
+++ b/aries/aries_vcx/src/common/primitives/credential_schema.rs
@@ -38,11 +38,7 @@ impl Schema {
         attributes: Vec<String>,
     ) -> VcxResult<Self> {
         trace!(
-            "Schema::create >>> submitter_did: {}, name: {}, version: {}, attributes: {:?}",
-            submitter_did,
-            name,
-            version,
-            attributes
+            "Schema::create >>> submitter_did: {submitter_did}, name: {name}, version: {version}, attributes: {attributes:?}"
         );
 
         let schema_json = anoncreds
diff --git a/aries/aries_vcx/src/common/primitives/revocation_registry.rs b/aries/aries_vcx/src/common/primitives/revocation_registry.rs
index 7abe0d1576..5c31ff0fc5 100644
--- a/aries/aries_vcx/src/common/primitives/revocation_registry.rs
+++ b/aries/aries_vcx/src/common/primitives/revocation_registry.rs
@@ -37,13 +37,8 @@ impl RevocationRegistry {
         tag: u32,
     ) -> VcxResult<RevocationRegistry> {
         trace!(
-            "RevocationRegistry::create >>> issuer_did: {}, cred_def_id: {}, tails_dir: {}, \
-             max_creds: {}, tag_no: {}",
-            issuer_did,
-            cred_def_id,
-            tails_dir,
-            max_creds,
-            tag
+            "RevocationRegistry::create >>> issuer_did: {issuer_did}, cred_def_id: {cred_def_id}, tails_dir: {tails_dir}, \
+             max_creds: {max_creds}, tag_no: {tag}"
         );
         let (rev_reg_id, rev_reg_def, rev_reg_entry) = generate_rev_reg(
             wallet,
@@ -52,16 +47,13 @@ impl RevocationRegistry {
             cred_def_id,
             tails_dir,
             max_creds,
-            &format!("tag{}", tag),
+            &format!("tag{tag}"),
         )
         .await
         .map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::SerializationError,
-                format!(
-                    "Failed to locally create a new Revocation Registry: {:?}",
-                    err
-                ),
+                format!("Failed to locally create a new Revocation Registry: {err:?}"),
             )
         })?;
         Ok(RevocationRegistry {
@@ -169,10 +161,7 @@ impl RevocationRegistry {
         ledger_write: &impl AnoncredsLedgerWrite,
         tails_url: &str,
     ) -> VcxResult<()> {
-        trace!(
-            "RevocationRegistry::publish_revocation_primitives >>> tails_url: {}",
-            tails_url
-        );
+        trace!("RevocationRegistry::publish_revocation_primitives >>> tails_url: {tails_url}");
         self.publish_built_rev_reg_def(wallet, ledger_write, tails_url)
             .await?;
         self.publish_built_rev_reg_delta(wallet, ledger_write).await
@@ -213,7 +202,7 @@ impl RevocationRegistry {
         serde_json::to_string(&self).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::SerializationError,
-                format!("Cannot serialize revocation registry: {:?}", err),
+                format!("Cannot serialize revocation registry: {err:?}"),
             )
         })
     }
@@ -222,7 +211,7 @@ impl RevocationRegistry {
         serde_json::from_str(rev_reg_data).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!("Cannot deserialize revocation registry: {:?}", err),
+                format!("Cannot deserialize revocation registry: {err:?}"),
             )
         })
     }
@@ -318,13 +307,8 @@ pub async fn generate_rev_reg(
     tag: &str,
 ) -> VcxResult<(String, RevocationRegistryDefinition, String)> {
     trace!(
-        "generate_rev_reg >>> issuer_did: {}, cred_def_id: {}, tails_file: {}, max_creds: {}, \
-         tag: {}",
-        issuer_did,
-        cred_def_id,
-        tails_dir,
-        max_creds,
-        tag
+        "generate_rev_reg >>> issuer_did: {issuer_did}, cred_def_id: {cred_def_id}, tails_file: {tails_dir}, max_creds: {max_creds}, \
+         tag: {tag}"
     );
 
     let (rev_reg_id, rev_reg_def_json, rev_reg_entry_json) = anoncreds
diff --git a/aries/aries_vcx/src/common/proofs/prover/prover_internal.rs b/aries/aries_vcx/src/common/proofs/prover/prover_internal.rs
index 72947ffb37..22e55c03f3 100644
--- a/aries/aries_vcx/src/common/proofs/prover/prover_internal.rs
+++ b/aries/aries_vcx/src/common/proofs/prover/prover_internal.rs
@@ -35,10 +35,7 @@ pub async fn build_schemas_json_prover(
     ledger: &impl AnoncredsLedgerRead,
     credentials_identifiers: &Vec<CredInfoProver>,
 ) -> VcxResult<SchemasMap> {
-    trace!(
-        "build_schemas_json_prover >>> credentials_identifiers: {:?}",
-        credentials_identifiers
-    );
+    trace!("build_schemas_json_prover >>> credentials_identifiers: {credentials_identifiers:?}");
     let mut rtn: SchemasMap = HashMap::new();
 
     for cred_info in credentials_identifiers {
@@ -63,10 +60,7 @@ pub async fn build_cred_defs_json_prover(
     ledger: &impl AnoncredsLedgerRead,
     credentials_identifiers: &Vec<CredInfoProver>,
 ) -> VcxResult<CredentialDefinitionsMap> {
-    trace!(
-        "build_cred_defs_json_prover >>> credentials_identifiers: {:?}",
-        credentials_identifiers
-    );
+    trace!("build_cred_defs_json_prover >>> credentials_identifiers: {credentials_identifiers:?}");
     let mut rtn: CredentialDefinitionsMap = HashMap::new();
 
     for cred_info in credentials_identifiers {
@@ -91,11 +85,7 @@ pub fn credential_def_identifiers(
     credentials: &SelectedCredentials,
     proof_req: &PresentationRequest,
 ) -> VcxResult<Vec<CredInfoProver>> {
-    trace!(
-        "credential_def_identifiers >>> credentials: {:?}, proof_req: {:?}",
-        credentials,
-        proof_req
-    );
+    trace!("credential_def_identifiers >>> credentials: {credentials:?}, proof_req: {proof_req:?}");
     let mut rtn = Vec::new();
 
     for (referent, selected_cred) in credentials.credential_for_referent.iter() {
@@ -135,7 +125,7 @@ fn _get_revocation_interval(
     } else {
         Err(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidProofCredentialData,
-            format!("Attribute not found for: {}", attr_name),
+            format!("Attribute not found for: {attr_name}"),
         ))
     }
 }
@@ -145,10 +135,7 @@ pub async fn build_rev_states_json(
     anoncreds: &impl BaseAnonCreds,
     credentials_identifiers: &mut Vec<CredInfoProver>,
 ) -> VcxResult<RevocationStatesMap> {
-    trace!(
-        "build_rev_states_json >> credentials_identifiers: {:?}",
-        credentials_identifiers
-    );
+    trace!("build_rev_states_json >> credentials_identifiers: {credentials_identifiers:?}");
     let mut rtn: RevocationStatesMap = HashMap::new();
     let mut timestamps: HashMap<String, u64> = HashMap::new();
 
@@ -213,11 +200,8 @@ pub fn build_requested_credentials_json(
     proof_req: &PresentationRequest,
 ) -> VcxResult<RequestedCredentials> {
     trace!(
-        "build_requested_credentials_json >> credentials_identifiers: {:?}, self_attested_attrs: \
-         {:?}, proof_req: {:?}",
-        credentials_identifiers,
-        self_attested_attrs,
-        proof_req
+        "build_requested_credentials_json >> credentials_identifiers: {credentials_identifiers:?}, self_attested_attrs: \
+         {self_attested_attrs:?}, proof_req: {proof_req:?}"
     );
 
     let mut rtn = RequestedCredentials::default();
diff --git a/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs b/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs
index 0c6e137cf8..d822a939d8 100644
--- a/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs
+++ b/aries/aries_vcx/src/common/proofs/verifier/verifier_internal.rs
@@ -18,7 +18,7 @@ pub fn get_credential_info(proof: &str) -> VcxResult<Vec<CredInfoVerifier>> {
     let credentials: Value = serde_json::from_str(proof).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
-            format!("Cannot deserialize libndy proof: {}", err),
+            format!("Cannot deserialize libndy proof: {err}"),
         )
     })?;
 
@@ -53,7 +53,7 @@ pub fn validate_proof_revealed_attributes(proof_json: &str) -> VcxResult<()> {
     let proof: Value = serde_json::from_str(proof_json).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
-            format!("Cannot deserialize libndy proof: {}", err),
+            format!("Cannot deserialize libndy proof: {err}"),
         )
     })?;
 
@@ -65,14 +65,11 @@ pub fn validate_proof_revealed_attributes(proof_json: &str) -> VcxResult<()> {
     for (attr1_referent, info) in revealed_attrs.iter() {
         let raw = info["raw"].as_str().ok_or(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidProof,
-            format!("Cannot get raw value for \"{}\" attribute", attr1_referent),
+            format!("Cannot get raw value for \"{attr1_referent}\" attribute"),
         ))?;
         let encoded_ = info["encoded"].as_str().ok_or(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidProof,
-            format!(
-                "Cannot get encoded value for \"{}\" attribute",
-                attr1_referent
-            ),
+            format!("Cannot get encoded value for \"{attr1_referent}\" attribute"),
         ))?;
 
         let expected_encoded = encode(raw)?;
@@ -81,8 +78,7 @@ pub fn validate_proof_revealed_attributes(proof_json: &str) -> VcxResult<()> {
             return Err(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidProof,
                 format!(
-                    "Encoded values are different. Expected: {}. From Proof: {}",
-                    expected_encoded, encoded_
+                    "Encoded values are different. Expected: {expected_encoded}. From Proof: {encoded_}"
                 ),
             ));
         }
@@ -108,7 +104,7 @@ pub async fn build_cred_defs_json_verifier(
             let credential_def = serde_json::to_value(&credential_def).map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidProofCredentialData,
-                    format!("Cannot deserialize credential definition: {}", err),
+                    format!("Cannot deserialize credential definition: {err}"),
                 )
             })?;
 
@@ -136,7 +132,7 @@ pub async fn build_schemas_json_verifier(
             let schema_val = serde_json::to_value(&schema_json).map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidSchema,
-                    format!("Cannot deserialize schema: {}", err),
+                    format!("Cannot deserialize schema: {err}"),
                 )
             })?;
             schemas_json[schema_id.to_string()] = schema_val;
@@ -161,8 +157,7 @@ pub async fn build_rev_reg_defs_json(
             .ok_or(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidRevocationDetails,
                 format!(
-                    "build_rev_reg_defs_json >> Missing rev_reg_id in the record {:?}",
-                    cred_info
+                    "build_rev_reg_defs_json >> Missing rev_reg_id in the record {cred_info:?}"
                 ),
             ))?;
 
@@ -172,7 +167,7 @@ pub async fn build_rev_reg_defs_json(
                 .await?;
             let rev_reg_def_json = serde_json::to_value(&json).or(Err(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!("Failed to deserialize as json rev_reg_def: {:?}", json),
+                format!("Failed to deserialize as json rev_reg_def: {json:?}"),
             )))?;
             rev_reg_defs_json[rev_reg_id] = rev_reg_def_json;
         }
@@ -195,15 +190,12 @@ pub async fn build_rev_reg_json(
             .as_ref()
             .ok_or(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidRevocationDetails,
-                format!(
-                    "build_rev_reg_json >> missing rev_reg_id in the record {:?}",
-                    cred_info
-                ),
+                format!("build_rev_reg_json >> missing rev_reg_id in the record {cred_info:?}"),
             ))?;
 
         let timestamp = cred_info.timestamp.as_ref().ok_or(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidRevocationTimestamp,
-            format!("Revocation timestamp is missing on record {:?}", cred_info),
+            format!("Revocation timestamp is missing on record {cred_info:?}"),
         ))?;
 
         if rev_regs_json.get(rev_reg_id).is_none() {
@@ -213,7 +205,7 @@ pub async fn build_rev_reg_json(
             let rev_reg_json =
                 serde_json::to_value(rev_reg_json.clone()).or(Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidJson,
-                    format!("Failed to deserialize as json: {:?}", rev_reg_json),
+                    format!("Failed to deserialize as json: {rev_reg_json:?}"),
                 )))?;
             let rev_reg_json = json!({ timestamp.to_string(): rev_reg_json });
             rev_regs_json[rev_reg_id] = rev_reg_json;
diff --git a/aries/aries_vcx/src/common/signing.rs b/aries/aries_vcx/src/common/signing.rs
index d03c4a82ff..c1fb5f5004 100644
--- a/aries/aries_vcx/src/common/signing.rs
+++ b/aries/aries_vcx/src/common/signing.rs
@@ -14,7 +14,7 @@ fn base64url_decode(encoded: &str) -> VcxResult<Vec<u8>> {
     URL_SAFE_LENIENT.decode(encoded).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
-            format!("Cannot decode Base64URL data: {:?}", err),
+            format!("Cannot decode Base64URL data: {err:?}"),
         )
     })
 }
@@ -61,7 +61,7 @@ pub async fn decode_signed_connection_response(
         .map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!("Cannot decode ConnectionResponse: {:?}", err),
+                format!("Cannot decode ConnectionResponse: {err:?}"),
             )
         })?;
 
diff --git a/aries/aries_vcx/src/errors/error.rs b/aries/aries_vcx/src/errors/error.rs
index 09049bb120..a63d459042 100644
--- a/aries/aries_vcx/src/errors/error.rs
+++ b/aries/aries_vcx/src/errors/error.rs
@@ -180,12 +180,12 @@ fn format_error(err: &AriesVcxError, f: &mut fmt::Formatter) -> fmt::Result {
     match err.backtrace() {
         None => {}
         Some(backtrace) => {
-            writeln!(f, "Backtrace: {}", backtrace)?;
+            writeln!(f, "Backtrace: {backtrace}")?;
         }
     }
     let mut current = err.source();
     while let Some(cause) = current {
-        writeln!(f, "Caused by:\n{}", cause)?;
+        writeln!(f, "Caused by:\n{cause}")?;
         current = cause.source();
     }
     Ok(())
@@ -221,7 +221,7 @@ fn try_capture_backtrace() -> Option<String> {
                     }
                 }
                 if let Some(name) = symbol.name() {
-                    filtered_backtrace.push_str(&format!(" {}", name));
+                    filtered_backtrace.push_str(&format!(" {name}"));
                 }
                 filtered_backtrace.push('\n');
             }
diff --git a/aries/aries_vcx/src/handlers/issuance/holder.rs b/aries/aries_vcx/src/handlers/issuance/holder.rs
index 1e69450970..678fd59d55 100644
--- a/aries/aries_vcx/src/handlers/issuance/holder.rs
+++ b/aries/aries_vcx/src/handlers/issuance/holder.rs
@@ -55,7 +55,7 @@ pub struct Holder {
 
 impl Holder {
     pub fn create(source_id: &str) -> VcxResult<Holder> {
-        trace!("Holder::create >>> source_id: {:?}", source_id);
+        trace!("Holder::create >>> source_id: {source_id:?}");
         let holder_sm = HolderSM::new(source_id.to_string());
         Ok(Holder { holder_sm })
     }
@@ -69,9 +69,7 @@ impl Holder {
         propose_credential: ProposeCredentialV1,
     ) -> VcxResult<Holder> {
         trace!(
-            "Holder::create_with_proposal >>> source_id: {:?}, propose_credential: {:?}",
-            source_id,
-            propose_credential
+            "Holder::create_with_proposal >>> source_id: {source_id:?}, propose_credential: {propose_credential:?}"
         );
         let holder_sm = HolderSM::with_proposal(propose_credential, source_id.to_string());
         Ok(Holder { holder_sm })
@@ -82,9 +80,7 @@ impl Holder {
         credential_offer: OfferCredentialV1,
     ) -> VcxResult<Holder> {
         trace!(
-            "Holder::create_from_offer >>> source_id: {:?}, credential_offer: {:?}",
-            source_id,
-            credential_offer
+            "Holder::create_from_offer >>> source_id: {source_id:?}, credential_offer: {credential_offer:?}"
         );
         let holder_sm = HolderSM::from_offer(credential_offer, source_id.to_string());
         Ok(Holder { holder_sm })
diff --git a/aries/aries_vcx/src/handlers/issuance/issuer.rs b/aries/aries_vcx/src/handlers/issuance/issuer.rs
index 8fb03725ac..a4af47da9f 100644
--- a/aries/aries_vcx/src/handlers/issuance/issuer.rs
+++ b/aries/aries_vcx/src/handlers/issuance/issuer.rs
@@ -46,8 +46,7 @@ fn _build_credential_preview(credential_json: &str) -> VcxResult<CredentialPrevi
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
             format!(
-                "Can't deserialize credential preview json. credential_json: {}, error: {:?}",
-                credential_json, err
+                "Can't deserialize credential preview json. credential_json: {credential_json}, error: {err:?}"
             ),
         )
     })?;
@@ -61,11 +60,11 @@ fn _build_credential_preview(credential_json: &str) -> VcxResult<CredentialPrevi
             for cred_value in cred_values.iter() {
                 let key = cred_value.get("name").ok_or(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidAttributesStructure,
-                    format!("No 'name' field in cred_value: {:?}", cred_value),
+                    format!("No 'name' field in cred_value: {cred_value:?}"),
                 ))?;
                 let value = cred_value.get("value").ok_or(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidAttributesStructure,
-                    format!("No 'value' field in cred_value: {:?}", cred_value),
+                    format!("No 'value' field in cred_value: {cred_value:?}"),
                 ))?;
 
                 let name = key
@@ -120,7 +119,7 @@ fn _build_credential_preview(credential_json: &str) -> VcxResult<CredentialPrevi
 
 impl Issuer {
     pub fn create(source_id: &str) -> VcxResult<Issuer> {
-        trace!("Issuer::create >>> source_id: {:?}", source_id);
+        trace!("Issuer::create >>> source_id: {source_id:?}");
         let issuer_sm = IssuerSM::new(source_id);
         Ok(Issuer { issuer_sm })
     }
@@ -130,9 +129,7 @@ impl Issuer {
         credential_proposal: &ProposeCredentialV1,
     ) -> VcxResult<Issuer> {
         trace!(
-            "Issuer::create_from_proposal >>> source_id: {:?}, credential_proposal: {:?}",
-            source_id,
-            credential_proposal
+            "Issuer::create_from_proposal >>> source_id: {source_id:?}, credential_proposal: {credential_proposal:?}"
         );
         let issuer_sm = IssuerSM::from_proposal(source_id, credential_proposal);
         Ok(Issuer { issuer_sm })
diff --git a/aries/aries_vcx/src/handlers/out_of_band/receiver.rs b/aries/aries_vcx/src/handlers/out_of_band/receiver.rs
index 8d74dc69c1..5be2671a03 100644
--- a/aries/aries_vcx/src/handlers/out_of_band/receiver.rs
+++ b/aries/aries_vcx/src/handlers/out_of_band/receiver.rs
@@ -25,7 +25,7 @@ pub struct OutOfBandReceiver {
 
 impl OutOfBandReceiver {
     pub fn create_from_a2a_msg(msg: &AriesMessage) -> VcxResult<Self> {
-        trace!("OutOfBandReceiver::create_from_a2a_msg >>> msg: {:?}", msg);
+        trace!("OutOfBandReceiver::create_from_a2a_msg >>> msg: {msg:?}");
         match msg {
             AriesMessage::OutOfBand(OutOfBand::Invitation(oob)) => {
                 Ok(OutOfBandReceiver { oob: oob.clone() })
@@ -34,8 +34,7 @@ impl OutOfBandReceiver {
                 AriesVcxErrorKind::InvalidMessageFormat,
                 format!(
                     "Expected OutOfBandInvitation message to create OutOfBandReceiver, but \
-                     received message of unknown type: {:?}",
-                    m
+                     received message of unknown type: {m:?}"
                 ),
             )),
         }
@@ -157,7 +156,7 @@ fn attachment_to_aries_message(attach: &Attachment) -> VcxResult<Option<AriesMes
         AttachmentId::from_str(attach_id).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::SerializationError,
-                format!("Failed to deserialize attachment ID: {}", err),
+                format!("Failed to deserialize attachment ID: {err}"),
             )
         })
     } else {
@@ -188,7 +187,7 @@ fn attachment_to_aries_message(attach: &Attachment) -> VcxResult<Option<AriesMes
         }
         _ => Err(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidMessageFormat,
-            format!("unexpected attachment type: {:?}", attach_id),
+            format!("unexpected attachment type: {attach_id:?}"),
         )),
     }
 }
diff --git a/aries/aries_vcx/src/handlers/out_of_band/sender.rs b/aries/aries_vcx/src/handlers/out_of_band/sender.rs
index c7e4b3cb07..4757e7cddf 100644
--- a/aries/aries_vcx/src/handlers/out_of_band/sender.rs
+++ b/aries/aries_vcx/src/handlers/out_of_band/sender.rs
@@ -111,10 +111,10 @@ impl OutOfBandSender {
                 CredentialIssuanceV1::OfferCredential(_),
             )) => (AttachmentId::CredentialOffer, json!(&a2a_msg).to_string()),
             _ => {
-                error!("Appended message type {:?} is not allowed.", msg);
+                error!("Appended message type {msg:?} is not allowed.");
                 return Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidMessageFormat,
-                    format!("Appended message type {:?} is not allowed.", msg),
+                    format!("Appended message type {msg:?} is not allowed."),
                 ));
             }
         };
diff --git a/aries/aries_vcx/src/handlers/proof_presentation/prover.rs b/aries/aries_vcx/src/handlers/proof_presentation/prover.rs
index d29df591eb..231ac4fb7f 100644
--- a/aries/aries_vcx/src/handlers/proof_presentation/prover.rs
+++ b/aries/aries_vcx/src/handlers/proof_presentation/prover.rs
@@ -45,7 +45,7 @@ pub struct Prover {
 
 impl Prover {
     pub fn create(source_id: &str) -> VcxResult<Prover> {
-        trace!("Prover::create >>> source_id: {}", source_id);
+        trace!("Prover::create >>> source_id: {source_id}");
         Ok(Prover {
             prover_sm: ProverSM::new(source_id.to_string()),
         })
@@ -56,9 +56,7 @@ impl Prover {
         presentation_request: RequestPresentationV1,
     ) -> VcxResult<Prover> {
         trace!(
-            "Prover::create_from_request >>> source_id: {}, presentation_request: {:?}",
-            source_id,
-            presentation_request
+            "Prover::create_from_request >>> source_id: {source_id}, presentation_request: {presentation_request:?}"
         );
         Ok(Prover {
             prover_sm: ProverSM::from_request(presentation_request, source_id.to_string()),
@@ -102,9 +100,7 @@ impl Prover {
         self_attested_attrs: HashMap<String, String>,
     ) -> VcxResult<()> {
         trace!(
-            "Prover::generate_presentation >>> credentials: {:?}, self_attested_attrs: {:?}",
-            credentials,
-            self_attested_attrs
+            "Prover::generate_presentation >>> credentials: {credentials:?}, self_attested_attrs: {self_attested_attrs:?}"
         );
         self.prover_sm = self
             .prover_sm
@@ -179,10 +175,7 @@ impl Prover {
         let proof_request_data: serde_json::Value = serde_json::from_str(&data).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!(
-                    "Cannot deserialize {:?} into PresentationRequestData: {:?}",
-                    data, err
-                ),
+                format!("Cannot deserialize {data:?} into PresentationRequestData: {err:?}"),
             )
         })?;
         Ok(proof_request_data.to_string())
@@ -232,9 +225,7 @@ impl Prover {
         proposal: Option<String>,
     ) -> VcxResult<AriesMessage> {
         trace!(
-            "Prover::decline_presentation_request >>> reason: {:?}, proposal: {:?}",
-            reason,
-            proposal
+            "Prover::decline_presentation_request >>> reason: {reason:?}, proposal: {proposal:?}"
         );
         let (sm, message) = match (reason, proposal) {
             (Some(reason), None) => {
@@ -253,7 +244,7 @@ impl Prover {
                     .map_err(|err| {
                         AriesVcxError::from_msg(
                             AriesVcxErrorKind::InvalidJson,
-                            format!("Cannot serialize Presentation Preview: {:?}", err),
+                            format!("Cannot serialize Presentation Preview: {err:?}"),
                         )
                     })?;
                 let thread_id = self.prover_sm.get_thread_id()?;
diff --git a/aries/aries_vcx/src/handlers/proof_presentation/verifier.rs b/aries/aries_vcx/src/handlers/proof_presentation/verifier.rs
index 83f63074ed..39f7a9d371 100644
--- a/aries/aries_vcx/src/handlers/proof_presentation/verifier.rs
+++ b/aries/aries_vcx/src/handlers/proof_presentation/verifier.rs
@@ -35,7 +35,7 @@ pub struct Verifier {
 
 impl Verifier {
     pub fn create(source_id: &str) -> VcxResult<Self> {
-        trace!("Verifier::create >>> source_id: {:?}", source_id);
+        trace!("Verifier::create >>> source_id: {source_id:?}");
 
         Ok(Self {
             verifier_sm: VerifierSM::new(source_id),
@@ -47,9 +47,7 @@ impl Verifier {
         presentation_request: &PresentationRequest,
     ) -> VcxResult<Self> {
         trace!(
-            "Verifier::create_from_request >>> source_id: {:?}, presentation_request: {:?}",
-            source_id,
-            presentation_request
+            "Verifier::create_from_request >>> source_id: {source_id:?}, presentation_request: {presentation_request:?}"
         );
         let verifier_sm = VerifierSM::from_request(&source_id, presentation_request)?;
         Ok(Self { verifier_sm })
@@ -60,9 +58,7 @@ impl Verifier {
         presentation_proposal: &ProposePresentationV1,
     ) -> VcxResult<Self> {
         trace!(
-            "Issuer::create_from_proposal >>> source_id: {:?}, presentation_proposal: {:?}",
-            source_id,
-            presentation_proposal
+            "Issuer::create_from_proposal >>> source_id: {source_id:?}, presentation_proposal: {presentation_proposal:?}"
         );
         Ok(Self {
             verifier_sm: VerifierSM::from_proposal(source_id, presentation_proposal),
@@ -113,10 +109,8 @@ impl Verifier {
         comment: Option<String>,
     ) -> VcxResult<()> {
         trace!(
-            "Verifier::set_presentation_request >>> presentation_request_data: {:?}, comment: \
-             ${:?}",
-            presentation_request_data,
-            comment
+            "Verifier::set_presentation_request >>> presentation_request_data: {presentation_request_data:?}, comment: \
+             ${comment:?}"
         );
         self.verifier_sm = self
             .verifier_sm
@@ -218,10 +212,7 @@ impl Verifier {
         &'a mut self,
         reason: &'a str,
     ) -> VcxResult<ProblemReport> {
-        trace!(
-            "Verifier::decline_presentation_proposal >>> reason: {:?}",
-            reason
-        );
+        trace!("Verifier::decline_presentation_proposal >>> reason: {reason:?}");
         let state = self.verifier_sm.get_state();
         if state == VerifierState::PresentationProposalReceived {
             let proposal = self.verifier_sm.presentation_proposal()?;
@@ -239,10 +230,7 @@ impl Verifier {
         } else {
             Err(AriesVcxError::from_msg(
                 AriesVcxErrorKind::NotReady,
-                format!(
-                    "Unable to reject presentation proposal in state {:?}",
-                    state
-                ),
+                format!("Unable to reject presentation proposal in state {state:?}"),
             ))
         }
     }
diff --git a/aries/aries_vcx/src/handlers/util.rs b/aries/aries_vcx/src/handlers/util.rs
index 332496ff5a..27b92eeab3 100644
--- a/aries/aries_vcx/src/handlers/util.rs
+++ b/aries/aries_vcx/src/handlers/util.rs
@@ -267,8 +267,7 @@ pub fn verify_thread_id(thread_id: &str, message: &AriesMessage) -> VcxResult<()
         return Err(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
             format!(
-                "Cannot handle message {:?}: thread id does not match, expected {:?}",
-                message, thread_id
+                "Cannot handle message {message:?}: thread id does not match, expected {thread_id:?}"
             ),
         ));
     };
diff --git a/aries/aries_vcx/src/protocols/connection/invitee/mod.rs b/aries/aries_vcx/src/protocols/connection/invitee/mod.rs
index 9b64838dc7..baae8b2a61 100644
--- a/aries/aries_vcx/src/protocols/connection/invitee/mod.rs
+++ b/aries/aries_vcx/src/protocols/connection/invitee/mod.rs
@@ -256,10 +256,7 @@ pub async fn any_invitation_into_did_doc(
             let service = get_service(indy_ledger, &content.did.parse()?)
                 .await
                 .unwrap_or_else(|err| {
-                    error!(
-                        "Failed to obtain service definition from the ledger: {}",
-                        err
-                    );
+                    error!("Failed to obtain service definition from the ledger: {err}");
                     AriesService::default()
                 });
             (
diff --git a/aries/aries_vcx/src/protocols/connection/inviter/mod.rs b/aries/aries_vcx/src/protocols/connection/inviter/mod.rs
index 9ddd1bdf17..77df303b75 100644
--- a/aries/aries_vcx/src/protocols/connection/inviter/mod.rs
+++ b/aries/aries_vcx/src/protocols/connection/inviter/mod.rs
@@ -167,11 +167,8 @@ impl InviterConnection<Invited> {
         new_routing_keys: Vec<String>,
     ) -> VcxResult<InviterConnection<Requested>> {
         trace!(
-            "Connection::process_request >>> request: {:?}, service_endpoint: {}, routing_keys: \
-             {:?}",
-            request,
-            new_service_endpoint,
-            new_routing_keys,
+            "Connection::process_request >>> request: {request:?}, service_endpoint: {new_service_endpoint}, routing_keys: \
+             {new_routing_keys:?}",
         );
 
         // There must be some other way to validate the thread ID other than cloning the entire
diff --git a/aries/aries_vcx/src/protocols/did_exchange/mod.rs b/aries/aries_vcx/src/protocols/did_exchange/mod.rs
index fe17e135e4..6805c441ed 100644
--- a/aries/aries_vcx/src/protocols/did_exchange/mod.rs
+++ b/aries/aries_vcx/src/protocols/did_exchange/mod.rs
@@ -28,8 +28,7 @@ fn resolve_verification_method(
         let reference_fragment = match verification_method_ref.fragment() {
             None => {
                 warn!(
-                    "Fragment not found in verification method reference {}",
-                    verification_method_ref
+                    "Fragment not found in verification method reference {verification_method_ref}"
                 );
                 return false;
             }
@@ -50,10 +49,7 @@ fn resolve_verification_method(
     match key {
         None => Err(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidState,
-            format!(
-                "Verification method not found in resolved did document {}",
-                did_doc
-            ),
+            format!("Verification method not found in resolved did document {did_doc}"),
         )),
         Some(verification_method) => Ok(verification_method.clone()),
     }
@@ -66,10 +62,7 @@ fn resolve_first_key_agreement(did_document: &DidDocument) -> VcxResult<Verifica
     let verification_method_kind = did_document.key_agreement().first().ok_or_else(|| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidState,
-            format!(
-                "No verification method found in resolved did document {}",
-                did_document
-            ),
+            format!("No verification method found in resolved did document {did_document}"),
         )
     })?;
     let verification_method = match verification_method_kind {
@@ -92,7 +85,7 @@ pub async fn resolve_enc_key_from_invitation(
         )
     })? {
         OobService::Did(did) => {
-            info!("Invitation contains service (DID format): {}", did);
+            info!("Invitation contains service (DID format): {did}");
             let output = resolver_registry
                 .resolve(&did.clone().try_into()?, &Default::default())
                 .await
diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs
index 7168c6d320..cacf70a6e1 100644
--- a/aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs
+++ b/aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs
@@ -132,7 +132,7 @@ pub async fn create_peer_did_4(
     )
     .try_into()?;
 
-    info!("Prepared service for peer:did:4 generation: {} ", service);
+    info!("Prepared service for peer:did:4 generation: {service} ");
     let vm_ka = DidPeer4VerificationMethod::builder()
         .id(vm_ka_id.clone())
         .verification_method_type(VerificationMethodType::Ed25519VerificationKey2020)
@@ -146,10 +146,7 @@ pub async fn create_peer_did_4(
 
     construction_did_doc.add_service(service);
 
-    info!(
-        "Created did document for peer:did:4 generation: {} ",
-        construction_did_doc
-    );
+    info!("Created did document for peer:did:4 generation: {construction_did_doc} ");
     let peer_did = PeerDid::<Numalgo4>::new(construction_did_doc)?;
     info!("Created peer did: {peer_did}");
 
@@ -219,7 +216,7 @@ pub(crate) async fn jws_sign_attach(
     });
     let b64_protected =
         base64::engine::Engine::encode(&URL_SAFE_LENIENT, protected_header.to_string());
-    let sign_input = format!("{}.{}", b64_protected, attach_base64).into_bytes();
+    let sign_input = format!("{b64_protected}.{attach_base64}").into_bytes();
     let signed: Vec<u8> = wallet.sign(&verkey, &sign_input).await?;
     let signature_base64 = base64::engine::Engine::encode(&URL_SAFE_LENIENT, signed);
 
@@ -271,7 +268,7 @@ pub(crate) async fn jws_verify_attachment(
         ));
     };
 
-    let sign_input = format!("{}.{}", b64_protected, attach_base64).into_bytes();
+    let sign_input = format!("{b64_protected}.{attach_base64}").into_bytes();
     let signature =
         base64::engine::Engine::decode(&URL_SAFE_LENIENT, b64_signature).map_err(|_| {
             AriesVcxError::from_msg(
diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/helpers.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/helpers.rs
index 06e4f78a5e..c2c30c24a2 100644
--- a/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/helpers.rs
+++ b/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/helpers.rs
@@ -95,7 +95,7 @@ pub fn invitation_get_first_did_service(invitation: &Invitation) -> VcxResult<Di
             return Did::parse(did_string.clone()).map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidState,
-                    format!("Invalid DID in invitation: {}", err),
+                    format!("Invalid DID in invitation: {err}"),
                 )
             });
         }
diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/request_sent/mod.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/request_sent/mod.rs
index a171d91087..c76e98e9d2 100644
--- a/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/request_sent/mod.rs
+++ b/aries/aries_vcx/src/protocols/did_exchange/state_machine/requester/request_sent/mod.rs
@@ -41,9 +41,8 @@ impl DidExchangeRequester<RequestSent> {
         version: DidExchangeTypeV1,
     ) -> Result<TransitionResult<Self, AnyRequest>, AriesVcxError> {
         debug!(
-            "DidExchangeRequester<RequestSent>::construct_request >> their_did: {}, our_peer_did: \
-             {}",
-            their_did, our_peer_did
+            "DidExchangeRequester<RequestSent>::construct_request >> their_did: {their_did}, our_peer_did: \
+             {our_peer_did}"
         );
         let their_did_document = resolver_registry
             .resolve(their_did, &Default::default())
@@ -58,8 +57,7 @@ impl DidExchangeRequester<RequestSent> {
         );
 
         debug!(
-            "DidExchangeRequester<RequestSent>::construct_request << prepared request: {:?}",
-            request
+            "DidExchangeRequester<RequestSent>::construct_request << prepared request: {request:?}"
         );
         Ok(TransitionResult {
             state: DidExchangeRequester::from_parts(
@@ -82,10 +80,7 @@ impl DidExchangeRequester<RequestSent> {
         resolver_registry: &Arc<ResolverRegistry>,
     ) -> Result<TransitionResult<DidExchangeRequester<Completed>, AnyComplete>, TransitionError<Self>>
     {
-        debug!(
-            "DidExchangeRequester<RequestSent>::receive_response >> response: {:?}",
-            response
-        );
+        debug!("DidExchangeRequester<RequestSent>::receive_response >> response: {response:?}");
         let version = response.get_version();
         let response = response.into_v1_1();
 
@@ -114,8 +109,7 @@ impl DidExchangeRequester<RequestSent> {
             version,
         );
         debug!(
-            "DidExchangeRequester<RequestSent>::receive_response << complete_message: {:?}",
-            complete_message
+            "DidExchangeRequester<RequestSent>::receive_response << complete_message: {complete_message:?}"
         );
 
         Ok(TransitionResult {
diff --git a/aries/aries_vcx/src/protocols/did_exchange/state_machine/responder/response_sent/mod.rs b/aries/aries_vcx/src/protocols/did_exchange/state_machine/responder/response_sent/mod.rs
index e0fdff3ed7..89558bf064 100644
--- a/aries/aries_vcx/src/protocols/did_exchange/state_machine/responder/response_sent/mod.rs
+++ b/aries/aries_vcx/src/protocols/did_exchange/state_machine/responder/response_sent/mod.rs
@@ -37,9 +37,8 @@ impl DidExchangeResponder<ResponseSent> {
     ) -> Result<TransitionResult<DidExchangeResponder<ResponseSent>, AnyResponse>, AriesVcxError>
     {
         debug!(
-            "DidExchangeResponder<ResponseSent>::receive_request >> request: {:?}, our_peer_did: \
-             {}, invitation_key: {:?}",
-            request, our_peer_did, invitation_key
+            "DidExchangeResponder<ResponseSent>::receive_request >> request: {request:?}, our_peer_did: \
+             {our_peer_did}, invitation_key: {invitation_key:?}"
         );
         let version = request.get_version();
         let request = request.into_inner();
@@ -71,8 +70,7 @@ impl DidExchangeResponder<ResponseSent> {
             )),
         };
         debug!(
-            "DidExchangeResponder<ResponseSent>::receive_request << prepared response: {:?}",
-            response
+            "DidExchangeResponder<ResponseSent>::receive_request << prepared response: {response:?}"
         );
 
         Ok(TransitionResult {
diff --git a/aries/aries_vcx/src/protocols/issuance/holder/state_machine.rs b/aries/aries_vcx/src/protocols/issuance/holder/state_machine.rs
index f44a236f1d..a375d8262a 100644
--- a/aries/aries_vcx/src/protocols/issuance/holder/state_machine.rs
+++ b/aries/aries_vcx/src/protocols/issuance/holder/state_machine.rs
@@ -180,7 +180,7 @@ impl HolderSM {
                 HolderFullState::ProposalSet(ProposalSetState::new(proposal))
             }
             s => {
-                warn!("Unable to set credential proposal in state {}", s);
+                warn!("Unable to set credential proposal in state {s}");
                 s
             }
         };
@@ -200,7 +200,7 @@ impl HolderSM {
                 HolderFullState::OfferReceived(OfferReceivedState::new(offer))
             }
             s => {
-                warn!("Unable to receive credential offer in state {}", s);
+                warn!("Unable to receive credential offer in state {s}");
                 s
             }
         };
@@ -240,15 +240,14 @@ impl HolderSM {
                             build_problem_report_msg(Some(err.to_string()), &self.thread_id);
                         error!(
                             "Failed to create credential request with error {err}, generating \
-                             problem report: {:?}",
-                            problem_report
+                             problem report: {problem_report:?}"
                         );
                         HolderFullState::Finished(FinishedHolderState::new(problem_report))
                     }
                 }
             }
             s => {
-                warn!("Unable to set credential request in state {}", s);
+                warn!("Unable to set credential request in state {s}");
                 s
             }
         };
@@ -263,7 +262,7 @@ impl HolderSM {
                 HolderFullState::Finished(FinishedHolderState::new(problem_report))
             }
             s => {
-                warn!("Unable to decline credential offer in state {}", s);
+                warn!("Unable to decline credential offer in state {s}");
                 s
             }
         };
@@ -305,7 +304,7 @@ impl HolderSM {
                 }
             }
             s => {
-                warn!("Unable to receive credential offer in state {}", s);
+                warn!("Unable to receive credential offer in state {s}");
                 s
             }
         };
@@ -319,7 +318,7 @@ impl HolderSM {
                 HolderFullState::Finished(FinishedHolderState::new(problem_report))
             }
             s => {
-                warn!("Unable to receive problem report in state {}", s);
+                warn!("Unable to receive problem report in state {s}");
                 s
             }
         };
@@ -508,15 +507,12 @@ impl HolderSM {
 }
 
 pub fn parse_cred_def_id_from_cred_offer(cred_offer: &str) -> VcxResult<String> {
-    trace!(
-        "Holder::parse_cred_def_id_from_cred_offer >>> cred_offer: {:?}",
-        cred_offer
-    );
+    trace!("Holder::parse_cred_def_id_from_cred_offer >>> cred_offer: {cred_offer:?}");
 
     let parsed_offer: serde_json::Value = serde_json::from_str(cred_offer).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
-            format!("Invalid Credential Offer Json: {:?}", err),
+            format!("Invalid Credential Offer Json: {err:?}"),
         )
     })?;
 
@@ -536,15 +532,12 @@ fn _parse_rev_reg_id_from_credential(credential: &str) -> VcxResult<Option<Strin
     let parsed_credential: serde_json::Value = serde_json::from_str(credential).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
-            format!("Invalid Credential Json: {}, err: {:?}", credential, err),
+            format!("Invalid Credential Json: {credential}, err: {err:?}"),
         )
     })?;
 
     let rev_reg_id = parsed_credential["rev_reg_id"].as_str().map(String::from);
-    trace!(
-        "Holder::_parse_rev_reg_id_from_credential <<< {:?}",
-        rev_reg_id
-    );
+    trace!("Holder::_parse_rev_reg_id_from_credential <<< {rev_reg_id:?}");
 
     Ok(rev_reg_id)
 }
@@ -559,10 +552,7 @@ async fn _store_credential(
     schema_json: &str,
 ) -> VcxResult<(String, Option<String>)> {
     trace!(
-        "Holder::_store_credential >>> credential: {:?}, req_meta: {}, cred_def_json: {}",
-        credential,
-        req_meta,
-        cred_def_json
+        "Holder::_store_credential >>> credential: {credential:?}, req_meta: {req_meta}, cred_def_json: {cred_def_json}"
     );
 
     let credential_json = get_attach_as_string!(&credential.content.credentials_attach);
@@ -622,7 +612,7 @@ pub async fn create_anoncreds_credential_request(
         .map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidState,
-                format!("Cannot create credential request; {}", err),
+                format!("Cannot create credential request; {err}"),
             )
         })
         .map(|(s1, s2)| {
@@ -646,19 +636,15 @@ async fn build_credential_request_msg(
     my_pw_did: Did,
     offer: &OfferCredentialV1,
 ) -> VcxResult<(RequestCredentialV1, String, String, SchemaId)> {
-    trace!(
-        "Holder::_make_credential_request >>> my_pw_did: {:?}, offer: {:?}",
-        my_pw_did,
-        offer
-    );
+    trace!("Holder::_make_credential_request >>> my_pw_did: {my_pw_did:?}, offer: {offer:?}");
 
     let cred_offer = get_attach_as_string!(&offer.content.offers_attach);
 
-    trace!("Parsed cred offer attachment: {}", cred_offer);
+    trace!("Parsed cred offer attachment: {cred_offer}");
     let (req, req_meta, _cred_def_id, cred_def_json, schema_id) =
         create_anoncreds_credential_request(wallet, ledger, anoncreds, &my_pw_did, &cred_offer)
             .await?;
-    trace!("Created cred def json: {}", cred_def_json);
+    trace!("Created cred def json: {cred_def_json}");
     let credential_request_msg = _build_credential_request_msg(req, &thread_id);
     Ok((credential_request_msg, req_meta, cred_def_json, schema_id))
 }
diff --git a/aries/aries_vcx/src/protocols/issuance/holder/states/finished.rs b/aries/aries_vcx/src/protocols/issuance/holder/states/finished.rs
index 55145a94c1..c45dcbee74 100644
--- a/aries/aries_vcx/src/protocols/issuance/holder/states/finished.rs
+++ b/aries/aries_vcx/src/protocols/issuance/holder/states/finished.rs
@@ -22,10 +22,7 @@ impl FinishedHolderState {
         let cred_data: CredentialData = serde_json::from_str(&attach).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!(
-                    "Cannot deserialize {:?}, into CredentialData, err: {:?}",
-                    attach, err
-                ),
+                format!("Cannot deserialize {attach:?}, into CredentialData, err: {err:?}"),
             )
         })?;
 
@@ -46,7 +43,7 @@ impl FinishedHolderState {
             }
             _ => Err(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!("Cannot convert {:?} into object", attach),
+                format!("Cannot convert {attach:?} into object"),
             )),
         }
     }
@@ -76,20 +73,14 @@ impl FinishedHolderState {
             serde_json::from_str(rev_reg_def_json).map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::SerializationError,
-                    format!(
-                        "Cannot deserialize {:?} into Value, err: {:?}",
-                        rev_reg_def_json, err
-                    ),
+                    format!("Cannot deserialize {rev_reg_def_json:?} into Value, err: {err:?}"),
                 )
             })?;
         let value = rev_reg_def["value"]
             .as_object()
             .ok_or(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!(
-                    "The field 'value' not found on rev_reg_def_json: {:?}",
-                    rev_reg_def_json
-                ),
+                format!("The field 'value' not found on rev_reg_def_json: {rev_reg_def_json:?}"),
             ))?;
         let tails_location = value["tailsLocation"]
             .as_str()
@@ -100,10 +91,7 @@ impl FinishedHolderState {
                     self.rev_reg_def_json
                 ),
             ))?;
-        trace!(
-            "get_tails_location <<< tails_location: {}",
-            tails_location.to_string()
-        );
+        trace!("get_tails_location <<< tails_location: {tails_location}");
         Ok(tails_location.to_string())
     }
 
@@ -119,20 +107,14 @@ impl FinishedHolderState {
             serde_json::from_str(rev_reg_def_json).map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::SerializationError,
-                    format!(
-                        "Cannot deserialize {:?} into Value, err: {:?}",
-                        rev_reg_def_json, err
-                    ),
+                    format!("Cannot deserialize {rev_reg_def_json:?} into Value, err: {err:?}"),
                 )
             })?;
         let value = rev_reg_def["value"]
             .as_object()
             .ok_or(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!(
-                    "The field 'value' not found on rev_reg_def_json: {:?}",
-                    rev_reg_def_json
-                ),
+                format!("The field 'value' not found on rev_reg_def_json: {rev_reg_def_json:?}"),
             ))?;
         let tails_hash = value["tailsHash"].as_str().ok_or(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
@@ -156,18 +138,12 @@ impl FinishedHolderState {
             serde_json::from_str(rev_reg_def_json).map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::SerializationError,
-                    format!(
-                        "Cannot deserialize {:?} into Value, err: {:?}",
-                        rev_reg_def_json, err
-                    ),
+                    format!("Cannot deserialize {rev_reg_def_json:?} into Value, err: {err:?}"),
                 )
             })?;
         let rev_reg_def_id = rev_reg_def["id"].as_str().ok_or(AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
-            format!(
-                "The field 'id' not found on rev_reg_def_json: {:?}",
-                rev_reg_def_json
-            ),
+            format!("The field 'id' not found on rev_reg_def_json: {rev_reg_def_json:?}"),
         ))?;
         Ok(rev_reg_def_id.to_string())
     }
diff --git a/aries/aries_vcx/src/protocols/issuance/holder/states/offer_received.rs b/aries/aries_vcx/src/protocols/issuance/holder/states/offer_received.rs
index 0eba80cdb7..7d37211583 100644
--- a/aries/aries_vcx/src/protocols/issuance/holder/states/offer_received.rs
+++ b/aries/aries_vcx/src/protocols/issuance/holder/states/offer_received.rs
@@ -41,10 +41,7 @@ impl OfferReceivedState {
         let cred_def_id = parse_cred_def_id_from_cred_offer(&offer).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!(
-                    "Failed to parse credential definition id from credential offer: {}",
-                    err
-                ),
+                format!("Failed to parse credential definition id from credential offer: {err}"),
             )
         })?;
         is_cred_def_revokable(ledger, &cred_def_id).await
diff --git a/aries/aries_vcx/src/protocols/issuance/issuer/state_machine.rs b/aries/aries_vcx/src/protocols/issuance/issuer/state_machine.rs
index 7c9641231f..5f2786b6fe 100644
--- a/aries/aries_vcx/src/protocols/issuance/issuer/state_machine.rs
+++ b/aries/aries_vcx/src/protocols/issuance/issuer/state_machine.rs
@@ -351,7 +351,7 @@ impl IssuerSM {
             _ => {
                 return Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidState,
-                    format!("Can not set_offer in current state {}.", state),
+                    format!("Can not set_offer in current state {state}."),
                 ));
             }
         };
@@ -391,7 +391,7 @@ impl IssuerSM {
                 (state, self.thread_id.clone())
             }
             s => {
-                warn!("Unable to receive credential proposal in state {}", s);
+                warn!("Unable to receive credential proposal in state {s}");
                 (s, self.thread_id.clone())
             }
         };
@@ -414,7 +414,7 @@ impl IssuerSM {
                 RequestReceivedState::from_offer_set_and_request(state_data, request),
             ),
             s => {
-                warn!("Unable to receive credential request in state {}", s);
+                warn!("Unable to receive credential request in state {s}");
                 s
             }
         };
@@ -507,7 +507,7 @@ impl IssuerSM {
                 IssuerFullState::Finished(FinishedState::from_credential_set_state(state_data))
             }
             s => {
-                warn!("Unable to receive credential ack in state {}", s);
+                warn!("Unable to receive credential ack in state {s}");
                 s
             }
         };
@@ -527,7 +527,7 @@ impl IssuerSM {
                 IssuerFullState::Finished(FinishedState::from_credential_set_state(state_data))
             }
             s => {
-                warn!("Unable to receive credential ack in state {}", s);
+                warn!("Unable to receive credential ack in state {s}");
                 s
             }
         };
@@ -583,14 +583,8 @@ async fn create_credential(
     let offer = get_attach_as_string!(&offer.content.offers_attach);
 
     trace!(
-        "Issuer::_create_credential >>> request: {:?}, rev_reg_id: {:?}, tails_file: {:?}, offer: \
-         {}, cred_data: {}, thread_id: {}",
-        request,
-        rev_reg_id,
-        tails_file,
-        offer,
-        cred_data,
-        thread_id
+        "Issuer::_create_credential >>> request: {request:?}, rev_reg_id: {rev_reg_id:?}, tails_file: {tails_file:?}, offer: \
+         {offer}, cred_data: {cred_data}, thread_id: {thread_id}"
     );
     if !matches_opt_thread_id!(request, thread_id.as_str()) {
         return Err(AriesVcxError::from_msg(
diff --git a/aries/aries_vcx/src/protocols/issuance/mod.rs b/aries/aries_vcx/src/protocols/issuance/mod.rs
index 2902e9ca4b..5ad5157ed2 100644
--- a/aries/aries_vcx/src/protocols/issuance/mod.rs
+++ b/aries/aries_vcx/src/protocols/issuance/mod.rs
@@ -15,18 +15,14 @@ pub async fn is_cred_def_revokable(
         .map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidLedgerResponse,
-                format!(
-                    "Failed to obtain credential definition from ledger or cache: {}",
-                    err
-                ),
+                format!("Failed to obtain credential definition from ledger or cache: {err}"),
             )
         })?;
     let parsed_cred_def = serde_json::to_value(&cred_def_json).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::SerializationError,
             format!(
-                "Failed deserialize credential definition json {:?}\nError: {}",
-                cred_def_json, err
+                "Failed deserialize credential definition json {cred_def_json:?}\nError: {err}"
             ),
         )
     })?;
diff --git a/aries/aries_vcx/src/protocols/mediated_connection/invitee/state_machine.rs b/aries/aries_vcx/src/protocols/mediated_connection/invitee/state_machine.rs
index aaaaacb502..ebc53f8377 100644
--- a/aries/aries_vcx/src/protocols/mediated_connection/invitee/state_machine.rs
+++ b/aries/aries_vcx/src/protocols/mediated_connection/invitee/state_machine.rs
@@ -322,10 +322,7 @@ impl SmMediatedConnectionInvitee {
             s => {
                 return Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidState,
-                    format!(
-                        "Cannot handle inviation: not in Initial state, current state: {:?}",
-                        s
-                    ),
+                    format!("Cannot handle inviation: not in Initial state, current state: {s:?}"),
                 ));
             }
         };
@@ -407,8 +404,7 @@ impl SmMediatedConnectionInvitee {
                             return Err(AriesVcxError::from_msg(
                                 AriesVcxErrorKind::InvalidJson,
                                 format!(
-                                    "Cannot handle response: thread id does not match: {:?}",
-                                    thread_id
+                                    "Cannot handle response: thread id does not match: {thread_id:?}"
                                 ),
                             ));
                         }
diff --git a/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/requested.rs b/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/requested.rs
index 54afb1d704..b1316b5723 100644
--- a/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/requested.rs
+++ b/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/requested.rs
@@ -17,8 +17,7 @@ impl From<(RequestedState, ProblemReport)> for InitialState {
     fn from((_state, problem_report): (RequestedState, ProblemReport)) -> InitialState {
         trace!(
             "ConnectionInvitee: transit state from RequestedState to InitialState, \
-             problem_report: {:?}",
-            problem_report
+             problem_report: {problem_report:?}"
         );
         InitialState::new(Some(problem_report), None)
     }
diff --git a/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/responded.rs b/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/responded.rs
index 61055f8705..759c3487c7 100644
--- a/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/responded.rs
+++ b/aries/aries_vcx/src/protocols/mediated_connection/invitee/states/responded.rs
@@ -53,8 +53,7 @@ impl From<(RespondedState, ProblemReport)> for InitialState {
     fn from((_state, problem_report): (RespondedState, ProblemReport)) -> InitialState {
         trace!(
             "ConnectionInvitee: transit state from RespondedState to InitialState, \
-             problem_report: {:?}",
-            problem_report
+             problem_report: {problem_report:?}"
         );
         InitialState::new(Some(problem_report), None)
     }
diff --git a/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/invited.rs b/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/invited.rs
index 3af7e4735c..59e5fcb763 100644
--- a/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/invited.rs
+++ b/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/invited.rs
@@ -18,8 +18,7 @@ pub struct InvitedState {
 impl From<ProblemReport> for InitialState {
     fn from(problem_report: ProblemReport) -> InitialState {
         trace!(
-            "ConnectionInviter: transit state to InitialState, problem_report: {:?}",
-            problem_report
+            "ConnectionInviter: transit state to InitialState, problem_report: {problem_report:?}"
         );
         InitialState::new(Some(problem_report))
     }
diff --git a/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/requested.rs b/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/requested.rs
index 10047ce0be..ff6c14b141 100644
--- a/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/requested.rs
+++ b/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/requested.rs
@@ -18,8 +18,7 @@ impl From<(RequestedState, ProblemReport)> for InitialState {
     fn from((_state, problem_report): (RequestedState, ProblemReport)) -> InitialState {
         trace!(
             "ConnectionInviter: transit state from RequestedState to InitialState, \
-             problem_report: {:?}",
-            problem_report
+             problem_report: {problem_report:?}"
         );
         InitialState::new(Some(problem_report))
     }
diff --git a/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/responded.rs b/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/responded.rs
index 43b9c6e4b9..28d391f521 100644
--- a/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/responded.rs
+++ b/aries/aries_vcx/src/protocols/mediated_connection/inviter/states/responded.rs
@@ -17,8 +17,7 @@ impl From<(RespondedState, ProblemReport)> for InitialState {
     fn from((_state, problem_report): (RespondedState, ProblemReport)) -> InitialState {
         trace!(
             "ConnectionInviter: transit state from RespondedState to InitialState, \
-             problem_report: {:?}",
-            problem_report
+             problem_report: {problem_report:?}"
         );
         InitialState::new(Some(problem_report))
     }
diff --git a/aries/aries_vcx/src/protocols/oob/mod.rs b/aries/aries_vcx/src/protocols/oob/mod.rs
index 18a7f6b459..cb83f4fa7b 100644
--- a/aries/aries_vcx/src/protocols/oob/mod.rs
+++ b/aries/aries_vcx/src/protocols/oob/mod.rs
@@ -106,16 +106,13 @@ fn normalize_keys_as_naked(keys_list: &Vec<String>) -> VcxResult<Vec<String>> {
             } else {
                 Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidDid,
-                    format!("z prefix is missing: {}", key),
+                    format!("z prefix is missing: {key}"),
                 ))?
             };
             let decoded_value = bs58::decode(stripped).into_vec().map_err(|_| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidDid,
-                    format!(
-                        "Could not decode base58: {} as portion of {}",
-                        stripped, key
-                    ),
+                    format!("Could not decode base58: {stripped} as portion of {key}"),
                 )
             })?;
             let verkey = if let Some(public_key_bytes) =
@@ -125,10 +122,7 @@ fn normalize_keys_as_naked(keys_list: &Vec<String>) -> VcxResult<Vec<String>> {
             } else {
                 Err(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidDid,
-                    format!(
-                        "Only Ed25519-based did:keys are currently supported, got key: {}",
-                        key
-                    ),
+                    format!("Only Ed25519-based did:keys are currently supported, got key: {key}"),
                 ))
             }?;
             result.push(verkey);
diff --git a/aries/aries_vcx/src/protocols/proof_presentation/prover/state_machine.rs b/aries/aries_vcx/src/protocols/proof_presentation/prover/state_machine.rs
index ad45857cd5..695ffa47bf 100644
--- a/aries/aries_vcx/src/protocols/proof_presentation/prover/state_machine.rs
+++ b/aries/aries_vcx/src/protocols/proof_presentation/prover/state_machine.rs
@@ -192,7 +192,7 @@ impl ProverSM {
                 ProverFullState::PresentationProposalSent(PresentationProposalSent::new(proposal))
             }
             s => {
-                warn!("Unable to set presentation proposal in state {}", s);
+                warn!("Unable to set presentation proposal in state {s}");
                 s
             }
         };
@@ -211,7 +211,7 @@ impl ProverSM {
                 ProverFullState::Finished(FinishedState::declined(problem_report))
             }
             s => {
-                warn!("Unable to decline presentation request in state {}", s);
+                warn!("Unable to decline presentation request in state {s}");
                 s
             }
         };
@@ -225,7 +225,7 @@ impl ProverSM {
             }
             ProverFullState::PresentationPrepared(state) => ProverFullState::Finished(state.into()),
             s => {
-                warn!("Unable to send handle presentation proposal in state {}", s);
+                warn!("Unable to send handle presentation proposal in state {s}");
                 s
             }
         };
@@ -260,8 +260,7 @@ impl ProverSM {
                         let problem_report =
                             build_problem_report_msg(Some(err.to_string()), &self.thread_id);
                         error!(
-                            "Failed bo build presentation, sending problem report: {:?}",
-                            problem_report
+                            "Failed bo build presentation, sending problem report: {problem_report:?}"
                         );
                         ProverFullState::PresentationPreparationFailed(
                             (state, problem_report).into(),
@@ -270,7 +269,7 @@ impl ProverSM {
                 }
             }
             s => {
-                warn!("Unable to send generate presentation in state {}", s);
+                warn!("Unable to send generate presentation in state {s}");
                 s
             }
         };
@@ -286,7 +285,7 @@ impl ProverSM {
                 ProverFullState::Finished((state).into())
             }
             s => {
-                warn!("Unable to send send presentation in state {}", s);
+                warn!("Unable to send send presentation in state {s}");
                 s
             }
         };
@@ -354,7 +353,7 @@ impl ProverSM {
                 ProverFullState::Finished((state, ack).into())
             }
             s => {
-                warn!("Unable to process presentation ack in state {}", s);
+                warn!("Unable to process presentation ack in state {s}");
                 s
             }
         };
diff --git a/aries/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs b/aries/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs
index 943ce41521..f18cd6108e 100644
--- a/aries/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs
+++ b/aries/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs
@@ -188,7 +188,7 @@ impl VerifierSM {
                 self.thread_id.clone(),
             ),
             s => {
-                warn!("Unable to receive presentation proposal in state {}", s);
+                warn!("Unable to receive presentation proposal in state {s}");
                 (s, self.thread_id.clone())
             }
         };
@@ -212,10 +212,7 @@ impl VerifierSM {
                 VerifierFullState::Finished((state, problem_report).into())
             }
             s => {
-                warn!(
-                    "Unable to receive presentation request reject in state {}",
-                    s
-                );
+                warn!("Unable to receive presentation request reject in state {s}");
                 s
             }
         };
@@ -238,7 +235,7 @@ impl VerifierSM {
                 )
             }
             s => {
-                warn!("Unable to reject presentation proposal in state {}", s);
+                warn!("Unable to reject presentation proposal in state {s}");
                 (s, self.thread_id.clone())
             }
         };
@@ -281,7 +278,7 @@ impl VerifierSM {
                 }
             }
             s => {
-                warn!("Unable to verify presentation in state {}", s);
+                warn!("Unable to verify presentation in state {s}");
                 s
             }
         };
@@ -314,7 +311,7 @@ impl VerifierSM {
             },
             s => Err(AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidState,
-                format!("Cannot get final message in this state: {:?}", s),
+                format!("Cannot get final message in this state: {s:?}"),
             )),
         }
     }
diff --git a/aries/aries_vcx/src/protocols/proof_presentation/verifier/states/presentation_request_sent.rs b/aries/aries_vcx/src/protocols/proof_presentation/verifier/states/presentation_request_sent.rs
index b3ddfd5027..968b95dbf5 100644
--- a/aries/aries_vcx/src/protocols/proof_presentation/verifier/states/presentation_request_sent.rs
+++ b/aries/aries_vcx/src/protocols/proof_presentation/verifier/states/presentation_request_sent.rs
@@ -86,8 +86,7 @@ impl From<(PresentationRequestSentState, ProblemReport)> for FinishedState {
     fn from((state, problem_report): (PresentationRequestSentState, ProblemReport)) -> Self {
         trace!(
             "transit state from PresentationRequestSentState to FinishedState; problem_report: \
-             {:?}",
-            problem_report
+             {problem_report:?}"
         );
         FinishedState {
             presentation_request: Some(state.presentation_request),
diff --git a/aries/aries_vcx/src/utils/didcomm_utils.rs b/aries/aries_vcx/src/utils/didcomm_utils.rs
index 1845613a85..6e13927222 100644
--- a/aries/aries_vcx/src/utils/didcomm_utils.rs
+++ b/aries/aries_vcx/src/utils/didcomm_utils.rs
@@ -16,13 +16,13 @@ pub(crate) fn resolve_service_key_to_typed_key(
             let verification_method = did_document.dereference_key(reference).ok_or_else(|| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidState,
-                    format!("Unable to dereference key: {}", reference),
+                    format!("Unable to dereference key: {reference}"),
                 )
             })?;
             let key = verification_method.public_key().map_err(|err| {
                 AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidState,
-                    format!("Unable to get public key from verification method: {}", err),
+                    format!("Unable to get public key from verification method: {err}"),
                 )
             })?;
             Ok(key)
diff --git a/aries/aries_vcx/src/utils/encryption_envelope.rs b/aries/aries_vcx/src/utils/encryption_envelope.rs
index 0fed891fe6..375c5b38ab 100644
--- a/aries/aries_vcx/src/utils/encryption_envelope.rs
+++ b/aries/aries_vcx/src/utils/encryption_envelope.rs
@@ -26,10 +26,7 @@ impl EncryptionEnvelope {
         did_doc: &AriesDidDoc,
     ) -> VcxResult<EncryptionEnvelope> {
         trace!(
-            "EncryptionEnvelope::create >>> data: {:?}, sender_vk: {:?}, did_doc: {:?}",
-            data,
-            sender_vk,
-            did_doc
+            "EncryptionEnvelope::create >>> data: {data:?}, sender_vk: {sender_vk:?}, did_doc: {did_doc:?}"
         );
 
         let recipient_key_base58 =
@@ -39,7 +36,7 @@ impl EncryptionEnvelope {
                 .cloned()
                 .ok_or(AriesVcxError::from_msg(
                     AriesVcxErrorKind::InvalidState,
-                    format!("No recipient key found in DIDDoc: {:?}", did_doc),
+                    format!("No recipient key found in DIDDoc: {did_doc:?}"),
                 ))?;
 
         let recipient_key = Key::from_base58(&recipient_key_base58, KeyType::Ed25519)?;
@@ -129,10 +126,7 @@ impl EncryptionEnvelope {
         sender_vk: Option<Key>,
         recipient_key: Key,
     ) -> VcxResult<Vec<u8>> {
-        debug!(
-            "Encrypting for pairwise; sender_vk: {:?}, recipient_key: {}",
-            sender_vk, recipient_key
-        );
+        debug!("Encrypting for pairwise; sender_vk: {sender_vk:?}, recipient_key: {recipient_key}");
 
         let recipient_keys = vec![recipient_key];
 
@@ -152,8 +146,7 @@ impl EncryptionEnvelope {
 
         for routing_key in routing_keys {
             debug!(
-                "Wrapping message in forward message; forward_to_key: {}, routing_key: {}",
-                forward_to_key, routing_key
+                "Wrapping message in forward message; forward_to_key: {forward_to_key}, routing_key: {routing_key}"
             );
             data = EncryptionEnvelope::wrap_into_forward(
                 wallet,
@@ -225,7 +218,7 @@ impl EncryptionEnvelope {
         let a2a_message = serde_json::from_str(&message).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!("Cannot deserialize A2A message: {}", err),
+                format!("Cannot deserialize A2A message: {err}"),
             )
         })?;
         Ok((a2a_message, sender_vk, recipient_vk))
@@ -250,15 +243,13 @@ impl EncryptionEnvelope {
                 Some(sender_vk) => {
                     if sender_vk != expected_key {
                         error!(
-                        "auth_unpack  sender_vk != expected_sender_vk.... sender_vk: {}, expected_sender_vk: {}",
-                        sender_vk, expected_key
+                        "auth_unpack  sender_vk != expected_sender_vk.... sender_vk: {sender_vk}, expected_sender_vk: {expected_key}"
                     );
                         return Err(AriesVcxError::from_msg(
                             AriesVcxErrorKind::AuthenticationError,
                             format!(
                             "Message did not pass authentication check. Expected sender verkey \
-                             was {}, but actually was {}",
-                             expected_key, sender_vk
+                             was {expected_key}, but actually was {sender_vk}"
                         ),
                         ));
                     }
diff --git a/aries/aries_vcx/src/utils/serialization.rs b/aries/aries_vcx/src/utils/serialization.rs
index bbfca4bb53..72c36858c1 100644
--- a/aries/aries_vcx/src/utils/serialization.rs
+++ b/aries/aries_vcx/src/utils/serialization.rs
@@ -18,7 +18,7 @@ where
         ::serde_json::to_string(self).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!("Cannot serialize object: {}", err),
+                format!("Cannot serialize object: {err}"),
             )
         })
     }
@@ -30,7 +30,7 @@ where
         ::serde_json::from_str(data).map_err(|err| {
             AriesVcxError::from_msg(
                 AriesVcxErrorKind::InvalidJson,
-                format!("Cannot deserialize object: {}", err),
+                format!("Cannot deserialize object: {err}"),
             )
         })
     }
diff --git a/aries/aries_vcx/src/utils/validation.rs b/aries/aries_vcx/src/utils/validation.rs
index e5fc212561..18d2f90898 100644
--- a/aries/aries_vcx/src/utils/validation.rs
+++ b/aries/aries_vcx/src/utils/validation.rs
@@ -19,7 +19,7 @@ pub fn validate_did(did: &str) -> VcxResult<String> {
             )),
             Err(err) => Err(AriesVcxError::from_msg(
                 AriesVcxErrorKind::NotBase58,
-                format!("DID is not valid base58, details: {}", err),
+                format!("DID is not valid base58, details: {err}"),
             )),
         }
     }
@@ -35,7 +35,7 @@ pub fn validate_actors(actors: &str) -> VcxResult<Vec<Role>> {
     ::serde_json::from_str(actors).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidOption,
-            format!("Invalid actors: {:?}", err),
+            format!("Invalid actors: {err:?}"),
         )
     })
 }
diff --git a/aries/aries_vcx/tests/test_did_exchange.rs b/aries/aries_vcx/tests/test_did_exchange.rs
index 8d83da96d0..69608f98c7 100644
--- a/aries/aries_vcx/tests/test_did_exchange.rs
+++ b/aries/aries_vcx/tests/test_did_exchange.rs
@@ -51,7 +51,7 @@ use crate::utils::test_agent::{
 pub mod utils;
 
 fn assert_key_agreement(a: DidDocument, b: DidDocument) {
-    log::warn!("comparing did doc a: {}, b: {}", a, b);
+    log::warn!("comparing did doc a: {a}, b: {b}");
     let a_key = resolve_ed25519_key_agreement(&a).unwrap();
     let b_key = resolve_ed25519_key_agreement(&b).unwrap();
     assert_eq!(a_key, b_key);
@@ -86,18 +86,14 @@ async fn did_exchange_test(
     let invitation_key = resolve_enc_key_from_invitation(&invitation, &resolver_registry)
         .await
         .unwrap();
-    info!(
-        "Inviter prepares invitation and passes to invitee {}",
-        invitation
-    );
+    info!("Inviter prepares invitation and passes to invitee {invitation}");
 
     let (requesters_peer_did, _our_verkey) =
         create_peer_did_4(&agent_invitee.wallet, dummy_url.clone(), vec![]).await?;
     let did_inviter: Did = invitation_get_first_did_service(&invitation)?;
     info!(
-        "Invitee resolves Inviter's DID from invitation {} (as a first DID service found in the \
-         invitation)",
-        did_inviter
+        "Invitee resolves Inviter's DID from invitation {did_inviter} (as a first DID service found in the \
+         invitation)"
     );
 
     let TransitionResult {
@@ -187,14 +183,14 @@ async fn did_exchange_test(
     )
     .await?;
 
-    info!("Encrypted message: {:?}", m);
+    info!("Encrypted message: {m:?}");
 
     let requesters_peer_did = requesters_peer_did.resolve_did_doc()?;
     let expected_sender_vk = resolve_ed25519_key_agreement(&requesters_peer_did)?;
     let unpacked =
         EncryptionEnvelope::unpack(&agent_inviter.wallet, &m.0, &Some(expected_sender_vk)).await?;
 
-    info!("Unpacked message: {:?}", unpacked);
+    info!("Unpacked message: {unpacked:?}");
 
     Ok(())
 }
diff --git a/aries/aries_vcx/tests/test_proof_presentation.rs b/aries/aries_vcx/tests/test_proof_presentation.rs
index 2609da0175..a284a3ee0b 100644
--- a/aries/aries_vcx/tests/test_proof_presentation.rs
+++ b/aries/aries_vcx/tests/test_proof_presentation.rs
@@ -165,7 +165,7 @@ async fn test_agency_pool_generate_proof_with_predicates() -> Result<(), Box<dyn
             PresentationVerificationStatus::Valid
         );
     } else {
-        panic!("Unexpected message type {:?}", final_message);
+        panic!("Unexpected message type {final_message:?}");
     }
     Ok(())
 }
diff --git a/aries/aries_vcx/tests/utils/scenarios/data.rs b/aries/aries_vcx/tests/utils/scenarios/data.rs
index 828a455acd..36ed30e2d1 100644
--- a/aries/aries_vcx/tests/utils/scenarios/data.rs
+++ b/aries/aries_vcx/tests/utils/scenarios/data.rs
@@ -53,7 +53,7 @@ pub fn requested_attrs_address(
         .into_iter()
         .map(|name| {
             (
-                format!("{}_1", name),
+                format!("{name}_1"),
                 AttributeInfo {
                     name: Some(name),
                     restrictions: Some(restrictions.to_owned()),
diff --git a/aries/aries_vcx/tests/utils/scenarios/proof_presentation.rs b/aries/aries_vcx/tests/utils/scenarios/proof_presentation.rs
index edad1f5729..547af8b35e 100644
--- a/aries/aries_vcx/tests/utils/scenarios/proof_presentation.rs
+++ b/aries/aries_vcx/tests/utils/scenarios/proof_presentation.rs
@@ -187,8 +187,7 @@ pub async fn generate_and_send_proof(
 ) -> Option<PresentationV1> {
     let thread_id = prover.get_thread_id().unwrap();
     info!(
-        "generate_and_send_proof >>> generating proof using selected credentials {:?}",
-        selected_credentials
+        "generate_and_send_proof >>> generating proof using selected credentials {selected_credentials:?}"
     );
     prover
         .generate_presentation(
@@ -431,8 +430,7 @@ pub fn retrieved_to_selected_credentials_simple(
     with_tails: bool,
 ) -> SelectedCredentials {
     info!(
-        "retrieved_to_selected_credentials_simple >>> retrieved matching credentials {:?}",
-        retrieved_credentials
+        "retrieved_to_selected_credentials_simple >>> retrieved matching credentials {retrieved_credentials:?}"
     );
     let mut selected_credentials = SelectedCredentials::default();
 
@@ -457,8 +455,7 @@ pub fn match_preselected_credentials(
     with_tails: bool,
 ) -> SelectedCredentials {
     info!(
-        "retrieved_to_selected_credentials_specific >>> retrieved matching credentials {:?}",
-        retrieved_credentials
+        "retrieved_to_selected_credentials_specific >>> retrieved matching credentials {retrieved_credentials:?}"
     );
     let credential_data: Value = serde_json::from_str(credential_data).unwrap();
     let preselected_credentials: Value = serde_json::from_str(preselected_credentials).unwrap();
diff --git a/aries/aries_vcx_anoncreds/src/anoncreds/anoncreds/mod.rs b/aries/aries_vcx_anoncreds/src/anoncreds/anoncreds/mod.rs
index 5b83239d47..60de7860eb 100644
--- a/aries/aries_vcx_anoncreds/src/anoncreds/anoncreds/mod.rs
+++ b/aries/aries_vcx_anoncreds/src/anoncreds/anoncreds/mod.rs
@@ -1062,16 +1062,14 @@ impl BaseAnonCreds for Anoncreds {
 
         if existing_record.is_some() {
             return Err(VcxAnoncredsError::DuplicationMasterSecret(format!(
-                "Master secret id: {} already exists in wallet.",
-                link_secret_id
+                "Master secret id: {link_secret_id} already exists in wallet."
             )));
         }
 
         let secret = anoncreds::prover::create_link_secret()?;
         let ms_decimal = TryInto::<String>::try_into(secret).map_err(|err| {
             VcxAnoncredsError::UrsaError(format!(
-                "Failed convert BigNumber to decimal string: {}",
-                err
+                "Failed convert BigNumber to decimal string: {err}"
             ))
         })?;
 
@@ -1197,9 +1195,8 @@ impl BaseAnonCreds for Anoncreds {
 
         if let Err(err) = &res_rev_reg_delta {
             warn!(
-                "get_rev_reg_delta >> Unable to get rev_reg_delta cache for rev_reg_id: {}, \
-                 error: {}",
-                rev_reg_id, err
+                "get_rev_reg_delta >> Unable to get rev_reg_delta cache for rev_reg_id: {rev_reg_id}, \
+                 error: {err}"
             );
         }
 
@@ -1237,16 +1234,14 @@ fn get_rev_state(
             .as_ref()
             .and_then(|_rev_states| _rev_states.get(&cred_rev_reg_id));
         let rev_state = rev_state.ok_or(VcxAnoncredsError::InvalidJson(format!(
-            "No revocation states provided for credential '{}' with rev_reg_id '{}'",
-            cred_id, cred_rev_reg_id
+            "No revocation states provided for credential '{cred_id}' with rev_reg_id '{cred_rev_reg_id}'"
         )))?;
 
         let rev_state = rev_state
             .get(&timestamp)
             .ok_or(VcxAnoncredsError::InvalidJson(format!(
-                "No revocation states provided for credential '{}' with rev_reg_id '{}' at \
-                 timestamp '{}'",
-                cred_id, cred_rev_reg_id, timestamp
+                "No revocation states provided for credential '{cred_id}' with rev_reg_id '{cred_rev_reg_id}' at \
+                 timestamp '{timestamp}'"
             )))?;
 
         Some(rev_state.clone())
@@ -1300,9 +1295,9 @@ fn _format_attribute_as_marker_tag_name(attribute_name: &str) -> String {
 pub fn make_schema_id(did: &Did, name: &str, version: &str) -> SchemaId {
     let prefix = did
         .method()
-        .map(|method| format!("schema:{}:", method))
+        .map(|method| format!("schema:{method}:"))
         .unwrap_or_default();
-    let id = format!("{}{}:2:{}:{}", prefix, did, name, version);
+    let id = format!("{prefix}{did}:2:{name}:{version}");
     SchemaId::new(id).unwrap()
 }
 
@@ -1320,12 +1315,12 @@ pub fn make_credential_definition_id(
     let tag = if tag.is_empty() {
         String::new()
     } else {
-        format!(":{}", tag)
+        format!(":{tag}")
     };
 
     let prefix = origin_did
         .method()
-        .map(|method| format!("creddef:{}:", method))
+        .map(|method| format!("creddef:{method}:"))
         .unwrap_or_default();
 
     let schema_infix_id = schema_seq_no
@@ -1333,12 +1328,7 @@ pub fn make_credential_definition_id(
         .unwrap_or(schema_id.to_string());
 
     let id = format!(
-        "{}{}:3:{}:{}{}",
-        prefix,
-        origin_did,
-        signature_type,
-        schema_infix_id,
-        tag // prefix, origin_did, signature_type, schema_id, tag
+        "{prefix}{origin_did}:3:{signature_type}:{schema_infix_id}{tag}" // prefix, origin_did, signature_type, schema_id, tag
     );
 
     CredentialDefinitionId::new(id).unwrap()
@@ -1355,7 +1345,7 @@ fn make_revocation_registry_id(
         "{}{}:4:{}:{}:{}",
         origin_did
             .method()
-            .map_or(Default::default(), |method| format!("revreg:{}:", method)),
+            .map_or(Default::default(), |method| format!("revreg:{method}:")),
         origin_did,
         cred_def_id.0,
         match rev_reg_type {
diff --git a/aries/aries_vcx_ledger/src/ledger/type_conversion.rs b/aries/aries_vcx_ledger/src/ledger/type_conversion.rs
index 8bd3046c86..21e84f35a8 100644
--- a/aries/aries_vcx_ledger/src/ledger/type_conversion.rs
+++ b/aries/aries_vcx_ledger/src/ledger/type_conversion.rs
@@ -147,7 +147,7 @@ impl Convert for IndyVdrCredentialDefinition {
             IndyVdrCredentialDefinition::CredentialDefinitionV1(cred_def) => {
                 let id = &cred_def.id;
                 let Some((_method, issuer_id, _sig_type, _schema_id, _tag)) = id.parts() else {
-                    return Err(format!("cred def ID is malformed. cannot convert. {}", id).into());
+                    return Err(format!("cred def ID is malformed. cannot convert. {id}").into());
                 };
                 Ok(OurCredentialDefinition {
                     id: OurCredentialDefinitionId::new(id.to_string())?,
diff --git a/aries/aries_vcx_wallet/src/errors/error.rs b/aries/aries_vcx_wallet/src/errors/error.rs
index 3e30e9d9a7..613a00ec28 100644
--- a/aries/aries_vcx_wallet/src/errors/error.rs
+++ b/aries/aries_vcx_wallet/src/errors/error.rs
@@ -14,8 +14,7 @@ pub struct NotFoundInfo(Option<String>);
 impl NotFoundInfo {
     pub fn new_with_details(category: RecordCategory, name: &str) -> Self {
         Self(Some(format!(
-            "Not found, category: {}, name {}",
-            category, name
+            "Not found, category: {category}, name {name}"
         )))
     }
 
@@ -32,7 +31,7 @@ impl fmt::Debug for NotFoundInfo {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self.0 {
             None => write!(f, "no details provided"),
-            Some(payload) => write!(f, "{}", payload),
+            Some(payload) => write!(f, "{payload}"),
         }
     }
 }
@@ -72,21 +71,21 @@ impl Display for OpaqueError {
 impl Display for VcxWalletError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            VcxWalletError::DuplicateRecord(inner) => write!(f, "Duplicate record: {}", inner),
-            VcxWalletError::NotUtf8(inner) => write!(f, "Not UTF-8: {}", inner),
-            VcxWalletError::NotBase58(inner) => write!(f, "Not Base58: {}", inner),
-            VcxWalletError::NotBase64(inner) => write!(f, "Not Base64: {}", inner),
-            VcxWalletError::RecordNotFound(inner) => write!(f, "Record not found: {}", inner),
+            VcxWalletError::DuplicateRecord(inner) => write!(f, "Duplicate record: {inner}"),
+            VcxWalletError::NotUtf8(inner) => write!(f, "Not UTF-8: {inner}"),
+            VcxWalletError::NotBase58(inner) => write!(f, "Not Base58: {inner}"),
+            VcxWalletError::NotBase64(inner) => write!(f, "Not Base64: {inner}"),
+            VcxWalletError::RecordNotFound(inner) => write!(f, "Record not found: {inner}"),
             VcxWalletError::UnknownRecordCategory(inner) => {
-                write!(f, "Unknown RecordCategory: {}", inner)
+                write!(f, "Unknown RecordCategory: {inner}")
             }
-            VcxWalletError::InvalidInput(inner) => write!(f, "Invalid input: {}", inner),
+            VcxWalletError::InvalidInput(inner) => write!(f, "Invalid input: {inner}"),
             VcxWalletError::NoRecipientKeyFound => write!(f, "No recipient key found"),
-            VcxWalletError::InvalidJson(inner) => write!(f, "Invalid JSON: {}", inner),
-            VcxWalletError::PublicKeyError(inner) => write!(f, "Public key error: {}", inner),
-            VcxWalletError::Unimplemented(inner) => write!(f, "Not implemented: {}", inner),
-            VcxWalletError::Unknown(inner) => write!(f, "Unknown error: {}", inner),
-            VcxWalletError::WalletCreate(inner) => write!(f, "Error creating a wallet: {}", inner),
+            VcxWalletError::InvalidJson(inner) => write!(f, "Invalid JSON: {inner}"),
+            VcxWalletError::PublicKeyError(inner) => write!(f, "Public key error: {inner}"),
+            VcxWalletError::Unimplemented(inner) => write!(f, "Not implemented: {inner}"),
+            VcxWalletError::Unknown(inner) => write!(f, "Unknown error: {inner}"),
+            VcxWalletError::WalletCreate(inner) => write!(f, "Error creating a wallet: {inner}"),
         }
     }
 }
diff --git a/aries/aries_vcx_wallet/src/wallet/askar/askar_utils.rs b/aries/aries_vcx_wallet/src/wallet/askar/askar_utils.rs
index eebbf6f6db..471db7a759 100644
--- a/aries/aries_vcx_wallet/src/wallet/askar/askar_utils.rs
+++ b/aries/aries_vcx_wallet/src/wallet/askar/askar_utils.rs
@@ -35,7 +35,6 @@ pub fn public_key_type_to_askar_key_alg(value: &KeyType) -> VcxWalletResult<KeyA
     let alg = match value {
         KeyType::Ed25519 => KeyAlg::Ed25519,
         KeyType::X25519 => KeyAlg::X25519,
-        KeyType::Bls12381g1g2 => KeyAlg::Bls12_381(BlsCurves::G1G2),
         KeyType::Bls12381g1 => KeyAlg::Bls12_381(BlsCurves::G1),
         KeyType::Bls12381g2 => KeyAlg::Bls12_381(BlsCurves::G2),
         KeyType::P256 => KeyAlg::EcCurve(EcCurves::Secp256r1),
diff --git a/aries/aries_vcx_wallet/src/wallet/askar/entry_tags.rs b/aries/aries_vcx_wallet/src/wallet/askar/entry_tags.rs
index ea773957a9..3bf83442c8 100644
--- a/aries/aries_vcx_wallet/src/wallet/askar/entry_tags.rs
+++ b/aries/aries_vcx_wallet/src/wallet/askar/entry_tags.rs
@@ -6,7 +6,7 @@ impl From<EntryTag> for RecordTag {
     fn from(askar_tag: EntryTag) -> Self {
         match askar_tag {
             EntryTag::Encrypted(key, val) => RecordTag::new(&key, &val),
-            EntryTag::Plaintext(key, val) => RecordTag::new(&format!("~{}", key), &val),
+            EntryTag::Plaintext(key, val) => RecordTag::new(&format!("~{key}"), &val),
         }
     }
 }
diff --git a/aries/aries_vcx_wallet/src/wallet/askar/sig_type.rs b/aries/aries_vcx_wallet/src/wallet/askar/sig_type.rs
index 65645c041b..8503997772 100644
--- a/aries/aries_vcx_wallet/src/wallet/askar/sig_type.rs
+++ b/aries/aries_vcx_wallet/src/wallet/askar/sig_type.rs
@@ -31,8 +31,7 @@ impl SigType {
                 EcCurves::Secp384r1 => Ok(SigType::ES384),
             },
             alg => Err(VcxWalletError::InvalidInput(format!(
-                "{} does not support signing",
-                alg
+                "{alg} does not support signing"
             ))),
         }
     }
diff --git a/aries/aries_vcx_wallet/src/wallet/base_wallet/migrate.rs b/aries/aries_vcx_wallet/src/wallet/base_wallet/migrate.rs
index 758997ff36..d727219574 100644
--- a/aries/aries_vcx_wallet/src/wallet/base_wallet/migrate.rs
+++ b/aries/aries_vcx_wallet/src/wallet/base_wallet/migrate.rs
@@ -47,7 +47,7 @@ where
             );
         }
 
-        trace!("Migrating record: {:?}", source_record);
+        trace!("Migrating record: {source_record:?}");
         let maybe_record =
             transform_record(num_record, source_record.clone(), &mut migration_stats);
 
diff --git a/aries/aries_vcx_wallet/src/wallet/base_wallet/record_category.rs b/aries/aries_vcx_wallet/src/wallet/base_wallet/record_category.rs
index a2669c1b5c..db02f91aa1 100644
--- a/aries/aries_vcx_wallet/src/wallet/base_wallet/record_category.rs
+++ b/aries/aries_vcx_wallet/src/wallet/base_wallet/record_category.rs
@@ -86,6 +86,6 @@ impl Display for RecordCategory {
             RecordCategory::Key => KEY,
         };
 
-        write!(f, "{}", value)
+        write!(f, "{value}")
     }
 }
diff --git a/aries/messages/Cargo.toml b/aries/messages/Cargo.toml
index a144c404b4..c95727cbde 100644
--- a/aries/messages/Cargo.toml
+++ b/aries/messages/Cargo.toml
@@ -11,6 +11,7 @@ doctest = false
 [dependencies]
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
+serde-value.workspace = true
 chrono = { workspace = true, features = ["serde"] }
 lazy_static.workspace = true
 url = { workspace = true, features = ["serde"] }
diff --git a/aries/messages/src/lib.rs b/aries/messages/src/lib.rs
index 65f20cc785..591c6ff262 100644
--- a/aries/messages/src/lib.rs
+++ b/aries/messages/src/lib.rs
@@ -234,37 +234,6 @@ impl DelayedSerde for AriesMessage {
 ///
 /// For readability, the [`MessageType`] matching is done in the
 /// [`DelayedSerde::delayed_deserialize`] method.
-//
-// Yes, we're using some private serde constructs. Here's why I think this is okay:
-//  1) This emulates the derived implementation with the #[serde(tag = "@type")] attribute,
-// but uses [`MessageType`] instead of some [`Field`] struct that serde generates.
-//
-//  2) Without this, the implementation would either rely on something inefficient such as [`Value`]
-// as an intermediary, use some custom map which fails on duplicate entries as intermediary or
-// basically use [`serde_value`] which seems to be an old replica of [`Content`] and
-// [`ContentDeserializer`]. Also, [`serde_value::Value`] seems to always allocate. Using something
-// like `HashMap::<&str, &RawValue>` wouldn't work either, as there are issues flattening
-// `serde_json::RawValue`. It would also require some custom deserialization afterwards.
-//
-//  3) Exposing these parts as public is in progress from serde. When that will happen is still
-// unknown. See: <https://github.com/serde-rs/serde/issues/741>. With [`serde_value`] lacking
-// activity and not seeming to get integrated into [`serde`], this will most likely resurface.
-//
-//  4) Reimplementing this on breaking semver changes is as easy as expanding the derived
-// [`Deserialize`] impl and altering it a bit. And if that fails, the 2nd argument will still be
-// viable.
-//
-//
-// In the event of a `serde` version bump and this breaking, the fix is a matter of
-// implementing a struct such as and expanding the derive macro to see what it does:
-// ```
-// #[derive(Deserialize)]
-// #[serde(tag = "@type")]
-// enum MyStruct {
-//     Var(u8),
-//     Var2(u8),
-// }
-// ```
 impl<'de> Deserialize<'de> for AriesMessage {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -272,8 +241,6 @@ impl<'de> Deserialize<'de> for AriesMessage {
     {
         use std::borrow::Cow;
 
-        use serde::__private::de::{Content, ContentDeserializer};
-
         /// Helper that will only deserialize the message type and buffer the
         /// rest of the fields (borrowing where possible).
         #[derive(Deserialize)]
@@ -282,8 +249,7 @@ impl<'de> Deserialize<'de> for AriesMessage {
             #[serde(borrow)]
             msg_type: Cow<'a, str>,
             #[serde(flatten)]
-            #[serde(borrow)]
-            content: Content<'a>,
+            content: serde_value::Value,
         }
 
         let TypeAndContent { msg_type, content } = TypeAndContent::deserialize(deserializer)?;
@@ -291,9 +257,8 @@ impl<'de> Deserialize<'de> for AriesMessage {
         // Parse the message type field to get the protocol and message kind
         let msg_type = msg_type.as_ref().try_into().map_err(D::Error::custom)?;
 
-        // The content is [`Content`], the cached remaining fields of the
-        // serialized data. Serde uses this [`ContentDeserializer`] to deserialize from that format.
-        let deserializer = ContentDeserializer::<D::Error>::new(content);
+        // The content is serde_value::Value, which can be deserialized using ValueDeserializer
+        let deserializer = serde_value::ValueDeserializer::<D::Error>::new(content);
 
         Self::delayed_deserialize(msg_type, deserializer)
     }
diff --git a/aries/messages/src/msg_fields/protocols/did_exchange/v1_0/request.rs b/aries/messages/src/msg_fields/protocols/did_exchange/v1_0/request.rs
index ed8a1eca0b..f960e6fb7f 100644
--- a/aries/messages/src/msg_fields/protocols/did_exchange/v1_0/request.rs
+++ b/aries/messages/src/msg_fields/protocols/did_exchange/v1_0/request.rs
@@ -60,7 +60,7 @@ mod tests {
             .content(request_content())
             .decorators(RequestDecorators::default())
             .build();
-        let printed_json = format!("{}", msg);
+        let printed_json = format!("{msg}");
         let parsed_request: Request = serde_json::from_str(&printed_json).unwrap();
         assert_eq!(msg, parsed_request);
     }
diff --git a/aries/messages/src/msg_fields/protocols/did_exchange/v1_1/request.rs b/aries/messages/src/msg_fields/protocols/did_exchange/v1_1/request.rs
index 44456ea24e..977892cb18 100644
--- a/aries/messages/src/msg_fields/protocols/did_exchange/v1_1/request.rs
+++ b/aries/messages/src/msg_fields/protocols/did_exchange/v1_1/request.rs
@@ -60,7 +60,7 @@ mod tests {
             .content(request_content())
             .decorators(RequestDecorators::default())
             .build();
-        let printed_json = format!("{}", msg);
+        let printed_json = format!("{msg}");
         let parsed_request: Request = serde_json::from_str(&printed_json).unwrap();
         assert_eq!(msg, parsed_request);
     }
diff --git a/aries/misc/anoncreds_types/src/data_types/messages/pres_request.rs b/aries/misc/anoncreds_types/src/data_types/messages/pres_request.rs
index e43f0e0722..29e29314c3 100644
--- a/aries/misc/anoncreds_types/src/data_types/messages/pres_request.rs
+++ b/aries/misc/anoncreds_types/src/data_types/messages/pres_request.rs
@@ -290,11 +290,8 @@ impl Validatable for PresentationRequest {
             let has_name = !requested_attribute
                 .name
                 .as_ref()
-                .map_or(true, String::is_empty);
-            let has_names = !requested_attribute
-                .names
-                .as_ref()
-                .map_or(true, Vec::is_empty);
+                .is_none_or(String::is_empty);
+            let has_names = !requested_attribute.names.as_ref().is_none_or(Vec::is_empty);
             if !has_name && !has_names {
                 return Err(invalid!(
                     "Presentation request validation failed: there is empty requested attribute: \
diff --git a/aries/misc/anoncreds_types/src/utils/conversions.rs b/aries/misc/anoncreds_types/src/utils/conversions.rs
index 1230753994..53c05af294 100644
--- a/aries/misc/anoncreds_types/src/utils/conversions.rs
+++ b/aries/misc/anoncreds_types/src/utils/conversions.rs
@@ -61,5 +61,4 @@ pub fn from_revocation_registry_delta_to_revocation_status_list(
         Some(accum),
         Some(timestamp),
     )
-    .map_err(Into::into)
 }
diff --git a/aries/misc/anoncreds_types/src/utils/query.rs b/aries/misc/anoncreds_types/src/utils/query.rs
index 644729e323..fc489e3edf 100644
--- a/aries/misc/anoncreds_types/src/utils/query.rs
+++ b/aries/misc/anoncreds_types/src/utils/query.rs
@@ -476,7 +476,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":"{}"}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":"{value1}"}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -490,7 +490,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":{{"$neq":"{}"}}}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":{{"$neq":"{value1}"}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -504,7 +504,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":{{"$gt":"{}"}}}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":{{"$gt":"{value1}"}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -518,7 +518,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":{{"$gte":"{}"}}}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":{{"$gte":"{value1}"}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -532,7 +532,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":{{"$lt":"{}"}}}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":{{"$lt":"{value1}"}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -546,7 +546,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":{{"$lte":"{}"}}}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":{{"$lte":"{value1}"}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -560,7 +560,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":{{"$like":"{}"}}}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":{{"$like":"{value1}"}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -574,7 +574,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"{}":{{"$in":["{}"]}}}}"#, name1, value1);
+        let json = format!(r#"{{"{name1}":{{"$in":["{value1}"]}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -590,10 +590,7 @@ mod tests {
         let value2 = _random_string(10);
         let value3 = _random_string(10);
 
-        let json = format!(
-            r#"{{"{}":{{"$in":["{}","{}","{}"]}}}}"#,
-            name1, value1, value2, value3
-        );
+        let json = format!(r#"{{"{name1}":{{"$in":["{value1}","{value2}","{value3}"]}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -606,7 +603,7 @@ mod tests {
     fn test_exist_parse_string() {
         let name1 = _random_string(10);
 
-        let json = format!(r#"{{"$exist":"{}"}}"#, name1);
+        let json = format!(r#"{{"$exist":"{name1}"}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -620,7 +617,7 @@ mod tests {
         let name1 = _random_string(10);
         let name2 = _random_string(10);
 
-        let json = format!(r#"{{"$exist":["{}","{}"]}}"#, name1, name2);
+        let json = format!(r#"{{"$exist":["{name1}","{name2}"]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -634,10 +631,7 @@ mod tests {
         let name1 = _random_string(10);
         let name2 = _random_string(10);
 
-        let json = format!(
-            r#"{{"$and":[{{"$exist":"{}"}},{{"$exist":"{}"}}]}}"#,
-            name1, name2
-        );
+        let json = format!(r#"{{"$and":[{{"$exist":"{name1}"}},{{"$exist":"{name2}"}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -651,7 +645,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":"{}"}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":"{value1}"}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -665,7 +659,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":{{"$neq":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":{{"$neq":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -679,7 +673,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":{{"$gt":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":{{"$gt":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -693,7 +687,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":{{"$gte":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":{{"$gte":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -707,7 +701,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":{{"$lt":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":{{"$lt":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -721,7 +715,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":{{"$lte":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":{{"$lte":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -735,7 +729,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":{{"$like":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":{{"$like":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -749,7 +743,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"{}":{{"$in":["{}"]}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"{name1}":{{"$in":["{value1}"]}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -763,7 +757,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$and":[{{"$not":{{"{}":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$and":[{{"$not":{{"{name1}":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -781,10 +775,8 @@ mod tests {
         let name3 = _random_string(10);
         let value3 = _random_string(10);
 
-        let json = format!(
-            r#"{{"{}":"{}","{}":"{}","{}":"{}"}}"#,
-            name1, value1, name2, value2, name3, value3,
-        );
+        let json =
+            format!(r#"{{"{name1}":"{value1}","{name2}":"{value2}","{name3}":"{value3}"}}"#,);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
         let mut clauses = vec![
@@ -809,8 +801,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":"{}"}},{{"{}":"{}"}},{{"{}":"{}"}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":"{value1}"}},{{"{name2}":"{value2}"}},{{"{name3}":"{value3}"}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -834,8 +825,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$neq":"{value1}"}}}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$neq":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -859,8 +849,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$gt":"{value1}"}}}},{{"{name2}":{{"$gt":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -884,8 +873,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$gte":"{value1}"}}}},{{"{name2}":{{"$gte":"{value2}"}}}},{{"{name3}":{{"$gte":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -909,8 +897,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$lt":"{value1}"}}}},{{"{name2}":{{"$lt":"{value2}"}}}},{{"{name3}":{{"$lt":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -934,8 +921,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$lte":"{value1}"}}}},{{"{name2}":{{"$lte":"{value2}"}}}},{{"{name3}":{{"$lte":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -959,8 +945,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$like":"{value1}"}}}},{{"{name2}":{{"$like":"{value2}"}}}},{{"{name3}":{{"$like":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -984,8 +969,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$in":["{value1}"]}}}},{{"{name2}":{{"$in":["{value2}"]}}}},{{"{name3}":{{"$in":["{value3}"]}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1009,8 +993,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"$not":{{"{name1}":"{value1}"}}}},{{"$not":{{"{name2}":"{value2}"}}}},{{"$not":{{"{name3}":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1047,26 +1030,7 @@ mod tests {
         let value9 = _random_string(10);
 
         let json = format!(
-            r#"{{"$and":[{{"{}":"{}"}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$in":["{}","{}"]}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1,
-            value1,
-            name2,
-            value2,
-            name3,
-            value3,
-            name4,
-            value4,
-            name5,
-            value5,
-            name6,
-            value6,
-            name7,
-            value7,
-            name8,
-            value8a,
-            value8b,
-            name9,
-            value9,
+            r#"{{"$and":[{{"{name1}":"{value1}"}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}},{{"{name4}":{{"$gte":"{value4}"}}}},{{"{name5}":{{"$lt":"{value5}"}}}},{{"{name6}":{{"$lte":"{value6}"}}}},{{"{name7}":{{"$like":"{value7}"}}}},{{"{name8}":{{"$in":["{value8a}","{value8b}"]}}}},{{"$not":{{"{name9}":"{value9}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1091,7 +1055,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":"{}"}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":"{value1}"}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1105,7 +1069,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":{{"$neq":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":{{"$neq":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1119,7 +1083,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":{{"$gt":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":{{"$gt":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1133,7 +1097,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":{{"$gte":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":{{"$gte":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1147,7 +1111,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":{{"$lt":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":{{"$lt":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1161,7 +1125,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":{{"$lte":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":{{"$lte":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1175,7 +1139,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":{{"$like":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":{{"$like":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1189,7 +1153,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"{}":{{"$in":["{}"]}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"{name1}":{{"$in":["{value1}"]}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1203,7 +1167,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$or":[{{"$not":{{"{}":"{}"}}}}]}}"#, name1, value1);
+        let json = format!(r#"{{"$or":[{{"$not":{{"{name1}":"{value1}"}}}}]}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1222,8 +1186,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":"{}"}},{{"{}":"{}"}},{{"{}":"{}"}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":"{value1}"}},{{"{name2}":"{value2}"}},{{"{name3}":"{value3}"}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1247,8 +1210,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$neq":"{value1}"}}}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$neq":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1272,8 +1234,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$gt":"{value1}"}}}},{{"{name2}":{{"$gt":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1297,8 +1258,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$gte":"{value1}"}}}},{{"{name2}":{{"$gte":"{value2}"}}}},{{"{name3}":{{"$gte":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1322,8 +1282,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$lt":"{value1}"}}}},{{"{name2}":{{"$lt":"{value2}"}}}},{{"{name3}":{{"$lt":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1347,8 +1306,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$lte":"{value1}"}}}},{{"{name2}":{{"$lte":"{value2}"}}}},{{"{name3}":{{"$lte":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1372,8 +1330,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$like":"{value1}"}}}},{{"{name2}":{{"$like":"{value2}"}}}},{{"{name3}":{{"$like":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1397,8 +1354,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$in":["{value1}"]}}}},{{"{name2}":{{"$in":["{value2}"]}}}},{{"{name3}":{{"$in":["{value3}"]}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1422,8 +1378,7 @@ mod tests {
         let value3 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"$not":{{"{name1}":"{value1}"}}}},{{"$not":{{"{name2}":"{value2}"}}}},{{"$not":{{"{name3}":"{value3}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1460,26 +1415,7 @@ mod tests {
         let value9 = _random_string(10);
 
         let json = format!(
-            r#"{{"$or":[{{"{}":"{}"}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$in":["{}","{}"]}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1,
-            value1,
-            name2,
-            value2,
-            name3,
-            value3,
-            name4,
-            value4,
-            name5,
-            value5,
-            name6,
-            value6,
-            name7,
-            value7,
-            name8,
-            value8a,
-            value8b,
-            name9,
-            value9,
+            r#"{{"$or":[{{"{name1}":"{value1}"}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}},{{"{name4}":{{"$gte":"{value4}"}}}},{{"{name5}":{{"$lt":"{value5}"}}}},{{"{name6}":{{"$lte":"{value6}"}}}},{{"{name7}":{{"$like":"{value7}"}}}},{{"{name8}":{{"$in":["{value8a}","{value8b}"]}}}},{{"$not":{{"{name9}":"{value9}"}}}}]}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1504,7 +1440,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":"{}"}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":"{value1}"}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1518,7 +1454,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":{{"$neq":"{}"}}}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":{{"$neq":"{value1}"}}}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1532,7 +1468,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":{{"$gt":"{}"}}}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":{{"$gt":"{value1}"}}}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1546,7 +1482,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":{{"$gte":"{}"}}}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":{{"$gte":"{value1}"}}}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1560,7 +1496,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":{{"$lt":"{}"}}}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":{{"$lt":"{value1}"}}}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1574,7 +1510,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":{{"$lte":"{}"}}}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":{{"$lte":"{value1}"}}}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1588,7 +1524,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":{{"$like":"{}"}}}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":{{"$like":"{value1}"}}}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1602,7 +1538,7 @@ mod tests {
         let name1 = _random_string(10);
         let value1 = _random_string(10);
 
-        let json = format!(r#"{{"$not":{{"{}":{{"$in":["{}"]}}}}}}"#, name1, value1);
+        let json = format!(r#"{{"$not":{{"{name1}":{{"$in":["{value1}"]}}}}}}"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
@@ -1631,23 +1567,7 @@ mod tests {
         let value8 = _random_string(10);
 
         let json = format!(
-            r#"{{"$not":{{"$and":[{{"{}":"{}"}},{{"$or":[{{"{}":{{"$gt":"{}"}}}},{{"$not":{{"{}":{{"$lte":"{}"}}}}}},{{"$and":[{{"{}":{{"$lt":"{}"}}}},{{"$not":{{"{}":{{"$gte":"{}"}}}}}}]}}]}},{{"$not":{{"{}":{{"$like":"{}"}}}}}},{{"$and":[{{"{}":"{}"}},{{"$not":{{"{}":{{"$neq":"{}"}}}}}}]}}]}}}}"#,
-            name1,
-            value1,
-            name2,
-            value2,
-            name3,
-            value3,
-            name4,
-            value4,
-            name5,
-            value5,
-            name6,
-            value6,
-            name7,
-            value7,
-            name8,
-            value8,
+            r#"{{"$not":{{"$and":[{{"{name1}":"{value1}"}},{{"$or":[{{"{name2}":{{"$gt":"{value2}"}}}},{{"$not":{{"{name3}":{{"$lte":"{value3}"}}}}}},{{"$and":[{{"{name4}":{{"$lt":"{value4}"}}}},{{"$not":{{"{name5}":{{"$gte":"{value5}"}}}}}}]}}]}},{{"$not":{{"{name6}":{{"$like":"{value6}"}}}}}},{{"$and":[{{"{name7}":"{value7}"}},{{"$not":{{"{name8}":{{"$neq":"{value8}"}}}}}}]}}]}}}}"#,
         );
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
@@ -1715,7 +1635,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":"{}"}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":"{value1}"}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1729,7 +1649,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":{{"$neq":"{}"}}}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":{{"$neq":"{value1}"}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1743,7 +1663,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":{{"$gt":"{}"}}}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":{{"$gt":"{value1}"}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1757,7 +1677,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":{{"$gte":"{}"}}}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":{{"$gte":"{value1}"}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1771,7 +1691,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":{{"$lt":"{}"}}}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":{{"$lt":"{value1}"}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1785,7 +1705,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":{{"$lte":"{}"}}}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":{{"$lte":"{value1}"}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1799,7 +1719,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":{{"$like":"{}"}}}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":{{"$like":"{value1}"}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1813,7 +1733,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"{}":{{"$in":["{}"]}}}}"#, name1, value1);
+        let expected = format!(r#"{{"{name1}":{{"$in":["{value1}"]}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1832,10 +1752,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(
-            r#"{{"{}":{{"$in":["{}","{}","{}"]}}}}"#,
-            name1, value1, value2, value3
-        );
+        let expected = format!(r#"{{"{name1}":{{"$in":["{value1}","{value2}","{value3}"]}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1849,7 +1766,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":"{}"}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":"{value1}"}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1863,7 +1780,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":{{"$neq":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":{{"$neq":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1877,7 +1794,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":{{"$gt":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":{{"$gt":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1891,7 +1808,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":{{"$gte":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":{{"$gte":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1905,7 +1822,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":{{"$lt":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":{{"$lt":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1919,7 +1836,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":{{"$lte":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":{{"$lte":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1933,7 +1850,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":{{"$like":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":{{"$like":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1947,7 +1864,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"{}":{{"$in":["{}"]}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"{name1}":{{"$in":["{value1}"]}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1964,7 +1881,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$and":[{{"$not":{{"{}":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$and":[{{"$not":{{"{name1}":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -1987,8 +1904,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":"{}"}},{{"{}":"{}"}},{{"{}":"{}"}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":"{value1}"}},{{"{name2}":"{value2}"}},{{"{name3}":"{value3}"}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2012,8 +1928,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$neq":"{value1}"}}}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$neq":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2037,8 +1952,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$gt":"{value1}"}}}},{{"{name2}":{{"$gt":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2062,8 +1976,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$gte":"{value1}"}}}},{{"{name2}":{{"$gte":"{value2}"}}}},{{"{name3}":{{"$gte":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2087,8 +2000,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$lt":"{value1}"}}}},{{"{name2}":{{"$lt":"{value2}"}}}},{{"{name3}":{{"$lt":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2112,8 +2024,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$lte":"{value1}"}}}},{{"{name2}":{{"$lte":"{value2}"}}}},{{"{name3}":{{"$lte":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2137,8 +2048,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$like":"{value1}"}}}},{{"{name2}":{{"$like":"{value2}"}}}},{{"{name3}":{{"$like":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2162,8 +2072,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"{name1}":{{"$in":["{value1}"]}}}},{{"{name2}":{{"$in":["{value2}"]}}}},{{"{name3}":{{"$in":["{value3}"]}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2187,8 +2096,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$and":[{{"$not":{{"{name1}":"{value1}"}}}},{{"$not":{{"{name2}":"{value2}"}}}},{{"$not":{{"{name3}":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2231,26 +2139,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$and":[{{"{}":"{}"}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$in":["{}","{}"]}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1,
-            value1,
-            name2,
-            value2,
-            name3,
-            value3,
-            name4,
-            value4,
-            name5,
-            value5,
-            name6,
-            value6,
-            name7,
-            value7,
-            name8,
-            value8a,
-            value8b,
-            name9,
-            value9,
+            r#"{{"$and":[{{"{name1}":"{value1}"}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}},{{"{name4}":{{"$gte":"{value4}"}}}},{{"{name5}":{{"$lt":"{value5}"}}}},{{"{name6}":{{"$lte":"{value6}"}}}},{{"{name7}":{{"$like":"{value7}"}}}},{{"{name8}":{{"$in":["{value8a}","{value8b}"]}}}},{{"$not":{{"{name9}":"{value9}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2265,7 +2154,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":"{}"}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":"{value1}"}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2279,7 +2168,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":{{"$neq":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":{{"$neq":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2293,7 +2182,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":{{"$gt":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":{{"$gt":"{value1}"}}}}]}}"#);
         assert_eq!(json, expected);
     }
 
@@ -2306,7 +2195,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":{{"$gte":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":{{"$gte":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2320,7 +2209,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":{{"$lt":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":{{"$lt":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2334,7 +2223,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":{{"$lte":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":{{"$lte":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2348,7 +2237,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":{{"$like":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":{{"$like":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2362,7 +2251,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"{}":{{"$in":["{}"]}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"{name1}":{{"$in":["{value1}"]}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2379,7 +2268,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$or":[{{"$not":{{"{}":"{}"}}}}]}}"#, name1, value1);
+        let expected = format!(r#"{{"$or":[{{"$not":{{"{name1}":"{value1}"}}}}]}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2402,8 +2291,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":"{}"}},{{"{}":"{}"}},{{"{}":"{}"}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":"{value1}"}},{{"{name2}":"{value2}"}},{{"{name3}":"{value3}"}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2427,8 +2315,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$neq":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$neq":"{value1}"}}}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$neq":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2452,8 +2339,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$gt":"{value1}"}}}},{{"{name2}":{{"$gt":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2477,8 +2363,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$gte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$gte":"{value1}"}}}},{{"{name2}":{{"$gte":"{value2}"}}}},{{"{name3}":{{"$gte":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2502,8 +2387,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lt":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$lt":"{value1}"}}}},{{"{name2}":{{"$lt":"{value2}"}}}},{{"{name3}":{{"$lt":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2527,8 +2411,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$lte":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$lte":"{value1}"}}}},{{"{name2}":{{"$lte":"{value2}"}}}},{{"{name3}":{{"$lte":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2552,8 +2435,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$like":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$like":"{value1}"}}}},{{"{name2}":{{"$like":"{value2}"}}}},{{"{name3}":{{"$like":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2577,8 +2459,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}},{{"{}":{{"$in":["{}"]}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"{name1}":{{"$in":["{value1}"]}}}},{{"{name2}":{{"$in":["{value2}"]}}}},{{"{name3}":{{"$in":["{value3}"]}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2602,8 +2483,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1, value1, name2, value2, name3, value3,
+            r#"{{"$or":[{{"$not":{{"{name1}":"{value1}"}}}},{{"$not":{{"{name2}":"{value2}"}}}},{{"$not":{{"{name3}":"{value3}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2646,26 +2526,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$or":[{{"{}":"{}"}},{{"{}":{{"$neq":"{}"}}}},{{"{}":{{"$gt":"{}"}}}},{{"{}":{{"$gte":"{}"}}}},{{"{}":{{"$lt":"{}"}}}},{{"{}":{{"$lte":"{}"}}}},{{"{}":{{"$like":"{}"}}}},{{"{}":{{"$in":["{}","{}"]}}}},{{"$not":{{"{}":"{}"}}}}]}}"#,
-            name1,
-            value1,
-            name2,
-            value2,
-            name3,
-            value3,
-            name4,
-            value4,
-            name5,
-            value5,
-            name6,
-            value6,
-            name7,
-            value7,
-            name8,
-            value8a,
-            value8b,
-            name9,
-            value9,
+            r#"{{"$or":[{{"{name1}":"{value1}"}},{{"{name2}":{{"$neq":"{value2}"}}}},{{"{name3}":{{"$gt":"{value3}"}}}},{{"{name4}":{{"$gte":"{value4}"}}}},{{"{name5}":{{"$lt":"{value5}"}}}},{{"{name6}":{{"$lte":"{value6}"}}}},{{"{name7}":{{"$like":"{value7}"}}}},{{"{name8}":{{"$in":["{value8a}","{value8b}"]}}}},{{"$not":{{"{name9}":"{value9}"}}}}]}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2680,7 +2541,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":"{}"}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":"{value1}"}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2694,7 +2555,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":{{"$neq":"{}"}}}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":{{"$neq":"{value1}"}}}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2708,7 +2569,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":{{"$gt":"{}"}}}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":{{"$gt":"{value1}"}}}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2722,7 +2583,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":{{"$gte":"{}"}}}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":{{"$gte":"{value1}"}}}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2736,7 +2597,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":{{"$lt":"{}"}}}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":{{"$lt":"{value1}"}}}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2750,7 +2611,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":{{"$lte":"{}"}}}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":{{"$lte":"{value1}"}}}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2764,7 +2625,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":{{"$like":"{}"}}}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":{{"$like":"{value1}"}}}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2778,7 +2639,7 @@ mod tests {
 
         let json = ::serde_json::to_string(&query).unwrap();
 
-        let expected = format!(r#"{{"$not":{{"{}":{{"$in":["{}"]}}}}}}"#, name1, value1);
+        let expected = format!(r#"{{"$not":{{"{name1}":{{"$in":["{value1}"]}}}}}}"#);
 
         assert_eq!(json, expected);
     }
@@ -2822,23 +2683,7 @@ mod tests {
         let json = ::serde_json::to_string(&query).unwrap();
 
         let expected = format!(
-            r#"{{"$not":{{"$and":[{{"{}":"{}"}},{{"$or":[{{"{}":{{"$gt":"{}"}}}},{{"$not":{{"{}":{{"$lte":"{}"}}}}}},{{"$and":[{{"{}":{{"$lt":"{}"}}}},{{"$not":{{"{}":{{"$gte":"{}"}}}}}}]}}]}},{{"$not":{{"{}":{{"$like":"{}"}}}}}},{{"$and":[{{"{}":"{}"}},{{"$not":{{"{}":{{"$neq":"{}"}}}}}}]}}]}}}}"#,
-            name1,
-            value1,
-            name2,
-            value2,
-            name3,
-            value3,
-            name4,
-            value4,
-            name5,
-            value5,
-            name6,
-            value6,
-            name7,
-            value7,
-            name8,
-            value8,
+            r#"{{"$not":{{"$and":[{{"{name1}":"{value1}"}},{{"$or":[{{"{name2}":{{"$gt":"{value2}"}}}},{{"$not":{{"{name3}":{{"$lte":"{value3}"}}}}}},{{"$and":[{{"{name4}":{{"$lt":"{value4}"}}}},{{"$not":{{"{name5}":{{"$gte":"{value5}"}}}}}}]}}]}},{{"$not":{{"{name6}":{{"$like":"{value6}"}}}}}},{{"$and":[{{"{name7}":"{value7}"}},{{"$not":{{"{name8}":{{"$neq":"{value8}"}}}}}}]}}]}}}}"#,
         );
 
         assert_eq!(json, expected);
@@ -2851,10 +2696,7 @@ mod tests {
         let value1 = _random_string(10);
         let value2 = _random_string(10);
 
-        let json = format!(
-            r#"[{{"{}":"{}"}}, {{"{}":"{}"}}]"#,
-            name1, value1, name2, value2
-        );
+        let json = format!(r#"[{{"{name1}":"{value1}"}}, {{"{name2}":"{value2}"}}]"#);
 
         let query: Query = ::serde_json::from_str(&json).unwrap();
 
diff --git a/aries/misc/indy_ledger_response_parser/src/domain/response.rs b/aries/misc/indy_ledger_response_parser/src/domain/response.rs
index 8a0fac4a89..e27b759c91 100644
--- a/aries/misc/indy_ledger_response_parser/src/domain/response.rs
+++ b/aries/misc/indy_ledger_response_parser/src/domain/response.rs
@@ -112,8 +112,7 @@ where
         let actual_type = value.result.type_;
         if expected_type != actual_type {
             Err(LedgerResponseParserError::InvalidTransaction(format!(
-                "Unexpected response type:\nExpected: {}\nActual: {}",
-                expected_type, actual_type
+                "Unexpected response type:\nExpected: {expected_type}\nActual: {actual_type}"
             )))
         } else {
             Ok(ReplyV0 {
diff --git a/aries/misc/shared/src/http_client.rs b/aries/misc/shared/src/http_client.rs
index 8b37051ed1..6084566ccd 100644
--- a/aries/misc/shared/src/http_client.rs
+++ b/aries/misc/shared/src/http_client.rs
@@ -16,7 +16,7 @@ lazy_static! {
             .build()
         {
             Ok(client) => client,
-            Err(e) => panic!("Building reqwest client failed: {:?}", e),
+            Err(e) => panic!("Building reqwest client failed: {e:?}"),
         }
     };
 }
@@ -36,7 +36,7 @@ async fn send_post_request(url: &Url, body_content: Vec<u8>) -> HttpResult<Respo
         .header(USER_AGENT, "reqwest")
         .send()
         .await
-        .map_err(|err| HttpError::from_msg(format!("HTTP Client could not connect, err: {}", err)))
+        .map_err(|err| HttpError::from_msg(format!("HTTP Client could not connect, err: {err}")))
 }
 
 async fn process_response(response: Response) -> HttpResult<Vec<u8>> {
@@ -48,15 +48,13 @@ async fn process_response(response: Response) -> HttpResult<Vec<u8>> {
                 Ok(payload.into_bytes())
             } else {
                 Err(HttpError::from_msg(format!(
-                    "POST failed due to non-success HTTP status: {}, response body: {}",
-                    response_status, payload
+                    "POST failed due to non-success HTTP status: {response_status}, response body: {payload}"
                 )))
             }
         }
         Err(error) => Err(HttpError::from_msg(format!(
-            "POST failed because response could not be decoded as utf-8, HTTP status: {}, \
-             content-length header: {:?}, error: {:?}",
-            response_status, content_length, error
+            "POST failed because response could not be decoded as utf-8, HTTP status: {response_status}, \
+             content-length header: {content_length:?}, error: {error:?}"
         ))),
     }
 }
diff --git a/aries/misc/test_utils/src/devsetup.rs b/aries/misc/test_utils/src/devsetup.rs
index 4697bd8fb8..4e01d9b3e6 100644
--- a/aries/misc/test_utils/src/devsetup.rs
+++ b/aries/misc/test_utils/src/devsetup.rs
@@ -52,9 +52,7 @@ pub fn write_file<P: AsRef<Path> + AsRef<std::ffi::OsStr>>(
         DirBuilder::new()
             .recursive(true)
             .create(parent_path)
-            .map_err(|err| {
-                TestUtilsError::UnknownError(format!("Can't create the file: {}", err))
-            })?;
+            .map_err(|err| TestUtilsError::UnknownError(format!("Can't create the file: {err}")))?;
     }
 
     let mut file = OpenOptions::new()
@@ -62,26 +60,23 @@ pub fn write_file<P: AsRef<Path> + AsRef<std::ffi::OsStr>>(
         .truncate(true)
         .create(true)
         .open(path)
-        .map_err(|err| TestUtilsError::UnknownError(format!("Can't open the file: {}", err)))?;
+        .map_err(|err| TestUtilsError::UnknownError(format!("Can't open the file: {err}")))?;
 
     file.write_all(content.as_bytes()).map_err(|err| {
         TestUtilsError::UnknownError(format!(
-            "Can't write content: \"{}\" to the file: {}",
-            content, err
+            "Can't write content: \"{content}\" to the file: {err}"
         ))
     })?;
 
     file.flush().map_err(|err| {
         TestUtilsError::UnknownError(format!(
-            "Can't write content: \"{}\" to the file: {}",
-            content, err
+            "Can't write content: \"{content}\" to the file: {err}"
         ))
     })?;
 
     file.sync_data().map_err(|err| {
         TestUtilsError::UnknownError(format!(
-            "Can't write content: \"{}\" to the file: {}",
-            content, err
+            "Can't write content: \"{content}\" to the file: {err}"
         ))
     })
 }
@@ -221,7 +216,7 @@ pub async fn build_setup_profile() -> SetupProfile<
         .await
         .unwrap();
 
-    debug!("genesis_file_path: {}", genesis_file_path);
+    debug!("genesis_file_path: {genesis_file_path}");
 
     SetupProfile {
         ledger_read,
diff --git a/aries/misc/test_utils/src/logger.rs b/aries/misc/test_utils/src/logger.rs
index 1d75fcddff..978de87782 100644
--- a/aries/misc/test_utils/src/logger.rs
+++ b/aries/misc/test_utils/src/logger.rs
@@ -73,9 +73,7 @@ impl LibvcxDefaultLogger {
             .filter(None, LevelFilter::Off)
             .parse_filters(pattern.as_deref().unwrap_or("warn"))
             .try_init()
-            .map_err(|err| {
-                TestUtilsError::LoggingError(format!("Cannot init logger: {:?}", err))
-            })?;
+            .map_err(|err| TestUtilsError::LoggingError(format!("Cannot init logger: {err:?}")))?;
         Ok(())
     }
 }
diff --git a/aries/misc/test_utils/src/mock_wallet.rs b/aries/misc/test_utils/src/mock_wallet.rs
index ed475ede83..50e22e09b1 100644
--- a/aries/misc/test_utils/src/mock_wallet.rs
+++ b/aries/misc/test_utils/src/mock_wallet.rs
@@ -163,7 +163,7 @@ impl DidWallet for MockWallet {
 
     async fn unpack_message(&self, msg: &[u8]) -> VcxWalletResult<UnpackMessageOutput> {
         Ok(UnpackMessageOutput {
-            message: format!("{:?}", msg),
+            message: format!("{msg:?}"),
             recipient_verkey: "".to_owned(),
             sender_verkey: None,
         })
diff --git a/aries/wrappers/uniffi-aries-vcx/README.md b/aries/wrappers/uniffi-aries-vcx/README.md
deleted file mode 100644
index d85d469228..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# UniFFI Aries VCX Proof Of Concept
-
-This sub-directory contains the UniFFI wrappers and tools to generate Kotlin & Swift mobile wrappers over the `aries-vcx` crate.
-
-## Core
-
-Core contains a crate which wraps over the `aries-vcx` crate to provide a UniFFI-ready interface for wrapping. This crate's interface is what is used in `demos`.
-
-## Demos
-
-Coming soon..
-
-## Building
-
-This module is distributed in three directories.
-
-1. `core`: The UniFFI bindings for Aries VCX.
-2. `demo`: Demo application consuming the UniFFI wrapper code.
-3. `scripts`: Contains helper sh scripts to ease the process of setting up, building and generating the UniFFI code.
-
-To generate the UniFFI bindings, you need to set up [cargo-ndk](https://github.com/bbqsrc/cargo-ndk) on your system. Instructions to set up `cargo-ndk` are available [here](https://github.com/bbqsrc/cargo-ndk#installing), but can be summed up as:
-
-1. Install `cargo-ndk`.
-
-```bash
-cargo install cargo-ndk
-```
-
-2. Add target architectures you want to use.
-
-```bash
-rustup target add <target>
-```
-
-eg. for Android ARM64 on host linux platform.
-
-```bash
-rustup target add aarch64-linux-android
-```
-
-More documentation can be found [here](https://rust-lang.github.io/rustup/cross-compilation.html). Information on supported platforms can be found [here](https://doc.rust-lang.org/stable/rustc/platform-support.html).
-
-3. `cargo-ndk` requires Android NDK to be set up on the host machine. The recommended way of doing this is using Android Studio as described [here](https://developer.android.com/studio/projects/install-ndk#default-version).
-
-4. If `cargo-ndk` cannot find the installed NDK, you may have to configure the `ANDROID_NDK_HOME` environment variable as described [here](https://github.com/bbqsrc/cargo-ndk#usage).
-
-5. Run the helper build script.
-
-```bash
-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.
-
-# Testing the simple message relay on Android
-
-Aries-VCX supports connection to [tools/simple_message_relay](/misc/simple_message_relay/) on android. You need to setup the agent with instructions [here](/misc/simple_message_relay/README.md#service-setup) and exposing a public endpoint as explained [here](/misc/simple_message_relay/README.md#public-endpoints).
-
-The demo app needs this endpoint to establish communication with the peer.
-
-Update [BASE_RELAY_ENDPOINT](./demo/app/src/main/java/org/hyperledger/ariesvcx/Constants.kt) to reflect the public IP.
-
-```kt
-const val BASE_RELAY_ENDPOINT = <your-public-ip-endpoint>;
-```
-
-Now you are ready to start communicating. Use the QR scanner in the app to establish connection with the peer.
-
-## Support
-
-Currently the builds have been tested for android `arm64 (aarch64)` on a physical device. In the future we plan to support other architectures.
diff --git a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml
deleted file mode 100644
index 4c0b7cc183..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "uniffi_aries_vcx"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-
-[lib]
-crate-type = ["cdylib"]
-name = "uniffi_vcx"
-
-[[bin]]
-name = "uniffi-bindgen"
-path = "uniffi-bindgen.rs"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-uniffi = { workspace = true, features = ["cli"] }
-aries_vcx = { path = "../../../aries_vcx", features = [
-    "anoncreds",
-    "askar_wallet"
-] }
-aries_vcx_ledger = { path = "../../../aries_vcx_ledger" }
-aries_vcx_anoncreds = { path = "../../../aries_vcx_anoncreds" }
-indy-vdr.workspace = true
-tokio = { workspace = true, features = ["rt-multi-thread"] }
-once_cell.workspace = true
-thiserror.workspace = true
-serde_json.workspace = true
-async-trait.workspace = true
-did_parser_nom = { path = "../../../../did_core/did_parser_nom" }
-shared = { path = "../../../misc/shared" }
-url.workspace = true
-android_logger.workspace = true
-log.workspace = true
-
-[build-dependencies]
-uniffi = { workspace = true, features = ["build", "cli"] }
diff --git a/aries/wrappers/uniffi-aries-vcx/core/README.md b/aries/wrappers/uniffi-aries-vcx/core/README.md
deleted file mode 100644
index b9f3431913..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Core UniFFI Aries VCX wrapper
-
-This crate contains the proof of concept UniFFI wrapper over the `aries-vcx` crate. The wrapper's purpose is to very thinly wrap over the `aries-vcx` crate, to make it UniFFI-friendly.
-
-# Scaffolding
-
-Scaffolding is the rust code generated by UniFFI to create C-callable bindings to this crate. These bindings are automatically built by `build.rs`, targeting the `vcx.udl` file. These bindings are located in the `target` directory of the project/workspace and will show compiler errors if the `vcx.udl` interface does not integrate with this crate.
-
-# Wrapper generation
-
-Wrappers can be generated using the `uniffi-bindgen.rs` build script for kotlin and swift:
-
-```
-cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/vcx.udl --language kotlin
-```
-
-```
-cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/vcx.udl --language swift
-```
-
-More info can be found here: https://mozilla.github.io/uniffi-rs/tutorial/foreign_language_bindings.html.
diff --git a/aries/wrappers/uniffi-aries-vcx/core/build.rs b/aries/wrappers/uniffi-aries-vcx/core/build.rs
deleted file mode 100644
index 702c6cc8a2..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/build.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    uniffi::generate_scaffolding("./src/vcx.udl").unwrap();
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/anoncreds.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/anoncreds.rs
deleted file mode 100644
index f79092428e..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/anoncreds.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use std::sync::Arc;
-
-use aries_vcx_anoncreds::anoncreds::base_anoncreds::BaseAnonCreds;
-
-use super::profile::ProfileHolder;
-use crate::{errors::error::VcxUniFFIResult, runtime::block_on};
-
-pub fn get_credentials(profile_holder: Arc<ProfileHolder>) -> VcxUniFFIResult<String> {
-    block_on(async {
-        let credentials = profile_holder
-            .inner
-            .anoncreds()
-            .prover_get_credentials(profile_holder.inner.wallet(), Some("{}"))
-            .await?;
-        Ok(serde_json::to_string(&credentials)?)
-    })
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/http_client.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/http_client.rs
deleted file mode 100644
index 0e29279c83..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/http_client.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use aries_vcx::{errors::error::VcxResult, transport::Transport};
-use async_trait::async_trait;
-use shared::http_client::post_message;
-use url::Url;
-pub struct HttpClient;
-
-#[async_trait]
-impl Transport for HttpClient {
-    async fn send_message(&self, msg: Vec<u8>, service_endpoint: &Url) -> VcxResult<()> {
-        post_message(msg, service_endpoint).await?;
-        Ok(())
-    }
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/logging.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/logging.rs
deleted file mode 100644
index 9a21940e04..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/logging.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use android_logger::Config;
-use log::{debug, LevelFilter};
-
-pub fn enable_logging() {
-    android_logger::init_once(Config::default().with_max_level(LevelFilter::Trace));
-    debug!("this is a debug {}", "message");
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/mod.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/mod.rs
deleted file mode 100644
index 0b52298f0e..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod anoncreds;
-pub mod http_client;
-pub mod logging;
-pub mod profile;
-pub mod unpack_message;
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/profile/askar.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/profile/askar.rs
deleted file mode 100644
index ef272e99aa..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/profile/askar.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::sync::Arc;
-
-use aries_vcx::{
-    aries_vcx_anoncreds::anoncreds::base_anoncreds::BaseAnonCreds,
-    aries_vcx_wallet::wallet::{
-        askar::{askar_wallet_config::AskarWalletConfig, AskarWallet},
-        base_wallet::ManageWallet,
-    },
-};
-use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
-use aries_vcx_ledger::ledger::{
-    indy_vdr_ledger::{indyvdr_build_ledger_read, IndyVdrLedgerRead},
-    request_submitter::vdr_ledger::{IndyVdrLedgerPool, IndyVdrSubmitter},
-    response_cacher::in_memory::{InMemoryResponseCacher, InMemoryResponseCacherConfig},
-};
-use indy_vdr::config::PoolConfig;
-
-use crate::{
-    core::logging::enable_logging, errors::error::VcxUniFFIResult, runtime::block_on, ProfileHolder,
-};
-
-#[derive(Debug)]
-pub struct UniffiProfile {
-    pub wallet: AskarWallet,
-    pub anoncreds: Anoncreds,
-    pub ledger_read: IndyVdrLedgerRead<IndyVdrSubmitter, InMemoryResponseCacher>,
-}
-
-pub fn new_indy_profile(
-    wallet_config: AskarWalletConfig,
-    genesis_file_path: String,
-) -> VcxUniFFIResult<Arc<ProfileHolder>> {
-    // Enable android logging
-    enable_logging();
-
-    block_on(async {
-        let wallet = wallet_config.create_wallet().await?;
-
-        let anoncreds = Anoncreds;
-
-        anoncreds
-            .prover_create_link_secret(&wallet, &"main".to_string())
-            .await
-            .ok();
-
-        let indy_vdr_config = PoolConfig::default();
-        let cache_config = InMemoryResponseCacherConfig::builder()
-            .ttl(std::time::Duration::from_secs(60))
-            .capacity(1000)?
-            .build();
-        let ledger_pool = IndyVdrLedgerPool::new(genesis_file_path, indy_vdr_config, vec![])?;
-        let request_submitter = IndyVdrSubmitter::new(ledger_pool);
-        let ledger_read = indyvdr_build_ledger_read(request_submitter, cache_config)?;
-        let profile = UniffiProfile {
-            anoncreds: Anoncreds,
-            wallet,
-            ledger_read,
-        };
-
-        Ok(Arc::new(ProfileHolder { inner: profile }))
-    })
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/profile/mod.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/profile/mod.rs
deleted file mode 100644
index 332460c3e7..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/profile/mod.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use aries_vcx::errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult};
-use aries_vcx_anoncreds::anoncreds::anoncreds::Anoncreds;
-use aries_vcx_ledger::ledger::{
-    base_ledger::TxnAuthrAgrmtOptions, indy_vdr_ledger::IndyVdrLedgerRead,
-    request_submitter::vdr_ledger::IndyVdrSubmitter,
-    response_cacher::in_memory::InMemoryResponseCacher,
-};
-
-pub mod askar;
-use aries_vcx::aries_vcx_wallet::wallet::askar::AskarWallet;
-pub use askar as profile;
-
-use crate::profile::UniffiProfile;
-
-impl UniffiProfile {
-    pub fn ledger_read(&self) -> &IndyVdrLedgerRead<IndyVdrSubmitter, InMemoryResponseCacher> {
-        &self.ledger_read
-    }
-
-    pub fn anoncreds(&self) -> &Anoncreds {
-        &self.anoncreds
-    }
-
-    pub fn wallet(&self) -> &AskarWallet {
-        &self.wallet
-    }
-
-    pub fn update_taa_configuration(&self, _taa_options: TxnAuthrAgrmtOptions) -> VcxResult<()> {
-        Err(AriesVcxError::from_msg(
-            AriesVcxErrorKind::ActionNotSupported,
-            "update_taa_configuration no implemented for VdrtoolsProfile",
-        ))
-    }
-}
-
-pub struct ProfileHolder {
-    pub(crate) inner: UniffiProfile,
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/unpack_message.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/unpack_message.rs
deleted file mode 100644
index 6dea52d5c7..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/unpack_message.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use std::sync::Arc;
-
-use aries_vcx::aries_vcx_wallet::wallet::{
-    base_wallet::did_wallet::DidWallet, structs_io::UnpackMessageOutput,
-};
-
-use super::profile::ProfileHolder;
-use crate::{errors::error::VcxUniFFIResult, runtime::block_on};
-
-pub type UnpackMessage = UnpackMessageOutput;
-
-pub fn unpack_message(
-    profile_holder: Arc<ProfileHolder>,
-    packed_msg: String,
-) -> VcxUniFFIResult<UnpackMessage> {
-    block_on(async {
-        let packed_bytes = packed_msg.as_bytes();
-        let wallet = profile_holder.inner.wallet();
-        let unpacked_message = wallet.unpack_message(packed_bytes).await?;
-        Ok(unpacked_message)
-    })
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/errors/error.rs b/aries/wrappers/uniffi-aries-vcx/core/src/errors/error.rs
deleted file mode 100644
index b58f8c7859..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/errors/error.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-pub type VcxUniFFIResult<T> = Result<T, VcxUniFFIError>;
-
-// I've been super lazy here and only defined two types. But there
-// can/should be effectively 1-to-1 mapping with Aries_VCX errors
-#[derive(Debug, thiserror::Error)]
-pub enum VcxUniFFIError {
-    #[error("An AriesVCX error occured. More Info: {}", error_msg)]
-    AriesVcxError { error_msg: String },
-    #[error("An AriesVCXWallet error occured. More Info: {}", error_msg)]
-    AriesVcxWalletError { error_msg: String },
-    #[error("An AriesVCXLedger error occured. More Info: {}", error_msg)]
-    AriesVcxLedgerError { error_msg: String },
-    #[error("An AriesVCXAnoncreds error occured. More Info: {}", error_msg)]
-    AriesVcxAnoncredsError { error_msg: String },
-    #[error(
-        "A serialization error occurred. Check your inputs. More Info: {}",
-        error_msg
-    )]
-    SerializationError { error_msg: String },
-    #[error("A string could not be parsed. More Info: {}", error_msg)]
-    StringParseError { error_msg: String },
-    #[error("An unexpected internal error occured. More Info: {}", error_msg)]
-    InternalError { error_msg: String },
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/errors/mapping_from_ariesvcx.rs b/aries/wrappers/uniffi-aries-vcx/core/src/errors/mapping_from_ariesvcx.rs
deleted file mode 100644
index 7abd8c8321..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/errors/mapping_from_ariesvcx.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use aries_vcx::{aries_vcx_wallet::errors::error::VcxWalletError, errors::error::AriesVcxError};
-use aries_vcx_anoncreds::errors::error::VcxAnoncredsError;
-use aries_vcx_ledger::errors::error::VcxLedgerError;
-
-use super::error::VcxUniFFIError;
-
-impl From<AriesVcxError> for VcxUniFFIError {
-    fn from(e: AriesVcxError) -> Self {
-        let default = e;
-        VcxUniFFIError::AriesVcxError {
-            error_msg: format!("AriesVcxError: {default}"),
-        }
-    }
-}
-
-impl From<VcxWalletError> for VcxUniFFIError {
-    fn from(e: VcxWalletError) -> Self {
-        let default = e;
-        VcxUniFFIError::AriesVcxWalletError {
-            error_msg: format!("AriesVcxWalletError: {default}"),
-        }
-    }
-}
-
-impl From<VcxLedgerError> for VcxUniFFIError {
-    fn from(e: VcxLedgerError) -> Self {
-        let default = e;
-        VcxUniFFIError::AriesVcxLedgerError {
-            error_msg: format!("AriesVcxLedgerError: {default}"),
-        }
-    }
-}
-
-impl From<VcxAnoncredsError> for VcxUniFFIError {
-    fn from(e: VcxAnoncredsError) -> Self {
-        let default = e;
-        VcxUniFFIError::AriesVcxAnoncredsError {
-            error_msg: format!("AriesVcxanoncredsError: {default}"),
-        }
-    }
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/errors/mapping_from_others.rs b/aries/wrappers/uniffi-aries-vcx/core/src/errors/mapping_from_others.rs
deleted file mode 100644
index 47676cf159..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/errors/mapping_from_others.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use std::{string::FromUtf8Error, sync::PoisonError};
-
-use super::error::VcxUniFFIError;
-
-impl<T> From<PoisonError<T>> for VcxUniFFIError {
-    fn from(e: PoisonError<T>) -> Self {
-        VcxUniFFIError::InternalError {
-            error_msg: e.to_string(),
-        }
-    }
-}
-
-impl From<serde_json::Error> for VcxUniFFIError {
-    fn from(e: serde_json::Error) -> Self {
-        VcxUniFFIError::SerializationError {
-            error_msg: e.to_string(),
-        }
-    }
-}
-
-impl From<FromUtf8Error> for VcxUniFFIError {
-    fn from(e: FromUtf8Error) -> Self {
-        VcxUniFFIError::StringParseError {
-            error_msg: e.to_string(),
-        }
-    }
-}
-
-impl From<did_parser_nom::ParseError> for VcxUniFFIError {
-    fn from(e: did_parser_nom::ParseError) -> Self {
-        VcxUniFFIError::StringParseError {
-            error_msg: e.to_string(),
-        }
-    }
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/errors/mod.rs b/aries/wrappers/uniffi-aries-vcx/core/src/errors/mod.rs
deleted file mode 100644
index f78bc4f824..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/errors/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod error;
-pub mod mapping_from_ariesvcx;
-pub mod mapping_from_others;
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/handlers/connection.rs b/aries/wrappers/uniffi-aries-vcx/core/src/handlers/connection.rs
deleted file mode 100644
index b77787399a..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/handlers/connection.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use aries_vcx::{
-    errors::error::{AriesVcxError, AriesVcxErrorKind},
-    protocols::connection::{
-        pairwise_info::PairwiseInfo, Connection as VcxConnection,
-        GenericConnection as VcxGenericConnection, ThinState,
-    },
-};
-use url::Url;
-
-use crate::{
-    core::{http_client::HttpClient, profile::ProfileHolder},
-    errors::error::VcxUniFFIResult,
-    runtime::block_on,
-};
-
-/// Wraps [ThinState], as uniffi cannot process enums with un-named fields
-pub struct ConnectionState {
-    pub role: ConnectionRole,
-    pub protocol_state: ConnectionProtocolState,
-}
-
-pub enum ConnectionRole {
-    Invitee,
-    Inviter,
-}
-
-pub enum ConnectionProtocolState {
-    Initial,
-    Invited,
-    Requested,
-    Responded,
-    Completed,
-}
-
-impl From<ThinState> for ConnectionState {
-    fn from(x: ThinState) -> Self {
-        match x {
-            ThinState::Inviter(state) => ConnectionState {
-                role: ConnectionRole::Inviter,
-                protocol_state: ConnectionProtocolState::from(state),
-            },
-            ThinState::Invitee(state) => ConnectionState {
-                role: ConnectionRole::Invitee,
-                protocol_state: ConnectionProtocolState::from(state),
-            },
-        }
-    }
-}
-
-impl From<aries_vcx::protocols::connection::State> for ConnectionProtocolState {
-    fn from(value: aries_vcx::protocols::connection::State) -> Self {
-        match value {
-            aries_vcx::protocols::connection::State::Initial => ConnectionProtocolState::Initial,
-            aries_vcx::protocols::connection::State::Invited => ConnectionProtocolState::Invited,
-            aries_vcx::protocols::connection::State::Requested => {
-                ConnectionProtocolState::Requested
-            }
-            aries_vcx::protocols::connection::State::Responded => {
-                ConnectionProtocolState::Responded
-            }
-            aries_vcx::protocols::connection::State::Completed => {
-                ConnectionProtocolState::Completed
-            }
-        }
-    }
-}
-
-pub struct Connection {
-    handler: Mutex<VcxGenericConnection>,
-}
-
-// seperate function since uniffi can't handle constructors with results
-pub fn create_inviter(profile: Arc<ProfileHolder>) -> VcxUniFFIResult<Arc<Connection>> {
-    block_on(async {
-        let pairwise_info = PairwiseInfo::create(profile.inner.wallet()).await?;
-        let connection = VcxConnection::new_inviter(String::new(), pairwise_info);
-        let handler = Mutex::new(VcxGenericConnection::from(connection));
-        Ok(Arc::new(Connection { handler }))
-    })
-}
-
-// seperate function since uniffi can't handle constructors with results
-pub fn create_invitee(profile: Arc<ProfileHolder>) -> VcxUniFFIResult<Arc<Connection>> {
-    block_on(async {
-        let pairwise_info = PairwiseInfo::create(profile.inner.wallet()).await?;
-        let connection = VcxConnection::new_invitee(String::new(), pairwise_info);
-        let handler = Mutex::new(VcxGenericConnection::from(connection));
-
-        Ok(Arc::new(Connection { handler }))
-    })
-}
-
-impl Connection {
-    pub fn get_state(&self) -> VcxUniFFIResult<ConnectionState> {
-        let handler = self.handler.lock()?;
-        Ok(ConnectionState::from(handler.state()))
-    }
-
-    pub fn pairwise_info(&self) -> VcxUniFFIResult<PairwiseInfo> {
-        let handler = self.handler.lock()?;
-        Ok(handler.pairwise_info().clone())
-    }
-
-    // NOTE : using string here out of laziness. We could have type this,
-    // but UniFFI does not support structs with unnamed fields. So we'd have to
-    // wrap these types
-    // here invitation -> aries_vcx::Invitation
-    pub fn accept_invitation(
-        &self,
-        profile: Arc<ProfileHolder>,
-        invitation: String,
-    ) -> VcxUniFFIResult<()> {
-        let mut handler = self.handler.lock()?;
-        let invitation = serde_json::from_str(&invitation)?;
-
-        let connection = VcxConnection::try_from(handler.clone())?;
-
-        block_on(async {
-            let new_conn = connection
-                .accept_invitation(profile.inner.ledger_read(), invitation)
-                .await?;
-            *handler = VcxGenericConnection::from(new_conn);
-            Ok(())
-        })
-    }
-
-    // NOTE : using string here out of laziness. We could have type this,
-    // but UniFFI does not support structs with unnamed fields. So we'd have to
-    // wrap these types
-    // here request -> aries_vcx::Request
-    pub fn handle_request(
-        &self,
-        profile: Arc<ProfileHolder>,
-        request: String,
-        service_endpoint: String,
-        routing_keys: Vec<String>,
-    ) -> VcxUniFFIResult<()> {
-        let mut handler = self.handler.lock()?;
-        let request = serde_json::from_str(&request)?;
-
-        let connection = VcxConnection::try_from(handler.clone())?;
-        let url = Url::parse(&service_endpoint).map_err(|err| {
-            AriesVcxError::from_msg(AriesVcxErrorKind::InvalidUrl, err.to_string())
-        })?;
-
-        block_on(async {
-            let new_conn = connection
-                .handle_request(profile.inner.wallet(), request, url, routing_keys)
-                .await?;
-
-            *handler = VcxGenericConnection::from(new_conn);
-
-            Ok(())
-        })
-    }
-
-    // NOTE : using string here out of laziness. We could have type this,
-    // but UniFFI does not support structs with unnamed fields. So we'd have to
-    // wrap these types
-    // here request -> aries_vcx::Request
-    pub fn handle_response(
-        &self,
-        profile: Arc<ProfileHolder>,
-        response: String,
-    ) -> VcxUniFFIResult<()> {
-        let mut handler = self.handler.lock()?;
-        let response = serde_json::from_str(&response)?;
-
-        let connection = VcxConnection::try_from(handler.clone())?;
-
-        block_on(async {
-            let new_conn = connection
-                .handle_response(profile.inner.wallet(), response)
-                .await?;
-            *handler = VcxGenericConnection::from(new_conn);
-
-            Ok(())
-        })
-    }
-
-    pub fn send_request(
-        &self,
-        profile: Arc<ProfileHolder>,
-        service_endpoint: String,
-        routing_keys: Vec<String>,
-    ) -> VcxUniFFIResult<()> {
-        let mut handler = self.handler.lock()?;
-
-        let connection = VcxConnection::try_from(handler.clone())?;
-        let url = Url::parse(&service_endpoint).map_err(|err| {
-            AriesVcxError::from_msg(AriesVcxErrorKind::InvalidUrl, err.to_string())
-        })?;
-
-        block_on(async {
-            let connection = connection.prepare_request(url, routing_keys).await?;
-            let request = connection.get_request().clone();
-            connection
-                .send_message(profile.inner.wallet(), &request.into(), &HttpClient)
-                .await?;
-            *handler = VcxGenericConnection::from(connection);
-            Ok(())
-        })
-    }
-
-    pub fn send_response(&self, profile: Arc<ProfileHolder>) -> VcxUniFFIResult<()> {
-        let mut handler = self.handler.lock()?;
-
-        let connection = VcxConnection::try_from(handler.clone())?;
-
-        block_on(async {
-            let response = connection.get_connection_response_msg();
-            connection
-                .send_message(profile.inner.wallet(), &response.into(), &HttpClient)
-                .await?;
-
-            *handler = VcxGenericConnection::from(connection);
-
-            Ok(())
-        })
-    }
-
-    pub fn send_ack(&self, profile: Arc<ProfileHolder>) -> VcxUniFFIResult<()> {
-        let handler = self.handler.lock()?;
-
-        let connection = VcxConnection::try_from(handler.clone())?;
-
-        block_on(async {
-            connection
-                .send_message(
-                    profile.inner.wallet(),
-                    &connection.get_ack().into(),
-                    &HttpClient,
-                )
-                .await?;
-            Ok(())
-        })
-    }
-
-    pub fn send_message(
-        &self,
-        profile: Arc<ProfileHolder>,
-        message: String,
-    ) -> VcxUniFFIResult<()> {
-        let message = serde_json::from_str(&message)?;
-        let handler = self.handler.lock()?.clone();
-
-        block_on(async {
-            handler
-                .send_message(profile.inner.wallet(), &message, &HttpClient)
-                .await?;
-            Ok(())
-        })
-    }
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/handlers/holder.rs b/aries/wrappers/uniffi-aries-vcx/core/src/handlers/holder.rs
deleted file mode 100644
index 99e8e57cb2..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/handlers/holder.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use aries_vcx::{
-    handlers::issuance::holder::Holder as VcxHolder, messages::AriesMessage,
-    protocols::issuance::holder::state_machine::HolderState as VcxHolderState,
-};
-
-use crate::{core::profile::ProfileHolder, errors::error::VcxUniFFIResult, runtime::block_on};
-pub struct Holder {
-    handler: Mutex<VcxHolder>,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum HolderState {
-    Initial,
-    ProposalSet,
-    OfferReceived,
-    RequestSet,
-    Finished,
-    Failed,
-}
-
-impl From<VcxHolderState> for HolderState {
-    fn from(x: VcxHolderState) -> Self {
-        match x {
-            VcxHolderState::Initial => HolderState::Initial,
-            VcxHolderState::ProposalSet => HolderState::ProposalSet,
-            VcxHolderState::OfferReceived => HolderState::OfferReceived,
-            VcxHolderState::RequestSet => HolderState::RequestSet,
-            VcxHolderState::Finished => HolderState::Finished,
-            VcxHolderState::Failed => HolderState::Failed,
-        }
-    }
-}
-
-pub fn create(source_id: String) -> VcxUniFFIResult<Arc<Holder>> {
-    block_on(async {
-        let handler = Mutex::new(VcxHolder::create(&source_id)?);
-        Ok(Arc::new(Holder { handler }))
-    })
-}
-
-pub fn create_from_offer(source_id: String, offer_message: String) -> VcxUniFFIResult<Arc<Holder>> {
-    let offer_message = serde_json::from_str(&offer_message)?;
-    block_on(async {
-        let handler = Mutex::new(VcxHolder::create_from_offer(&source_id, offer_message)?);
-        Ok(Arc::new(Holder { handler }))
-    })
-}
-
-pub fn create_with_proposal(
-    source_id: String,
-    propose_credential: String,
-) -> VcxUniFFIResult<Arc<Holder>> {
-    let propose_credential = serde_json::from_str(&propose_credential)?;
-
-    block_on(async {
-        let handler = Mutex::new(VcxHolder::create_with_proposal(
-            &source_id,
-            propose_credential,
-        )?);
-        Ok(Arc::new(Holder { handler }))
-    })
-}
-
-impl Holder {
-    pub fn set_proposal(&self, credential_proposal: String) -> VcxUniFFIResult<()> {
-        let mut handler = self.handler.lock()?;
-
-        handler.set_proposal(serde_json::from_str(&credential_proposal)?)?;
-        Ok(())
-    }
-
-    pub fn prepare_credential_request(
-        &self,
-        profile: Arc<ProfileHolder>,
-        my_pw_did: String,
-    ) -> VcxUniFFIResult<()> {
-        let mut handler = self.handler.lock()?;
-        let mut holder = handler.clone();
-
-        block_on(async {
-            holder
-                .prepare_credential_request(
-                    profile.inner.wallet(),
-                    profile.inner.ledger_read(),
-                    profile.inner.anoncreds(),
-                    my_pw_did.parse()?,
-                )
-                .await?;
-            *handler = holder;
-
-            Ok(())
-        })
-    }
-
-    pub fn get_msg_credential_request(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(serde_json::to_string(&AriesMessage::from(
-            handler.clone().get_msg_credential_request()?,
-        ))?)
-    }
-
-    pub fn decline_offer(&self, comment: Option<String>) -> VcxUniFFIResult<String> {
-        let mut handler = self.handler.lock()?;
-        let mut holder = handler.clone();
-        let problem_report_result = &holder.decline_offer(comment.as_deref())?;
-        *handler = holder;
-
-        Ok(serde_json::to_string(problem_report_result)?)
-    }
-
-    pub fn process_credential(
-        &self,
-        profile: Arc<ProfileHolder>,
-        credential: String,
-    ) -> VcxUniFFIResult<()> {
-        let credential = serde_json::from_str(&credential)?;
-        let mut handler = self.handler.lock()?;
-        let mut holder = handler.clone();
-
-        block_on(async {
-            holder
-                .process_credential(
-                    profile.inner.wallet(),
-                    profile.inner.ledger_read(),
-                    profile.inner.anoncreds(),
-                    credential,
-                )
-                .await?;
-            *handler = holder;
-            Ok(())
-        })
-    }
-
-    pub fn is_terminal_state(&self) -> VcxUniFFIResult<bool> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.is_terminal_state())
-    }
-
-    pub fn get_state(&self) -> VcxUniFFIResult<HolderState> {
-        let handler = self.handler.lock()?;
-
-        Ok(HolderState::from(handler.get_state()))
-    }
-
-    pub fn get_source_id(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_source_id())
-    }
-
-    pub fn get_credential(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-        let credential = handler.get_credential()?;
-        Ok(credential.0)
-    }
-
-    pub fn get_attributes(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_attributes()?)
-    }
-
-    pub fn get_attachment(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_attachment()?)
-    }
-
-    pub fn get_offer(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(serde_json::to_string(&(handler.get_offer()?))?)
-    }
-
-    pub fn get_tails_location(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_tails_location()?)
-    }
-
-    pub fn get_tails_hash(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_tails_hash()?)
-    }
-
-    pub fn get_rev_reg_id(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_rev_reg_id()?)
-    }
-
-    pub fn get_cred_id(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_cred_id()?)
-    }
-
-    pub fn get_thread_id(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(handler.get_thread_id()?)
-    }
-
-    pub fn is_revokable(&self, profile: Arc<ProfileHolder>) -> VcxUniFFIResult<bool> {
-        let handler = self.handler.lock()?.clone();
-
-        block_on(async { Ok(handler.is_revokable(profile.inner.ledger_read()).await?) })
-    }
-
-    pub fn is_revoked(&self, profile: Arc<ProfileHolder>) -> VcxUniFFIResult<bool> {
-        let handler = self.handler.lock()?.clone();
-
-        block_on(async {
-            Ok(handler
-                .is_revoked(
-                    profile.inner.wallet(),
-                    profile.inner.ledger_read(),
-                    profile.inner.anoncreds(),
-                )
-                .await?)
-        })
-    }
-
-    pub fn get_cred_rev_id(&self, profile: Arc<ProfileHolder>) -> VcxUniFFIResult<u32> {
-        let handler = self.handler.lock()?.clone();
-
-        block_on(async {
-            Ok(handler
-                .get_cred_rev_id(profile.inner.wallet(), profile.inner.anoncreds())
-                .await?)
-        })
-    }
-
-    pub fn get_problem_report(&self) -> VcxUniFFIResult<String> {
-        let handler = self.handler.lock()?;
-
-        Ok(serde_json::to_string(&handler.get_problem_report()?)?)
-    }
-
-    pub fn get_final_message(&self) -> VcxUniFFIResult<Option<String>> {
-        let handler = self.handler.lock()?;
-
-        Ok(Some(serde_json::to_string(&handler.get_final_message()?)?))
-    }
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/handlers/mod.rs b/aries/wrappers/uniffi-aries-vcx/core/src/handlers/mod.rs
deleted file mode 100644
index b1ff1075cd..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/handlers/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod connection;
-pub mod holder;
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs b/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs
deleted file mode 100644
index 0703e7f664..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-uniffi::include_scaffolding!("vcx");
-
-pub mod core;
-pub mod errors;
-pub mod handlers;
-pub mod runtime;
-
-use aries_vcx::{
-    aries_vcx_wallet::wallet::askar::{
-        askar_wallet_config::AskarWalletConfig,
-        key_method::{ArgonLevel, AskarKdfMethod, KeyMethod},
-    },
-    protocols::connection::pairwise_info::PairwiseInfo,
-};
-use handlers::{connection::*, holder::*};
-
-use crate::{
-    core::{anoncreds::*, profile::*, unpack_message::*},
-    errors::error::*,
-    profile::new_indy_profile,
-};
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/runtime.rs b/aries/wrappers/uniffi-aries-vcx/core/src/runtime.rs
deleted file mode 100644
index 9d3b9d340b..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/runtime.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use std::future::Future;
-
-use once_cell::sync::Lazy;
-use tokio::runtime::Runtime;
-
-static RUNTIME: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("Error creating tokio runtime"));
-
-/// Block the current thread on an async task, when not running inside the scheduler.
-pub fn block_on<R>(f: impl Future<Output = R>) -> R {
-    RUNTIME.block_on(f)
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/vcx.udl b/aries/wrappers/uniffi-aries-vcx/core/src/vcx.udl
deleted file mode 100644
index 685387627c..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/src/vcx.udl
+++ /dev/null
@@ -1,199 +0,0 @@
-interface ProfileHolder {
-
-};
-
-enum ArgonLevel {
-    "Interactive",
-    "Moderate",
-};
-
-[Enum]
-interface AskarKdfMethod {
-    Argon2i(ArgonLevel inner);
-};
-
-[Enum]
-interface KeyMethod {
-    DeriveKey(AskarKdfMethod inner);
-    RawKey();
-    Unprotected();
-};
-
-dictionary AskarWalletConfig {
-    string db_url;
-    KeyMethod key_method;
-    string pass_key;
-    string profile;
-};
-
-dictionary ConnectionState {
-    ConnectionRole role;
-    ConnectionProtocolState protocol_state;
-};
-
-enum ConnectionRole {
-    "Invitee",
-    "Inviter",
-};
-
-enum ConnectionProtocolState {
-    "Initial",
-    "Invited",
-    "Requested",
-    "Responded",
-    "Completed",
-};
-
-dictionary PairwiseInfo {
-    string pw_did;
-    string pw_vk;
-};
-
-dictionary UnpackMessage {
-    string message;
-    string recipient_verkey;
-    string? sender_verkey;
-};
-
-interface Connection {
-    [Throws=VcxUniFFIError]
-    ConnectionState get_state();
-
-    [Throws=VcxUniFFIError]
-    PairwiseInfo pairwise_info();
-
-    [Throws=VcxUniFFIError]
-    void accept_invitation(ProfileHolder profile, string invitation);
-
-    [Throws=VcxUniFFIError]
-    void handle_request(ProfileHolder profile, string request, string service_endpoint, sequence<string> routing_keys);
-
-    [Throws=VcxUniFFIError]
-    void handle_response(ProfileHolder profile, string response);
-
-    [Throws=VcxUniFFIError]
-    void send_request(ProfileHolder profile, string service_endpoint, sequence<string> routing_keys);
-
-    [Throws=VcxUniFFIError]
-    void send_response(ProfileHolder profile);
-
-    [Throws=VcxUniFFIError]
-    void send_ack(ProfileHolder profile);
-
-    [Throws=VcxUniFFIError]
-    void send_message(ProfileHolder profile, string message);
-};
-
-interface Holder {
-    [Throws=VcxUniFFIError]
-    void set_proposal(string credential_proposal);
-
-    [Throws=VcxUniFFIError]
-    void prepare_credential_request(ProfileHolder profile, string my_pw_did);
-
-    [Throws=VcxUniFFIError]
-    string get_msg_credential_request();
-
-    [Throws=VcxUniFFIError]
-    string decline_offer(string? comment);
-
-    [Throws=VcxUniFFIError]
-    void process_credential(ProfileHolder profile, string credential);
-
-    [Throws=VcxUniFFIError]
-    boolean is_terminal_state();
-
-    [Throws=VcxUniFFIError]
-    HolderState get_state();
-
-    [Throws=VcxUniFFIError]
-    string get_source_id();
-
-    [Throws=VcxUniFFIError]
-    string get_credential();
-
-    [Throws=VcxUniFFIError]
-    string get_attributes();
-
-    [Throws=VcxUniFFIError]
-    string get_attachment();
-
-    [Throws=VcxUniFFIError]
-    string get_offer();
-
-    [Throws=VcxUniFFIError]
-    string get_tails_location();
-
-    [Throws=VcxUniFFIError]
-    string get_tails_hash();
-
-    [Throws=VcxUniFFIError]
-    string get_rev_reg_id();
-
-    [Throws=VcxUniFFIError]
-    string get_cred_id();
-
-    [Throws=VcxUniFFIError]
-    string get_thread_id();
-
-    [Throws=VcxUniFFIError]
-    boolean is_revokable(ProfileHolder profile);
-
-    [Throws=VcxUniFFIError]
-    boolean is_revoked(ProfileHolder profile);
-
-    [Throws=VcxUniFFIError]
-    u32 get_cred_rev_id(ProfileHolder profile);
-
-    [Throws=VcxUniFFIError]
-    string get_problem_report();
-
-    [Throws=VcxUniFFIError]
-    string? get_final_message();
-};
-
-enum HolderState {
-    "Initial",
-    "ProposalSet",
-    "OfferReceived",
-    "RequestSet",
-    "Finished",
-    "Failed"
-};
-
-[Error]
-enum VcxUniFFIError {
-    "AriesVcxError",
-    "AriesVcxWalletError",
-    "AriesVcxLedgerError",
-    "AriesVcxAnoncredsError",
-    "SerializationError",
-    "InternalError",
-    "StringParseError"
-};
-
-namespace vcx {
-    [Throws=VcxUniFFIError]
-    ProfileHolder new_indy_profile(AskarWalletConfig wallet_config, string genesis_file_path);
-
-    [Throws=VcxUniFFIError]
-    Connection create_inviter(ProfileHolder profile);
-
-    [Throws=VcxUniFFIError]
-    Connection create_invitee(ProfileHolder profile);
-
-    [Throws=VcxUniFFIError]
-    UnpackMessage unpack_message(ProfileHolder profile, string packed_msg);
-
-    [Throws=VcxUniFFIError]
-    Holder create(string source_id);
-
-    [Throws=VcxUniFFIError]
-    Holder create_from_offer(string source_id, string offer_message);
-
-    [Throws=VcxUniFFIError]
-    Holder create_with_proposal(string source_id, string propose_credential);
-
-    [Throws=VcxUniFFIError]
-    string get_credentials(ProfileHolder profile);
-};
diff --git a/aries/wrappers/uniffi-aries-vcx/core/uniffi-bindgen.rs b/aries/wrappers/uniffi-aries-vcx/core/uniffi-bindgen.rs
deleted file mode 100644
index f6cff6cf1d..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/uniffi-bindgen.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    uniffi::uniffi_bindgen_main()
-}
diff --git a/aries/wrappers/uniffi-aries-vcx/core/uniffi.toml b/aries/wrappers/uniffi-aries-vcx/core/uniffi.toml
deleted file mode 100644
index fa0fe64f06..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/core/uniffi.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[bindings.kotlin]
-package_name = "org.hyperledger.ariesvcx"
\ No newline at end of file
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
deleted file mode 100644
index 9bb9f81727..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-set -ex
-
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
-
-# Required env vars
-ARIES_VCX_ROOT=$(dirname $(dirname $(dirname $(dirname $SCRIPT_DIR))))
-ANDROID_BUILD_DEPS_DIR=${ARIES_VCX_ROOT}/target/android_build_deps
-LANGUAGE="kotlin"
-TARGET="aarch64-linux-android"
-TARGET_NICKNAME="arm64"
-ABI="arm64-v8a"
-
-generate_bindings() {
-    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries/wrappers/uniffi-aries-vcx"
-    export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/mobile_demo"
-
-    pushd "${UNIFFI_ROOT}/core"
-                cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/vcx.udl --language ${LANGUAGE}
-    popd
-    
-    cp -R ${UNIFFI_ROOT}/core/src/org/hyperledger/ariesvcx/vcx.kt ${ANDROID_DEMO_DIR}/app/src/main/java/org/hyperledger/ariesvcx
-    rm -R ${UNIFFI_ROOT}/core/src/org
-}
-
-download_and_unzip_if_missed() {
-    expected_directory="$1"
-    url="$2"
-    fname="tmp_$(date +%s)_$expected_directory.zip"
-    if [ ! -d "${expected_directory}" ] ; then
-        echo "Downloading ${GREEN}${url}${RESET} as ${GREEN}${fname}${RESET}"
-        wget -q -O ${fname} "${url}"
-        echo "Unzipping ${GREEN}${fname}${RESET}"
-        unzip -qqo "${fname}"
-        rm "${fname}"
-        echo "${GREEN}Done!${RESET}"
-    else
-        echo "${BLUE}Skipping download ${url}${RESET}. Expected directory ${expected_directory} was found"
-    fi
-}
-
-setup_linked_dependencies() {
-    mkdir -p $ANDROID_BUILD_DEPS_DIR
-    # download deps
-    pushd "${ANDROID_BUILD_DEPS_DIR}"
-        download_and_unzip_if_missed "openssl_$TARGET_NICKNAME" "https://repo.sovrin.org/android/libindy/deps/openssl/openssl_$TARGET_NICKNAME.zip"
-        download_and_unzip_if_missed "libsodium_$TARGET_NICKNAME" "https://repo.sovrin.org/android/libindy/deps/sodium/libsodium_$TARGET_NICKNAME.zip"
-        download_and_unzip_if_missed "libzmq_$TARGET_NICKNAME" "https://repo.sovrin.org/android/libindy/deps/zmq/libzmq_$TARGET_NICKNAME.zip"
-    popd
-
-    # main env vars that need to be set
-    export OPENSSL_DIR=${ANDROID_BUILD_DEPS_DIR}/openssl_${TARGET_NICKNAME}
-    export SODIUM_DIR=${ANDROID_BUILD_DEPS_DIR}/libsodium_${TARGET_NICKNAME}
-    export LIBZMQ_DIR=${ANDROID_BUILD_DEPS_DIR}/libzmq_${TARGET_NICKNAME}
-
-    # secondary env vars that need to be set
-    export SODIUM_LIB_DIR=${SODIUM_DIR}/lib
-    export SODIUM_INCLUDE_DIR=${SODIUM_DIR}/include
-    export SODIUM_STATIC=1
-    export LIBZMQ_LIB_DIR=${LIBZMQ_DIR}/lib
-    export LIBZMQ_INCLUDE_DIR=${LIBZMQ_DIR}/include
-    export LIBZMQ_PREFIX=${LIBZMQ_DIR}
-    export OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib
-    export OPENSSL_STATIC=1
-}
-
-build_uniffi_for_demo() {
-    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries/wrappers/uniffi-aries-vcx"
-    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}
-
-    pushd ${UNIFFI_ROOT}/core
-        cargo ndk -t ${ABI} build
-        cp ${ARIES_VCX_ROOT}/target/${TARGET}/debug/libuniffi_vcx.so ${ABI_PATH}/libuniffi_vcx.so
-        cp ${LIBZMQ_LIB_DIR}/libzmq.so ${ABI_PATH}/libzmq.so
-    popd
-}
-
-generate_bindings
-setup_linked_dependencies
-build_uniffi_for_demo
diff --git a/aries/wrappers/uniffi-aries-vcx/scripts/android.build.sh b/aries/wrappers/uniffi-aries-vcx/scripts/android.build.sh
deleted file mode 100644
index c93ce26db5..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/scripts/android.build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -ex
-
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
-
-# Required env vars
-ARIES_VCX_ROOT=$(dirname $(dirname $SCRIPT_DIR))
-ANDROID_BUILD_DIR=~/android_build
-BUILD_MODE="debug"
-LANGUAGE="kotlin"
-
-source ${SCRIPT_DIR}/android.utils.sh
-
-generate_arch_flags "arm64"
-generate_bindings
-set_dependencies_env_vars
-set_android_arch_env
-build_uniffi
diff --git a/aries/wrappers/uniffi-aries-vcx/scripts/android.prepare.sh b/aries/wrappers/uniffi-aries-vcx/scripts/android.prepare.sh
deleted file mode 100644
index ed8d1642a3..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/scripts/android.prepare.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -ex
-
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
-
-# Required env vars
-ANDROID_BUILD_DIR=~/android_build
-
-source ${SCRIPT_DIR}/android.utils.sh
-
-set_android_env
-download_sdk
-prepare_dependencies "arm64"
-download_and_setup_toolchain
diff --git a/aries/wrappers/uniffi-aries-vcx/scripts/android.toolchain.sh b/aries/wrappers/uniffi-aries-vcx/scripts/android.toolchain.sh
deleted file mode 100644
index 95b560dae7..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/scripts/android.toolchain.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -ex
-
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
-
-# Required env vars
-ANDROID_BUILD_DIR=~/android_build
-
-source ${SCRIPT_DIR}/android.utils.sh
-
-create_standalone_toolchain_and_rust_target "arm64"
-create_cargo_config
diff --git a/aries/wrappers/uniffi-aries-vcx/scripts/android.utils.sh b/aries/wrappers/uniffi-aries-vcx/scripts/android.utils.sh
deleted file mode 100644
index 5ee676e389..0000000000
--- a/aries/wrappers/uniffi-aries-vcx/scripts/android.utils.sh
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/env bash
-export BLACK=`tput setaf 0`
-export RED=`tput setaf 1`
-export GREEN=`tput setaf 2`
-export YELLOW=`tput setaf 3`
-export BLUE=`tput setaf 4`
-export MAGENTA=`tput setaf 5`
-export CYAN=`tput setaf 6`
-export WHITE=`tput setaf 7`
-export BOLD=`tput bold`
-export RESET=`tput sgr0`
-
-if [ -z "${ANDROID_BUILD_DIR}" ]; then
-    echo STDERR "${RED}ANDROID_BUILD_DIR is not set. Please set it in the caller script${RESET}"
-    exit 1
-fi
-
-create_cargo_config(){
-set_android_arch_env
-mkdir -p ${HOME}/.cargo
-cat << EOF > ${HOME}/.cargo/config
-[target.${TRIPLET}]
-linker = "$(realpath ${CC})"
-EOF
-}
-
-create_standalone_toolchain_and_rust_target() {
-    generate_arch_flags ${1}
-    # will only create toolchain if not already created
-    python3 ${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py \
-        --arch ${TARGET_ARCH} \
-        --api ${TARGET_API} \
-        --stl=libc++ \
-        --force \
-        --install-dir ${TOOLCHAIN_DIR}
-
-    # add rust target
-    rustup target add ${TRIPLET}
-}
-
-download_and_setup_toolchain() {
-    if [ "$(uname)" == "Darwin" ]; then
-        export TOOLCHAIN_PREFIX="${ANDROID_BUILD_DIR}/toolchains/darwin"
-        mkdir -p ${TOOLCHAIN_PREFIX}
-        pushd $TOOLCHAIN_PREFIX
-        echo "${GREEN}Resolving NDK for OSX${RESET}"
-        download_and_unzip_if_missed "android-ndk-r20" "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"
-        popd
-    elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-        export TOOLCHAIN_PREFIX="${ANDROID_BUILD_DIR}/toolchains/linux"
-        mkdir -p ${TOOLCHAIN_PREFIX}
-        pushd $TOOLCHAIN_PREFIX
-        echo "${GREEN}Resolving NDK for Linux${RESET}"
-        download_and_unzip_if_missed "android-ndk-r25c" "https://dl.google.com/android/repository/android-ndk-r25c-linux.zip"
-        popd
-    fi
-    export ANDROID_NDK_ROOT=${TOOLCHAIN_PREFIX}/android-ndk-r25c
-    echo "${GREEN}NDK RESOLVED AT${RESET} ${ANDROID_NDK_ROOT}"
-}
-
-download_and_unzip_if_missed() {
-    expected_directory="$1"
-    url="$2"
-    fname="tmp_$(date +%s)_$expected_directory.zip"
-    if [ ! -d "${expected_directory}" ] ; then
-        echo "Downloading ${GREEN}${url}${RESET} as ${GREEN}${fname}${RESET}"
-        wget -q -O ${fname} "${url}"
-        echo "Unzipping ${GREEN}${fname}${RESET}"
-        unzip -qqo "${fname}"
-        rm "${fname}"
-        echo "${GREEN}Done!${RESET}"
-    else
-        echo "${BLUE}Skipping download ${url}${RESET}. Expected directory ${expected_directory} was found"
-    fi
-}
-
-download_sdk() {
-    mkdir -p ${ANDROID_SDK}
-    pushd ${ANDROID_SDK}
-        download_and_unzip_if_missed "tools" "https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip"
-        mv cmdline-tools tools
-    popd
-}
-
-generate_arch_flags() {
-    if [ -z $1 ]; then
-        echo STDERR "${RED}Please provide the arch e.g arm, armv7, x86 or arm64${RESET}"
-        exit 1
-    fi
-    export TARGET_ARCH=$1
-    download_and_setup_toolchain
-
-    if [ $1 == "arm" ]; then
-        export TARGET_API="30"
-        export TRIPLET="arm-linux-androideabi"
-        export ANDROID_TRIPLET=${TRIPLET}
-        export ABI="armeabi-v7a"
-        export TOOLCHAIN_SYSROOT_LIB="lib"
-    fi
-
-    if [ $1 == "armv7" ]; then
-        export TARGET_ARCH="arm"
-        export TARGET_API="30"
-        export TRIPLET="armv7-linux-androideabi"
-        export ANDROID_TRIPLET="arm-linux-androideabi"
-        export ABI="armeabi-v7a"
-        export TOOLCHAIN_SYSROOT_LIB="lib"
-    fi
-
-    if [ $1 == "arm64" ]; then
-        export TARGET_API="30"
-        export TRIPLET="aarch64-linux-android"
-        export ANDROID_TRIPLET=${TRIPLET}
-        export ABI="arm64-v8a"
-        export TOOLCHAIN_SYSROOT_LIB="lib"
-    fi
-
-    if [ $1 == "x86" ]; then
-        export TARGET_API="30"
-        export TRIPLET="i686-linux-android"
-        export ANDROID_TRIPLET=${TRIPLET}
-        export ABI="x86"
-        export TOOLCHAIN_SYSROOT_LIB="lib"
-    fi
-
-    if [ $1 == "x86_64" ]; then
-        export TARGET_API="30"
-        export TRIPLET="x86_64-linux-android"
-        export ANDROID_TRIPLET=${TRIPLET}
-        export ABI="x86_64"
-        export TOOLCHAIN_SYSROOT_LIB="lib64"
-    fi
-
-    export TOOLCHAIN_DIR=${TOOLCHAIN_PREFIX}/${TARGET_ARCH}
-    export PATH=${TOOLCHAIN_DIR}/bin:${PATH}
-}
-
-prepare_dependencies() {
-    if [ -z $1 ]; then
-        echo STDERR "${RED}Please provide the architecture e.g arm, armv7, x86, x86_64 or arm64.${RESET}"
-        exit 1
-    fi
-    TARGET_ARCH="$1"
-    echo "prepare_dependencies >> TARGET_ARCH=${TARGET_ARCH}"
-    pushd "${ANDROID_BUILD_DIR}"
-        download_and_unzip_if_missed "openssl_$TARGET_ARCH" "https://repo.sovrin.org/android/libindy/deps/openssl/openssl_$TARGET_ARCH.zip"
-        download_and_unzip_if_missed "libsodium_$TARGET_ARCH" "https://repo.sovrin.org/android/libindy/deps/sodium/libsodium_$TARGET_ARCH.zip"
-        download_and_unzip_if_missed "libzmq_$TARGET_ARCH" "https://repo.sovrin.org/android/libindy/deps/zmq/libzmq_$TARGET_ARCH.zip"
-    popd
-    set_dependencies_env_vars
-    generate_arch_flags ${TARGET_ARCH}
-    echo "${GREEN}SUCCESSFULLY PREPARED DEPS FOR${RESET} ${TARGET_ARCH}"
-}
-
-set_android_arch_env() {
-    echo $
-    export CC=${TOOLCHAIN_DIR}/bin/${ANDROID_TRIPLET}-clang
-    export AR=${TOOLCHAIN_DIR}/bin/llvm-ar
-    export CXX=${TOOLCHAIN_DIR}/bin/${ANDROID_TRIPLET}-clang++
-    export CXXLD=${TOOLCHAIN_DIR}/bin/${ANDROID_TRIPLET}-ld
-    export RANLIB=${TOOLCHAIN_DIR}/bin/${ANDROID_TRIPLET}-ranlib
-    export OBJCOPY=${TOOLCHAIN_DIR}/bin/${ANDROID_TRIPLET}-objcopy
-}
-
-set_android_env() {
-    export PKG_CONFIG_ALLOW_CROSS=1
-    export CARGO_INCREMENTAL=0
-    export RUST_LOG=indy=trace
-    export RUST_TEST_THREADS=1
-    export RUST_BACKTRACE=1
-
-    # SDK location
-    export ANDROID_SDK=${ANDROID_BUILD_DIR}/sdk
-    export PATH=${PATH}:${ANDROID_SDK}/platform-tools
-    export PATH=${PATH}:${ANDROID_SDK}/tools
-    export PATH=${PATH}:${ANDROID_SDK}/tools/bin
-
-    export TARGET=android
-}
-
-set_dependencies_env_vars() {
-    # main env vars that need to be set
-    export OPENSSL_DIR=${ANDROID_BUILD_DIR}/openssl_${TARGET_ARCH}
-    export SODIUM_DIR=${ANDROID_BUILD_DIR}/libsodium_${TARGET_ARCH}
-    export LIBZMQ_DIR=${ANDROID_BUILD_DIR}/libzmq_${TARGET_ARCH}
-
-    # export TOOLCHAIN_DIR=${TOOLCHAIN_PREFIX}/${TARGET_ARCH}
-    # export PATH=${TOOLCHAIN_DIR}/bin:${PATH}
-
-    # secondary env vars that need to be set
-    export SODIUM_LIB_DIR=${SODIUM_DIR}/lib
-    export SODIUM_INCLUDE_DIR=${SODIUM_DIR}/include
-    export SODIUM_STATIC=1
-    export LIBZMQ_LIB_DIR=${LIBZMQ_DIR}/lib
-    export LIBZMQ_INCLUDE_DIR=${LIBZMQ_DIR}/include
-    export LIBZMQ_PREFIX=${LIBZMQ_DIR}
-    export OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib
-    export OPENSSL_STATIC=1
-}
-
-fix_ndk() {
-    find $ANDROID_NDK_ROOT -name 'libunwind.a' | sed 's@libunwind.a$@libgcc.a@' | \
-    while read x; do
-        echo "INPUT(-lunwind)" > $x
-    done
-}
-
-build_uniffi() {
-    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/uniffi_aries_vcx"
-    export ANDROID_DEMO_DIR="${UNIFFI_ROOT}/demo"
-    export ABI_PATH=${ANDROID_DEMO_DIR}/app/src/main/jniLibs/${ABI}
-    mkdir -p ${ABI_PATH}
-
-    pushd "${UNIFFI_ROOT}/core"
-        cargo build --lib --target=${TRIPLET}
-        cp "$(realpath ${ARIES_VCX_ROOT}/target/${TRIPLET}/debug/libuniffi_vcx.so)" "$(realpath ${ABI_PATH}/libuniffi_vcx.so)"
-        cp "$(realpath ${LIBZMQ_LIB_DIR}/libzmq.so)" "$(realpath ${ABI_PATH}/libzmq.so)"
-    popd
-}
-
-generate_bindings() {
-    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/uniffi_aries_vcx"
-    export ANDROID_DEMO_DIR="${UNIFFI_ROOT}/demo"
-
-    pushd "${UNIFFI_ROOT}/core"
-        cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/vcx.udl --language ${LANGUAGE}
-    popd
-
-    cp -R "$(realpath ${UNIFFI_ROOT}/core/src/org/hyperledger/ariesvcx/vcx.kt)" "$(realpath ${ANDROID_DEMO_DIR}/app/src/main/java/org/hyperledger/ariesvcx)"
-    rm -R "$(realpath ${UNIFFI_ROOT}/core/src/org)"
-}
diff --git a/did_core/did_doc/src/error.rs b/did_core/did_doc/src/error.rs
index 26e5f9e720..15f15219aa 100644
--- a/did_core/did_doc/src/error.rs
+++ b/did_core/did_doc/src/error.rs
@@ -14,22 +14,22 @@ impl std::fmt::Display for DidDocumentBuilderError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             DidDocumentBuilderError::MissingField(field) => {
-                write!(f, "Missing field: {}", field)
+                write!(f, "Missing field: {field}")
             }
             DidDocumentBuilderError::JsonError(error) => {
-                write!(f, "(De)serialization error: {}", error)
+                write!(f, "(De)serialization error: {error}")
             }
             DidDocumentBuilderError::UnsupportedVerificationMethodType(vm_type) => {
-                write!(f, "Unsupported verification method type: {}", vm_type)
+                write!(f, "Unsupported verification method type: {vm_type}")
             }
             DidDocumentBuilderError::PublicKeyError(error) => {
-                write!(f, "Public key error: {}", error)
+                write!(f, "Public key error: {error}")
             }
             DidDocumentBuilderError::CustomError(string) => {
-                write!(f, "Custom DidDocumentBuilderError: {}", string)
+                write!(f, "Custom DidDocumentBuilderError: {string}")
             }
             DidDocumentBuilderError::KeyDecodingError(error) => {
-                write!(f, "Key decoding error: {}", error)
+                write!(f, "Key decoding error: {error}")
             }
         }
     }
diff --git a/did_core/did_doc/src/schema/service/service_accept_type.rs b/did_core/did_doc/src/schema/service/service_accept_type.rs
index a92c7ec067..11983ab81e 100644
--- a/did_core/did_doc/src/schema/service/service_accept_type.rs
+++ b/did_core/did_doc/src/schema/service/service_accept_type.rs
@@ -24,7 +24,7 @@ impl Display for ServiceAcceptType {
         match self {
             ServiceAcceptType::DIDCommV1 => write!(f, "didcomm/aip2;env=rfc19"),
             ServiceAcceptType::DIDCommV2 => write!(f, "didcomm/v2"),
-            ServiceAcceptType::Other(other) => write!(f, "{}", other),
+            ServiceAcceptType::Other(other) => write!(f, "{other}"),
         }
     }
 }
diff --git a/did_core/did_doc/src/schema/service/service_key_kind.rs b/did_core/did_doc/src/schema/service/service_key_kind.rs
index 17f14bace8..156fe32a74 100644
--- a/did_core/did_doc/src/schema/service/service_key_kind.rs
+++ b/did_core/did_doc/src/schema/service/service_key_kind.rs
@@ -15,9 +15,9 @@ pub enum ServiceKeyKind {
 impl Display for ServiceKeyKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ServiceKeyKind::Reference(did_url) => write!(f, "{}", did_url),
-            ServiceKeyKind::Value(value) => write!(f, "{}", value),
-            ServiceKeyKind::DidKey(did_key) => write!(f, "{}", did_key),
+            ServiceKeyKind::Reference(did_url) => write!(f, "{did_url}"),
+            ServiceKeyKind::Value(value) => write!(f, "{value}"),
+            ServiceKeyKind::DidKey(did_key) => write!(f, "{did_key}"),
         }
     }
 }
diff --git a/did_core/did_doc/src/schema/service/typed/mod.rs b/did_core/did_doc/src/schema/service/typed/mod.rs
index 795a820cfe..ec588c66df 100644
--- a/did_core/did_doc/src/schema/service/typed/mod.rs
+++ b/did_core/did_doc/src/schema/service/typed/mod.rs
@@ -86,7 +86,7 @@ impl Display for ServiceType {
             // * didcommv2 - https://identity.foundation/didcomm-messaging/spec/#service-endpoint
             ServiceType::DIDCommV2 => write!(f, "DIDCommMessaging"),
             ServiceType::Legacy => write!(f, "IndyAgent"),
-            ServiceType::Other(other) => write!(f, "{}", other),
+            ServiceType::Other(other) => write!(f, "{other}"),
         }
     }
 }
diff --git a/did_core/did_doc/src/schema/utils/mod.rs b/did_core/did_doc/src/schema/utils/mod.rs
index 8df0309e83..d8d41dffd4 100644
--- a/did_core/did_doc/src/schema/utils/mod.rs
+++ b/did_core/did_doc/src/schema/utils/mod.rs
@@ -40,8 +40,8 @@ impl OneOrList<String> {
 impl<T: Display + Debug> Display for OneOrList<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            OneOrList::One(t) => write!(f, "{}", t),
-            OneOrList::List(t) => write!(f, "{:?}", t),
+            OneOrList::One(t) => write!(f, "{t}"),
+            OneOrList::List(t) => write!(f, "{t:?}"),
         }
     }
 }
@@ -58,8 +58,7 @@ impl DidDocument {
                     match self.dereference_key(reference) {
                         None => {
                             return Err(DidDocumentLookupError::new(format!(
-                                "Unable to resolve key agreement key by reference: {}",
-                                reference
+                                "Unable to resolve key agreement key by reference: {reference}"
                             )))
                         }
                         Some(verification_method) => verification_method,
@@ -86,8 +85,7 @@ impl DidDocument {
             .find(|service| service.service_types().contains(service_type))
             .cloned()
             .ok_or(DidDocumentLookupError::new(format!(
-                "Failed to look up service object by type {}",
-                service_type
+                "Failed to look up service object by type {service_type}"
             )))
     }
 
@@ -97,8 +95,7 @@ impl DidDocument {
             .find(|service| service.id() == id)
             .cloned()
             .ok_or(DidDocumentLookupError::new(format!(
-                "Failed to look up service object by id {}",
-                id
+                "Failed to look up service object by id {id}"
             )))
     }
 }
diff --git a/did_core/did_doc/src/schema/verification_method/public_key.rs b/did_core/did_doc/src/schema/verification_method/public_key.rs
index f913ff07df..e09e2ba8aa 100644
--- a/did_core/did_doc/src/schema/verification_method/public_key.rs
+++ b/did_core/did_doc/src/schema/verification_method/public_key.rs
@@ -122,7 +122,7 @@ mod tests {
             public_key_base58: "abcdefghijkl".to_string(),
         };
         let err = public_key_field.key_decoded().expect_err("Expected error");
-        println!("Error: {}", err);
+        println!("Error: {err}");
         assert!(err
             .source()
             .expect("Error was expected to has source set up.")
@@ -136,7 +136,7 @@ mod tests {
             public_key_pem: "abcdefghijkl".to_string(),
         };
         let err = public_key_field.key_decoded().unwrap_err();
-        println!("Error: {}", err);
+        println!("Error: {err}");
         assert!(err
             .source()
             .expect("Error was expected to has source set up.")
diff --git a/did_core/did_methods/did_cheqd/src/resolution/resolver.rs b/did_core/did_methods/did_cheqd/src/resolution/resolver.rs
index 98cb8b5255..a72bc3f0b9 100644
--- a/did_core/did_methods/did_cheqd/src/resolution/resolver.rs
+++ b/did_core/did_methods/did_cheqd/src/resolution/resolver.rs
@@ -341,6 +341,7 @@ impl DidCheqdResolver {
 /// Assembles a hyper client which:
 /// * uses native TLS
 /// * supports HTTP2 only (gRPC)
+#[allow(clippy::result_large_err)]
 fn native_tls_hyper_client() -> DidCheqdResult<HyperClient> {
     let tls = native_tls::TlsConnector::builder()
         .request_alpns(&["h2"])
diff --git a/did_core/did_methods/did_cheqd/src/resolution/transformer.rs b/did_core/did_methods/did_cheqd/src/resolution/transformer.rs
index 54b5a3c308..a14bf1c7e2 100644
--- a/did_core/did_methods/did_cheqd/src/resolution/transformer.rs
+++ b/did_core/did_methods/did_cheqd/src/resolution/transformer.rs
@@ -280,6 +280,7 @@ impl TryFrom<CheqdResourceMetadataWithUri> for DidResourceMetadata {
     }
 }
 
+#[allow(clippy::result_large_err)]
 fn prost_timestamp_to_dt(mut timestamp: prost_types::Timestamp) -> DidCheqdResult<DateTime<Utc>> {
     timestamp.normalize();
     DateTime::from_timestamp(timestamp.seconds, timestamp.nanos.try_into()?).ok_or(
diff --git a/did_core/did_methods/did_jwk/src/resolver.rs b/did_core/did_methods/did_jwk/src/resolver.rs
index cf0da5b43b..223f5de8ba 100644
--- a/did_core/did_methods/did_jwk/src/resolver.rs
+++ b/did_core/did_methods/did_jwk/src/resolver.rs
@@ -37,7 +37,7 @@ impl DidResolvable for DidJwkResolver {
 
         let mut did_doc = DidDocument::new(did.to_owned());
 
-        let vm_id = DidUrl::parse(format!("{}#0", did))?;
+        let vm_id = DidUrl::parse(format!("{did}#0"))?;
 
         let vm = VerificationMethod::builder()
             .id(vm_id.clone())
diff --git a/did_core/did_methods/did_peer/examples/demo.rs b/did_core/did_methods/did_peer/examples/demo.rs
index 4bca83cf12..11f909edb9 100644
--- a/did_core/did_methods/did_peer/examples/demo.rs
+++ b/did_core/did_methods/did_peer/examples/demo.rs
@@ -46,16 +46,13 @@ async fn demo_did_peer_2_and_3() -> Result<(), Box<dyn Error>> {
     );
 
     let peer_did_2 = PeerDid::<Numalgo2>::from_did_doc(did_doc.clone())?;
-    log::info!("as did:peer numalgo(2): {}", peer_did_2);
+    log::info!("as did:peer numalgo(2): {peer_did_2}");
 
     let peer_did_3 = PeerDid::<Numalgo3>::from_did_doc(did_doc)?;
-    log::info!("as did:peer numalgo(3): {}", peer_did_3);
+    log::info!("as did:peer numalgo(3): {peer_did_3}");
 
     let peer_did_3_v2 = peer_did_2.to_numalgo3()?;
-    log::info!(
-        "as did:peer numalgo(2) converted to numalgo(3): {}",
-        peer_did_3_v2
-    );
+    log::info!("as did:peer numalgo(2) converted to numalgo(3): {peer_did_3_v2}");
 
     let DidResolutionOutput { did_document, .. } = PeerDidResolver::new()
         .resolve(
@@ -88,7 +85,7 @@ async fn demo_did_peer_4() -> Result<(), Box<dyn Error>> {
     );
 
     let peer_did_4 = PeerDid::<Numalgo4>::new(construction_did_doc)?;
-    log::info!("Instance of peer did: {}", peer_did_4);
+    log::info!("Instance of peer did: {peer_did_4}");
 
     let did_document = peer_did_4.resolve_did_doc()?;
     log::info!(
diff --git a/did_core/did_methods/did_peer/src/peer_did/generic.rs b/did_core/did_methods/did_peer/src/peer_did/generic.rs
index 519a036042..936d3fa053 100644
--- a/did_core/did_methods/did_peer/src/peer_did/generic.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/generic.rs
@@ -26,9 +26,9 @@ impl AnyPeerDid {
         Did: TryFrom<T>,
         <Did as TryFrom<T>>::Error: Into<DidPeerError>,
     {
-        log::info!("AnyPeerDid >> parsing input {} as peer:did", did);
+        log::info!("AnyPeerDid >> parsing input {did} as peer:did");
         let did: Did = did.try_into().map_err(Into::into)?;
-        log::info!("AnyPeerDid >> parsed did {}", did);
+        log::info!("AnyPeerDid >> parsed did {did}");
         let numalgo = parse_numalgo(&did)?;
         log::info!("AnyPeerDid >> parsed numalgo {}", numalgo.to_char());
         let parsed = match numalgo {
@@ -114,13 +114,13 @@ mod tests {
         #[test]
         fn numalgo2() {
             let serialized = serde_json::to_string(&generic_peer_did_numalgo2()).unwrap();
-            assert_eq!(serialized, format!("\"{}\"", VALID_PEER_DID_NUMALGO2));
+            assert_eq!(serialized, format!("\"{VALID_PEER_DID_NUMALGO2}\""));
         }
 
         #[test]
         fn numalgo3() {
             let serialized = serde_json::to_string(&generic_peer_did_numalgo3()).unwrap();
-            assert_eq!(serialized, format!("\"{}\"", VALID_PEER_DID_NUMALGO3));
+            assert_eq!(serialized, format!("\"{VALID_PEER_DID_NUMALGO3}\""));
         }
     }
 
@@ -130,14 +130,14 @@ mod tests {
         #[test]
         fn numalgo2() {
             let deserialized: AnyPeerDid =
-                serde_json::from_str(&format!("\"{}\"", VALID_PEER_DID_NUMALGO2)).unwrap();
+                serde_json::from_str(&format!("\"{VALID_PEER_DID_NUMALGO2}\"")).unwrap();
             assert_eq!(deserialized, generic_peer_did_numalgo2());
         }
 
         #[test]
         fn numalgo3() {
             let deserialized: AnyPeerDid =
-                serde_json::from_str(&format!("\"{}\"", VALID_PEER_DID_NUMALGO3)).unwrap();
+                serde_json::from_str(&format!("\"{VALID_PEER_DID_NUMALGO3}\"")).unwrap();
             assert_eq!(deserialized, generic_peer_did_numalgo3());
         }
     }
diff --git a/did_core/did_methods/did_peer/src/peer_did/mod.rs b/did_core/did_methods/did_peer/src/peer_did/mod.rs
index ba5599544c..359a59519e 100644
--- a/did_core/did_methods/did_peer/src/peer_did/mod.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/mod.rs
@@ -198,7 +198,7 @@ mod tests {
         fn numalgo2() {
             assert_eq!(
                 serde_json::to_string(&peer_did_numalgo2()).unwrap(),
-                format!("\"{}\"", VALID_PEER_DID_NUMALGO2)
+                format!("\"{VALID_PEER_DID_NUMALGO2}\"")
             );
         }
 
@@ -219,14 +219,14 @@ mod tests {
         #[test]
         fn numalgo2() {
             let deserialized: PeerDid<Numalgo2> =
-                serde_json::from_str(&format!("\"{}\"", VALID_PEER_DID_NUMALGO2)).unwrap();
+                serde_json::from_str(&format!("\"{VALID_PEER_DID_NUMALGO2}\"")).unwrap();
             assert_eq!(peer_did_numalgo2(), deserialized);
         }
 
         #[test]
         fn numalgo3() {
             let deserialized: PeerDid<Numalgo3> =
-                serde_json::from_str(&format!("\"{}\"", VALID_PEER_DID_NUMALGO3)).unwrap();
+                serde_json::from_str(&format!("\"{VALID_PEER_DID_NUMALGO3}\"")).unwrap();
             assert_eq!(peer_did_numalgo3(), deserialized);
         }
     }
diff --git a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/encoding.rs b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/encoding.rs
index 93d798856a..1d68cd2513 100644
--- a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/encoding.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/encoding.rs
@@ -101,9 +101,8 @@ fn resolve_verification_method<'a>(
             did_document
                 .dereference_key(did_url)
                 .ok_or(DidPeerError::InvalidKeyReference(format!(
-                    "Could not resolve verification method: {} on DID document: {}",
-                    did_url, did_document
-                )))
+                "Could not resolve verification method: {did_url} on DID document: {did_document}"
+            )))
         }
     }
 }
@@ -157,7 +156,7 @@ mod tests {
         let did = "did:peer:2";
         let key_0 = "z6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc";
         let key_1 = "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V";
-        let did_full = format!("{}.E{}.V{}", did, key_0, key_1);
+        let did_full = format!("{did}.E{key_0}.V{key_1}");
 
         let vm_0 = create_verification_method(
             "#key-1".to_string(),
@@ -186,7 +185,7 @@ mod tests {
     async fn test_append_encoded_service_segment() {
         let did = "did:peer:2";
         let service = "eyJpZCI6IiNzZXJ2aWNlLTAiLCJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0";
-        let did_expected = format!("{}.S{}", did, service);
+        let did_expected = format!("{did}.S{service}");
 
         let extra = ExtraFieldsDidCommV2::builder()
             .routing_keys(vec![ServiceKeyKind::Reference(
@@ -225,7 +224,7 @@ mod tests {
     fn test_append_encoded_segments_error() {
         let did = "did:peer:2";
         let key = "invalid_key";
-        let did_full = format!("{}.E{}", did, key);
+        let did_full = format!("{did}.E{key}");
 
         let vm = create_verification_method(
             "#key-1".to_string(),
@@ -247,7 +246,7 @@ mod tests {
         let key_0 = "z6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc";
         let key_1 = "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V";
         let key_2 = "z6Mkumaf3DZPAw8CN8r7vqA4UbW5b6hFfpq6nM4xud1MBZ9n";
-        let did_full = format!("{}.A{}.E{}.V{}", did, key_0, key_1, key_2);
+        let did_full = format!("{did}.A{key_0}.E{key_1}.V{key_2}");
 
         let vm_0 = create_verification_method(
             "#key-1".to_string(),
@@ -284,11 +283,11 @@ mod tests {
 
         let did = "did:peer:2";
         let key = "z6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc";
-        let did_full = format!("{}.E{}.V{}", did, key, key);
+        let did_full = format!("{did}.E{key}.V{key}");
         let reference = "key-1";
 
         let vm = create_verification_method(
-            format!("#{}", reference),
+            format!("#{reference}"),
             did_full.to_string(),
             key.to_string(),
             VerificationMethodType::X25519KeyAgreementKey2020,
diff --git a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/helpers.rs b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/helpers.rs
index b6a47a6eed..790dd19608 100644
--- a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/helpers.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/helpers.rs
@@ -48,8 +48,7 @@ fn add_attributes_from_element(
         .chars()
         .next()
         .ok_or(DidPeerError::DidValidationError(format!(
-            "No purpose code following element separator in '{}'",
-            element
+            "No purpose code following element separator in '{element}'"
         )))?
         .try_into()?;
     let purposeless_element = &element[1..];
@@ -185,7 +184,7 @@ mod tests {
     fn test_process_service_element_one_service() {
         let purposeless_service_element =
             "eyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCJ9";
-        let did: Did = format!("did:peer:2.S{}", purposeless_service_element)
+        let did: Did = format!("did:peer:2.S{purposeless_service_element}")
             .parse()
             .unwrap();
         let mut index = 0;
@@ -205,7 +204,7 @@ mod tests {
     #[test]
     fn test_process_key_element() {
         let purposeless_key_element = "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V";
-        let did: Did = format!("did:peer:2.V{}", purposeless_key_element)
+        let did: Did = format!("did:peer:2.V{purposeless_key_element}")
             .parse()
             .unwrap();
 
diff --git a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/mod.rs b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/mod.rs
index bff5e7a5e9..637de8fcb7 100644
--- a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/mod.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/mod.rs
@@ -39,7 +39,7 @@ impl PeerDid<Numalgo2> {
         let bytes = [MULTIHASH_SHA2_256.as_slice(), &numalgoless_id_hashed[..]].concat();
 
         let multibase_hash = multibase::encode(multibase::Base::Base58Btc, bytes);
-        PeerDid::<Numalgo3>::parse(format!("did:peer:3{}", multibase_hash))
+        PeerDid::<Numalgo3>::parse(format!("did:peer:3{multibase_hash}"))
     }
 
     pub(crate) fn to_did_doc_builder(
diff --git a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/purpose.rs b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/purpose.rs
index 471e226e85..fd1fcfc9a0 100644
--- a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/purpose.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/purpose.rs
@@ -15,7 +15,7 @@ pub enum ElementPurpose {
 impl Display for ElementPurpose {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let c: char = (*self).into();
-        write!(f, "{}", c)
+        write!(f, "{c}")
     }
 }
 
diff --git a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/service_abbreviation.rs b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/service_abbreviation.rs
index 739b865072..7dbfc8f212 100644
--- a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/service_abbreviation.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/service_abbreviation.rs
@@ -70,8 +70,7 @@ pub(crate) fn abbreviate_service(
                 from_value::<Vec<ServiceKeyKind>>(value.clone()).map_err(|_| {
                     DidPeerError::ParsingError(format!(
                         "Could not parse routing keys as Vector of Strings. Value of \
-                         routing_keys: {}",
-                        value
+                         routing_keys: {value}"
                     ))
                 })
             })
@@ -84,8 +83,7 @@ pub(crate) fn abbreviate_service(
             .map(|value| {
                 from_value::<Vec<ServiceAcceptType>>(value.clone()).map_err(|_| {
                     DidPeerError::ParsingError(format!(
-                        "Could not parse accept as Vector of Strings. Value of accept: {}",
-                        value
+                        "Could not parse accept as Vector of Strings. Value of accept: {value}"
                     ))
                 })
             })
@@ -151,7 +149,7 @@ pub(crate) fn deabbreviate_service(
     let id = abbreviated
         .id
         .clone()
-        .unwrap_or(format!("#service-{}", index).parse()?);
+        .unwrap_or(format!("#service-{index}").parse()?);
 
     let mut service = Service::new(
         id,
diff --git a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/construction_did_doc.rs b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/construction_did_doc.rs
index 88a6e32d0e..6308392320 100644
--- a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/construction_did_doc.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/construction_did_doc.rs
@@ -96,9 +96,8 @@ impl DidPeer4ConstructionDidDocument {
         let did_short_form = did_peer_4.short_form().to_string();
         let did_as_uri = Uri::new(&did_short_form).unwrap_or_else(|_| {
             panic!(
-                "DID or URI implementation is buggy, because DID {} failed to be parsed as URI. \
-                 This counters W3C DID-CORE spec which states that \"DIDs are URIs\" [RFC3986].",
-                did_short_form
+                "DID or URI implementation is buggy, because DID {did_short_form} failed to be parsed as URI. \
+                 This counters W3C DID-CORE spec which states that \"DIDs are URIs\" [RFC3986]."
             )
         });
         did_doc.add_also_known_as(did_as_uri);
diff --git a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/mod.rs b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/mod.rs
index a726673d6a..7c0e31d13d 100644
--- a/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/mod.rs
+++ b/did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo4/mod.rs
@@ -39,7 +39,7 @@ impl PeerDid<Numalgo4> {
             multibase::Base::Base58Btc,
             [MULTIHASH_SHA2_256.as_slice(), &encoded_doc_digest].concat(),
         );
-        let did = Did::parse(format!("did:peer:4{}:{}", hash, encoded_document))?;
+        let did = Did::parse(format!("did:peer:4{hash}:{encoded_document}"))?;
         Ok(Self {
             did,
             numalgo: Numalgo4,
@@ -63,9 +63,9 @@ impl PeerDid<Numalgo4> {
             }
             Some(hash_part) => hash_part,
         };
-        let short_form_did = format!("did:peer:{}", short_form_id);
+        let short_form_did = format!("did:peer:{short_form_id}");
         let parse_result = Did::parse(short_form_did).map_err(|e| {
-            DidPeerError::GeneralError(format!("Failed to parse short form of PeerDid: {}", e))
+            DidPeerError::GeneralError(format!("Failed to parse short form of PeerDid: {e}"))
         });
         // ** safety note (panic) **
         // This should only panic if the parser is inherently buggy. We rely on following
@@ -100,15 +100,14 @@ impl PeerDid<Numalgo4> {
         let (_base, diddoc_with_multibase_prefix) =
             multibase::decode(encoded_did_doc).map_err(|e| {
                 DidPeerError::GeneralError(format!(
-                    "Failed to decode multibase prefix from encoded did doc: {}",
-                    e
+                    "Failed to decode multibase prefix from encoded did doc: {e}"
                 ))
             })?;
         // without first 2 bytes
         let peer4_did_doc: &[u8] = &diddoc_with_multibase_prefix[2..];
         let encoded_document: DidPeer4ConstructionDidDocument =
             serde_json::from_slice(peer4_did_doc).map_err(|e| {
-                DidPeerError::GeneralError(format!("Failed to decode the encoded did doc: {}", e))
+                DidPeerError::GeneralError(format!("Failed to decode the encoded did doc: {e}"))
             })?;
         Ok(encoded_document)
     }
diff --git a/did_core/did_methods/did_resolver_sov/src/dereferencing/utils.rs b/did_core/did_methods/did_resolver_sov/src/dereferencing/utils.rs
index e51e99a20a..5e47d9951a 100644
--- a/did_core/did_methods/did_resolver_sov/src/dereferencing/utils.rs
+++ b/did_core/did_methods/did_resolver_sov/src/dereferencing/utils.rs
@@ -40,11 +40,11 @@ fn content_stream_from(
     did_url: &DidUrl,
 ) -> Result<Cursor<Vec<u8>>, DidSovError> {
     let fragment = did_url.fragment().ok_or_else(|| {
-        DidSovError::InvalidDid(format!("No fragment provided in the DID URL {}", did_url))
+        DidSovError::InvalidDid(format!("No fragment provided in the DID URL {did_url}"))
     })?;
 
     let did_url_string = did_url.to_string();
-    let fragment_string = format!("#{}", fragment);
+    let fragment_string = format!("#{fragment}");
     let id_matcher = |id: &str| id == did_url_string || id.ends_with(&fragment_string);
 
     let value = match (
@@ -55,14 +55,12 @@ fn content_stream_from(
         (None, Some(authentication)) => serde_json::to_value(authentication)?,
         (None, None) => {
             return Err(DidSovError::NotFound(format!(
-                "Fragment '{}' not found in the DID document",
-                fragment
+                "Fragment '{fragment}' not found in the DID document"
             )));
         }
         (Some(_), Some(_)) => {
             return Err(DidSovError::InvalidDid(format!(
-                "Fragment '{}' is ambiguous",
-                fragment
+                "Fragment '{fragment}' is ambiguous"
             )));
         }
     };
diff --git a/did_core/did_methods/did_resolver_sov/src/resolution/resolver.rs b/did_core/did_methods/did_resolver_sov/src/resolution/resolver.rs
index 2ce386b4a9..3101e51271 100644
--- a/did_core/did_methods/did_resolver_sov/src/resolution/resolver.rs
+++ b/did_core/did_methods/did_resolver_sov/src/resolution/resolver.rs
@@ -52,7 +52,7 @@ where
         parsed_did: &Did,
         _options: &Self::DidResolutionOptions,
     ) -> Result<DidResolutionOutput, GenericError> {
-        log::info!("DidSovResolver::resolve >> Resolving did: {}", parsed_did);
+        log::info!("DidSovResolver::resolve >> Resolving did: {parsed_did}");
         let method = parsed_did.method().ok_or_else(|| {
             DidSovError::InvalidDid("Attempted to resolve unqualified did".to_string())
         })?;
@@ -86,7 +86,7 @@ where
 {
     async fn get_verkey(&self, did: &Did) -> Result<String, DidSovError> {
         let nym_response = self.ledger.borrow().get_nym(did).await?;
-        log::info!("get_verkey >> nym_response: {}", nym_response);
+        log::info!("get_verkey >> nym_response: {nym_response}");
         let nym_json: Value = serde_json::from_str(&nym_response)?;
         let nym_data = nym_json["result"]["data"]
             .as_str()
diff --git a/did_core/did_methods/did_resolver_sov/src/resolution/utils.rs b/did_core/did_methods/did_resolver_sov/src/resolution/utils.rs
index 65de49d405..efc4990352 100644
--- a/did_core/did_methods/did_resolver_sov/src/resolution/utils.rs
+++ b/did_core/did_methods/did_resolver_sov/src/resolution/utils.rs
@@ -57,14 +57,12 @@ fn expand_abbreviated_verkey(nym: &str, verkey: &str) -> Result<String, DidSovEr
     if let Some(stripped_verkey) = verkey.strip_prefix('~') {
         let mut decoded_nym = bs58::decode(nym).into_vec().map_err(|e| {
             DidSovError::ParsingError(ParsingErrorSource::LedgerResponseParsingError(format!(
-                "Failed to decode did from base58: {} (error: {})",
-                nym, e
+                "Failed to decode did from base58: {nym} (error: {e})"
             )))
         })?;
         let decoded_stripped_verkey = bs58::decode(stripped_verkey).into_vec().map_err(|e| {
             DidSovError::ParsingError(ParsingErrorSource::LedgerResponseParsingError(format!(
-                "Failed to decode verkey from base58: {} (error: {})",
-                stripped_verkey, e
+                "Failed to decode verkey from base58: {stripped_verkey} (error: {e})"
             )))
         })?;
         decoded_nym.extend(&decoded_stripped_verkey);
@@ -94,7 +92,7 @@ pub(super) async fn ledger_response_to_ddo(
     let service_data = match get_data_from_response(resp) {
         Ok(data) => data,
         Err(e) => {
-            log::warn!("Failed to get service data: {}", e);
+            log::warn!("Failed to get service data: {e}");
             serde_json::Value::Null
         }
     };
@@ -131,7 +129,7 @@ pub(super) async fn ledger_response_to_ddo(
     let datetime = match txn_time_result {
         Ok(txn_time) => unix_to_datetime(txn_time),
         Err(e) => {
-            log::warn!("Failed to parse txnTime: {}", e);
+            log::warn!("Failed to parse txnTime: {e}");
             None
         }
     };
diff --git a/did_core/did_methods/did_resolver_web/src/resolution/resolver.rs b/did_core/did_methods/did_resolver_web/src/resolution/resolver.rs
index d7494c9bc7..0de28ae7d5 100644
--- a/did_core/did_methods/did_resolver_web/src/resolution/resolver.rs
+++ b/did_core/did_methods/did_resolver_web/src/resolution/resolver.rs
@@ -104,7 +104,7 @@ where
             "/.well-known/did.json".to_string()
         } else {
             let path = path_parts.join("/");
-            format!("/{}/did.json", path)
+            format!("/{path}/did.json")
         };
         let url = uri::Builder::new()
             .scheme(self.scheme.clone())
diff --git a/did_core/did_methods/did_resolver_web/tests/resolution.rs b/did_core/did_methods/did_resolver_web/tests/resolution.rs
index 65949563a3..f3a2c68aff 100644
--- a/did_core/did_methods/did_resolver_web/tests/resolution.rs
+++ b/did_core/did_methods/did_resolver_web/tests/resolution.rs
@@ -143,8 +143,8 @@ async fn test_did_web_resolver() {
 
     let did_web_resolver = DidWebResolver::http();
 
-    let did_example_1 = Did::parse(format!("did:web:{}%3A{}", host, port)).unwrap();
-    let did_example_2 = Did::parse(format!("did:web:{}%3A{}:user:alice", host, port)).unwrap();
+    let did_example_1 = Did::parse(format!("did:web:{host}%3A{port}")).unwrap();
+    let did_example_2 = Did::parse(format!("did:web:{host}%3A{port}:user:alice")).unwrap();
 
     let DidResolutionOutput {
         did_document: ddo1, ..
diff --git a/did_core/did_parser_nom/src/did/parsing/did_core.rs b/did_core/did_parser_nom/src/did/parsing/did_core.rs
index 9930d374b0..3f6ddfbfa9 100644
--- a/did_core/did_parser_nom/src/did/parsing/did_core.rs
+++ b/did_core/did_parser_nom/src/did/parsing/did_core.rs
@@ -45,39 +45,27 @@ fn method_name(input: &str) -> IResult<&str, &str> {
 }
 
 fn method_specific_id_optional_repeat(input: &str) -> IResult<&str, &str> {
-    log::trace!(
-        "did_core::method_specific_id_optional_repeat >> input: {:?}",
-        input
-    );
+    log::trace!("did_core::method_specific_id_optional_repeat >> input: {input:?}");
     let ret = recognize(many0(terminated(many0(idchar), char(':'))))(input); // First half of DID Syntax ABNF rule method-specific-id: *( *idchar ":"
                                                                              // )recognize(many1(idchar))(input)
-    log::trace!(
-        "did_core::method_specific_id_optional_repeat >> ret: {:?}",
-        ret
-    );
+    log::trace!("did_core::method_specific_id_optional_repeat >> ret: {ret:?}");
     ret
 }
 
 fn method_specific_id_required_characters(input: &str) -> IResult<&str, &str> {
-    log::trace!(
-        "did_core::method_specific_id_required_characters >> input: {:?}",
-        input
-    );
+    log::trace!("did_core::method_specific_id_required_characters >> input: {input:?}");
     let ret = recognize(many1(idchar))(input); // Second half of DID Syntax ABNF rule method-specific-id: 1*idchar
-    log::trace!(
-        "did_core::method_specific_id_required_characters >> ret: {:?}",
-        ret
-    );
+    log::trace!("did_core::method_specific_id_required_characters >> ret: {ret:?}");
     ret
 }
 
 pub(super) fn general_did_id(input: &str) -> IResult<&str, &str> {
-    log::trace!("did_core::general_did_id >> input: {:?}", input);
+    log::trace!("did_core::general_did_id >> input: {input:?}");
     let (input, did_id) = recognize(tuple((
         method_specific_id_optional_repeat,
         method_specific_id_required_characters,
     )))(input)?;
-    log::trace!("did_core::general_did_id >> did_id: {:?}", did_id);
+    log::trace!("did_core::general_did_id >> did_id: {did_id:?}");
     Ok((input, did_id))
 }
 
diff --git a/did_core/did_parser_nom/src/did_url/mod.rs b/did_core/did_parser_nom/src/did_url/mod.rs
index 0f733ad6b2..4900998bcd 100644
--- a/did_core/did_parser_nom/src/did_url/mod.rs
+++ b/did_core/did_parser_nom/src/did_url/mod.rs
@@ -79,7 +79,7 @@ impl DidUrl {
         }
         let len = fragment.len();
         Ok(Self {
-            did_url: format!("#{}", fragment),
+            did_url: format!("#{fragment}"),
             did: None,
             method: None,
             namespace: None,
diff --git a/did_core/did_parser_nom/src/error.rs b/did_core/did_parser_nom/src/error.rs
index 3990d68b38..de43c0435a 100644
--- a/did_core/did_parser_nom/src/error.rs
+++ b/did_core/did_parser_nom/src/error.rs
@@ -18,8 +18,8 @@ impl std::error::Error for ParseError {
 impl fmt::Display for ParseError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            ParseError::InvalidInput(input) => write!(f, "Invalid input: {}", input),
-            ParseError::ParserError(error) => write!(f, "Parsing library error: {}", error),
+            ParseError::InvalidInput(input) => write!(f, "Invalid input: {input}"),
+            ParseError::ParserError(error) => write!(f, "Parsing library error: {error}"),
         }
     }
 }
diff --git a/did_core/public_key/src/jwk.rs b/did_core/public_key/src/jwk.rs
index 0242dfc842..a7d232ed63 100644
--- a/did_core/public_key/src/jwk.rs
+++ b/did_core/public_key/src/jwk.rs
@@ -19,7 +19,6 @@ impl Key {
 
         let key_type = match askar_alg {
             askar_crypto::alg::KeyAlg::Ed25519 => KeyType::Ed25519,
-            askar_crypto::alg::KeyAlg::Bls12_381(BlsCurves::G1G2) => KeyType::Bls12381g1g2,
             askar_crypto::alg::KeyAlg::Bls12_381(BlsCurves::G1) => KeyType::Bls12381g1,
             askar_crypto::alg::KeyAlg::Bls12_381(BlsCurves::G2) => KeyType::Bls12381g2,
             askar_crypto::alg::KeyAlg::X25519 => KeyType::X25519,
@@ -50,7 +49,6 @@ pub fn public_key_type_to_askar_key_alg(value: &KeyType) -> Result<KeyAlg, Publi
     let alg = match value {
         KeyType::Ed25519 => KeyAlg::Ed25519,
         KeyType::X25519 => KeyAlg::X25519,
-        KeyType::Bls12381g1g2 => KeyAlg::Bls12_381(BlsCurves::G1G2),
         KeyType::Bls12381g1 => KeyAlg::Bls12_381(BlsCurves::G1),
         KeyType::Bls12381g2 => KeyAlg::Bls12_381(BlsCurves::G2),
         KeyType::P256 => KeyAlg::EcCurve(EcCurves::Secp256r1),
diff --git a/misc/display_as_json/tests/demo.rs b/misc/display_as_json/tests/demo.rs
index 705ab3d60e..02dcbac47b 100644
--- a/misc/display_as_json/tests/demo.rs
+++ b/misc/display_as_json/tests/demo.rs
@@ -17,7 +17,7 @@ fn test_display_as_json() {
         field1: 42,
         field2: "hello".to_string(),
     };
-    let displayed = format!("{}", instance);
+    let displayed = format!("{instance}");
     let expected = r#"{"field1":42,"field2":"hello"}"#;
     assert_eq!(displayed, expected);
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index fcb78ec564..e88baf106b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.1"
+channel = "1.88.0"