@twin.org/identity-cli 0.0.1-next.24 → 0.0.1-next.26

package/dist/cjs/index.cjs

@@ -6,16 +6,16 @@ var cliCore = require('@twin.org/cli-core');
 var cryptoCli = require('@twin.org/crypto-cli');
 var walletCli = require('@twin.org/wallet-cli');
 var core = require('@twin.org/core');
-var identityConnectorIota = require('@twin.org/identity-connector-iota');
+var identityConnectorIotaStardust = require('@twin.org/identity-connector-iota-stardust');
 var vaultModels = require('@twin.org/vault-models');
 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 identityConnectorIota = require('@twin.org/identity-connector-iota');
 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 standardsW3cDid = require('@twin.org/standards-w3c-did');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 // Copyright 2024 IOTA Stiftung.
@@ -30,9 +30,9 @@ const IdentityConnectorTypes = {
      */
     Iota: "iota",
     /**
-     * IOTA Rebased.
+     * IOTA Stardust.
      */
-    IotaRebased: "iota-rebased"
+    IotaStardust: "iota-stardust"
 };
 
 // Copyright 2024 IOTA Stiftung.
@@ -63,8 +63,8 @@ function setupVault() {
  */
 function setupIdentityConnector(options, connector) {
     connector ??= IdentityConnectorTypes.Iota;
-    if (connector === IdentityConnectorTypes.IotaRebased) {
-        return new identityConnectorIotaRebased.IotaRebasedIdentityConnector({
+    if (connector === IdentityConnectorTypes.Iota) {
+        return new identityConnectorIota.IotaIdentityConnector({
             config: {
                 clientOptions: {
                     url: options.nodeEndpoint
@@ -75,7 +75,7 @@ function setupIdentityConnector(options, connector) {
             }
         });
     }
-    return new identityConnectorIota.IotaIdentityConnector({
+    return new identityConnectorIotaStardust.IotaStardustIdentityConnector({
         config: {
             clientOptions: {
                 nodes: [options.nodeEndpoint],
@@ -124,13 +124,13 @@ function buildCommandIdentityCreate() {
  * @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.network The network to use for 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
@@ -165,7 +165,7 @@ async function actionCommandIdentityCreate(opts) {
     if (core.Is.stringValue(opts?.env)) {
         await cliCore.CLIUtils.writeEnvFile(opts.env, [`DID="${document.id}"`], opts.mergeEnv);
     }
-    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIota.IotaIdentityUtils.didToAddress(document.id)}?tab=DID`);
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIotaStardust.IotaStardustIdentityUtils.didToAddress(document.id)}?tab=DID`);
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.done();
 }
@@ -206,13 +206,13 @@ function buildCommandIdentityResolve() {
  * @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.network The network to use for 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
@@ -226,7 +226,7 @@ async function actionCommandIdentityResolve(opts) {
     setupVault();
     const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
     walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
-    const iotaIdentityResolverConnector = new identityConnectorIota.IotaIdentityResolverConnector({
+    const iotaIdentityResolverConnector = new identityConnectorIotaStardust.IotaStardustIdentityResolverConnector({
         config: {
             clientOptions: {
                 nodes: [nodeEndpoint],
@@ -247,7 +247,7 @@ async function actionCommandIdentityResolve(opts) {
     if (core.Is.stringValue(opts?.json)) {
         await cliCore.CLIUtils.writeJsonFile(opts.json, document, opts.mergeJson);
     }
-    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIota.IotaIdentityUtils.didToAddress(document.id)}?tab=DID`);
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIotaStardust.IotaStardustIdentityUtils.didToAddress(document.id)}?tab=DID`);
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.done();
 }
@@ -291,14 +291,14 @@ function buildCommandProofCreate() {
  * @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.
+ * @param opts.network The network to use for 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.proof-create.labels.verificationMethodId"), id);
@@ -309,8 +309,9 @@ async function actionCommandProofCreate(opts) {
     cliCore.CLIDisplay.break();
     setupVault();
     const localIdentity = "local";
+    const vmParts = identityModels.DocumentHelper.parseId(id);
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
-    await vaultConnector.addKey(`${localIdentity}/${id}`, vaultModels.VaultKeyType.Ed25519, privateKey, new Uint8Array());
+    await vaultConnector.addKey(`${localIdentity}/${vmParts.fragment}`, vaultModels.VaultKeyType.Ed25519, privateKey, new Uint8Array());
     const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
     walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
     const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
@@ -373,7 +374,7 @@ function buildCommandProofVerify() {
  * @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.
+ * @param opts.network The network to use for connector.
  */
 async function actionCommandProofVerify(opts) {
     const id = cliCore.CLIParam.stringValue("id", opts.id);
@@ -381,7 +382,7 @@ 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.proof-verify.labels.verificationMethodId"), id);
@@ -475,7 +476,7 @@ 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
@@ -512,7 +513,7 @@ async function actionCommandServiceAdd(opts) {
             `DID_SERVICE_ENDPOINT="${service.serviceEndpoint}"`
         ], opts.mergeEnv);
     }
-    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIota.IotaIdentityUtils.didToAddress(did)}?tab=DID`);
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIotaStardust.IotaStardustIdentityUtils.didToAddress(did)}?tab=DID`);
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.done();
 }
@@ -555,14 +556,14 @@ function buildCommandServiceRemove() {
  * @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.network The network to use for 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
@@ -586,7 +587,7 @@ async function actionCommandServiceRemove(opts) {
     cliCore.CLIDisplay.spinnerStart();
     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.parseId(id).id)}?tab=DID`);
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIotaStardust.IotaStardustIdentityUtils.didToAddress(identityModels.DocumentHelper.parseId(id).id)}?tab=DID`);
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.done();
 }
@@ -642,7 +643,7 @@ 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-create.labels.verificationMethodId"), id);
@@ -656,8 +657,9 @@ async function actionCommandVerifiableCredentialCreate(opts) {
     cliCore.CLIDisplay.break();
     setupVault();
     const localIdentity = "local";
+    const vmParts = identityModels.DocumentHelper.parseId(id);
     const vaultConnector = vaultModels.VaultConnectorFactory.get("vault");
-    await vaultConnector.addKey(`${localIdentity}/${id}`, vaultModels.VaultKeyType.Ed25519, privateKey, new Uint8Array());
+    await vaultConnector.addKey(`${localIdentity}/${vmParts.fragment}`, vaultModels.VaultKeyType.Ed25519, privateKey, new Uint8Array());
     const walletConnector = walletCli.setupWalletConnector({ nodeEndpoint, network }, opts.connector);
     walletModels.WalletConnectorFactory.register("wallet", () => walletConnector);
     const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
@@ -719,14 +721,14 @@ function buildCommandVerifiableCredentialRevoke() {
  * @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.
+ * @param opts.network The network to use for 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.did"), did);
@@ -784,14 +786,14 @@ function buildCommandVerifiableCredentialUnrevoke() {
  * @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.
+ * @param opts.network The network to use for 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.did"), did);
@@ -856,7 +858,7 @@ function buildCommandVerifiableCredentialVerify() {
 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.verifiable-credential-verify.labels.jwt"), jwt);
@@ -944,7 +946,7 @@ 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
@@ -972,7 +974,8 @@ async function actionCommandVerificationMethodAdd(opts) {
     cliCore.CLIDisplay.spinnerStart();
     const verificationMethod = await identityConnector.addVerificationMethod(localIdentity, did, type, opts?.id);
     cliCore.CLIDisplay.spinnerStop();
-    const keyPair = await vaultConnector.getKey(`${localIdentity}/${verificationMethod.id}`);
+    const keyParts = identityModels.DocumentHelper.parseId(verificationMethod.id);
+    const keyPair = await vaultConnector.getKey(`${localIdentity}/${keyParts.fragment}`);
     const privateKey = core.Converter.bytesToBase64(keyPair.privateKey);
     const publicKey = core.Is.uint8Array(keyPair.publicKey)
         ? core.Converter.bytesToBase64(keyPair.publicKey)
@@ -993,7 +996,7 @@ async function actionCommandVerificationMethodAdd(opts) {
             `DID_VERIFICATION_METHOD_PUBLIC_KEY="${publicKey}"`
         ], opts.mergeEnv);
     }
-    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIota.IotaIdentityUtils.didToAddress(did)}?tab=DID`);
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIotaStardust.IotaStardustIdentityUtils.didToAddress(did)}?tab=DID`);
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.done();
 }
@@ -1037,13 +1040,13 @@ function buildCommandVerificationMethodRemove() {
  * @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.
+ * @param opts.network The network to use for 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
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? cliCore.CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = cliCore.CLIParam.url("explorer", opts.explorer);
@@ -1067,7 +1070,7 @@ async function actionCommandVerificationMethodRemove(opts) {
     cliCore.CLIDisplay.spinnerStart();
     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.parseId(id).id)}?tab=DID`);
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.common.labels.explore"), `${core.StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${identityConnectorIotaStardust.IotaStardustIdentityUtils.didToAddress(identityModels.DocumentHelper.parseId(id).id)}?tab=DID`);
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.done();
 }
@@ -1090,7 +1093,7 @@ class CLI extends cliCore.CLIBase {
         return this.execute({
             title: "TWIN Identity",
             appName: "twin-identity",
-            version: "0.0.1-next.24",
+            version: "0.0.1-next.26",
             icon: "🌍",
             supportsEnvFiles: true,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/esm/index.mjs

@@ -4,16 +4,16 @@ import { CLIOptions, CLIParam, CLIDisplay, CLIUtils, CLIBase } from '@twin.org/c
 import { buildCommandMnemonic, buildCommandAddress } from '@twin.org/crypto-cli';
 import { setupWalletConnector, buildCommandFaucet, buildCommandTransfer } from '@twin.org/wallet-cli';
 import { I18n, Is, Converter, StringHelper, Coerce, GeneralError } from '@twin.org/core';
-import { IotaIdentityConnector, IotaIdentityUtils, IotaIdentityResolverConnector } from '@twin.org/identity-connector-iota';
+import { IotaStardustIdentityConnector, IotaStardustIdentityUtils, IotaStardustIdentityResolverConnector } from '@twin.org/identity-connector-iota-stardust';
 import { VaultConnectorFactory, VaultKeyType } from '@twin.org/vault-models';
 import { WalletConnectorFactory } from '@twin.org/wallet-models';
 import { Command, Option } from 'commander';
 import { MemoryEntityStorageConnector } from '@twin.org/entity-storage-connector-memory';
 import { EntityStorageConnectorFactory } from '@twin.org/entity-storage-models';
-import { IotaRebasedIdentityConnector } from '@twin.org/identity-connector-iota-rebased';
+import { IotaIdentityConnector } from '@twin.org/identity-connector-iota';
 import { initSchema, EntityStorageVaultConnector } from '@twin.org/vault-connector-entity-storage';
-import { DidContexts, DidTypes, DidVerificationMethodType } from '@twin.org/standards-w3c-did';
 import { DocumentHelper } from '@twin.org/identity-models';
+import { DidTypes, DidContexts, DidVerificationMethodType } from '@twin.org/standards-w3c-did';
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
@@ -27,9 +27,9 @@ const IdentityConnectorTypes = {
      */
     Iota: "iota",
     /**
-     * IOTA Rebased.
+     * IOTA Stardust.
      */
-    IotaRebased: "iota-rebased"
+    IotaStardust: "iota-stardust"
 };
 
 // Copyright 2024 IOTA Stiftung.
@@ -60,8 +60,8 @@ function setupVault() {
  */
 function setupIdentityConnector(options, connector) {
     connector ??= IdentityConnectorTypes.Iota;
-    if (connector === IdentityConnectorTypes.IotaRebased) {
-        return new IotaRebasedIdentityConnector({
+    if (connector === IdentityConnectorTypes.Iota) {
+        return new IotaIdentityConnector({
             config: {
                 clientOptions: {
                     url: options.nodeEndpoint
@@ -72,7 +72,7 @@ function setupIdentityConnector(options, connector) {
             }
         });
     }
-    return new IotaIdentityConnector({
+    return new IotaStardustIdentityConnector({
         config: {
             clientOptions: {
                 nodes: [options.nodeEndpoint],
@@ -121,13 +121,13 @@ function buildCommandIdentityCreate() {
  * @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.network The network to use for connector.
  * @param opts.explorer The explorer URL.
  */
 async function actionCommandIdentityCreate(opts) {
     const seed = CLIParam.hexBase64("seed", opts.seed);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = CLIParam.url("explorer", opts.explorer);
@@ -162,7 +162,7 @@ async function actionCommandIdentityCreate(opts) {
     if (Is.stringValue(opts?.env)) {
         await CLIUtils.writeEnvFile(opts.env, [`DID="${document.id}"`], opts.mergeEnv);
     }
-    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaIdentityUtils.didToAddress(document.id)}?tab=DID`);
+    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaStardustIdentityUtils.didToAddress(document.id)}?tab=DID`);
     CLIDisplay.break();
     CLIDisplay.done();
 }
@@ -203,13 +203,13 @@ function buildCommandIdentityResolve() {
  * @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.network The network to use for connector.
  * @param opts.explorer The explorer URL.
  */
 async function actionCommandIdentityResolve(opts) {
     const did = CLIParam.stringValue("did", opts.did);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = CLIParam.url("explorer", opts.explorer);
@@ -223,7 +223,7 @@ async function actionCommandIdentityResolve(opts) {
     setupVault();
     const walletConnector = setupWalletConnector({ nodeEndpoint, network }, opts.connector);
     WalletConnectorFactory.register("wallet", () => walletConnector);
-    const iotaIdentityResolverConnector = new IotaIdentityResolverConnector({
+    const iotaIdentityResolverConnector = new IotaStardustIdentityResolverConnector({
         config: {
             clientOptions: {
                 nodes: [nodeEndpoint],
@@ -244,7 +244,7 @@ async function actionCommandIdentityResolve(opts) {
     if (Is.stringValue(opts?.json)) {
         await CLIUtils.writeJsonFile(opts.json, document, opts.mergeJson);
     }
-    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaIdentityUtils.didToAddress(document.id)}?tab=DID`);
+    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaStardustIdentityUtils.didToAddress(document.id)}?tab=DID`);
     CLIDisplay.break();
     CLIDisplay.done();
 }
@@ -288,14 +288,14 @@ function buildCommandProofCreate() {
  * @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.
+ * @param opts.network The network to use for connector.
  */
 async function actionCommandProofCreate(opts) {
     const id = CLIParam.stringValue("id", opts.id);
     const privateKey = CLIParam.hexBase64("private-key", opts.privateKey);
     const data = CLIParam.hexBase64("data", opts.data);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     CLIDisplay.value(I18n.formatMessage("commands.proof-create.labels.verificationMethodId"), id);
@@ -306,8 +306,9 @@ async function actionCommandProofCreate(opts) {
     CLIDisplay.break();
     setupVault();
     const localIdentity = "local";
+    const vmParts = DocumentHelper.parseId(id);
     const vaultConnector = VaultConnectorFactory.get("vault");
-    await vaultConnector.addKey(`${localIdentity}/${id}`, VaultKeyType.Ed25519, privateKey, new Uint8Array());
+    await vaultConnector.addKey(`${localIdentity}/${vmParts.fragment}`, VaultKeyType.Ed25519, privateKey, new Uint8Array());
     const walletConnector = setupWalletConnector({ nodeEndpoint, network }, opts.connector);
     WalletConnectorFactory.register("wallet", () => walletConnector);
     const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
@@ -370,7 +371,7 @@ function buildCommandProofVerify() {
  * @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.
+ * @param opts.network The network to use for connector.
  */
 async function actionCommandProofVerify(opts) {
     const id = CLIParam.stringValue("id", opts.id);
@@ -378,7 +379,7 @@ async function actionCommandProofVerify(opts) {
     const cryptosuite = CLIParam.stringValue("cryptosuite", opts.cryptosuite);
     const value = CLIParam.stringValue("value", opts.value);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     CLIDisplay.value(I18n.formatMessage("commands.proof-verify.labels.verificationMethodId"), id);
@@ -472,7 +473,7 @@ async function actionCommandServiceAdd(opts) {
     const type = CLIParam.stringValue("type", opts.type);
     const endpoint = CLIParam.url("endpoint", opts.endpoint);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = CLIParam.url("explorer", opts.explorer);
@@ -509,7 +510,7 @@ async function actionCommandServiceAdd(opts) {
             `DID_SERVICE_ENDPOINT="${service.serviceEndpoint}"`
         ], opts.mergeEnv);
     }
-    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaIdentityUtils.didToAddress(did)}?tab=DID`);
+    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaStardustIdentityUtils.didToAddress(did)}?tab=DID`);
     CLIDisplay.break();
     CLIDisplay.done();
 }
@@ -552,14 +553,14 @@ function buildCommandServiceRemove() {
  * @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.network The network to use for connector.
  * @param opts.explorer The explorer URL.
  */
 async function actionCommandServiceRemove(opts) {
     const seed = CLIParam.hexBase64("seed", opts.seed);
     const id = CLIParam.stringValue("id", opts.id);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = CLIParam.url("explorer", opts.explorer);
@@ -583,7 +584,7 @@ async function actionCommandServiceRemove(opts) {
     CLIDisplay.spinnerStart();
     await identityConnector.removeService(localIdentity, id);
     CLIDisplay.spinnerStop();
-    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaIdentityUtils.didToAddress(DocumentHelper.parseId(id).id)}?tab=DID`);
+    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaStardustIdentityUtils.didToAddress(DocumentHelper.parseId(id).id)}?tab=DID`);
     CLIDisplay.break();
     CLIDisplay.done();
 }
@@ -639,7 +640,7 @@ async function actionCommandVerifiableCredentialCreate(opts) {
     const subjectJson = path.resolve(CLIParam.stringValue("subject-json", opts.subjectJson));
     const revocationIndex = Coerce.number(opts.revocationIndex);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     CLIDisplay.value(I18n.formatMessage("commands.verifiable-credential-create.labels.verificationMethodId"), id);
@@ -653,8 +654,9 @@ async function actionCommandVerifiableCredentialCreate(opts) {
     CLIDisplay.break();
     setupVault();
     const localIdentity = "local";
+    const vmParts = DocumentHelper.parseId(id);
     const vaultConnector = VaultConnectorFactory.get("vault");
-    await vaultConnector.addKey(`${localIdentity}/${id}`, VaultKeyType.Ed25519, privateKey, new Uint8Array());
+    await vaultConnector.addKey(`${localIdentity}/${vmParts.fragment}`, VaultKeyType.Ed25519, privateKey, new Uint8Array());
     const walletConnector = setupWalletConnector({ nodeEndpoint, network }, opts.connector);
     WalletConnectorFactory.register("wallet", () => walletConnector);
     const identityConnector = setupIdentityConnector({ nodeEndpoint, network }, opts.connector);
@@ -716,14 +718,14 @@ function buildCommandVerifiableCredentialRevoke() {
  * @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.
+ * @param opts.network The network to use for connector.
  */
 async function actionCommandVerifiableCredentialRevoke(opts) {
     const seed = CLIParam.hexBase64("seed", opts.seed);
     const did = CLIParam.stringValue("did", opts.did);
     const revocationIndex = CLIParam.integer("revocation-index", opts.revocationIndex);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     CLIDisplay.value(I18n.formatMessage("commands.common.labels.did"), did);
@@ -781,14 +783,14 @@ function buildCommandVerifiableCredentialUnrevoke() {
  * @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.
+ * @param opts.network The network to use for connector.
  */
 async function actionCommandVerifiableCredentialUnrevoke(opts) {
     const seed = CLIParam.hexBase64("seed", opts.seed);
     const did = CLIParam.stringValue("did", opts.did);
     const revocationIndex = CLIParam.integer("revocation-index", opts.revocationIndex);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     CLIDisplay.value(I18n.formatMessage("commands.common.labels.did"), did);
@@ -853,7 +855,7 @@ function buildCommandVerifiableCredentialVerify() {
 async function actionCommandVerifiableCredentialVerify(opts) {
     const jwt = CLIParam.stringValue("jwt", opts.jwt);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     CLIDisplay.value(I18n.formatMessage("commands.verifiable-credential-verify.labels.jwt"), jwt);
@@ -941,7 +943,7 @@ async function actionCommandVerificationMethodAdd(opts) {
     const did = CLIParam.stringValue("did", opts.did);
     const type = CLIParam.stringValue("type", opts.type);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = CLIParam.url("explorer", opts.explorer);
@@ -969,7 +971,8 @@ async function actionCommandVerificationMethodAdd(opts) {
     CLIDisplay.spinnerStart();
     const verificationMethod = await identityConnector.addVerificationMethod(localIdentity, did, type, opts?.id);
     CLIDisplay.spinnerStop();
-    const keyPair = await vaultConnector.getKey(`${localIdentity}/${verificationMethod.id}`);
+    const keyParts = DocumentHelper.parseId(verificationMethod.id);
+    const keyPair = await vaultConnector.getKey(`${localIdentity}/${keyParts.fragment}`);
     const privateKey = Converter.bytesToBase64(keyPair.privateKey);
     const publicKey = Is.uint8Array(keyPair.publicKey)
         ? Converter.bytesToBase64(keyPair.publicKey)
@@ -990,7 +993,7 @@ async function actionCommandVerificationMethodAdd(opts) {
             `DID_VERIFICATION_METHOD_PUBLIC_KEY="${publicKey}"`
         ], opts.mergeEnv);
     }
-    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaIdentityUtils.didToAddress(did)}?tab=DID`);
+    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaStardustIdentityUtils.didToAddress(did)}?tab=DID`);
     CLIDisplay.break();
     CLIDisplay.done();
 }
@@ -1034,13 +1037,13 @@ function buildCommandVerificationMethodRemove() {
  * @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.
+ * @param opts.network The network to use for connector.
  */
 async function actionCommandVerificationMethodRemove(opts) {
     const seed = CLIParam.hexBase64("seed", opts.seed);
     const id = CLIParam.stringValue("id", opts.id);
     const nodeEndpoint = CLIParam.url("node", opts.node);
-    const network = opts.connector === IdentityConnectorTypes.IotaRebased
+    const network = opts.connector === IdentityConnectorTypes.Iota
         ? CLIParam.stringValue("network", opts.network)
         : undefined;
     const explorerEndpoint = CLIParam.url("explorer", opts.explorer);
@@ -1064,7 +1067,7 @@ async function actionCommandVerificationMethodRemove(opts) {
     CLIDisplay.spinnerStart();
     await identityConnector.removeVerificationMethod(localIdentity, id);
     CLIDisplay.spinnerStop();
-    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaIdentityUtils.didToAddress(DocumentHelper.parseId(id).id)}?tab=DID`);
+    CLIDisplay.value(I18n.formatMessage("commands.common.labels.explore"), `${StringHelper.trimTrailingSlashes(explorerEndpoint)}/addr/${IotaStardustIdentityUtils.didToAddress(DocumentHelper.parseId(id).id)}?tab=DID`);
     CLIDisplay.break();
     CLIDisplay.done();
 }
@@ -1087,7 +1090,7 @@ class CLI extends CLIBase {
         return this.execute({
             title: "TWIN Identity",
             appName: "twin-identity",
-            version: "0.0.1-next.24",
+            version: "0.0.1-next.26",
             icon: "🌍",
             supportsEnvFiles: true,
             overrideOutputWidth: options?.overrideOutputWidth