refactor(org.id-resolver): added support for the new blockchainAccountId format

Author: kostysh

packages/resolver/package.json

@@ -32,10 +32,10 @@
     "url": "git+ssh://[email protected]:windingtree/org.id-resolver.git"
   },
   "dependencies": {
-    "@windingtree/org.id": "3.0.0-beta.6",
-    "@windingtree/org.id-auth": "1.0.0-beta.32",
-    "@windingtree/org.id-core": "1.0.0-beta.32",
-    "@windingtree/org.id-utils": "1.0.0-beta.32",
+    "@windingtree/org.id": "^3.0.0-beta.6",
+    "@windingtree/org.id-auth": "^1.0.0-beta.45",
+    "@windingtree/org.id-core": "^1.0.0-beta.45",
+    "@windingtree/org.id-utils": "^1.0.0-beta.45",
     "@windingtree/org.json-schema": "1.0.1",
     "ethers": "5.5.3",
     "luxon": "2.3.0"

packages/resolver/src/index.ts

@@ -625,23 +625,23 @@ export const OrgIdResolver = (options: ResolverOptions): OrgIdResolverAPI => {
         }
 
         const {
-          accountId,
+          accountAddress,
           blockchainType,
-          blockchainId
+          chainId
         } = parseBlockchainAccountId(orgJsonVerificationMethod.blockchainAccountId);
 
-        if (accountId !== orgIdOwner) {
+        if (accountAddress !== orgIdOwner) {
           throw new Error(
-            `Verification method blockchain account Id "${orgIdOwner}" is expected but found "${accountId}" in the VC proof`
+            `Verification method blockchain account Id "${orgIdOwner}" is expected but found "${accountAddress}" in the VC proof`
           );
         }
 
         if (
           blockchainType !== selectedChain.config.blockchainType ||
-          blockchainId !== selectedChain.config.blockchainId
+          chainId !== selectedChain.config.blockchainId
         ) {
           throw new Error(
-            `Verification method blockchain type "${selectedChain.config.blockchainType}" and Id "${selectedChain.config.blockchainId}" are expected but found "${blockchainType}" and "${blockchainId}" in the VC proof`
+            `Verification method blockchain type "${selectedChain.config.blockchainType}" and Id "${selectedChain.config.blockchainId}" are expected but found "${blockchainType}" and "${chainId}" in the VC proof`
           );
         }
 

packages/resolver/test/fixtures/org.json

@@ -23,7 +23,7 @@
         "id": "did:orgid:4:0x9300bad07f0b9d904b23781e8bbb05c1219530c51e7e494701db2539b7a5a119#key-1",
         "controller": "did:orgid:4:0x9300bad07f0b9d904b23781e8bbb05c1219530c51e7e494701db2539b7a5a119",
         "type": "EcdsaSecp256k1RecoveryMethod2020",
-        "blockchainAccountId": "0xBfD9EebE27d5a2F1113220b53844E5066889035C@eip155:1337"
+        "blockchainAccountId": "eip155:1337:0xBfD9EebE27d5a2F1113220b53844E5066889035C"
       }
     ],
     "service": [],

packages/resolver/test/fixtures/resolver.spec.ts renamed to packages/resolver/test/resolver.spec.ts

@@ -10,7 +10,7 @@ import type {
   FetcherConfig,
   OrgIdResolverAPI,
   ResolverOptions
-} from '../../src';
+} from '../src';
 import { orgIdSetup } from '@windingtree/org.id-test-setup';
 import {
   generateSalt,
@@ -22,7 +22,7 @@ import {
   buildHttpFetcherConfig,
   parseDid,
   parseUri
-} from '../../src';
+} from '../src';
 import chai, { expect } from 'chai';
 import chp from 'chai-as-promised';
 chai.use(chp);
@@ -250,7 +250,7 @@ describe('ORGiD DID Resolver', () => {
             "id": "did:orgid:1337:0x2389deb1e582b49ab388c7ebc16b49e5a95e0b8c92ffa9c74881a9904074de9a#key-100",
             "controller": "did:orgid:1337:0x2389deb1e582b49ab388c7ebc16b49e5a95e0b8c92ffa9c74881a9904074de9a",
             "type": "EcdsaSecp256k1RecoveryMethod2020",
-            "blockchainAccountId": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266@eip155:1337"
+            "blockchainAccountId": "eip155:1337:0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
           }
         ]
       };
@@ -316,7 +316,7 @@ describe('ORGiD DID Resolver', () => {
             "id": `did:orgid:1337:${orgIdHash}#key-111`,
             "controller": `did:orgid:1337:${orgIdHash}`,
             "type": "EcdsaSecp256k1RecoveryMethod2020",
-            "blockchainAccountId": `${ownerAddress}@${invalidBlockchainType}:1337`
+            "blockchainAccountId": `${invalidBlockchainType}:1337:${ownerAddress}`
           }
         ]
       };