@twin.org/identity-cli 0.0.1-next.20 → 0.0.1-next.22

package/dist/cjs/index.cjs

@@ -8,16 +8,33 @@ var walletCli = require('@twin.org/wallet-cli');
 var core = require('@twin.org/core');
 var identityConnectorIota = require('@twin.org/identity-connector-iota');
 var vaultModels = require('@twin.org/vault-models');
-var walletConnectorIota = require('@twin.org/wallet-connector-iota');
 var walletModels = require('@twin.org/wallet-models');
 var commander = require('commander');
 var entityStorageConnectorMemory = require('@twin.org/entity-storage-connector-memory');
 var entityStorageModels = require('@twin.org/entity-storage-models');
+var identityConnectorIotaRebased = require('@twin.org/identity-connector-iota-rebased');
 var vaultConnectorEntityStorage = require('@twin.org/vault-connector-entity-storage');
 var standardsW3cDid = require('@twin.org/standards-w3c-did');
 var identityModels = require('@twin.org/identity-models');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * The identity connector types.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const IdentityConnectorTypes = {
+    /**
+     * IOTA.
+     */
+    Iota: "iota",
+    /**
+     * IOTA Rebased.
+     */
+    IotaRebased: "iota-rebased"
+};
+
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
@@ -34,6 +51,41 @@ function setupVault() {
     const vaultConnector = new vaultConnectorEntityStorage.EntityStorageVaultConnector();
     vaultModels.VaultConnectorFactory.register("vault", () => vaultConnector);
 }
