resolve conflict

uncefact · May 21, 2024 · 1c4dadf · 1c4dadf
2 parents ab41620 + 07125f9
commit 1c4dadf
Show file tree

Hide file tree

Showing 6 changed files with 450 additions and 408 deletions.
diff --git a/package.json b/package.json
@@ -3,11 +3,13 @@
   "version": "1.0.0-beta.5",
   "scripts": {
     "postinstall": "mkdir .tmp_npm; cd .tmp_npm; mkdir veramo; cd veramo; git init; git remote add -f origin https://github.com/gs-gs/veramo.git; git pull --depth=1 origin vc-v2; pnpm install; pnpm build;",
-    "build": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --experimental-json-modules\" pnpm build:js && pnpm build:api && pnpm build:schema",
-    "build:js": "pnpm -r --stream build",
-    "build:api": "pnpm --package=@vckit/cli -c dlx \"pnpm -r --stream extract-api\"",
+    "build": "pnpm build:agent && pnpm build:explorer",
+    "build:agent": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --experimental-json-modules\" pnpm build:js && pnpm build:api && pnpm build:schema",
+    "build:js": "pnpm -r --stream --filter=!{@vckit/credential-oa,@vckit/oa-renderers,@vckit/demo-explorer} build",
+    "build:api": "pnpm --package=@vckit/cli -c dlx \"pnpm -r --stream --filter=!{@vckit/credential-oa,@vckit/oa-renderers,@vckit/demo-explorer} extract-api\"",
     "build:schema": "pnpm --package=@vckit/cli -c dlx \"pnpm -r --stream generate-plugin-schema\"",
-    "test": "pnpm test:packages && pnpm test:oa-renderer",
+    "build:explorer": "pnpm -r --stream --filter=@vckit/demo-explorer build",
+    "test": "pnpm test:packages",
     "test:packages-ci": "pnpm test:packages --coverage=true",
     "test:packages": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --experimental-import-meta-resolve\" jest",
     "test:packages-watch": "pnpm test:packages --watch --verbose",
@@ -84,6 +86,6 @@
     "jsonld": "npm:@digitalcredentials/jsonld@^5.2.1"
   },
   "engines": {
-    "node": ">= 18.0.0"
+    "node": ">= 21.0.0"
   }
-}
+}
diff --git a/packages/cli/default/agent.template.yml b/packages/cli/default/agent.template.yml
@@ -174,9 +174,6 @@ server:
         $args:
           - basePath: :${PORT}
 
-    - - /vc-api-docs
-      - $require: '@vckit/vc-api?t=function#VCApiDocsRouter'
-
     # API base path
     - - /messaging
       - $require: '@vckit/remote-server?t=function#MessagingRouter'
@@ -193,11 +190,14 @@ server:
     - - /credentials/status/revocation-list-2020
       - $require: '@vckit/revocationlist?t=function#revocationList2020Router'
 
+    - - /credentials/status/bitstring-status-list
+      - $require: '@vckit/bitstringStatusList?t=function#bitstringStatusListRouter'
+
     # API base path
     - - /agent
       - $require: '@vckit/remote-server?t=function#apiKeyAuth'
         $args:
-          - apiKey: kh14g04piduv
+          - apiKey: test123
 
       - $require: '@vckit/revocationlist?t=function#revocationList2020Middleware'
         $args:
@@ -221,7 +221,7 @@ server:
     - - /open-api.json
       - $require: '@vckit/remote-server?t=function#ApiSchemaRouter'
         $args:
-          - basePath: /agent
+          - basePath: :3332/agent
             securityScheme: bearer
             apiName: Agent
             apiVersion: '1.0.0'
@@ -402,6 +402,27 @@ renderer:
         SvgRenderingHint2022:
           $require: '@vckit/renderer#WebRenderingTemplate2022'
 
+dbConnectionBitstringStatusList:
+  $require: typeorm#DataSource
+  $args:
+    - type: sqlite
+      database:
+        $ref: /constants/databaseFile
+      synchronize: false
+      migrationsRun: true
+      migrations:
+        $require: '@vckit/bitstringStatusList?t=object#migrations'
+      logging: false
+      entities:
+        $require: '@vckit/bitstringStatusList?t=object#Entities'
+
+bitstringStatusList:
+  $require: '@vckit/bitstringStatusList#BitstringStatusList'
+  $args:
+    - bitstringDomainURL: http://localhost:3332
+      dbConnection:
+        $ref: /dbConnectionBitstringStatusList
+
 # Agent
 agent:
   $require: '@veramo/core#Agent'
@@ -416,6 +437,7 @@ agent:
         - $require: '@veramo/did-comm#DIDComm'
         - $require: '@vckit/credential-router#CredentialRouter'
         - $require: '@veramo/credential-w3c#CredentialPlugin'
