From 4c9167119ce74f877a91e939bbba029196934ac9 Mon Sep 17 00:00:00 2001
From: Roman Brazhnyk <rbrazhnyk@gmail.com>
Date: Mon, 19 Aug 2024 18:34:19 +0800
Subject: [PATCH] feat: FTL-14487 add commands to manage Iota configs (#399)

---
 README.md                             |   2 +
 docs/generate.md                      |   2 +-
 docs/iam.md                           |  10 +-
 docs/iota.md                          | 290 ++++++++++++++++++++++++++
 docs/login.md                         |  32 +--
 docs/project.md                       |  10 +-
 docs/start.md                         |   2 +-
 docs/stop.md                          |   2 +-
 docs/token.md                         |  10 +-
 docs/wallet.md                        | 137 ++++++++++++
 docs/whoami.md                        |   2 +-
 package-lock.json                     | 211 ++++++++++++++++---
 package.json                          |   8 +
 src/commands/iota/create-config.ts    | 183 ++++++++++++++++
 src/commands/iota/create-query.ts     |  83 ++++++++
 src/commands/iota/delete-config.ts    |  37 ++++
 src/commands/iota/delete-query.ts     |  42 ++++
 src/commands/iota/get-config.ts       |  38 ++++
 src/commands/iota/get-query.ts        |  43 ++++
 src/commands/iota/list-configs.ts     |  18 ++
 src/commands/iota/list-queries.ts     |  38 ++++
 src/commands/iota/update-config.ts    | 104 +++++++++
 src/commands/iota/update-query.ts     |  90 ++++++++
 src/commands/wallet/create-wallet.ts  | 112 ++++++++++
 src/commands/wallet/delete-wallet.ts  |  37 ++++
 src/commands/wallet/get-wallet.ts     |  38 ++++
 src/commands/wallet/list-wallets.ts   |  18 ++
 src/commands/wallet/update-wallet.ts  |  73 +++++++
 src/common/constants.ts               |   5 +
 src/services/affinidi/cwe/service.ts  |  72 +++++++
 src/services/affinidi/errors.ts       |   9 +-
 src/services/affinidi/iota/service.ts | 134 ++++++++++++
 test/commands/iota/configs.test.ts    | 157 ++++++++++++++
 test/commands/iota/queries.test.ts    | 117 +++++++++++
 test/commands/wallet/wallets.test.ts  | 184 ++++++++++++++++
 test/helpers/phone-pex-query.json     |  32 +++
 36 files changed, 2316 insertions(+), 66 deletions(-)
 create mode 100644 docs/iota.md
 create mode 100644 docs/wallet.md
 create mode 100644 src/commands/iota/create-config.ts
 create mode 100644 src/commands/iota/create-query.ts
 create mode 100644 src/commands/iota/delete-config.ts
 create mode 100644 src/commands/iota/delete-query.ts
 create mode 100644 src/commands/iota/get-config.ts
 create mode 100644 src/commands/iota/get-query.ts
 create mode 100644 src/commands/iota/list-configs.ts
 create mode 100644 src/commands/iota/list-queries.ts
 create mode 100644 src/commands/iota/update-config.ts
 create mode 100644 src/commands/iota/update-query.ts
 create mode 100644 src/commands/wallet/create-wallet.ts
 create mode 100644 src/commands/wallet/delete-wallet.ts
 create mode 100644 src/commands/wallet/get-wallet.ts
 create mode 100644 src/commands/wallet/list-wallets.ts
 create mode 100644 src/commands/wallet/update-wallet.ts
 create mode 100644 src/services/affinidi/cwe/service.ts
 create mode 100644 src/services/affinidi/iota/service.ts
 create mode 100644 test/commands/iota/configs.test.ts
 create mode 100644 test/commands/iota/queries.test.ts
 create mode 100644 test/commands/wallet/wallets.test.ts
 create mode 100644 test/helpers/phone-pex-query.json

diff --git a/README.md b/README.md
index 17820ab2..3d881e51 100644
--- a/README.md
+++ b/README.md
@@ -256,12 +256,14 @@ When you run `affinidi stop` your session information is deleted.
 * [`affinidi generate`](docs/generate.md) - Use these commands to generate code to get started or to scaffold your solution
 * [`affinidi help`](docs/help.md) - Display help for affinidi.
 * [`affinidi iam`](docs/iam.md) - Use these commands to manage policies for access configuration
+* [`affinidi iota`](docs/iota.md) - Use these commands to manage Iota configurations
 * [`affinidi login`](docs/login.md) - Use these commands for user login configuration and group management
 * [`affinidi project`](docs/project.md) - Use these commands to manage your projects
 * [`affinidi search`](docs/search.md) - Search for a command.
 * [`affinidi start`](docs/start.md) - Log in to Affinidi
 * [`affinidi stop`](docs/stop.md) - Log out from Affinidi
 * [`affinidi token`](docs/token.md) - Use these commands for Personal Access Token (PAT) management
+* [`affinidi wallet`](docs/wallet.md) - Use these commands to manage your wallets
 * [`affinidi whoami`](docs/whoami.md) - Returns user's subject, projects, and token details from the current session.
 
 <!-- commandsstop -->
diff --git a/docs/generate.md b/docs/generate.md
index 97cf408c..b4787a17 100644
--- a/docs/generate.md
+++ b/docs/generate.md
@@ -34,4 +34,4 @@ EXAMPLES
   $ affinidi generate app --path "../my-app" --framework django --provider affinidi --force
 ```
 
-_See code: [src/commands/generate/app.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/generate/app.ts)_
+_See code: [src/commands/generate/app.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/generate/app.ts)_
diff --git a/docs/iam.md b/docs/iam.md
index 1f574e2d..d10c10a6 100644
--- a/docs/iam.md
+++ b/docs/iam.md
@@ -44,7 +44,7 @@ FLAG DESCRIPTIONS
     Get a list of possible IDs with command affinidi token list-tokens
 ```
 
-_See code: [src/commands/iam/add-principal.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/iam/add-principal.ts)_
+_See code: [src/commands/iam/add-principal.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iam/add-principal.ts)_
 
 ## `affinidi iam get-policies`
 
@@ -82,7 +82,7 @@ FLAG DESCRIPTIONS
     Get a list of possible IDs with command affinidi token list-tokens
 ```
 
-_See code: [src/commands/iam/get-policies.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/iam/get-policies.ts)_
+_See code: [src/commands/iam/get-policies.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iam/get-policies.ts)_
 
 ## `affinidi iam list-principals`
 
@@ -106,7 +106,7 @@ EXAMPLES
   $ affinidi iam list-principals
 ```
 
-_See code: [src/commands/iam/list-principals.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/iam/list-principals.ts)_
+_See code: [src/commands/iam/list-principals.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iam/list-principals.ts)_
 
 ## `affinidi iam remove-principal`
 
@@ -143,7 +143,7 @@ FLAG DESCRIPTIONS
     Get a list of possible IDs with command affinidi token list-tokens
 ```
 
-_See code: [src/commands/iam/remove-principal.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/iam/remove-principal.ts)_
+_See code: [src/commands/iam/remove-principal.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iam/remove-principal.ts)_
 
 ## `affinidi iam update-policies`
 
@@ -182,4 +182,4 @@ FLAG DESCRIPTIONS
     Get a list of possible IDs with command affinidi token list-tokens
 ```
 
-_See code: [src/commands/iam/update-policies.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/iam/update-policies.ts)_
+_See code: [src/commands/iam/update-policies.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iam/update-policies.ts)_
diff --git a/docs/iota.md b/docs/iota.md
new file mode 100644
index 00000000..ce31e9c2
--- /dev/null
+++ b/docs/iota.md
@@ -0,0 +1,290 @@
+`affinidi iota`
+===============
+
+Use these commands to manage Iota configurations
+
+* [`affinidi iota create-config`](#affinidi-iota-create-config)
+* [`affinidi iota create-query`](#affinidi-iota-create-query)
+* [`affinidi iota delete-config`](#affinidi-iota-delete-config)
+* [`affinidi iota delete-query`](#affinidi-iota-delete-query)
+* [`affinidi iota get-config`](#affinidi-iota-get-config)
+* [`affinidi iota get-query`](#affinidi-iota-get-query)
+* [`affinidi iota list-configs`](#affinidi-iota-list-configs)
+* [`affinidi iota list-queries`](#affinidi-iota-list-queries)
+* [`affinidi iota update-config`](#affinidi-iota-update-config)
+* [`affinidi iota update-query`](#affinidi-iota-update-query)
+
+## `affinidi iota create-config`
+
+Creates Affinidi Iota Framework configuration in your active project
+
+```
+USAGE
+  $ affinidi iota create-config [--json] [--no-color] [--no-input] [-n <value>] [-d
+    <value>] [-w <value>] [--token-max-age <value>] [--response-webhook-url <value>] [--enable-verification]
+    [--enable-consent-audit-log] [--client-name <value>] [--client-origin <value>] [--client-logo <value>]
+
+FLAGS
+  -d, --description=<value>           Description of the Affinidi Iota Framework configuration
+  -n, --name=<value>                  Name of the Affinidi Iota Framework configuration
+  -w, --wallet-ari=<value>            ARI of the wallet
+      --client-logo=<value>           Application URL of a logo, displayed in the consent page
+      --client-name=<value>           Name, displayed in the consent page
+      --client-origin=<value>         Domain, displayed in the consent page
+      --enable-consent-audit-log      Log consents
+      --enable-verification           Perform verification
+      --response-webhook-url=<value>  Affinidi Iota Framework response webhook URL
+      --token-max-age=<value>         Token expiration time in seconds
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota create-config -n <value> -w <value>
+
+  $ affinidi iota create-config --name <value> --wallet-ari <value>
+
+  $ affinidi iota create-config --name <value> --wallet-ari <value> --enable-consent-audit-log --enable-verification --token-max-age <value>
+```
+
+_See code: [src/commands/iota/create-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/create-config.ts)_
+
+## `affinidi iota create-query`
+
+Creates PEX query for your Affinidi Iota Framework configuration
+
+```
+USAGE
+  $ affinidi iota create-query [--json] [--no-color] [--no-input] [-c <value>] [-n
+    <value>] [-d <value>] [-f <value>]
+
+FLAGS
+  -c, --configuration-id=<value>  ID of the Affinidi Iota Framework configuration
+  -d, --description=<value>       PEX query description
+  -f, --file=<value>              Location of a json file containing PEX query
+  -n, --name=<value>              PEX query name
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota create-query -c <value> -n <value> -d <value> -f pexQuery.json
+
+  $ affinidi iota create-query --configuration-id <value> --name <value> --description <value> --file pexQuery.json
+```
+
+_See code: [src/commands/iota/create-query.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/create-query.ts)_
+
+## `affinidi iota delete-config`
+
+Deletes Affinidi Iota Framework configuration from your active project
+
+```
+USAGE
+  $ affinidi iota delete-config [--json] [--no-color] [--no-input] [-i <value>]
+
+FLAGS
+  -i, --id=<value>  ID of the Affinidi Iota Framework configuration
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota delete-config -i <value>
+
+  $ affinidi iota delete-config --id <value>
+```
+
+_See code: [src/commands/iota/delete-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/delete-config.ts)_
+
+## `affinidi iota delete-query`
+
+Deletes the PEX query from your Affinidi Iota Framework configuration
+
+```
+USAGE
+  $ affinidi iota delete-query [--json] [--no-color] [--no-input] [-c <value>] [-i
+    <value>]
+
+FLAGS
+  -c, --configuration-id=<value>  ID of the Affinidi Iota Framework configuration
+  -i, --query-id=<value>          PEX query ID
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota delete-query -c <uuid> -i <uuid>
+
+  $ affinidi iota delete-query --configuration-id <uuid> --query-id <uuid>
+```
+
+_See code: [src/commands/iota/delete-query.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/delete-query.ts)_
+
+## `affinidi iota get-config`
+
+Gets the details of the Affinidi Iota Framework configuration in your active project
+
+```
+USAGE
+  $ affinidi iota get-config [--json] [--no-color] [--no-input] [-i <value>]
+
+FLAGS
+  -i, --id=<value>  ID of the Affinidi Iota Framework configuration
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota get-config -i <value>
+
+  $ affinidi iota get-config --id <value>
+```
+
+_See code: [src/commands/iota/get-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/get-config.ts)_
+
+## `affinidi iota get-query`
+
+Gets the PEX query details for your Affinidi Iota Framework configuration
+
+```
+USAGE
+  $ affinidi iota get-query [--json] [--no-color] [--no-input] [-c <value>] [-i
+    <value>]
+
+FLAGS
+  -c, --configuration-id=<value>  ID of the Affinidi Iota Framework configuration
+  -i, --query-id=<value>          PEX query ID
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota get-query -c <uuid> -i <uuid>
+
+  $ affinidi iota get-query --configuration-id <uuid> --query-id <uuid>
+```
+
+_See code: [src/commands/iota/get-query.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/get-query.ts)_
+
+## `affinidi iota list-configs`
+
+Lists Affinidi Iota Framework configurations in your active project
+
+```
+USAGE
+  $ affinidi iota list-configs [--json] [--no-color] [--no-input]
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota list-configs
+```
+
+_See code: [src/commands/iota/list-configs.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/list-configs.ts)_
+
+## `affinidi iota list-queries`
+
+Lists PEX queries for your Affinidi Iota Framework configuration
+
+```
+USAGE
+  $ affinidi iota list-queries [--json] [--no-color] [--no-input] [-c <value>]
+
+FLAGS
+  -c, --configuration-id=<value>  ID of the Affinidi Iota Framework configuration
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota list-queries -c <value>
+
+  $ affinidi iota list-queries --configuration-id <value>
+```
+
+_See code: [src/commands/iota/list-queries.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/list-queries.ts)_
+
+## `affinidi iota update-config`
+
+Updates Affinidi Iota Framework configuration in your active project
+
+```
+USAGE
+  $ affinidi iota update-config [--json] [--no-color] [--no-input] [-i <value>] [-n
+    <value>] [-d <value>] [--wallet-ari <value>] [--token-max-age <value>] [--response-webhook-url <value>]
+    [--enable-verification] [--enable-consent-audit-log] [--client-name <value>] [--client-origin <value>]
+    [--client-logo <value>]
+
+FLAGS
+  -d, --description=<value>           Description of the Affinidi Iota Framework configuration
+  -i, --id=<value>                    ID of the Affinidi Iota Framework configuration
+  -n, --name=<value>                  Name of the Affinidi Iota Framework configuration
+      --client-logo=<value>           Application URL of a logo, displayed in the consent page
+      --client-name=<value>           Name, displayed in the consent page
+      --client-origin=<value>         Domain, displayed in the consent page
+      --enable-consent-audit-log      Log consents
+      --enable-verification           Perform verification
+      --response-webhook-url=<value>  Affinidi Iota Framework response webhook URL
+      --token-max-age=<value>         Token expiration time in seconds - integer between 1 and 10
+      --wallet-ari=<value>            ARI of the wallet
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota update-config -i <value>
+
+  $ affinidi iota update-config --id <value>
+```
+
+_See code: [src/commands/iota/update-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/update-config.ts)_
+
+## `affinidi iota update-query`
+
+Updates PEX query for your Affinidi Iota Framework configuration
+
+```
+USAGE
+  $ affinidi iota update-query [--json] [--no-color] [--no-input] [-c <value>] [-i
+    <value>] [-d <value>] [-f <value>]
+
+FLAGS
+  -c, --configuration-id=<value>  ID of the Affinidi Iota Framework configuration
+  -d, --description=<value>       PEX query description
+  -f, --file=<value>              Location of a json file containing PEX query
+  -i, --query-id=<value>          PEX query ID
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi iota update-query -c <value> -i <value> -d <value> -f pexQuery.json
+
+  $ affinidi iota update-query --configuration-id <value> --query-id <value> -d <value> -f pexQuery.json
+
+  $ affinidi iota update-query --configuration-id <value> --query-id <value> --description <value> --file pexQuery.json
+```
+
+_See code: [src/commands/iota/update-query.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/iota/update-query.ts)_
diff --git a/docs/login.md b/docs/login.md
index 3b030344..c09449e3 100644
--- a/docs/login.md
+++ b/docs/login.md
@@ -42,7 +42,7 @@ EXAMPLES
   $ affinidi login add-user-to-group --group-name my_group --user-id did:key:12345
 ```
 
-_See code: [src/commands/login/add-user-to-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/add-user-to-group.ts)_
+_See code: [src/commands/login/add-user-to-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/add-user-to-group.ts)_
 
 ## `affinidi login create-config`
 
@@ -93,7 +93,7 @@ FLAG DESCRIPTIONS
     none: For public clients (native/mobile apps) which can not have a secret
 ```
 
-_See code: [src/commands/login/create-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/create-config.ts)_
+_See code: [src/commands/login/create-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/create-config.ts)_
 
 ## `affinidi login create-group`
 
@@ -117,7 +117,7 @@ EXAMPLES
   $ affinidi login create-group --name my_new_group
 ```
 
-_See code: [src/commands/login/create-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/create-group.ts)_
+_See code: [src/commands/login/create-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/create-group.ts)_
 
 ## `affinidi login delete-config`
 
@@ -141,7 +141,7 @@ EXAMPLES
   $ affinidi login delete-config --id <value>
 ```
 
-_See code: [src/commands/login/delete-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/delete-config.ts)_
+_See code: [src/commands/login/delete-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/delete-config.ts)_
 
 ## `affinidi login delete-group`
 
@@ -165,7 +165,7 @@ EXAMPLES
   $ affinidi login delete-group --name my_group
 ```
 
-_See code: [src/commands/login/delete-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/delete-group.ts)_
+_See code: [src/commands/login/delete-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/delete-group.ts)_
 
 ## `affinidi login export-configs`
 
@@ -191,7 +191,7 @@ EXAMPLES
   $ affinidi login export-configs --ids "configurationId1 configurationId2" --path "../my-configs.json"
 ```
 
-_See code: [src/commands/login/export-configs.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/export-configs.ts)_
+_See code: [src/commands/login/export-configs.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/export-configs.ts)_
 
 ## `affinidi login export-groups`
 
@@ -217,7 +217,7 @@ EXAMPLES
   $ affinidi login export-groups --names "groupName1 groupName2" --path "../my-user-groups.json"
 ```
 
-_See code: [src/commands/login/export-groups.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/export-groups.ts)_
+_See code: [src/commands/login/export-groups.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/export-groups.ts)_
 
 ## `affinidi login get-config`
 
@@ -241,7 +241,7 @@ EXAMPLES
   $ affinidi login get-config --id <value>
 ```
 
-_See code: [src/commands/login/get-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/get-config.ts)_
+_See code: [src/commands/login/get-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/get-config.ts)_
 
 ## `affinidi login get-group`
 
@@ -265,7 +265,7 @@ EXAMPLES
   $ affinidi login get-group --name my_group
 ```
 
-_See code: [src/commands/login/get-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/get-group.ts)_
+_See code: [src/commands/login/get-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/get-group.ts)_
 
 ## `affinidi login import-configs`
 
@@ -289,7 +289,7 @@ EXAMPLES
   $ affinidi login import-configs --path "../my-configs.json"
 ```
 
-_See code: [src/commands/login/import-configs.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/import-configs.ts)_
+_See code: [src/commands/login/import-configs.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/import-configs.ts)_
 
 ## `affinidi login import-groups`
 
@@ -313,7 +313,7 @@ EXAMPLES
   $ affinidi login import-groups --path "../my-groups.json"
 ```
 
-_See code: [src/commands/login/import-groups.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/import-groups.ts)_
+_See code: [src/commands/login/import-groups.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/import-groups.ts)_
 
 ## `affinidi login list-configs`
 
@@ -332,7 +332,7 @@ EXAMPLES
   $ affinidi login list-configs
 ```
 
-_See code: [src/commands/login/list-configs.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/list-configs.ts)_
+_See code: [src/commands/login/list-configs.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/list-configs.ts)_
 
 ## `affinidi login list-groups`
 
@@ -351,7 +351,7 @@ EXAMPLES
   $ affinidi login list-groups
 ```
 
-_See code: [src/commands/login/list-groups.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/list-groups.ts)_
+_See code: [src/commands/login/list-groups.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/list-groups.ts)_
 
 ## `affinidi login list-users-in-group`
 
@@ -376,7 +376,7 @@ EXAMPLES
   $ affinidi login list-users-in-group --group-name my_group
 ```
 
-_See code: [src/commands/login/list-users-in-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/list-users-in-group.ts)_
+_See code: [src/commands/login/list-users-in-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/list-users-in-group.ts)_
 
 ## `affinidi login remove-user-from-group`
 
@@ -400,7 +400,7 @@ EXAMPLES
   $ affinidi login remove-user-from-group --group-name my_group --user-id did:key:12345
 ```
 
-_See code: [src/commands/login/remove-user-from-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/remove-user-from-group.ts)_
+_See code: [src/commands/login/remove-user-from-group.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/remove-user-from-group.ts)_
 
 ## `affinidi login update-config`
 
@@ -448,4 +448,4 @@ FLAG DESCRIPTIONS
     none: For public clients (native/mobile apps) which can not have a secret
 ```
 
-_See code: [src/commands/login/update-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/login/update-config.ts)_
+_See code: [src/commands/login/update-config.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/login/update-config.ts)_
diff --git a/docs/project.md b/docs/project.md
index ac5d9ed5..462a1ae7 100644
--- a/docs/project.md
+++ b/docs/project.md
@@ -33,7 +33,7 @@ EXAMPLES
   $ affinidi project create-project --name "My project name"
 ```
 
-_See code: [src/commands/project/create-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/project/create-project.ts)_
+_See code: [src/commands/project/create-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/project/create-project.ts)_
 
 ## `affinidi project get-active-project`
 
@@ -52,7 +52,7 @@ EXAMPLES
   $ affinidi project get-active-project
 ```
 
-_See code: [src/commands/project/get-active-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/project/get-active-project.ts)_
+_See code: [src/commands/project/get-active-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/project/get-active-project.ts)_
 
 ## `affinidi project list-projects`
 
@@ -71,7 +71,7 @@ EXAMPLES
   $ affinidi project list-projects
 ```
 
-_See code: [src/commands/project/list-projects.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/project/list-projects.ts)_
+_See code: [src/commands/project/list-projects.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/project/list-projects.ts)_
 
 ## `affinidi project select-project`
 
@@ -97,7 +97,7 @@ EXAMPLES
   $ affinidi project select-project --project-id <project-id>
 ```
 
-_See code: [src/commands/project/select-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/project/select-project.ts)_
+_See code: [src/commands/project/select-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/project/select-project.ts)_
 
 ## `affinidi project update-project`
 
@@ -124,4 +124,4 @@ EXAMPLES
   $ affinidi project update-project --name="My project name" --description="My project description
 ```
 
-_See code: [src/commands/project/update-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/project/update-project.ts)_
+_See code: [src/commands/project/update-project.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/project/update-project.ts)_
diff --git a/docs/start.md b/docs/start.md
index 30243697..f8c309b1 100644
--- a/docs/start.md
+++ b/docs/start.md
@@ -22,4 +22,4 @@ EXAMPLES
   $ affinidi start
 ```
 
-_See code: [src/commands/start.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/start.ts)_
+_See code: [src/commands/start.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/start.ts)_
diff --git a/docs/stop.md b/docs/stop.md
index 6d673f59..9aa26366 100644
--- a/docs/stop.md
+++ b/docs/stop.md
@@ -22,4 +22,4 @@ EXAMPLES
   $ affinidi stop
 ```
 
-_See code: [src/commands/stop.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/stop.ts)_
+_See code: [src/commands/stop.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/stop.ts)_
diff --git a/docs/token.md b/docs/token.md
index a41c6b65..df03ce15 100644
--- a/docs/token.md
+++ b/docs/token.md
@@ -49,7 +49,7 @@ EXAMPLES
   $ affinidi token create-token -n MyNewToken -g -w
 ```
 
-_See code: [src/commands/token/create-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/token/create-token.ts)_
+_See code: [src/commands/token/create-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/token/create-token.ts)_
 
 ## `affinidi token delete-token`
 
@@ -73,7 +73,7 @@ EXAMPLES
   $ affinidi token delete-token --token-id <uuid>
 ```
 
-_See code: [src/commands/token/delete-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/token/delete-token.ts)_
+_See code: [src/commands/token/delete-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/token/delete-token.ts)_
 
 ## `affinidi token get-token`
 
@@ -97,7 +97,7 @@ EXAMPLES
   $ affinidi token get-token --token-id <uuid>
 ```
 
-_See code: [src/commands/token/get-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/token/get-token.ts)_
+_See code: [src/commands/token/get-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/token/get-token.ts)_
 
 ## `affinidi token list-tokens`
 
@@ -116,7 +116,7 @@ EXAMPLES
   $ affinidi token list-tokens
 ```
 
-_See code: [src/commands/token/list-tokens.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/token/list-tokens.ts)_
+_See code: [src/commands/token/list-tokens.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/token/list-tokens.ts)_
 
 ## `affinidi token update-token`
 
@@ -146,4 +146,4 @@ EXAMPLES
   $ affinidi token update-token --token-id <uuid> --name "My new token" --key-id "My key ID" --public-key-file publicKey.pem --algorithm RS256
 ```
 
-_See code: [src/commands/token/update-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/token/update-token.ts)_
+_See code: [src/commands/token/update-token.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/token/update-token.ts)_
diff --git a/docs/wallet.md b/docs/wallet.md
new file mode 100644
index 00000000..d4667c4b
--- /dev/null
+++ b/docs/wallet.md
@@ -0,0 +1,137 @@
+`affinidi wallet`
+=================
+
+Use these commands to manage your wallets
+
+* [`affinidi wallet create-wallet`](#affinidi-wallet-create-wallet)
+* [`affinidi wallet delete-wallet`](#affinidi-wallet-delete-wallet)
+* [`affinidi wallet get-wallet`](#affinidi-wallet-get-wallet)
+* [`affinidi wallet list-wallets`](#affinidi-wallet-list-wallets)
+* [`affinidi wallet update-wallet`](#affinidi-wallet-update-wallet)
+
+## `affinidi wallet create-wallet`
+
+Creates wallet in your active project
+
+```
+USAGE
+  $ affinidi wallet create-wallet [--json] [--no-color] [--no-input] [-n <value>] [-d
+    <value>] [-u <value> -m key|web]
+
+FLAGS
+  -d, --description=<value>  Description of the wallet
+  -m, --did-method=<option>  DID method
+                             <options: key|web>
+  -n, --name=<value>         Name of the wallet
+  -u, --did-web-url=<value>  URL of the DID if DID method is did:web
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi wallet create-wallet
+
+  $ affinidi wallet create-wallet --name <value> --description <value>
+
+  $ affinidi wallet create-wallet --name <value> --description <value> --did-method key
+
+  $ affinidi wallet create-wallet --name <value> --description <value> --did-method web --did-web-url <value>
+```
+
+_See code: [src/commands/wallet/create-wallet.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/wallet/create-wallet.ts)_
+
+## `affinidi wallet delete-wallet`
+
+Deletes wallet from your active project
+
+```
+USAGE
+  $ affinidi wallet delete-wallet [--json] [--no-color] [--no-input] [-i <value>]
+
+FLAGS
+  -i, --id=<value>  ID of the wallet
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi wallet delete-wallet -i <value>
+
+  $ affinidi wallet delete-wallet --id <value>
+```
+
+_See code: [src/commands/wallet/delete-wallet.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/wallet/delete-wallet.ts)_
+
+## `affinidi wallet get-wallet`
+
+Gets wallet details in your active project
+
+```
+USAGE
+  $ affinidi wallet get-wallet [--json] [--no-color] [--no-input] [-i <value>]
+
+FLAGS
+  -i, --id=<value>  ID of the wallet
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi wallet get-wallet -i <value>
+
+  $ affinidi wallet get-wallet --id <value>
+```
+
+_See code: [src/commands/wallet/get-wallet.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/wallet/get-wallet.ts)_
+
+## `affinidi wallet list-wallets`
+
+Lists wallets in your active project
+
+```
+USAGE
+  $ affinidi wallet list-wallets [--json] [--no-color] [--no-input]
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi wallet list-wallets
+```
+
+_See code: [src/commands/wallet/list-wallets.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/wallet/list-wallets.ts)_
+
+## `affinidi wallet update-wallet`
+
+Updates wallet in your active project
+
+```
+USAGE
+  $ affinidi wallet update-wallet [--json] [--no-color] [--no-input] [-i <value>] [-n
+    <value>] [-d <value>]
+
+FLAGS
+  -d, --description=<value>  Description of the wallet
+  -i, --id=<value>           ID of the wallet
+  -n, --name=<value>         Name of the wallet
+
+GLOBAL FLAGS
+  --json      Format output as json.
+  --no-color  Disables color in the output. If you have trouble distinguishing colors, consider using this flag.
+  --no-input  Disables all the interactive prompts
+
+EXAMPLES
+  $ affinidi wallet update-wallet -i <value>
+
+  $ affinidi wallet update-wallet --id <value> --name <value> --description <value>
+```
+
+_See code: [src/commands/wallet/update-wallet.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/wallet/update-wallet.ts)_
diff --git a/docs/whoami.md b/docs/whoami.md
index 654f3c3d..33757ed9 100644
--- a/docs/whoami.md
+++ b/docs/whoami.md
@@ -22,4 +22,4 @@ EXAMPLES
   $ affinidi whoami
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/affinidi/affinidi-cli/blob/v2.7.0/src/commands/whoami.ts)_
+_See code: [src/commands/whoami.ts](https://github.com/affinidi/affinidi-cli/blob/v2.8.1/src/commands/whoami.ts)_
diff --git a/package-lock.json b/package-lock.json
index 5b99b401..1b317d3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,8 @@
       "version": "2.8.1",
       "license": "Apache-2.0",
       "dependencies": {
+        "@affinidi-tdk/iota-client": "^1.11.0",
+        "@affinidi-tdk/wallets-client": "^1.14.0",
         "@inquirer/prompts": "^5.3.4",
         "@oclif/core": "^4.0.17",
         "@oclif/plugin-autocomplete": "^3.1.11",
@@ -81,6 +83,26 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@affinidi-tdk/iota-client": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@affinidi-tdk/iota-client/-/iota-client-1.11.0.tgz",
+      "integrity": "sha512-6YPvj9imSMlvCkHYikSFBazjUcGNRhbjBUN0u879d+TSnHyQgZXe5cu1qQjIPOvvVBszhVH4L6/0h0D11gOLlQ==",
+      "dependencies": {
+        "axios": "^1.6.0",
+        "axios-retry": "^4.1.0",
+        "url": "^0.11.3"
+      }
+    },
+    "node_modules/@affinidi-tdk/wallets-client": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@affinidi-tdk/wallets-client/-/wallets-client-1.14.0.tgz",
+      "integrity": "sha512-f08hEKQHQ/QbbIJ57ia5/r3MWfOAnFxLLH6k7dAG07cCVtE+87E+LboEwGv4ZpwtvoTTZOdWCSy699un6TwXwQ==",
+      "dependencies": {
+        "axios": "^1.6.0",
+        "axios-retry": "^4.1.0",
+        "url": "^0.11.3"
+      }
+    },
     "node_modules/@aws-crypto/crc32": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
@@ -4477,6 +4499,28 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "node_modules/axios-retry": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
+      "integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==",
+      "dependencies": {
+        "is-retry-allowed": "^2.2.0"
+      },
+      "peerDependencies": {
+        "axios": "0.x || 1.x"
+      }
+    },
+    "node_modules/axios-retry/node_modules/is-retry-allowed": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
+      "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -4681,12 +4725,18 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5437,6 +5487,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/define-lazy-prop": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
@@ -5940,6 +6006,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-set-tostringtag": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
@@ -7044,9 +7129,12 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/function.prototype.name": {
       "version": "1.1.6",
@@ -7091,14 +7179,18 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7409,11 +7501,11 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7455,6 +7547,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -11951,9 +12054,12 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -17255,6 +17361,22 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -17369,13 +17491,17 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -18881,6 +19007,18 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+      "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
+      "dependencies": {
+        "punycode": "^1.4.1",
+        "qs": "^6.12.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/url-join": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz",
@@ -18890,6 +19028,25 @@
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+    },
+    "node_modules/url/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/package.json b/package.json
index e8e3814b..4a0c5f26 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,8 @@
     "oclif"
   ],
   "dependencies": {
+    "@affinidi-tdk/iota-client": "^1.11.0",
+    "@affinidi-tdk/wallets-client": "^1.14.0",
     "@inquirer/prompts": "^5.3.4",
     "@oclif/core": "^4.0.17",
     "@oclif/plugin-autocomplete": "^3.1.11",
@@ -128,6 +130,12 @@
       },
       "generate": {
         "description": "Use these commands to generate code to get started or to scaffold your solution"
+      },
+      "iota": {
+        "description": "Use these commands to manage Iota configurations"
+      },
+      "wallet": {
+        "description": "Use these commands to manage your wallets"
       }
     },
     "warn-if-update-available": {
diff --git a/src/commands/iota/create-config.ts b/src/commands/iota/create-config.ts
new file mode 100644
index 00000000..aa28bd71
--- /dev/null
+++ b/src/commands/iota/create-config.ts
@@ -0,0 +1,183 @@
+import { CreateIotaConfigurationInput, IotaConfigurationDto } from '@affinidi-tdk/iota-client'
+import { WalletDto, CreateWalletInput } from '@affinidi-tdk/wallets-client'
+import { input, select, confirm, number } from '@inquirer/prompts'
+import { ux, Flags } from '@oclif/core'
+import { CLIError } from '@oclif/core/errors'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { DidMethods } from '../../common/constants.js'
+import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
+import { INPUT_LIMIT, validateInputLength } from '../../common/validators.js'
+import { cweService } from '../../services/affinidi/cwe/service.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class CreateIotaConfig extends BaseCommand<typeof CreateIotaConfig> {
+  static summary = 'Creates Affinidi Iota Framework configuration in your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -n <value> -w <value>',
+    '<%= config.bin %> <%= command.id %> --name <value> --wallet-ari <value>',
+    '<%= config.bin %> <%= command.id %> --name <value> --wallet-ari <value> --enable-consent-audit-log --enable-verification --token-max-age <value>',
+  ]
+  static flags = {
+    name: Flags.string({
+      char: 'n',
+      summary: 'Name of the Affinidi Iota Framework configuration',
+    }),
+    description: Flags.string({
+      char: 'd',
+      summary: 'Description of the Affinidi Iota Framework configuration',
+    }),
+    'wallet-ari': Flags.string({
+      char: 'w',
+      summary: 'ARI of the wallet',
+    }),
+    'token-max-age': Flags.integer({
+      summary: 'Token expiration time in seconds',
+    }),
+    'response-webhook-url': Flags.string({
+      summary: 'Affinidi Iota Framework response webhook URL',
+    }),
+    'enable-verification': Flags.boolean({
+      summary: 'Perform verification',
+      default: false,
+    }),
+    'enable-consent-audit-log': Flags.boolean({
+      summary: 'Log consents',
+      default: false,
+    }),
+    'client-name': Flags.string({
+      summary: 'Name, displayed in the consent page',
+    }),
+    'client-origin': Flags.string({
+      summary: 'Domain, displayed in the consent page',
+    }),
+    'client-logo': Flags.string({
+      summary: 'Application URL of a logo, displayed in the consent page',
+    }),
+  }
+
+  public async run(): Promise<IotaConfigurationDto> {
+    const { flags } = await this.parse(CreateIotaConfig)
+
+    if (flags['no-input']) {
+      if (!flags.name) throw new CLIError(giveFlagInputErrorMessage('name'))
+      if (!flags['wallet-ari']) throw new CLIError(giveFlagInputErrorMessage('wallet-ari'))
+    }
+
+    let walletAri = flags['wallet-ari']
+
+    ux.action.start('Fetching wallets')
+    const { wallets } = await cweService.listWallets()
+    ux.action.stop('Fetched successfully!')
+
+    const walletAris = wallets?.map((wallet: WalletDto) => wallet.ari) || []
+    const wrongAriProvided = !walletAris.includes(walletAri)
+
+    if (!walletAri || wallets?.length === 0 || wrongAriProvided) {
+      const walletChoices =
+        wallets?.map((wallet: WalletDto) => ({
+          name: wallet.name || wallet.id,
+          value: wallet.ari,
+        })) || []
+
+      const CREATE_NEW_WALLET = 'Create new wallet'
+      walletChoices.push({ name: CREATE_NEW_WALLET, value: CREATE_NEW_WALLET })
+
+      const selectedWallet = await select({
+        message: 'Select the wallet used to sign the request token to the Affinidi Vault',
+        choices: walletChoices,
+      })
+
+      if (selectedWallet === CREATE_NEW_WALLET) {
+        const walletDidMethodChoices = Object.values(DidMethods).map((method: string) => ({
+          name: method,
+          value: method,
+          default: DidMethods.KEY,
+        }))
+
+        const name = validateInputLength(await input({ message: 'Enter wallet name' }), INPUT_LIMIT)
+        const description = validateInputLength(
+          await input({ message: 'Enter wallet description (optional)' }),
+          INPUT_LIMIT,
+        )
+        const didMethod = await select({ message: 'Select DID method of wallet', choices: walletDidMethodChoices })
+
+        const isDidWeb = didMethod === DidMethods.WEB
+        const didWebUrl = isDidWeb
+          ? validateInputLength(await input({ message: 'Enter did:web URL (your applications domain)' }), INPUT_LIMIT)
+          : undefined
+
+        const newWalletData = {
+          name,
+          description,
+          didMethod,
+          ...(isDidWeb && { didWebUrl }),
+        }
+
+        const walletSchema = z
+          .object({
+            name: z.string().min(3).max(INPUT_LIMIT).optional(),
+            description: z.string().max(INPUT_LIMIT).optional(),
+            didMethod: z.nativeEnum(DidMethods).optional(),
+            didWebUrl: z.string().min(3).max(INPUT_LIMIT).optional(),
+          })
+          .refine((wallet) => {
+            if (wallet.didMethod === DidMethods.WEB && !wallet.didWebUrl) {
+              return false
+            }
+            return true
+          })
+
+        const createWalletInput = walletSchema.parse(newWalletData)
+
+        ux.action.start('Creating wallet')
+        const output = await cweService.createWallet(createWalletInput as CreateWalletInput)
+        ux.action.stop('Created successfully!')
+
+        walletAri = output.wallet?.ari || ''
+      } else {
+        walletAri = selectedWallet || ''
+      }
+    }
+
+    const data: CreateIotaConfigurationInput = {
+      name:
+        flags.name ??
+        validateInputLength(await input({ message: 'Enter Affinidi Iota Framework configuration name' }), INPUT_LIMIT),
+      description: flags.description ?? '',
+      walletAri,
+      iotaResponseWebhookURL: flags['response-webhook-url'] ?? '',
+      enableVerification: flags['enable-verification'] || false,
+      enableConsentAuditLog: flags['enable-consent-audit-log'] || false,
+      tokenMaxAge: flags['token-max-age'] ?? undefined,
+      clientMetadata: {
+        name: flags['client-name'] ?? '',
+        origin: flags['client-origin'] ?? '',
+        logo: flags['client-logo'] ?? '',
+      },
+    }
+
+    const schema = z.object({
+      name: z.string().min(3).max(INPUT_LIMIT),
+      walletAri: z.string().min(1).max(INPUT_LIMIT),
+      enableVerification: z.boolean(),
+      enableConsentAuditLog: z.boolean(),
+      description: z.string().max(INPUT_LIMIT).optional(),
+      tokenMaxAge: z.number().min(1).max(10).optional(),
+      iotaResponseWebhookURL: z.string().max(INPUT_LIMIT).optional(),
+      clientMetadata: z.object({
+        name: z.string().max(INPUT_LIMIT),
+        origin: z.string().max(INPUT_LIMIT),
+        logo: z.string().max(INPUT_LIMIT),
+      }),
+    })
+    const configInput = schema.parse(data)
+
+    ux.action.start('Creating Affinidi Iota Framework configuration')
+    const output = await iotaService.createIotaConfig(configInput)
+    ux.action.stop('Created successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/iota/create-query.ts b/src/commands/iota/create-query.ts
new file mode 100644
index 00000000..77f2932a
--- /dev/null
+++ b/src/commands/iota/create-query.ts
@@ -0,0 +1,83 @@
+import { readFile } from 'fs/promises'
+import { CreatePexQueryInput, PexQueryDto } from '@affinidi-tdk/iota-client'
+import { ux, Flags } from '@oclif/core'
+import { CLIError } from '@oclif/core/errors'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT, PRESENTATION_DEFINITION_LIMIT, validateInputLength } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class CreateQuery extends BaseCommand<typeof CreateQuery> {
+  static summary = 'Creates PEX query for your Affinidi Iota Framework configuration'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -c <value> -n <value> -d <value> -f pexQuery.json',
+    '<%= config.bin %> <%= command.id %> --configuration-id <value> --name <value> --description <value> --file pexQuery.json',
+  ]
+
+  static flags = {
+    'configuration-id': Flags.string({
+      char: 'c',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+    name: Flags.string({
+      char: 'n',
+      summary: 'PEX query name',
+    }),
+    description: Flags.string({
+      char: 'd',
+      summary: 'PEX query description',
+    }),
+    file: Flags.string({
+      char: 'f',
+      summary: 'Location of a json file containing PEX query',
+    }),
+  }
+
+  public async run(): Promise<PexQueryDto> {
+    const { flags } = await this.parse(CreateQuery)
+    const promptFlags = await promptRequiredParameters(['configuration-id', 'name', 'file'], flags)
+
+    const flagsSchema = z.object({
+      'configuration-id': z.string().max(INPUT_LIMIT).uuid(),
+      name: z.string().min(3).max(INPUT_LIMIT),
+      description: z.string().max(INPUT_LIMIT).optional(),
+      file: z.string(),
+    })
+    const validatedFlags = flagsSchema.parse(promptFlags)
+
+    let data: CreatePexQueryInput
+    const rawData = await readFile(validatedFlags.file, 'utf8')
+
+    try {
+      data = JSON.parse(rawData)
+    } catch (error) {
+      throw new CLIError(`Provided file is not a valid JSON\n${(error as Error).message}`)
+    }
+
+    const vpDefinition = JSON.stringify(data)
+    validateInputLength(vpDefinition, PRESENTATION_DEFINITION_LIMIT)
+
+    data.name = validatedFlags.name
+    data.vpDefinition = vpDefinition
+
+    if (validatedFlags.description) {
+      data.description = validatedFlags.description
+    }
+
+    const inputSchema = z.object({
+      name: z.string(),
+      description: z.string().optional(),
+      vpDefinition: z.string(),
+    })
+
+    const input = inputSchema.parse(data)
+
+    ux.action.start('Creating PEX query')
+    const output = await iotaService.createPexQuery(validatedFlags['configuration-id'], input)
+    ux.action.stop('Created successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/iota/delete-config.ts b/src/commands/iota/delete-config.ts
new file mode 100644
index 00000000..b8cfb5cd
--- /dev/null
+++ b/src/commands/iota/delete-config.ts
@@ -0,0 +1,37 @@
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class DeleteIotaConfig extends BaseCommand<typeof DeleteIotaConfig> {
+  static summary = 'Deletes Affinidi Iota Framework configuration from your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -i <value>',
+    '<%= config.bin %> <%= command.id %> --id <value>',
+  ]
+  static flags = {
+    id: Flags.string({
+      char: 'i',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+  }
+
+  public async run(): Promise<{ id: string }> {
+    const { flags } = await this.parse(DeleteIotaConfig)
+    const promptFlags = await promptRequiredParameters(['id'], flags)
+
+    const schema = z.object({
+      id: z.string().max(INPUT_LIMIT),
+    })
+    const validatedFlags = schema.parse(promptFlags)
+
+    ux.action.start('Deleting Affinidi Iota Framework configurations')
+    await iotaService.deleteIotaConfigById(validatedFlags.id)
+    ux.action.stop('Deleted successfully!')
+
+    if (!this.jsonEnabled()) this.logJson({ id: validatedFlags.id })
+    return { id: validatedFlags.id }
+  }
+}
diff --git a/src/commands/iota/delete-query.ts b/src/commands/iota/delete-query.ts
new file mode 100644
index 00000000..1e30fd09
--- /dev/null
+++ b/src/commands/iota/delete-query.ts
@@ -0,0 +1,42 @@
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class DeleteQuery extends BaseCommand<typeof DeleteQuery> {
+  static summary = 'Deletes the PEX query from your Affinidi Iota Framework configuration'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -c <uuid> -i <uuid>',
+    '<%= config.bin %> <%= command.id %> --configuration-id <uuid> --query-id <uuid>',
+  ]
+  static flags = {
+    'configuration-id': Flags.string({
+      char: 'c',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+    'query-id': Flags.string({
+      char: 'i',
+      summary: 'PEX query ID',
+    }),
+  }
+
+  public async run(): Promise<{ queryId: string }> {
+    const { flags } = await this.parse(DeleteQuery)
+    const promptFlags = await promptRequiredParameters(['configuration-id', 'query-id'], flags)
+
+    const schema = z.object({
+      'configuration-id': z.string().max(INPUT_LIMIT).uuid(),
+      'query-id': z.string().max(INPUT_LIMIT).uuid(),
+    })
+    const validatedFlags = schema.parse(promptFlags)
+
+    ux.action.start('Deleting PEX query')
+    await iotaService.deletePexQueryById(validatedFlags['configuration-id'], validatedFlags['query-id'])
+    ux.action.stop('Deleted successfully!')
+
+    if (!this.jsonEnabled()) this.logJson({ queryId: validatedFlags['query-id'] })
+    return { queryId: validatedFlags['query-id'] }
+  }
+}
diff --git a/src/commands/iota/get-config.ts b/src/commands/iota/get-config.ts
new file mode 100644
index 00000000..0fe25edb
--- /dev/null
+++ b/src/commands/iota/get-config.ts
@@ -0,0 +1,38 @@
+import { IotaConfigurationDto } from '@affinidi-tdk/iota-client'
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class GetIotaConfig extends BaseCommand<typeof GetIotaConfig> {
+  static summary = 'Gets the details of the Affinidi Iota Framework configuration in your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -i <value>',
+    '<%= config.bin %> <%= command.id %> --id <value>',
+  ]
+  static flags = {
+    id: Flags.string({
+      char: 'i',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+  }
+
+  public async run(): Promise<IotaConfigurationDto> {
+    const { flags } = await this.parse(GetIotaConfig)
+    const promptFlags = await promptRequiredParameters(['id'], flags)
+
+    const schema = z.object({
+      id: z.string().max(INPUT_LIMIT),
+    })
+    const validatedFlags = schema.parse(promptFlags)
+
+    ux.action.start('Fetching Affinidi Iota Framework configuration')
+    const output = await iotaService.getIotaConfigById(validatedFlags.id)
+    ux.action.stop('Fetched successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/iota/get-query.ts b/src/commands/iota/get-query.ts
new file mode 100644
index 00000000..cfc1ef99
--- /dev/null
+++ b/src/commands/iota/get-query.ts
@@ -0,0 +1,43 @@
+import { PexQueryDto } from '@affinidi-tdk/iota-client'
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class GetQuery extends BaseCommand<typeof GetQuery> {
+  static summary = 'Gets the PEX query details for your Affinidi Iota Framework configuration'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -c <uuid> -i <uuid>',
+    '<%= config.bin %> <%= command.id %> --configuration-id <uuid> --query-id <uuid>',
+  ]
+  static flags = {
+    'configuration-id': Flags.string({
+      char: 'c',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+    'query-id': Flags.string({
+      char: 'i',
+      summary: 'PEX query ID',
+    }),
+  }
+
+  public async run(): Promise<PexQueryDto> {
+    const { flags } = await this.parse(GetQuery)
+    const promptFlags = await promptRequiredParameters(['configuration-id', 'query-id'], flags)
+
+    const schema = z.object({
+      'configuration-id': z.string().min(1).max(INPUT_LIMIT).uuid(),
+      'query-id': z.string().min(1).max(INPUT_LIMIT).uuid(),
+    })
+    const validatedFlags = schema.parse(promptFlags)
+
+    ux.action.start('Fetching PEX query')
+    const output = await iotaService.getPexQueryById(validatedFlags['configuration-id'], validatedFlags['query-id'])
+    ux.action.stop('Fetched successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/iota/list-configs.ts b/src/commands/iota/list-configs.ts
new file mode 100644
index 00000000..266e94b0
--- /dev/null
+++ b/src/commands/iota/list-configs.ts
@@ -0,0 +1,18 @@
+import { ListConfigurationOK } from '@affinidi-tdk/iota-client'
+import { ux } from '@oclif/core'
+import { BaseCommand } from '../../common/base-command.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class ListIotaConfigs extends BaseCommand<typeof ListIotaConfigs> {
+  static summary = 'Lists Affinidi Iota Framework configurations in your active project'
+  static examples = ['<%= config.bin %> <%= command.id %>']
+
+  public async run(): Promise<ListConfigurationOK> {
+    ux.action.start('Fetching Affinidi Iota Framework configurations')
+    const output = await iotaService.listIotaConfigurations()
+    ux.action.stop('Fetched successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/iota/list-queries.ts b/src/commands/iota/list-queries.ts
new file mode 100644
index 00000000..76526bb5
--- /dev/null
+++ b/src/commands/iota/list-queries.ts
@@ -0,0 +1,38 @@
+import { ListPexQueriesOK } from '@affinidi-tdk/iota-client'
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class ListQueries extends BaseCommand<typeof ListQueries> {
+  static summary = 'Lists PEX queries for your Affinidi Iota Framework configuration'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -c <value>',
+    '<%= config.bin %> <%= command.id %> --configuration-id <value>',
+  ]
+  static flags = {
+    'configuration-id': Flags.string({
+      char: 'c',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+  }
+
+  public async run(): Promise<ListPexQueriesOK> {
+    const { flags } = await this.parse(ListQueries)
+    const promptFlags = await promptRequiredParameters(['configuration-id'], flags)
+
+    const schema = z.object({
+      'configuration-id': z.string().min(1).max(INPUT_LIMIT).uuid(),
+    })
+    const validatedFlags = schema.parse(promptFlags)
+
+    ux.action.start('Fetching PEX queries')
+    const output = await iotaService.listPexQueries(validatedFlags['configuration-id'])
+    ux.action.stop('Fetched successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/iota/update-config.ts b/src/commands/iota/update-config.ts
new file mode 100644
index 00000000..944f3c17
--- /dev/null
+++ b/src/commands/iota/update-config.ts
@@ -0,0 +1,104 @@
+import { UpdateConfigurationByIdInput, IotaConfigurationDto } from '@affinidi-tdk/iota-client'
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class UpdateIotaConfig extends BaseCommand<typeof UpdateIotaConfig> {
+  static summary = 'Updates Affinidi Iota Framework configuration in your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -i <value>',
+    '<%= config.bin %> <%= command.id %> --id <value>',
+  ]
+  static flags = {
+    id: Flags.string({
+      char: 'i',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+    name: Flags.string({
+      char: 'n',
+      summary: 'Name of the Affinidi Iota Framework configuration',
+    }),
+    description: Flags.string({
+      char: 'd',
+      summary: 'Description of the Affinidi Iota Framework configuration',
+    }),
+    'wallet-ari': Flags.string({
+      summary: 'ARI of the wallet',
+    }),
+    'token-max-age': Flags.integer({
+      summary: 'Token expiration time in seconds - integer between 1 and 10',
+    }),
+    'response-webhook-url': Flags.string({
+      summary: 'Affinidi Iota Framework response webhook URL',
+    }),
+    'enable-verification': Flags.boolean({
+      summary: 'Perform verification',
+    }),
+    'enable-consent-audit-log': Flags.boolean({
+      summary: 'Log consents',
+    }),
+    'client-name': Flags.string({
+      summary: 'Name, displayed in the consent page',
+    }),
+    'client-origin': Flags.string({
+      summary: 'Domain, displayed in the consent page',
+    }),
+    'client-logo': Flags.string({
+      summary: 'Application URL of a logo, displayed in the consent page',
+    }),
+  }
+
+  public async run(): Promise<IotaConfigurationDto> {
+    const { flags } = await this.parse(UpdateIotaConfig)
+    const promptFlags = await promptRequiredParameters(['id'], flags)
+
+    const flagsSchema = z.object({ id: z.string().max(INPUT_LIMIT).uuid() })
+    const validatedFlags = flagsSchema.parse(promptFlags)
+
+    const data: UpdateConfigurationByIdInput = {
+      name: promptFlags.name ?? undefined,
+      description: promptFlags.description ?? undefined,
+      walletAri: promptFlags['wallet-ari'] ?? undefined,
+      iotaResponseWebhookURL: promptFlags['response-webhook-url'] ?? undefined,
+      enableVerification: promptFlags['enable-verification'] ?? false,
+      enableConsentAuditLog: promptFlags['enable-consent-audit-log'] ?? false,
+      tokenMaxAge: promptFlags['token-max-age'] ?? undefined,
+    }
+
+    if (promptFlags['client-name'] || promptFlags['client-origin'] || promptFlags['client-logo']) {
+      data.clientMetadata = {
+        name: promptFlags['client-name'] ?? undefined,
+        origin: promptFlags['client-origin'] ?? undefined,
+        logo: promptFlags['client-logo'] ?? undefined,
+      }
+    }
+
+    const schema = z.object({
+      name: z.string().max(INPUT_LIMIT).optional(),
+      description: z.string().max(INPUT_LIMIT).optional(),
+      walletAri: z.string().min(1).max(INPUT_LIMIT).optional(),
+      enableVerification: z.boolean().optional(),
+      enableConsentAuditLog: z.boolean().optional(),
+      tokenMaxAge: z.number().min(1).max(10).optional(),
+      iotaResponseWebhookURL: z.string().max(INPUT_LIMIT).optional(),
+      clientMetadata: z
+        .object({
+          name: z.string().max(INPUT_LIMIT),
+          origin: z.string().max(INPUT_LIMIT),
+          logo: z.string().max(INPUT_LIMIT),
+        })
+        .optional(),
+    })
+    const configInput = schema.parse(data)
+
+    ux.action.start('Updating Affinidi Iota Framework configuration')
+    const output = await iotaService.updateIotaConfigById(validatedFlags.id, configInput)
+    ux.action.stop('Updated successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/iota/update-query.ts b/src/commands/iota/update-query.ts
new file mode 100644
index 00000000..251ba036
--- /dev/null
+++ b/src/commands/iota/update-query.ts
@@ -0,0 +1,90 @@
+import { readFile } from 'fs/promises'
+import { UpdatePexQueryInput, PexQueryDto } from '@affinidi-tdk/iota-client'
+import { ux, Flags } from '@oclif/core'
+import { CLIError } from '@oclif/core/errors'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT, PRESENTATION_DEFINITION_LIMIT, validateInputLength } from '../../common/validators.js'
+import { iotaService } from '../../services/affinidi/iota/service.js'
+
+export class UpdateQuery extends BaseCommand<typeof UpdateQuery> {
+  static summary = 'Updates PEX query for your Affinidi Iota Framework configuration'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -c <value> -i <value> -d <value> -f pexQuery.json',
+    '<%= config.bin %> <%= command.id %> --configuration-id <value> --query-id <value> -d <value> -f pexQuery.json',
+    '<%= config.bin %> <%= command.id %> --configuration-id <value> --query-id <value> --description <value> --file pexQuery.json',
+  ]
+
+  static flags = {
+    'configuration-id': Flags.string({
+      char: 'c',
+      summary: 'ID of the Affinidi Iota Framework configuration',
+    }),
+    'query-id': Flags.string({
+      char: 'i',
+      summary: 'PEX query ID',
+    }),
+    description: Flags.string({
+      char: 'd',
+      summary: 'PEX query description',
+    }),
+    file: Flags.string({
+      char: 'f',
+      summary: 'Location of a json file containing PEX query',
+    }),
+  }
+
+  public async run(): Promise<PexQueryDto> {
+    const { flags } = await this.parse(UpdateQuery)
+    const promptFlags = await promptRequiredParameters(['configuration-id', 'query-id'], flags)
+
+    const flagsSchema = z.object({
+      'configuration-id': z.string().max(INPUT_LIMIT).uuid(),
+      'query-id': z.string().max(INPUT_LIMIT).uuid(),
+      description: z.string().max(INPUT_LIMIT).optional(),
+      file: z.string().optional(),
+    })
+
+    const validatedFlags = flagsSchema.parse(promptFlags)
+
+    let data: UpdatePexQueryInput = {}
+
+    if (validatedFlags.file) {
+      const rawData = await readFile(validatedFlags.file, 'utf8')
+
+      try {
+        data = JSON.parse(rawData)
+      } catch (error) {
+        throw new CLIError(`Provided file is not a valid JSON\n${(error as Error).message}`)
+      }
+
+      const vpDefinition = JSON.stringify(data)
+      validateInputLength(vpDefinition, PRESENTATION_DEFINITION_LIMIT)
+
+      data.vpDefinition = vpDefinition
+    }
+
+    if (validatedFlags.description) {
+      data.description = validatedFlags.description
+    }
+
+    const inputSchema = z.object({
+      description: z.string().optional(),
+      vpDefinition: z.string().optional(),
+    })
+
+    const input = inputSchema.parse(data)
+
+    ux.action.start('Updating PEX query')
+    const output = await iotaService.updatePexQueryById(
+      validatedFlags['configuration-id'],
+      validatedFlags['query-id'],
+      input,
+    )
+    ux.action.stop('Updated successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/wallet/create-wallet.ts b/src/commands/wallet/create-wallet.ts
new file mode 100644
index 00000000..73655f7e
--- /dev/null
+++ b/src/commands/wallet/create-wallet.ts
@@ -0,0 +1,112 @@
+import { CreateWalletInput, CreateWalletResponse } from '@affinidi-tdk/wallets-client'
+import { input, select } from '@inquirer/prompts'
+import { ux, Flags } from '@oclif/core'
+import { CLIError } from '@oclif/core/errors'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { DidMethods } from '../../common/constants.js'
+import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
+import { INPUT_LIMIT, validateInputLength } from '../../common/validators.js'
+import { cweService } from '../../services/affinidi/cwe/service.js'
+
+export class CreateWallet extends BaseCommand<typeof CreateWallet> {
+  static summary = 'Creates wallet in your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %>',
+    '<%= config.bin %> <%= command.id %> --name <value> --description <value>',
+    '<%= config.bin %> <%= command.id %> --name <value> --description <value> --did-method key',
+    '<%= config.bin %> <%= command.id %> --name <value> --description <value> --did-method web --did-web-url <value>',
+  ]
+  static flags = {
+    name: Flags.string({
+      char: 'n',
+      summary: 'Name of the wallet',
+    }),
+    description: Flags.string({
+      char: 'd',
+      summary: 'Description of the wallet',
+      default: '',
+    }),
+    'did-method': Flags.string({
+      char: 'm',
+      summary: 'DID method',
+      options: Object.values(DidMethods),
+    }),
+    'did-web-url': Flags.string({
+      char: 'u',
+      summary: 'URL of the DID if DID method is did:web',
+      dependsOn: ['did-method'],
+      relationships: [
+        // Make this flag dependent on all of these flags
+        {
+          type: 'all',
+          flags: [
+            // Include `didWebUrl` but only when `method` is equal to `web`
+            { name: 'did-web-url', when: async (flags) => flags['did-method'] === DidMethods.WEB },
+          ],
+        },
+      ],
+    }),
+  }
+
+  public async run(): Promise<CreateWalletResponse> {
+    const { flags } = await this.parse(CreateWallet)
+
+    if (flags['no-input']) {
+      if (!flags['did-method']) {
+        throw new CLIError(giveFlagInputErrorMessage('did-method'))
+      }
+
+      if (flags['did-method'] === DidMethods.WEB && !flags['did-web-url']) {
+        throw new CLIError(giveFlagInputErrorMessage('did-web-url'))
+      }
+    }
+
+    const walletDidMethodChoices = Object.values(DidMethods).map((method: string) => ({
+      name: method,
+      value: method,
+      default: DidMethods.KEY,
+    }))
+
+    const name = flags.name ?? ''
+    const description = flags.description ?? ''
+    const didMethod =
+      flags['did-method'] ?? (await select({ message: 'Select DID method of wallet', choices: walletDidMethodChoices }))
+
+    const isDidWeb = didMethod === DidMethods.WEB
+    const didWebUrl = isDidWeb
+      ? flags['did-web-url'] ??
+        validateInputLength(await input({ message: 'Enter did:web URL (your applications domain)' }), INPUT_LIMIT)
+      : undefined
+
+    const data = {
+      name,
+      description,
+      didMethod,
+      ...(isDidWeb && { didWebUrl }),
+    }
+
+    const schema = z
+      .object({
+        name: z.string().max(INPUT_LIMIT).optional(),
+        description: z.string().max(INPUT_LIMIT).optional(),
+        didMethod: z.nativeEnum(DidMethods).optional(),
+        didWebUrl: z.string().min(3).max(INPUT_LIMIT).optional(),
+      })
+      .refine((wallet) => {
+        if (wallet.didMethod === DidMethods.WEB && !wallet.didWebUrl) {
+          return false
+        }
+        return true
+      })
+
+    const createWalletInput = schema.parse(data)
+
+    ux.action.start('Creating wallet')
+    const output = await cweService.createWallet(createWalletInput as CreateWalletInput)
+    ux.action.stop('Created successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/wallet/delete-wallet.ts b/src/commands/wallet/delete-wallet.ts
new file mode 100644
index 00000000..9aae499f
--- /dev/null
+++ b/src/commands/wallet/delete-wallet.ts
@@ -0,0 +1,37 @@
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { cweService } from '../../services/affinidi/cwe/service.js'
+
+export class DeleteWallet extends BaseCommand<typeof DeleteWallet> {
+  static summary = 'Deletes wallet from your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -i <value>',
+    '<%= config.bin %> <%= command.id %> --id <value>',
+  ]
+  static flags = {
+    id: Flags.string({
+      char: 'i',
+      summary: 'ID of the wallet',
+    }),
+  }
+
+  public async run(): Promise<{ id: string }> {
+    const { flags } = await this.parse(DeleteWallet)
+    const promptFlags = await promptRequiredParameters(['id'], flags)
+
+    const schema = z.object({
+      id: z.string().max(INPUT_LIMIT),
+    })
+    const validatedFlags = schema.parse(promptFlags)
+
+    ux.action.start('Deleting wallet')
+    await cweService.deleteWallet(validatedFlags.id)
+    ux.action.stop('Deleted successfully!')
+
+    if (!this.jsonEnabled()) this.logJson({ id: validatedFlags.id })
+    return { id: validatedFlags.id }
+  }
+}
diff --git a/src/commands/wallet/get-wallet.ts b/src/commands/wallet/get-wallet.ts
new file mode 100644
index 00000000..b161a5c2
--- /dev/null
+++ b/src/commands/wallet/get-wallet.ts
@@ -0,0 +1,38 @@
+import { WalletDto } from '@affinidi-tdk/wallets-client'
+import { ux, Flags } from '@oclif/core'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { cweService } from '../../services/affinidi/cwe/service.js'
+
+export class GetWallet extends BaseCommand<typeof GetWallet> {
+  static summary = 'Gets wallet details in your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -i <value>',
+    '<%= config.bin %> <%= command.id %> --id <value>',
+  ]
+  static flags = {
+    id: Flags.string({
+      char: 'i',
+      summary: 'ID of the wallet',
+    }),
+  }
+
+  public async run(): Promise<WalletDto> {
+    const { flags } = await this.parse(GetWallet)
+    const promptFlags = await promptRequiredParameters(['id'], flags)
+
+    const schema = z.object({
+      id: z.string().max(INPUT_LIMIT),
+    })
+    const validatedFlags = schema.parse(promptFlags)
+
+    ux.action.start('Fetching wallet details')
+    const output = await cweService.getWallet(validatedFlags.id)
+    ux.action.stop('Fetched successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/wallet/list-wallets.ts b/src/commands/wallet/list-wallets.ts
new file mode 100644
index 00000000..3353833a
--- /dev/null
+++ b/src/commands/wallet/list-wallets.ts
@@ -0,0 +1,18 @@
+import { WalletsListDto } from '@affinidi-tdk/wallets-client'
+import { ux } from '@oclif/core'
+import { BaseCommand } from '../../common/base-command.js'
+import { cweService } from '../../services/affinidi/cwe/service.js'
+
+export class ListWallets extends BaseCommand<typeof ListWallets> {
+  static summary = 'Lists wallets in your active project'
+  static examples = ['<%= config.bin %> <%= command.id %>']
+
+  public async run(): Promise<WalletsListDto> {
+    ux.action.start('Fetching wallets')
+    const output = await cweService.listWallets()
+    ux.action.stop('Fetched successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/commands/wallet/update-wallet.ts b/src/commands/wallet/update-wallet.ts
new file mode 100644
index 00000000..36b9e026
--- /dev/null
+++ b/src/commands/wallet/update-wallet.ts
@@ -0,0 +1,73 @@
+import { UpdateWalletInput, WalletDto } from '@affinidi-tdk/wallets-client'
+import { ux, Flags } from '@oclif/core'
+import { CLIError } from '@oclif/core/errors'
+import z from 'zod'
+import { BaseCommand } from '../../common/base-command.js'
+import { giveFlagInputErrorMessage } from '../../common/error-messages.js'
+import { promptRequiredParameters } from '../../common/prompts.js'
+import { INPUT_LIMIT } from '../../common/validators.js'
+import { cweService } from '../../services/affinidi/cwe/service.js'
+
+export class UpdateWallet extends BaseCommand<typeof UpdateWallet> {
+  static summary = 'Updates wallet in your active project'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> -i <value>',
+    '<%= config.bin %> <%= command.id %> --id <value> --name <value> --description <value>',
+  ]
+  static flags = {
+    id: Flags.string({
+      char: 'i',
+      summary: 'ID of the wallet',
+    }),
+    name: Flags.string({
+      char: 'n',
+      summary: 'Name of the wallet',
+    }),
+    description: Flags.string({
+      char: 'd',
+      summary: 'Description of the wallet',
+    }),
+  }
+
+  public async run(): Promise<WalletDto> {
+    const { flags } = await this.parse(UpdateWallet)
+    const promptFlags = await promptRequiredParameters(['id'], flags)
+
+    if (flags['no-input']) {
+      if (!flags.id) throw new CLIError(giveFlagInputErrorMessage('id'))
+      if (!flags.name && !flags.description) throw new CLIError(giveFlagInputErrorMessage('`name` or `description`'))
+    }
+
+    let data: UpdateWalletInput = {}
+
+    data = {
+      name: promptFlags.name,
+      description: promptFlags.description,
+    }
+
+    const schema = z
+      .object({
+        name: z.string().max(INPUT_LIMIT).optional(),
+        description: z.string().max(INPUT_LIMIT).optional(),
+      })
+      .refine(
+        (value) => {
+          if (!value.name && !value.description) {
+            return false
+          }
+          return true
+        },
+        {
+          message: 'at least one field `name` or `description` has to be provided',
+        },
+      )
+    const input = schema.parse(data)
+
+    ux.action.start('Updating wallet')
+    const output = await cweService.updateWallet(promptFlags.id, input)
+    ux.action.stop('Updated successfully!')
+
+    if (!this.jsonEnabled()) this.logJson(output)
+    return output
+  }
+}
diff --git a/src/common/constants.ts b/src/common/constants.ts
index 049bee0c..99408fed 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -35,3 +35,8 @@ export enum ServiceResourceIds {
   IAM_PROJECTS = 'iam.resource.Projects',
   VPA_CONFIGURATIONS = 'vpa.resource.Configurations',
 }
+
+export enum DidMethods {
+  KEY = 'key',
+  WEB = 'web',
+}
diff --git a/src/services/affinidi/cwe/service.ts b/src/services/affinidi/cwe/service.ts
new file mode 100644
index 00000000..792adab1
--- /dev/null
+++ b/src/services/affinidi/cwe/service.ts
@@ -0,0 +1,72 @@
+import {
+  WalletApi,
+  WalletDto,
+  Configuration,
+  WalletsListDto,
+  CreateWalletInput,
+  UpdateWalletInput,
+  CreateWalletResponse,
+} from '@affinidi-tdk/wallets-client'
+import { config } from '../../env-config.js'
+import { getBFFHeaders } from '../bff-service.js'
+import { handleServiceError } from '../errors.js'
+
+const headers = await getBFFHeaders()
+const baseOptions = { headers }
+const basePath = `${config.bffHost}/cwe`
+
+class CweService {
+  constructor(private readonly client = new WalletApi(new Configuration({ basePath, baseOptions }))) {}
+
+  public listWallets = async (): Promise<WalletsListDto> => {
+    try {
+      const response = await this.client.listWallets()
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public getWallet = async (id: string): Promise<WalletDto> => {
+    try {
+      const response = await this.client.getWallet(id)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public updateWallet = async (id: string, input: UpdateWalletInput): Promise<WalletDto> => {
+    try {
+      const response = await this.client.updateWallet(id, input)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public createWallet = async (input: CreateWalletInput): Promise<CreateWalletResponse> => {
+    try {
+      const response = await this.client.createWallet(input)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public deleteWallet = async (id: string): Promise<void> => {
+    try {
+      await this.client.deleteWallet(id)
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+}
+
+const cweService = new CweService()
+
+export { cweService }
diff --git a/src/services/affinidi/errors.ts b/src/services/affinidi/errors.ts
index df3fcb22..1e0eea7f 100644
--- a/src/services/affinidi/errors.ts
+++ b/src/services/affinidi/errors.ts
@@ -61,10 +61,11 @@ const getCommonAPIErrorMessage = (response: any): string => {
   }
 }
 
-export function handleServiceError(
-  error: unknown,
-  serviceErrorMessageHandler?: (response: any) => string | null,
-): never {
+export function handleServiceError(error: any, serviceErrorMessageHandler?: (response: any) => string | null): never {
+  if (error?.message === 'Session expired') {
+    throw new Error(AuthTokenExpired)
+  }
+
   const isAxiosError = error instanceof AxiosError
 
   if (!isAxiosError) {
diff --git a/src/services/affinidi/iota/service.ts b/src/services/affinidi/iota/service.ts
new file mode 100644
index 00000000..60a2661f
--- /dev/null
+++ b/src/services/affinidi/iota/service.ts
@@ -0,0 +1,134 @@
+import {
+  PexQueryApi,
+  PexQueryDto,
+  CreatePexQueryInput,
+  ListConfigurationOK,
+  UpdatePexQueryInput,
+  Configuration,
+  ListPexQueriesOK,
+  ConfigurationsApi,
+  IotaConfigurationDto,
+  CreateIotaConfigurationInput,
+  UpdateConfigurationByIdInput,
+} from '@affinidi-tdk/iota-client'
+import { config } from '../../env-config.js'
+import { getBFFHeaders } from '../bff-service.js'
+import { handleServiceError } from '../errors.js'
+
+const headers = await getBFFHeaders()
+const baseOptions = { headers }
+const basePath = `${config.bffHost}/ais`
+
+class IotaService {
+  constructor(
+    private readonly configurationsApiClient = new ConfigurationsApi(new Configuration({ basePath, baseOptions })),
+    private readonly pexQueryApiClient = new PexQueryApi(new Configuration({ basePath, baseOptions })),
+  ) {}
+
+  public listIotaConfigurations = async (): Promise<ListConfigurationOK> => {
+    try {
+      const response = await this.configurationsApiClient.listIotaConfigurations()
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public getIotaConfigById = async (configurationId: string): Promise<IotaConfigurationDto> => {
+    try {
+      const response = await this.configurationsApiClient.getIotaConfigurationById(configurationId)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public updateIotaConfigById = async (
+    configurationId: string,
+    input: UpdateConfigurationByIdInput,
+  ): Promise<IotaConfigurationDto> => {
+    try {
+      const response = await this.configurationsApiClient.updateIotaConfigurationById(configurationId, input)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public deleteIotaConfigById = async (configurationId: string): Promise<void> => {
+    try {
+      await this.configurationsApiClient.deleteIotaConfigurationById(configurationId)
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public createIotaConfig = async (input: CreateIotaConfigurationInput): Promise<IotaConfigurationDto> => {
+    try {
+      const response = await this.configurationsApiClient.createIotaConfiguration(input)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public listPexQueries = async (configurationId: string): Promise<ListPexQueriesOK> => {
+    try {
+      const response = await this.pexQueryApiClient.listPexQueries(configurationId)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public getPexQueryById = async (configurationId: string, queryId: string): Promise<PexQueryDto> => {
+    try {
+      const response = await this.pexQueryApiClient.getPexQueryById(configurationId, queryId)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public updatePexQueryById = async (
+    configurationId: string,
+    queryId: string,
+    input: UpdatePexQueryInput,
+  ): Promise<PexQueryDto> => {
+    try {
+      const response = await this.pexQueryApiClient.updatePexQueryById(configurationId, queryId, input)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public deletePexQueryById = async (configurationId: string, queryId: string): Promise<void> => {
+    try {
+      await this.pexQueryApiClient.deletePexQueryById(configurationId, queryId)
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+
+  public createPexQuery = async (configurationId: string, input: CreatePexQueryInput): Promise<PexQueryDto> => {
+    try {
+      const response = await this.pexQueryApiClient.createPexQuery(configurationId, input)
+
+      return response.data
+    } catch (error) {
+      handleServiceError(error)
+    }
+  }
+}
+
+const iotaService = new IotaService()
+
+export { iotaService }
diff --git a/test/commands/iota/configs.test.ts b/test/commands/iota/configs.test.ts
new file mode 100644
index 00000000..00b98ce7
--- /dev/null
+++ b/test/commands/iota/configs.test.ts
@@ -0,0 +1,157 @@
+import { runCommand } from '@oclif/test'
+import { expect } from 'chai'
+import nock from 'nock'
+
+import { config } from '../../../src/services/env-config.js'
+
+const CWE_URL = `${config.bffHost}/cwe`
+const AIS_URL = `${config.bffHost}/ais`
+
+const didKeyWallet = {
+  did: 'did:key:zQ3shX8xuicHdQjm9PAAvffDJQYHuBBXhsE2f1LWk47JeaSeN',
+  id: '886eb843efa8c515c395cc98a5080ff0',
+  ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:wallet/886eb843efa8c515c395cc98a5080ff0',
+  name: 'Wallet',
+  description: '',
+  keys: [
+    {
+      id: 'dde674328e69806278c580f4e09ee41e-236a45f3b9c272c9',
+      ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:key/dde674328e69806278c580f4e09ee41e-236a45f3b9c272c9',
+    },
+  ],
+}
+
+const configuration = {
+  projectId: '940e8684-55b3-4d41-8e3d-cd329e9f22f2',
+  name: 'ConfigName',
+  description: 'ConfigDescription',
+  createdAt: '2024-08-14T06:15:42.015Z',
+  modifiedAt: '2024-08-14T06:43:30.450Z',
+  createdBy: 'user/1c71597a-372f-4468-a434-7c0e6288ee86',
+  modifiedBy: 'user/1c71597a-372f-4468-a434-7c0e6288ee86',
+  ari: 'ari:iota_service:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:iota_configuration/8740f97f-d5cb-4fdb-af23-4c769cfed3ab',
+  walletAri: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:wallet/886eb843efa8c515c395cc98a5080ff0',
+  iotaResponseWebhookURL: 'https://vault.affinidi.com/login',
+  enableVerification: true,
+  enableConsentAuditLog: true,
+  tokenMaxAge: 10,
+  clientMetadata: {
+    name: 'testtest',
+    logo: 'https://test.com',
+    origin: 'https://test.com',
+  },
+  configurationId: '8740f97f-d5cb-4fdb-af23-4c769cfed3ab',
+}
+
+describe('iota: configs commands', function () {
+  describe('iota:create-config', () => {
+    it('creates a configutation and outputs its info', async () => {
+      nock(AIS_URL).post('/v1/configurations').reply(200, configuration)
+      nock(CWE_URL)
+        .get('/v1/wallets')
+        .reply(200, { wallets: [didKeyWallet] })
+      const { stdout } = await runCommand([
+        'iota:create-config',
+        `--name=${configuration.name}`,
+        `--description=${configuration.description}`,
+        `--wallet-ari=${didKeyWallet.ari}`,
+        `--response-webhook-url=${configuration.iotaResponseWebhookURL}`,
+        `--token-max-age=${configuration.tokenMaxAge}`,
+        `--enable-verification`,
+        `--enable-consent-audit-log`,
+        `--client-name=${configuration.clientMetadata.name}`,
+        `--client-logo=${configuration.clientMetadata.logo}`,
+        `--client-origin=${configuration.clientMetadata.origin}`,
+        '--no-input',
+        '--json',
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('projectId')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('walletAri')
+      expect(response).to.have.a.property('iotaResponseWebhookURL')
+      expect(response).to.have.a.property('enableVerification')
+      expect(response).to.have.a.property('enableConsentAuditLog')
+      expect(response).to.have.a.property('tokenMaxAge')
+      expect(response).to.have.a.property('clientMetadata')
+      expect(response).to.have.a.property('configurationId')
+    })
+  })
+
+  describe('iota:get-config', () => {
+    it('outputs configuration info based on id', async () => {
+      nock(AIS_URL).get(`/v1/configurations/${configuration.configurationId}`).reply(200, configuration)
+      const { stdout } = await runCommand(['iota:get-config', `--id=${configuration.configurationId}`])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('projectId')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('walletAri')
+      expect(response).to.have.a.property('iotaResponseWebhookURL')
+      expect(response).to.have.a.property('enableVerification')
+      expect(response).to.have.a.property('enableConsentAuditLog')
+      expect(response).to.have.a.property('tokenMaxAge')
+      expect(response).to.have.a.property('clientMetadata')
+      expect(response).to.have.a.property('configurationId')
+    })
+  })
+
+  describe('iota:list-configs', () => {
+    it('outputs the list of configurations', async () => {
+      nock(AIS_URL)
+        .get('/v1/configurations')
+        .reply(200, {
+          configurations: [configuration],
+        })
+      const { stdout } = await runCommand(['iota:list-configs'])
+      const { configurations: response } = JSON.parse(stdout)
+      expect(response[0]).to.have.a.property('projectId')
+      expect(response[0]).to.have.a.property('name')
+      expect(response[0]).to.have.a.property('description')
+      expect(response[0]).to.have.a.property('ari')
+      expect(response[0]).to.have.a.property('walletAri')
+      expect(response[0]).to.have.a.property('iotaResponseWebhookURL')
+      expect(response[0]).to.have.a.property('enableVerification')
+      expect(response[0]).to.have.a.property('enableConsentAuditLog')
+      expect(response[0]).to.have.a.property('tokenMaxAge')
+      expect(response[0]).to.have.a.property('clientMetadata')
+      expect(response[0]).to.have.a.property('configurationId')
+    })
+  })
+
+  describe('iota:update-config', () => {
+    it('updates config', async () => {
+      nock(AIS_URL).patch(`/v1/configurations/${configuration.configurationId}`).reply(200, configuration)
+
+      const { stdout } = await runCommand([
+        'iota:update-config',
+        `--description=${configuration.description}`,
+        `--id=${configuration.configurationId}`,
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('projectId')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('walletAri')
+      expect(response).to.have.a.property('iotaResponseWebhookURL')
+      expect(response).to.have.a.property('enableVerification')
+      expect(response).to.have.a.property('enableConsentAuditLog')
+      expect(response).to.have.a.property('tokenMaxAge')
+      expect(response).to.have.a.property('clientMetadata')
+      expect(response).to.have.a.property('configurationId')
+    })
+  })
+
+  describe('iota:delete-config', () => {
+    it('deletes configuration', async () => {
+      nock(AIS_URL).delete(`/v1/configurations/${configuration.configurationId}`).reply(200)
+      const { stdout } = await runCommand(['iota:delete-config', `--id=${configuration.configurationId}`])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('id')
+    })
+  })
+})
diff --git a/test/commands/iota/queries.test.ts b/test/commands/iota/queries.test.ts
new file mode 100644
index 00000000..98edc61b
--- /dev/null
+++ b/test/commands/iota/queries.test.ts
@@ -0,0 +1,117 @@
+import { runCommand } from '@oclif/test'
+import { expect } from 'chai'
+import nock from 'nock'
+
+import { config } from '../../../src/services/env-config.js'
+
+const AIS_URL = `${config.bffHost}/ais`
+
+const configurationId = '8740f97f-d5cb-4fdb-af23-4c769cfed3ab'
+const pexQueryFilePath = 'test/helpers/phone-pex-query.json'
+
+const pexQuery = {
+  ari: 'ari:iota_service:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:query/790a97ee-35eb-4e0e-84d1-357ae94d1cb6',
+  name: 'Test',
+  description: '',
+  createdAt: '2024-08-15T08:19:42.026Z',
+  modifiedAt: '2024-08-15T08:19:42.026Z',
+  createdBy: 'user/1c71597a-372f-4468-a434-7c0e6288ee86',
+  modifiedBy: 'user/1c71597a-372f-4468-a434-7c0e6288ee86',
+  configurationAri:
+    'ari:iota_service:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:iota_configuration/8740f97f-d5cb-4fdb-af23-4c769cfed3ab',
+  vpDefinition:
+    '{\n  "id": "token_with_contact_vc",\n  "input_descriptors": [\n    {\n      "id": "profile_phone",\n      "name": "Contact VC",\n      "purpose": "Check if Vault contains the required VC.",\n      "constraints": {\n        "fields": [\n          {\n            "path": [\n              "$.type"\n            ],\n            "purpose": "Check if VC type is correct",\n            "filter": {\n              "type": "array",\n              "contains": {\n                "type": "string",\n                "pattern": "^HITPhoneNumber$"\n              }\n            }\n          },\n          {\n            "path": [\n              "$.credentialSubject.phoneNumber"\n            ]\n          }\n        ]\n      }\n    }\n  ]\n}',
+  queryId: '790a97ee-35eb-4e0e-84d1-357ae94d1cb6',
+}
+
+describe('iota: queries commands', function () {
+  describe('iota:create-query', () => {
+    it('creates a PEX query and outputs its info', async () => {
+      nock(AIS_URL).post(`/v1/configurations/${configurationId}/pex-queries`).reply(200, pexQuery)
+      const { stdout } = await runCommand([
+        'iota:create-query',
+        `--configuration-id=${configurationId}`,
+        `--name=${pexQuery.name}`,
+        `--description=${pexQuery.description}`,
+        `--file=${pexQueryFilePath}`,
+        '--no-input',
+        '--json',
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('configurationAri')
+      expect(response).to.have.a.property('vpDefinition')
+      expect(response).to.have.a.property('queryId')
+    })
+  })
+
+  describe('iota:get-query', () => {
+    it('outputs PEX query info based on query ID', async () => {
+      nock(AIS_URL).get(`/v1/configurations/${configurationId}/pex-queries/${pexQuery.queryId}`).reply(200, pexQuery)
+      const { stdout } = await runCommand([
+        'iota:get-query',
+        `--configuration-id=${configurationId} --query-id=${pexQuery.queryId}`,
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('configurationAri')
+      expect(response).to.have.a.property('vpDefinition')
+      expect(response).to.have.a.property('queryId')
+    })
+  })
+
+  describe('iota:list-queries', () => {
+    it('outputs the list of PEX queries', async () => {
+      nock(AIS_URL)
+        .get(`/v1/configurations/${configurationId}/pex-queries`)
+        .reply(200, {
+          pexQueries: [pexQuery],
+        })
+      const { stdout } = await runCommand([`iota:list-queries --configuration-id=${configurationId}`])
+      const { pexQueries: response } = JSON.parse(stdout)
+      expect(response[0]).to.have.a.property('ari')
+      expect(response[0]).to.have.a.property('name')
+      expect(response[0]).to.have.a.property('description')
+      expect(response[0]).to.have.a.property('configurationAri')
+      expect(response[0]).to.have.a.property('vpDefinition')
+      expect(response[0]).to.have.a.property('queryId')
+    })
+  })
+
+  describe('iota:update-query', () => {
+    it('updates PEX query', async () => {
+      nock(AIS_URL).patch(`/v1/configurations/${configurationId}/pex-queries/${pexQuery.queryId}`).reply(200, pexQuery)
+
+      const { stdout } = await runCommand([
+        'iota:update-query',
+        `--configuration-id=${configurationId}`,
+        `--query-id=${pexQuery.queryId}`,
+        `--file=${pexQueryFilePath}`,
+        `--description=${pexQuery.description}`,
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('configurationAri')
+      expect(response).to.have.a.property('vpDefinition')
+      expect(response).to.have.a.property('queryId')
+    })
+  })
+
+  describe('iota:delete-query', () => {
+    it('deletes PEX query', async () => {
+      nock(AIS_URL).delete(`/v1/configurations/${configurationId}/pex-queries/${pexQuery.queryId}`).reply(200)
+      const { stdout } = await runCommand([
+        'iota:delete-query',
+        `--configuration-id=${configurationId} --query-id=${pexQuery.queryId}`,
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('queryId')
+    })
+  })
+})
diff --git a/test/commands/wallet/wallets.test.ts b/test/commands/wallet/wallets.test.ts
new file mode 100644
index 00000000..3abb534f
--- /dev/null
+++ b/test/commands/wallet/wallets.test.ts
@@ -0,0 +1,184 @@
+import { runCommand } from '@oclif/test'
+import { expect } from 'chai'
+import nock from 'nock'
+
+import { DidMethods } from '../../../src/common/constants.js'
+import { config } from '../../../src/services/env-config.js'
+
+const CWE_URL = `${config.bffHost}/cwe`
+
+const didKeyWallet = {
+  did: 'did:key:zQ3shX8xuicHdQjm9PAAvffDJQYHuBBXhsE2f1LWk47JeaSeN',
+  id: '886eb843efa8c515c395cc98a5080ff0',
+  ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:wallet/886eb843efa8c515c395cc98a5080ff0',
+  name: 'Test',
+  description: '',
+  keys: [
+    {
+      id: 'dde674328e69806278c580f4e09ee41e-236a45f3b9c272c9',
+      ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:key/dde674328e69806278c580f4e09ee41e-236a45f3b9c272c9',
+    },
+  ],
+}
+
+const didKeyWalletUpdated = {
+  did: 'did:key:zQ3shX8xuicHdQjm9PAAvffDJQYHuBBXhsE2f1LWk47JeaSeN',
+  id: '886eb843efa8c515c395cc98a5080ff0',
+  ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:wallet/886eb843efa8c515c395cc98a5080ff0',
+  name: 'NewName',
+  description: 'NewDescription',
+  keys: [
+    {
+      id: 'dde674328e69806278c580f4e09ee41e-236a45f3b9c272c9',
+      ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:key/dde674328e69806278c580f4e09ee41e-236a45f3b9c272c9',
+    },
+  ],
+}
+
+const didWebUrl = 'test.com'
+
+const didWebWallet = {
+  did: 'did:web:test.com',
+  id: '858ed4fa49002b6e22310bd510f50f01',
+  didDocument: {
+    id: 'did:web:test.com',
+    '@context': 'https://w3id.org/security/v2',
+    publicKey: [
+      {
+        id: 'did:web:test.com#primary',
+        usage: 'signing',
+        type: 'Secp256k1VerificationKey2018',
+        publicKeyHex: '0367b0e688887bc1d7b3341dfa56a549104957259a75b3ca1881afbca6e69da82e',
+      },
+    ],
+    authentication: ['did:web:test.com#primary'],
+    assertionMethod: ['did:web:test.com#primary'],
+  },
+  ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:wallet/858ed4fa49002b6e22310bd510f50f01',
+  name: '123',
+  description: '',
+  keys: [
+    {
+      id: 'e55bd987ad87eda34425759627652713-2533c445b7dc9fde',
+      ari: 'ari:identity:ap-southeast-1:940e8684-55b3-4d41-8e3d-cd329e9f22f2:key/e55bd987ad87eda34425759627652713-2533c445b7dc9fde',
+    },
+  ],
+}
+
+describe('wallet', function () {
+  describe('wallet:create-wallet', () => {
+    it('creates a wallet with did:key when only method is provided and outputs its info', async () => {
+      nock(CWE_URL).post('/v1/wallets').reply(200, didKeyWallet)
+      const { stdout } = await runCommand([
+        'wallet:create-wallet',
+        `--did-method=${DidMethods.KEY}`,
+        '--no-input',
+        '--json',
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('did')
+      expect(response).to.have.a.property('id')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('keys')
+    })
+
+    it('creates a wallet with did:key and outputs its info', async () => {
+      nock(CWE_URL).post('/v1/wallets').reply(200, didKeyWallet)
+      const { stdout } = await runCommand([
+        'wallet:create-wallet',
+        `--name=${didKeyWallet.name}`,
+        `--did-method=${DidMethods.KEY}`,
+        '--no-input',
+        '--json',
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('did')
+      expect(response).to.have.a.property('id')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('keys')
+    })
+
+    it('creates a wallet with did:web and outputs its info', async () => {
+      nock(CWE_URL).post('/v1/wallets').reply(200, didKeyWallet)
+      const { stdout } = await runCommand([
+        'wallet:create-wallet',
+        `--name=${didKeyWallet.name}`,
+        `--did-method=${DidMethods.WEB}`,
+        `--did-web-url=${didWebUrl}`,
+        '--no-input',
+        '--json',
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('did')
+      expect(response).to.have.a.property('id')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('keys')
+    })
+  })
+
+  describe('wallet:get-wallet', () => {
+    it('outputs the token info based on id', async () => {
+      nock(CWE_URL).get(`/v1/wallets/${didKeyWallet.id}`).reply(200, didKeyWallet)
+      const { stdout } = await runCommand(['wallet:get-wallet', `--id=${didKeyWallet.id}`])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('did')
+      expect(response).to.have.a.property('id')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('keys')
+    })
+  })
+
+  describe('wallet:list-wallets', () => {
+    it('outputs the list of wallets', async () => {
+      nock(CWE_URL)
+        .get('/v1/wallets')
+        .reply(200, {
+          wallets: [didKeyWallet, didWebWallet],
+        })
+      const { stdout } = await runCommand(['wallet:list-wallets'])
+      const { wallets: response } = JSON.parse(stdout)
+      expect(response[0]).to.have.a.property('did')
+      expect(response[0]).to.have.a.property('id')
+      expect(response[0]).to.have.a.property('ari')
+      expect(response[0]).to.have.a.property('name')
+      expect(response[0]).to.have.a.property('description')
+      expect(response[0]).to.have.a.property('keys')
+    })
+  })
+
+  describe('wallet:update-wallet', () => {
+    it('updates the wallet', async () => {
+      nock(CWE_URL).patch(`/v1/wallets/${didKeyWallet.id}`).reply(200, didKeyWalletUpdated)
+
+      const { stdout } = await runCommand([
+        'wallet:update-wallet',
+        `--name=${didKeyWalletUpdated.name}`,
+        `--id=${didKeyWallet.id}`,
+      ])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('did')
+      expect(response).to.have.a.property('id')
+      expect(response).to.have.a.property('ari')
+      expect(response).to.have.a.property('name')
+      expect(response).to.have.a.property('description')
+      expect(response).to.have.a.property('keys')
+    })
+  })
+
+  describe('wallet:delete-wallet', () => {
+    it('deletes the wallet', async () => {
+      nock(CWE_URL).delete(`/v1/wallets/${didKeyWallet.id}`).reply(200)
+      const { stdout } = await runCommand(['wallet:delete-wallet', `--id=${didKeyWallet.id}`])
+      const response = JSON.parse(stdout)
+      expect(response).to.have.a.property('id')
+    })
+  })
+})
diff --git a/test/helpers/phone-pex-query.json b/test/helpers/phone-pex-query.json
new file mode 100644
index 00000000..335e8bfd
--- /dev/null
+++ b/test/helpers/phone-pex-query.json
@@ -0,0 +1,32 @@
+{
+  "id": "token_with_contact_vc",
+  "input_descriptors": [
+    {
+      "id": "profile_phone",
+      "name": "Contact VC",
+      "purpose": "Check if Vault contains the required VC.",
+      "constraints": {
+        "fields": [
+          {
+            "path": [
+              "$.type"
+            ],
+            "purpose": "Check if VC type is correct",
+            "filter": {
+              "type": "array",
+              "contains": {
+                "type": "string",
+                "pattern": "^HITPhoneNumber$"
+              }
+            }
+          },
+          {
+            "path": [
+              "$.credentialSubject.phoneNumber"
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file