@verii/metadata-registration 1.1.0-pre.1765263305 → 1.1.0-pre.1765354771

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/metadata-registration",
-  "version": "1.1.0-pre.1765263305",
+  "version": "1.1.0-pre.1765354771",
   "description": "Package allows interacting with the smart contracts, based on ethers.js",
   "repository": "https://github.com/LFDT-Verii/core",
   "main": "./index.js",
@@ -17,19 +17,19 @@
     "lint:fix": "eslint --fix --ext .js ."
   },
   "dependencies": {
-    "@verii/base-contract-io": "1.1.0-pre.1765263305",
-    "@verii/blockchain-functions": "1.1.0-pre.1765263305",
-    "@verii/common-functions": "1.1.0-pre.1765263305",
-    "@verii/contract-permissions": "1.1.0-pre.1765263305",
-    "@verii/cose-key": "1.1.0-pre.1765263305",
-    "@verii/crypto": "1.1.0-pre.1765263305",
-    "@verii/jwt": "1.1.0-pre.1765263305",
+    "@verii/base-contract-io": "1.1.0-pre.1765354771",
+    "@verii/blockchain-functions": "1.1.0-pre.1765354771",
+    "@verii/common-functions": "1.1.0-pre.1765354771",
+    "@verii/contract-permissions": "1.1.0-pre.1765354771",
+    "@verii/cose-key": "1.1.0-pre.1765354771",
+    "@verii/crypto": "1.1.0-pre.1765354771",
+    "@verii/jwt": "1.1.0-pre.1765354771",
     "eth-url-parser": "1.0.4",
     "lodash": "4.17.21"
   },
   "devDependencies": {
     "@spencejs/spence-config": "0.10.2",
-    "@verii/tests-helpers": "1.1.0-pre.1765263305",
+    "@verii/tests-helpers": "1.1.0-pre.1765354771",
     "date-fns": "4.1.0",
     "expect": "30.2.0",
     "nanoid": "5.1.6"
@@ -39,5 +39,5 @@
       "lib"
     ]
   },
-  "gitHead": "6a8fbaa81a89d68728e9593a3fe1cc9e796c5c7d"
+  "gitHead": "95b0dfb9c8d00b85e3c0ca240ea38048505a8681"
 }

package/src/metadata-registry.js

@@ -245,8 +245,7 @@ const initMetadataRegistry = async (
 
     const multiToken = ':multi:';
     if (did.indexOf(multiToken) === -1) {
-      const [, , , accountId, listId, index, contentHash] = did.split(':');
-      return [{ accountId, listId, index, contentHash }];
+      return [parseSingleVelocityDid(did)];
     }
 
     const [, entriesPart] = did.split(multiToken);
@@ -255,6 +254,10 @@ const initMetadataRegistry = async (
       return { accountId, listId, index, contentHash };
     }, entriesPart.split(';'));
   };
+  const parseSingleVelocityDid = (did) => {
+    const [, , , accountId, listId, index, contentHash] = did.split(':');
+    return { accountId, listId, index, contentHash };
+  };
 
   const resolvePublicKey = async ({ id, entry, secret }) => {
     log.info({ id, entry, secret }, 'resolvePublicKey');
@@ -367,8 +370,14 @@ const initMetadataRegistry = async (
 
     const credentialEntries = await Promise.all(
       mapWithIndex(async (entry, i) => {
-        const id = toDID(indexEntries[i]).toLowerCase();
-        const credential = find((c) => c.id.toLowerCase() === id, credentials);
+        const credential = find((c) => {
+          const credentialIndexEntry = parseSingleVelocityDid(c.id);
+          return (
+            credentialIndexEntry.accountId === indexEntries[i].accountId &&
+            credentialIndexEntry.listId === indexEntries[i].listId &&
+            credentialIndexEntry.index === indexEntries[i].index
+          );
+        }, credentials);
         const secret =
           indexEntries[i].contentHash != null
             ? await deriveEncryptionSecretFromPassword(
@@ -377,7 +386,7 @@ const initMetadataRegistry = async (
             : await deriveEncryptionSecret(credential);
         return {
           entry,
-          id,
+          id: credential.id,
           credentialType: credential.credentialType,
           secret,
         };
@@ -447,14 +456,6 @@ const initMetadataRegistry = async (
     return tx.wait();
   };
 
-  const toDID = ({ accountId, listId, index, contentHash }) => {
-    if (contentHash != null) {
-      return `did:velocity:v2:${accountId}:${listId}:${index}:${contentHash}`;
-    }
-
-    return `did:velocity:v2:${accountId}:${listId}:${index}`;
-  };
-
   const pullCreatedMetadataListEvents = pullEvents('CreatedMetadataList');
 
   const pullAddedCredentialMetadataEvents = pullEvents(