+        # - $require: '@vckit/credential-oa#CredentialOA' #TODO: Implement
         - $ref: /credentialIssuerLD
         - $require: '@veramo/credential-eip712#CredentialIssuerEIP712'
         - $require: '@veramo/selective-disclosure#SelectiveDisclosure'
@@ -433,6 +455,4 @@ agent:
           $args:
             - BitstringStatusListEntry:
                 $require: '@vckit/bitstringStatusList?t=object#checkStatus'
-              RevocationList2020Status:
-                $require: '@vckit/revocationlist?t=object#checkStatus'
         - $require: '@vckit/tools#MultibaseEncodedSHA256'
diff --git a/packages/cli/default/default-dev.yml b/packages/cli/default/default-dev.yml
@@ -181,8 +181,8 @@ server:
     - - /credentials/status/revocation-list-2020
       - $require: '@vckit/revocationlist?t=function#revocationList2020Router'
 
-    - - /credentials/status/bitstring-status-list-entry
-      - $require: '@vckit/@vckit/bitstringStatusList?t=function#bitstringStatusListRouter'
+    - - /credentials/status/bitstring-status-list
+      - $require: '@vckit/bitstringStatusList?t=function#bitstringStatusListRouter'
 
     # API base path
     - - /agent
@@ -408,10 +408,9 @@ dbConnectionBitstringStatusList:
         $require: '@vckit/bitstringStatusList?t=object#Entities'
 
 bitstringStatusList:
-  $require: '@vckit/bitstringStatusList#BitstringStatusListEntry'
+  $require: '@vckit/bitstringStatusList#BitstringStatusList'
   $args:
-    - bitstringStatusListPath: http://localhost:3332
-      bitstringLength: 8
+    - bitstringDomainURL: http://localhost:3332
       dbConnection:
         $ref: /dbConnectionBitstringStatusList
 
@@ -429,7 +428,7 @@ agent:
         - $require: '@veramo/did-comm#DIDComm'
         - $require: '@vckit/credential-router#CredentialRouter'
         - $require: '@veramo/credential-w3c#CredentialPlugin'
-        - $require: '@vckit/credential-oa#CredentialOA'
+        # - $require: '@vckit/credential-oa#CredentialOA' #TODO: Implement
         - $ref: /credentialIssuerLD
         - $require: '@veramo/credential-eip712#CredentialIssuerEIP712'
         - $require: '@veramo/selective-disclosure#SelectiveDisclosure'

diff --git a/packages/cli/default/default.yml b/packages/cli/default/default.yml
@@ -181,8 +181,8 @@ server:
     - - /credentials/status/revocation-list-2020
       - $require: '@vckit/revocationlist?t=function#revocationList2020Router'
 
-    - - /credentials/status/bitstring-status-list-entry
-      - $require: '@vckit/@vckit/bitstringStatusList?t=function#bitstringStatusListRouter'
+    - - /credentials/status/bitstring-status-list
+      - $require: '@vckit/bitstringStatusList?t=function#bitstringStatusListRouter'
 
     # API base path
     - - /agent
@@ -409,10 +409,9 @@ dbConnectionBitstringStatusList:
 
 # BitstringStatusList for credentialStatus
 bitstringStatusList:
-  $require: '@vckit/bitstringStatusList#BitstringStatusListEntry'
+  $require: '@vckit/bitstringStatusList#BitstringStatusList'
   $args:
-    - bitstringStatusListPath: http://localhost:3332
-      bitstringLength: 8
+    - bitstringDomainURL: http://localhost:3332
       dbConnection:
         $ref: /dbConnectionBitstringStatusList
 
@@ -430,7 +429,7 @@ agent:
         - $require: '@veramo/did-comm#DIDComm'
         - $require: '@vckit/credential-router#CredentialRouter'
         - $require: '@veramo/credential-w3c#CredentialPlugin'
-        - $require: '@vckit/credential-oa#CredentialOA'
+        # - $require: '@vckit/credential-oa#CredentialOA' #TODO: Implement
         - $ref: /credentialIssuerLD
         - $require: '@veramo/credential-eip712#CredentialIssuerEIP712'
         - $require: '@veramo/selective-disclosure#SelectiveDisclosure'

diff --git a/packages/core-types/src/plugin.schema.json b/packages/core-types/src/plugin.schema.json
@@ -6970,12 +6970,12 @@
         "IToolsComputeHashArgs": {
           "type": "object",
           "properties": {
-            "value": {
+            "content": {
               "type": "string"
             }
           },
           "required": [
-            "value"
+            "content"
           ]
         }
       },