+/**
+ * Setup the identity connector for use in the CLI commands.
+ * @param options The options for the identity connector.
+ * @param options.nodeEndpoint The node endpoint.
+ * @param options.network The network.
+ * @param options.addressIndex The wallet index.
+ * @param options.vaultSeedId The vault seed ID.
+ * @param connector The connector to use.
+ * @returns The identity connector.
+ */
+function setupIdentityConnector(options, connector) {
+    connector ??= IdentityConnectorTypes.Iota;
+    if (connector === IdentityConnectorTypes.IotaRebased) {
+        return new identityConnectorIotaRebased.IotaRebasedIdentityConnector({
+            config: {
+                clientOptions: {
+                    url: options.nodeEndpoint
+                },
+                network: options.network ?? "",
+                vaultSeedId: options.vaultSeedId,
+                walletAddressIndex: options.addressIndex
+            }
+        });
+    }
+    return new identityConnectorIota.IotaIdentityConnector({
+        config: {
+            clientOptions: {
+                nodes: [options.nodeEndpoint],
+                localPow: true
+            },
+            vaultSeedId: options.vaultSeedId,
+            walletAddressIndex: options.addressIndex
+        }
+    });
+}
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
@@ -47,7 +99,8 @@ function buildCommandIdentityCreate() {
         .name("identity-create")
         .summary(core.I18n.formatMessage("commands.identity-create.summary"))
         .description(core.I18n.formatMessage("commands.identity-create.description"))
-        .requiredOption(core.I18n.formatMessage("commands.identity-create.options.seed.param"), core.I18n.formatMessage("commands.identity-create.options.seed.description"));
+        .requiredOption(core.I18n.formatMessage("commands.identity-create.options.seed.param"), core.I18n.formatMessage("commands.identity-create.options.seed.description"))
+        .option(core.I18n.formatMessage("commands.identity-create.options.addressIndex.param"), core.I18n.formatMessage("commands.identity-create.options.addressIndex.description"), "0");
     cliCore.CLIOptions.output(command, {
         noConsole: true,
         json: true,
@@ -56,7 +109,11 @@ function buildCommandIdentityCreate() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .option(core.I18n.formatMessage("commands.common.options.explorer.param"), core.I18n.formatMessage("commands.common.options.explorer.description"), "!EXPLORER_URL")
         .action(actionCommandIdentityCreate);
     return command;
@@ -65,44 +122,38 @@ function buildCommandIdentityCreate() {
  * Action the identity create command.
  * @param opts The options for the command.
  * @param opts.seed The private key for the controller.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
+ * @param opts.network The network to use for rebased connector.
  * @param opts.explorer The explorer URL.
  */
 async function actionCommandIdentityCreate(opts) {
     const seed = cliCore.CLIParam.hexBase64("seed", opts.seed);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
+    const addressIndex = cliCore.CLIParam.integer("addressIndex", opts.addressIndex ?? "0", false, 0);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explorer"), explorerEndpoint);
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.identity-create.labels.addressIndex"), addressIndex);
     cliCore.CLIDisplay.break();
     setupVault();
     const vaultSeedId = "local-seed";
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.setSecret(`${localIdentity}/${vaultSeedId}`, core.Converter.bytesToBase64(seed));
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, vaultSeedId, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, vaultSeedId, network, addressIndex }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.identity-create.progress.creatingIdentity"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    const document = await iotaIdentityConnector.createDocument(localIdentity);
+    const document = await identityConnector.createDocument(localIdentity);
     cliCore.CLIDisplay.spinnerStop();
     if (opts.console) {
         cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.identity-create.labels.identity"), document.id);
@@ -140,8 +191,12 @@ function buildCommandIdentityResolve() {
         mergeEnv: false
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
         .option(core.I18n.formatMessage("commands.common.options.explorer.param"), core.I18n.formatMessage("commands.common.options.explorer.description"), "!EXPLORER_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .action(actionCommandIdentityResolve);
     return command;
 }
@@ -149,28 +204,29 @@ function buildCommandIdentityResolve() {
  * Action the identity resolve command.
  * @param opts The options for the command.
  * @param opts.did The identity to resolve.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
+ * @param opts.network The network to use for rebased connector.
  * @param opts.explorer The explorer URL.
  */
 async function actionCommandIdentityResolve(opts) {
     const did = cliCore.CLIParam.stringValue("did", opts.did);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.did"), did);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explorer"), explorerEndpoint);
     cliCore.CLIDisplay.break();
     setupVault();
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const iotaIdentityResolverConnector = new identityConnectorIota.IotaIdentityResolverConnector({
         config: {
             clientOptions: {
                 nodes: [nodeEndpoint],
@@ -181,7 +237,7 @@ async function actionCommandIdentityResolve(opts) {
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.identity-resolve.progress.resolvingIdentity"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    const document = await iotaIdentityConnector.resolveDocument(did);
+    const document = await iotaIdentityResolverConnector.resolveDocument(did);
     cliCore.CLIDisplay.spinnerStop();
     if (opts.console) {
         cliCore.CLIDisplay.section(core.I18n.formatMessage("commands.identity-resolve.labels.didDocument"));
@@ -219,7 +275,11 @@ function buildCommandProofCreate() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .action(actionCommandProofCreate);
     return command;
 }
@@ -229,41 +289,35 @@ function buildCommandProofCreate() {
  * @param opts.id The id of the verification method to use for the credential.
  * @param opts.privateKey The private key for the verification method.
  * @param opts.data The data to create the proof for.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
+ * @param opts.network The network to use for rebased connector.
  */
 async function actionCommandProofCreate(opts) {
     const id = cliCore.CLIParam.stringValue("id", opts.id);
     const privateKey = cliCore.CLIParam.hexBase64("private-key", opts.privateKey);
     const data = cliCore.CLIParam.hexBase64("data", opts.data);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.proof-create.labels.verificationMethodId"), id);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.break();
     setupVault();
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.addKey(`${localIdentity}/${id}`, vaultModels.VaultKeyType.Ed25519, privateKey, new Uint8Array());
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.proof-create.progress.creatingProof"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    const proof = await iotaIdentityConnector.createProof(localIdentity, id, data);
+    const proof = await identityConnector.createProof(localIdentity, id, data);
     cliCore.CLIDisplay.spinnerStop();
     if (opts.console) {
         cliCore.CLIDisplay.json(proof);
@@ -302,7 +356,11 @@ function buildCommandProofVerify() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .action(actionCommandProofVerify);
     return command;
 }
@@ -313,7 +371,9 @@ function buildCommandProofVerify() {
  * @param opts.data The data to verify the proof for.
  * @param opts.cryptosuite The cryptosuite of the proof.
  * @param opts.value The proof value.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
+ * @param opts.network The network to use for rebased connector.
  */
 async function actionCommandProofVerify(opts) {
     const id = cliCore.CLIParam.stringValue("id", opts.id);
@@ -321,29 +381,21 @@ async function actionCommandProofVerify(opts) {
     const cryptosuite = cliCore.CLIParam.stringValue("cryptosuite", opts.cryptosuite);
     const value = cliCore.CLIParam.stringValue("value", opts.value);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.proof-verify.labels.verificationMethodId"), id);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.proof-verify.labels.cryptosuite"), cryptosuite);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.proof-verify.labels.value"), value);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.break();
     setupVault();
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.proof-verify.progress.verifyingProof"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
@@ -355,7 +407,7 @@ async function actionCommandProofVerify(opts) {
         proofPurpose: "assertionMethod",
         proofValue: value
     };
-    const isVerified = await iotaIdentityConnector.verifyProof(data, proof);
+    const isVerified = await identityConnector.verifyProof(data, proof);
     cliCore.CLIDisplay.spinnerStop();
     if (opts.console) {
         cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.proof-verify.labels.isVerified"), isVerified);
@@ -395,7 +447,11 @@ function buildCommandServiceAdd() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .option(core.I18n.formatMessage("commands.common.options.explorer.param"), core.I18n.formatMessage("commands.common.options.explorer.description"), "!EXPLORER_URL")
         .action(actionCommandServiceAdd);
     return command;
@@ -408,6 +464,7 @@ function buildCommandServiceAdd() {
  * @param opts.id The id of the service to add.
  * @param opts.type The type of the service to add.
  * @param opts.endpoint The service endpoint.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
  * @param opts.explorer The explorer URL.
  */
@@ -418,12 +475,18 @@ async function actionCommandServiceAdd(opts) {
     const type = cliCore.CLIParam.stringValue("type", opts.type);
     const endpoint = cliCore.CLIParam.url("endpoint", opts.endpoint);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.did"), did);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.service-add.labels.serviceId"), id);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.service-add.labels.serviceType"), type);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.service-add.labels.serviceEndpoint"), endpoint);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explorer"), explorerEndpoint);
     cliCore.CLIDisplay.break();
     setupVault();
@@ -431,29 +494,13 @@ async function actionCommandServiceAdd(opts) {
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.setSecret(`${localIdentity}/${vaultSeedId}`, core.Converter.bytesToBase64(seed));
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, vaultSeedId, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network, vaultSeedId }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.service-add.progress.addingService"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    const service = await iotaIdentityConnector.addService(localIdentity, did, id, type, endpoint);
+    const service = await identityConnector.addService(localIdentity, did, id, type, endpoint);
     cliCore.CLIDisplay.spinnerStop();
     if (core.Is.stringValue(opts?.json)) {
         await cliCore.CLIUtils.writeJsonFile(opts.json, service, opts.mergeJson);
@@ -492,7 +539,11 @@ function buildCommandServiceRemove() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .option(core.I18n.formatMessage("commands.common.options.explorer.param"), core.I18n.formatMessage("commands.common.options.explorer.description"), "!EXPLORER_URL")
         .action(actionCommandServiceRemove);
     return command;
@@ -502,16 +553,24 @@ function buildCommandServiceRemove() {
  * @param opts The options for the command.
  * @param opts.seed The private key for the controller.
  * @param opts.id The id of the service to remove.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
+ * @param opts.network The network to use for rebased connector.
  * @param opts.explorer The explorer URL.
  */
 async function actionCommandServiceRemove(opts) {
     const seed = cliCore.CLIParam.hexBase64("seed", opts.seed);
     const id = cliCore.CLIParam.stringValue("id", opts.id);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.service-remove.labels.serviceId"), id);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explorer"), explorerEndpoint);
     cliCore.CLIDisplay.break();
     setupVault();
@@ -519,29 +578,13 @@ async function actionCommandServiceRemove(opts) {
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.setSecret(`${localIdentity}/${vaultSeedId}`, core.Converter.bytesToBase64(seed));
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, vaultSeedId, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network, vaultSeedId }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.service-remove.progress.removingService"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    await iotaIdentityConnector.removeService(localIdentity, id);
+    await identityConnector.removeService(localIdentity, id);
     cliCore.CLIDisplay.spinnerStop();
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIota.IotaIdentityUtils.didToAddress(identityModels.DocumentHelper.parse(id).id)}?tab=DID`);
     cliCore.CLIDisplay.break();
@@ -573,7 +616,11 @@ function buildCommandVerifiableCredentialCreate() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .action(actionCommandVerifiableCredentialCreate);
     return command;
 }
@@ -585,6 +632,7 @@ function buildCommandVerifiableCredentialCreate() {
  * @param opts.credentialId The id of the credential.
  * @param opts.subjectJson The JSON data for the subject.
  * @param opts.revocationIndex The revocation index for the credential.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
  */
 async function actionCommandVerifiableCredentialCreate(opts) {
@@ -594,33 +642,25 @@ async function actionCommandVerifiableCredentialCreate(opts) {
     const subjectJson = path.resolve(cliCore.CLIParam.stringValue("subject-json", opts.subjectJson));
     const revocationIndex = core.Coerce.number(opts.revocationIndex);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-create.labels.verificationMethodId"), id);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-create.labels.credentialId"), credentialId);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-create.labels.subjectJson"), subjectJson);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-create.labels.revocationIndex"), revocationIndex);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.break();
     setupVault();
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.addKey(`${localIdentity}/${id}`, vaultModels.VaultKeyType.Ed25519, privateKey, new Uint8Array());
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.verifiable-credential-create.progress.loadingSubjectData"));
     cliCore.CLIDisplay.break();
     const jsonData = await cliCore.CLIUtils.readJsonFile(subjectJson);
@@ -630,7 +670,7 @@ async function actionCommandVerifiableCredentialCreate(opts) {
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.verifiable-credential-create.progress.creatingVerifiableCredential"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    const verifiableCredential = await iotaIdentityConnector.createVerifiableCredential(localIdentity, id, credentialId, jsonData, revocationIndex);
+    const verifiableCredential = await identityConnector.createVerifiableCredential(localIdentity, id, credentialId, jsonData, revocationIndex);
     cliCore.CLIDisplay.spinnerStop();
     if (opts.console) {
         cliCore.CLIDisplay.section(core.I18n.formatMessage("commands.verifiable-credential-create.labels.verifiableCredential"));
@@ -663,7 +703,11 @@ function buildCommandVerifiableCredentialRevoke() {
         .requiredOption(core.I18n.formatMessage("commands.verifiable-credential-revoke.options.did.param"), core.I18n.formatMessage("commands.verifiable-credential-revoke.options.did.description"))
         .requiredOption(core.I18n.formatMessage("commands.verifiable-credential-revoke.options.revocation-index.param"), core.I18n.formatMessage("commands.verifiable-credential-revoke.options.revocation-index.description"));
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .action(actionCommandVerifiableCredentialRevoke);
     return command;
 }
@@ -673,45 +717,37 @@ function buildCommandVerifiableCredentialRevoke() {
  * @param opts.seed The seed to generate the private key for the controller.
  * @param opts.did The id of the document to revoke the index.
  * @param opts.revocationIndex The revocation index for the credential.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
+ * @param opts.network The network to use for rebased connector.
  */
 async function actionCommandVerifiableCredentialRevoke(opts) {
     const seed = cliCore.CLIParam.hexBase64("seed", opts.seed);
     const did = cliCore.CLIParam.stringValue("did", opts.did);
     const revocationIndex = cliCore.CLIParam.integer("revocation-index", opts.revocationIndex);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.did"), did);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-revoke.labels.revocationIndex"), revocationIndex);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.break();
     setupVault();
     const vaultSeedId = "local-seed";
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.setSecret(`${localIdentity}/${vaultSeedId}`, core.Converter.bytesToBase64(seed));
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, vaultSeedId, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network, vaultSeedId }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.verifiable-credential-revoke.progress.revokingCredential"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    await iotaIdentityConnector.revokeVerifiableCredentials(localIdentity, did, [revocationIndex]);
+    await identityConnector.revokeVerifiableCredentials(localIdentity, did, [revocationIndex]);
     cliCore.CLIDisplay.spinnerStop();
     cliCore.CLIDisplay.done();
 }
@@ -732,7 +768,11 @@ function buildCommandVerifiableCredentialUnrevoke() {
         .requiredOption(core.I18n.formatMessage("commands.verifiable-credential-unrevoke.options.did.param"), core.I18n.formatMessage("commands.verifiable-credential-unrevoke.options.did.description"))
         .requiredOption(core.I18n.formatMessage("commands.verifiable-credential-unrevoke.options.revocation-index.param"), core.I18n.formatMessage("commands.verifiable-credential-unrevoke.options.revocation-index.description"));
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .action(actionCommandVerifiableCredentialUnrevoke);
     return command;
 }
@@ -742,45 +782,37 @@ function buildCommandVerifiableCredentialUnrevoke() {
  * @param opts.seed The seed to generate the private key for the controller.
  * @param opts.did The id of the document to unrevoke the index.
  * @param opts.revocationIndex The revocation index for the credential.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
+ * @param opts.network The network to use for rebased connector.
  */
 async function actionCommandVerifiableCredentialUnrevoke(opts) {
     const seed = cliCore.CLIParam.hexBase64("seed", opts.seed);
     const did = cliCore.CLIParam.stringValue("did", opts.did);
     const revocationIndex = cliCore.CLIParam.integer("revocation-index", opts.revocationIndex);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.did"), did);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-unrevoke.labels.revocationIndex"), revocationIndex);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.break();
     setupVault();
     const vaultSeedId = "local-seed";
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.setSecret(`${localIdentity}/${vaultSeedId}`, core.Converter.bytesToBase64(seed));
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, vaultSeedId, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network, vaultSeedId }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.verifiable-credential-unrevoke.progress.unrevokingCredential"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    await iotaIdentityConnector.unrevokeVerifiableCredentials(localIdentity, did, [revocationIndex]);
+    await identityConnector.unrevokeVerifiableCredentials(localIdentity, did, [revocationIndex]);
     cliCore.CLIDisplay.spinnerStop();
     cliCore.CLIDisplay.done();
 }
@@ -806,7 +838,11 @@ function buildCommandVerifiableCredentialVerify() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .action(actionCommandVerifiableCredentialVerify);
     return command;
 }
@@ -814,36 +850,29 @@ function buildCommandVerifiableCredentialVerify() {
  * Action the verifiable credential verify command.
  * @param opts The options for the command.
  * @param opts.jwt The JSON web token for the verifiable credential.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
  */
 async function actionCommandVerifiableCredentialVerify(opts) {
     const jwt = cliCore.CLIParam.stringValue("jwt", opts.jwt);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-verify.labels.jwt"), jwt);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.break();
     setupVault();
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            }
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.verifiable-credential-verify.progress.verifyingCredential"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    const verification = await iotaIdentityConnector.checkVerifiableCredential(jwt);
+    const verification = await identityConnector.checkVerifiableCredential(jwt);
     const isVerified = core.Is.notEmpty(verification.verifiableCredential);
     const isRevoked = verification.revoked;
     cliCore.CLIDisplay.spinnerStop();
@@ -890,7 +919,11 @@ function buildCommandVerificationMethodAdd() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .option(core.I18n.formatMessage("commands.common.options.explorer.param"), core.I18n.formatMessage("commands.common.options.explorer.description"), "!EXPLORER_URL")
         .action(actionCommandVerificationMethodAdd);
     return command;
@@ -902,6 +935,7 @@ function buildCommandVerificationMethodAdd() {
  * @param opts.did The identity of the document to add to.
  * @param opts.type The type of the verification method to add.
  * @param opts.id The id of the verification method to add.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
  * @param opts.explorer The explorer URL.
  */
@@ -910,6 +944,9 @@ async function actionCommandVerificationMethodAdd(opts) {
     const did = cliCore.CLIParam.stringValue("did", opts.did);
     const type = cliCore.CLIParam.stringValue("type", opts.type);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.did"), did);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verification-method-add.labels.verificationMethodType"), type);
@@ -917,6 +954,9 @@ async function actionCommandVerificationMethodAdd(opts) {
         cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verification-method-add.labels.verificationMethodId"), opts?.id);
     }
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explorer"), explorerEndpoint);
     cliCore.CLIDisplay.break();
     setupVault();
@@ -924,29 +964,13 @@ async function actionCommandVerificationMethodAdd(opts) {
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.setSecret(`${localIdentity}/${vaultSeedId}`, core.Converter.bytesToBase64(seed));
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, vaultSeedId, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network, vaultSeedId }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.verification-method-add.progress.addingVerificationMethod"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    const verificationMethod = await iotaIdentityConnector.addVerificationMethod(localIdentity, did, type, opts?.id);
+    const verificationMethod = await identityConnector.addVerificationMethod(localIdentity, did, type, opts?.id);
     cliCore.CLIDisplay.spinnerStop();
     const keyPair = await vaultConnector.getKey(`${localIdentity}/${verificationMethod.id}`);
     const privateKey = core.Converter.bytesToBase64(keyPair.privateKey);
@@ -996,7 +1020,11 @@ function buildCommandVerificationMethodRemove() {
         mergeEnv: true
     });
     command
+        .addOption(new commander.Option(core.I18n.formatMessage("commands.common.options.connector.param"), core.I18n.formatMessage("commands.common.options.connector.description"))
+        .choices(Object.values(IdentityConnectorTypes))
+        .default(IdentityConnectorTypes.Iota))
         .option(core.I18n.formatMessage("commands.common.options.node.param"), core.I18n.formatMessage("commands.common.options.node.description"), "!NODE_URL")
+        .option(core.I18n.formatMessage("commands.common.options.network.param"), core.I18n.formatMessage("commands.common.options.network.description"), "!NETWORK")
         .option(core.I18n.formatMessage("commands.common.options.explorer.param"), core.I18n.formatMessage("commands.common.options.explorer.description"), "!EXPLORER_URL")
         .action(actionCommandVerificationMethodRemove);
     return command;
@@ -1006,16 +1034,24 @@ function buildCommandVerificationMethodRemove() {
  * @param opts The options for the command.
  * @param opts.seed The private key for the controller.
  * @param opts.id The id of the verification method to remove.
+ * @param opts.connector The connector to perform the operations with.
  * @param opts.node The node URL.
  * @param opts.explorer The explorer URL.
+ * @param opts.network The network to use for rebased connector.
  */
 async function actionCommandVerificationMethodRemove(opts) {
     const seed = cliCore.CLIParam.hexBase64("seed", opts.seed);
     const id = cliCore.CLIParam.stringValue("id", opts.id);
     const nodeEndpoint = cliCore.CLIParam.url("node", opts.node);
+    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+        ? cliCore.CLIParam.stringValue("network", opts.network)
+        : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verification-method-add.labels.verificationMethodId"), id);
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.node"), nodeEndpoint);
+    if (core.Is.stringValue(network)) {
+        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.network"), network);
+    }
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explorer"), explorerEndpoint);
     cliCore.CLIDisplay.break();
     setupVault();
@@ -1023,29 +1059,13 @@ async function actionCommandVerificationMethodRemove(opts) {
     const localIdentity = "local";
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
     await vaultConnector.setSecret(`${localIdentity}/${vaultSeedId}`, core.Converter.bytesToBase64(seed));
-    const iotaWalletConnector = new walletConnectorIota.IotaWalletConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
-    walletModels.WalletConnectorFactory.register("wallet", () => iotaWalletConnector);
-    const iotaIdentityConnector = new identityConnectorIota.IotaIdentityConnector({
-        config: {
-            clientOptions: {
-                nodes: [nodeEndpoint],
-                localPow: true
-            },
-            vaultSeedId
-        }
-    });
+    const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, vaultSeedId, network }, opts.connector);
+    walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
+    const identityConnector = setupIdentityConnector({ nodeEndpoint, network, vaultSeedId }, opts.connector);
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.verification-method-remove.progress.removingVerificationMethod"));
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.spinnerStart();
-    await iotaIdentityConnector.removeVerificationMethod(localIdentity, id);
+    await identityConnector.removeVerificationMethod(localIdentity, id);
     cliCore.CLIDisplay.spinnerStop();
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIota.IotaIdentityUtils.didToAddress(identityModels.DocumentHelper.parse(id).id)}?tab=DID`);
     cliCore.CLIDisplay.break();
@@ -1070,7 +1090,7 @@ class CLI extends cliCore.CLIBase {
         return this.execute({
             title: "TWIN Identity",
             appName: "twin-identity",
-            version: "0.0.3-next.18",
+            version: "0.0.1-next.22",
             icon: "🌍",
             supportsEnvFiles: true,
             overrideOutputWidth: options?.overrideOutputWidth
@@ -1104,6 +1124,7 @@ class CLI extends cliCore.CLIBase {
 }
 
 exports.CLI = CLI;
+exports.IdentityConnectorTypes = IdentityConnectorTypes;
 exports.actionCommandIdentityCreate = actionCommandIdentityCreate;
 exports.actionCommandIdentityResolve = actionCommandIdentityResolve;
 exports.actionCommandProofCreate = actionCommandProofCreate;
@@ -1128,3 +1149,5 @@ exports.buildCommandVerifiableCredentialUnrevoke = buildCommandVerifiableCredent
 exports.buildCommandVerifiableCredentialVerify = buildCommandVerifiableCredentialVerify;
 exports.buildCommandVerificationMethodAdd = buildCommandVerificationMethodAdd;
 exports.buildCommandVerificationMethodRemove = buildCommandVerificationMethodRemove;
+exports.setupIdentityConnector = setupIdentityConnector;
+exports.setupVault = setupVault;