@cef-ebsi/cli 1.3.1 → 1.4.0

package/dist/programs/migrateTsr.js

@@ -1,18 +1,26 @@
-/* eslint-disable no-constant-condition */
-/* eslint-disable no-continue */
-import fs from "fs";
+import fs from "node:fs";
 import { execCommand } from "../app.js";
 import { loadConfig } from "../config.js";
-const [fileName] = process.argv.slice(2);
+const part = process.argv[2];
+let fileName = process.argv[3];
+if (!["migrate", "save"].includes(part)) {
+    throw new Error(`Invalid command. Use 'migrateTsr save <fileNameList>' to save schemas or 'migrateTsr migrate <fileNameList>' to migrate schemas`);
+}
+const fileNameSchemas = "schemasData.log";
 const config = loadConfig();
 const { admin } = config.programs;
-const currentDidVersion = Number(config.api.tsr.url.slice(-1));
-const oldDidVersion = currentDidVersion - 1;
-const tsrOld = config.api.tsr.url.replace(`/v${currentDidVersion}`, `/v${oldDidVersion}`);
-const tsr = config.api.tsr.url;
-async function safeExecCommand(command, opts) {
-    if (opts.skip && opts.skip.includes(opts.successMessage))
-        return;
+async function migrateSchema(schema) {
+    try {
+        // insert schema
+        await safeExecCommand(`tsr insertSchema ${JSON.stringify(schema)}`);
+        return { success: true };
+    }
+    catch (error) {
+        console.log(error);
+        return { error: error.message, success: false };
+    }
+}
+async function safeExecCommand(command) {
     try {
         await execCommand(command);
     }
@@ -22,135 +30,123 @@ async function safeExecCommand(command, opts) {
             message.includes("replacement fee too low")) {
             // try again after some seconds
             await execCommand("wait 5");
-            await safeExecCommand(command, opts);
+            await safeExecCommand(command);
             return;
         }
         if (message.includes("Revert reason: schemaId already exists") ||
-            message.includes("Revert reason: relationship already exists") ||
-            message.includes("Revert reason: vMethodId already exists")) {
+            message.includes("Revert reason: Schema already registered")) {
             // everything is ok, continue
             return;
         }
         throw error;
     }
 }
-async function getMissingSchemas(pageIni = 1, pageEnd = 0, pageSize = 50) {
-    const missingSchemas = [];
-    const errors = [];
-    let pageAfter = pageIni;
-    let url = `${tsrOld}/schemas?page[after]=${pageAfter}&page[size]=${pageSize}`;
-    while (true) {
-        // get DIDs from old api
-        const schemaIdListOld = await execCommand(`get ${url}`);
-        // get which ones are not in the current version
-        await Promise.all(schemaIdListOld.items.map(async (item) => {
-            try {
-                const hrefCurrent = item.href.replace(tsrOld, tsr);
-                await execCommand(`get ${hrefCurrent}`);
-            }
-            catch (error) {
-                if (error.message.includes("failed with status code 404")) {
-                    missingSchemas.push(item.schemaId);
-                }
-                else {
-                    errors.push({ url: item.href, error: error.message });
-                }
+async function saveListSchemas() {
+    let fileData = fs.readFileSync(fileName, "utf8");
+    if (!fileData)
+        fileData = JSON.stringify({
+            listCompleted: false,
+            nextPage: "",
+            schemas: [],
+        });
+    const data = JSON.parse(fileData);
+    if (data.listCompleted) {
+        console.log("List already completed.");
+        return;
+    }
+    let pageAfter = 1;
+    const pageSize = 50;
+    while (data.listCompleted === false) {
+        let url = `/schemas?page[after]=${pageAfter}&page[size]=${pageSize}`;
+        try {
+            // get DIDs from old api
+            const schemaIdListOld = await execCommand(`ledger tsr get ${url}`);
+            data.schemas.push(...schemaIdListOld.items.map((i) => ({
+                errors: [],
+                migrated: false,
+                schemaId: i.schemaId,
+            })));
+            const lastPage = Math.ceil(schemaIdListOld.total / pageSize);
+            if (pageAfter === lastPage) {
+                data.listCompleted = true;
             }
-        }));
-        if (schemaIdListOld.links.next === schemaIdListOld.self ||
-            (pageEnd && pageAfter >= pageEnd))
-            break;
-        pageAfter += 1;
-        url = schemaIdListOld.links.next;
+            pageAfter += 1;
+            url = `/schemas?page[after]=${pageAfter}&page[size]=${pageSize}`;
+            fs.writeFileSync(fileName, JSON.stringify(data, null, 2));
+        }
+        catch {
+            await new Promise((resolve) => {
+                setTimeout(resolve, 1000);
+            });
+        }
     }
-    return {
-        missingSchemas,
-        errors,
-    };
 }
-async function migrateSchema(schemaId, opts) {
-    const success = [];
-    let successMessage = "";
-    try {
-        const schema = await execCommand(`get ${tsrOld}/schemas/${schemaId}`);
-        // insert schema
-        successMessage = "insertSchema";
-        await safeExecCommand(`proxyledger tsr insertSchema ${JSON.stringify(schema)}`, { ...opts, successMessage });
-        success.push(successMessage);
-        return {};
-    }
-    catch (error) {
-        console.log(error);
-        return {
-            error: {
-                schemaId,
-                ...(success.length > 0 && { success }),
-                error: error.message,
-            },
-        };
+async function saveSchema(schemaId) {
+    const fileData = fs.readFileSync(fileNameSchemas, "utf8");
+    const data = JSON.parse(fileData);
+    if (data.some((s) => s.schemaId === schemaId)) {
+        console.log(`Schema ${schemaId} already saved.`);
+        return;
     }
+    const schemaData = await execCommand(`ledger tsr get /schemas/${schemaId}`);
+    data.push({ schema: schemaData, schemaId });
+    fs.writeFileSync(fileNameSchemas, JSON.stringify(data, null, 2), "utf8");
 }
 (async () => {
+    // // OPTIONAL: load a specific domain
+    // await execCommand("domain https://aio68-0-ebsi-pilot-rou.ebsi.eu");
     // load admin
-    await execCommand(`using user ES256K did1 ${admin.privateKey} ${admin.did}`);
-    await execCommand("t: authorisation siop");
-    await execCommand("using token t");
-    let migrated = [];
-    let noMigrated = [];
-    let errors = [];
-    const newFile = `migration-${Date.now()}.log`;
-    const saveFile = () => {
-        fs.writeFileSync(newFile, JSON.stringify({ migrated, noMigrated, errorList: errors }, null, 2));
-    };
-    if (fileName) {
-        const fileData = fs.readFileSync(fileName, "utf8");
-        const { migrated: m, noMigrated: nom } = JSON.parse(fileData);
-        migrated = m;
-        noMigrated = nom;
+    await execCommand(`using user ES256K did1 ${admin.ES256K.privateKey} ${admin.did}`);
+    if (!fileName) {
+        fileName = `migrationTsr-${Date.now()}.log`;
+        fs.writeFileSync(fileName, "", "utf8");
     }
-    else {
-        const { missingSchemas, errors: e } = await getMissingSchemas(1, 0, 50);
-        errors = e;
-        noMigrated = missingSchemas.map((s) => ({
-            schemaId: s,
-            success: [],
-            error: "",
-            pending: true,
-        }));
+    await saveListSchemas();
+    const fileData = fs.readFileSync(fileName, "utf8");
+    const data = JSON.parse(fileData);
+    const { schemas } = data;
+    if (part === "save") {
+        for (const schema of schemas) {
+            await saveSchema(schema.schemaId);
+        }
+        console.log(`Schemas saved to ${fileNameSchemas}.`);
+        return;
     }
-    for (let i = 0; i < noMigrated.length; i += 1) {
-        const { schemaId, success, error, pending } = noMigrated[i];
-        if (!schemaId)
-            continue;
-        if (pending ||
-            error.includes("nonce has already been used") ||
-            error.includes("replacement fee too low") ||
-            error.includes("Bad Gateway") ||
-            error.includes("Revert reason")) {
-            const result = await migrateSchema(schemaId, {
-                skip: success,
-            });
-            if (result.error) {
-                noMigrated[i] = result.error;
+    // part migrate
+    const fileDataSchemas = fs.readFileSync(fileNameSchemas, "utf8");
+    const schemasData = JSON.parse(fileDataSchemas);
+    await execCommand(`using user ES256 did1 ${admin.ES256.privateKey} ${admin.did}`);
+    await execCommand(`t: authorisation auth tsr_write_presentation`);
+    await execCommand(`using token t.access_token`);
+    // eslint-disable-next-line @typescript-eslint/prefer-for-of
+    for (let i = 0; i < schemas.length; i += 1) {
+        const schema = schemas[i];
+        if (!schema.migrated ||
+            schema.errors.some((error) => error.includes("nonce has already been used") ||
+                error.includes("replacement fee too low") ||
+                error.includes("Bad Gateway") ||
+                error.includes("Revert reason"))) {
+            const schemaData = schemasData.find((s) => s.schemaId === schema.schemaId);
+            if (schemaData) {
+                const result = await migrateSchema(schemaData.schema);
+                if (result.success) {
+                    schema.migrated = true;
+                }
+                else {
+                    schema.errors.push(result.error);
+                }
             }
             else {
-                noMigrated[i] = {
-                    schemaId: "",
-                    success: [],
-                    error: "",
-                    pending: false,
-                };
-                migrated.push(schemaId);
+                schema.errors.push("Schema not found in schemasData.log");
             }
+            fs.writeFileSync(fileName, JSON.stringify({ ...data, schemas }, null, 2), "utf8");
         }
-        saveFile();
     }
-    noMigrated = noMigrated.filter((n) => n.pending);
-    saveFile();
 })()
     .then(() => {
     process.exit(0);
 })
+    // eslint-disable-next-line unicorn/prefer-top-level-await
     .catch((error) => {
     console.log(error);
     process.exit(1);

package/dist/programs/migrateTsr.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrateTsr.js","sourceRoot":"","sources":["../../src/programs/migrateTsr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrateTsr.js","sourceRoot":"","sources":["../../src/programs/migrateTsr.ts"],"names":[],"mappings":"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"}

package/dist/scripts/accreditAndAuthorize/conformance/step1

@@ -3,7 +3,7 @@ env conformance
 # create new issuer
 using user null
 using user
-using user ES256 did1 user.privateKeyHex
+using user ES256 did1 user.keys.ES256K.privateKeyHex
 
 # request credential to onboard
 vcOnboard: conformance getCredential onboard

package/dist/scripts/accreditAndAuthorize/test/step1

@@ -3,7 +3,7 @@ env test
 # create new issuer
 using user null
 using user
-using user ES256 did1 user.privateKeyHex
+using user ES256 did1 user.keys.ES256K.privateKeyHex
 
 # request credential to onboard
 vcOnboard: conformance getCredential onboard

package/dist/scripts/accreditTI

@@ -2,7 +2,7 @@
 using user null
 using user ES256K did1 PRIVATE_KEY_ES256K_TAO DID_TAO
 using user ES256 did1 PRIVATE_KEY_ES256_TAO DID_TAO
-set taoPrivateKeyES256K user.privateKeyHex
+set taoPrivateKeyES256K user.keys.ES256K.privateKeyHex
 set taoPrivateKeyES256 user.keys.ES256.privateKeyJwk
 set taoDid user.did
 

package/dist/scripts/assets/CTRevocableCredential.json

@@ -24,7 +24,7 @@
  
   },
   "credentialSchema": {
-    "id": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM",
+    "id": "ebsi:pilot:trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu",
     "type": "FullJsonSchemaValidator2021"
   }
 }

package/dist/scripts/assets/CredentialToAttestVerifiableAuthorisationForTrustChain.json

@@ -13,7 +13,7 @@
       "id": "",
       "accreditedFor": [
         {
-          "schemaId": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM",
+          "schemaId": "ebsi:pilot:trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu",
           "types": [
             "VerifiableCredential",
             "VerifiableAttestation",
@@ -23,7 +23,7 @@
       ]
     },
     "credentialSchema": {
-      "id": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/zjVFNvbEBPAr3a724DttioZpgZmNr75BBtRzZqk7pkDe",
+      "id": "ebsi:pilot:trusted-schemas-registry:/schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv",
       "type": "FullJsonSchemaValidator2021"
     }
   }

package/dist/scripts/assets/TrustedNodesList.json

@@ -29,7 +29,7 @@
     "type": "IssuanceCertificate"
   },
   "credentialSchema": {
-    "id": "ebsi:pilot:trusted-schemas-registry:/schemas/z6pHzVWcE9hygBq8UWRXXyR8nRst6rUXMKUkTjMoh3sfJ",
+    "id": "ebsi:pilot:trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu",
     "type": "FullJsonSchemaValidator2021"
   }
 }

package/dist/scripts/assets/VerifiableAccreditationToAccredit.json

@@ -12,7 +12,7 @@
     "id": "",
     "accreditedFor": [
       {
-        "schemaId": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM",
+        "schemaId": "ebsi:pilot:trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu",
         "types": [
           "VerifiableCredential",
           "VerifiableAttestation",
@@ -29,7 +29,7 @@
     }
   ],
   "credentialSchema": {
-    "id": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/zjVFNvbEBPAr3a724DttioZpgZmNr75BBtRzZqk7pkDe",
+    "id": "ebsi:pilot:trusted-schemas-registry:/schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv",
     "type": "FullJsonSchemaValidator2021"
   }
 }

package/dist/scripts/assets/VerifiableAccreditationToAttest.json

@@ -11,7 +11,7 @@
     "id": "",
     "accreditedFor": [
       {
-        "schemaId": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM",
+        "schemaId": "ebsi:pilot:trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu",
         "types": [
           "VerifiableCredential",
           "VerifiableAttestation",
@@ -27,7 +27,7 @@
     "type": "IssuanceCertificate"
   },
   "credentialSchema": {
-    "id": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/zjVFNvbEBPAr3a724DttioZpgZmNr75BBtRzZqk7pkDe",
+    "id": "ebsi:pilot:trusted-schemas-registry:/schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv",
     "type": "FullJsonSchemaValidator2021"
   }
 }

package/dist/scripts/assets/VerifiableAuthorisationForTrustChain.json

@@ -16,7 +16,7 @@
     "type": "IssuanceCertificate"
   },
   "credentialSchema": {
-    "id": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM",
+    "id": "ebsi:pilot:trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu",
     "type": "FullJsonSchemaValidator2021"
   }
 }

package/dist/scripts/assets/VerifiableAuthorisationToOnboard.json

@@ -18,7 +18,7 @@
  
   },
   "credentialSchema": {
-    "id": "https://api-pilot.ebsi.eu/trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM",
+    "id": "ebsi:pilot:trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu",
     "type": "FullJsonSchemaValidator2021"
   }
 }

package/dist/scripts/bootstrap/6-setupConformanceIssuer

@@ -1,7 +1,7 @@
 # create keys for conformance
 using user null
 using user ES256K did1
-using user ES256 did1 user.privateKeyHex
+using user ES256 did1 user.keys.ES256K.privateKeyHex
 set confIssuer user
 
 # register conformance in the DID Registry

package/dist/scripts/issueVcOnboard

@@ -5,5 +5,5 @@ payloadVcOnboard: load assets/VerifiableAuthorisationToOnboard.json
 set payloadVcOnboard.issuer user.did
 set payloadVcOnboard.credentialSubject.id $1
 set payloadVcOnboard.termsOfUse.id user.accreditationUrl
-set payloadVcOnboard.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcOnboard.credentialSchema.id tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 compute createVcJwt payloadVcOnboard {} ES256

package/dist/scripts/issueVcRootTAO

@@ -6,6 +6,6 @@ payloadVcRootTAO: load assets/VerifiableAuthorisationForTrustChain.json
 set payloadVcRootTAO.issuer user.did
 set payloadVcRootTAO.credentialSubject.id $1
 set payloadVcRootTAO.termsOfUse.id user.accreditationUrl
-set payloadVcRootTAO.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcRootTAO.credentialSchema.id tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcRootTAO.credentialSubject.reservedAttributeId reservedAttributeId
 compute createVcJwt payloadVcRootTAO {} ES256

package/dist/scripts/issueVcTAO

@@ -5,8 +5,8 @@ reservedAttributeId: compute randomID
 payloadVcTAO: load assets/VerifiableAccreditationToAccredit.json
 set payloadVcTAO.issuer user.did
 set payloadVcTAO.credentialSubject.id $1
-set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcTAO.termsOfUse.0.id user.accreditationUrl
-set payloadVcTAO.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSchema.id tsrUrl /schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv
 set payloadVcTAO.credentialSubject.reservedAttributeId reservedAttributeId
 compute createVcJwt payloadVcTAO {} ES256

package/dist/scripts/issueVcTI

@@ -5,8 +5,8 @@ reservedAttributeId: compute randomID
 payloadVcTI: load assets/VerifiableAccreditationToAttest.json
 set payloadVcTI.issuer user.did
 set payloadVcTI.credentialSubject.id $1
-set payloadVcTI.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcTI.termsOfUse.id user.accreditationUrl
-set payloadVcTI.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSchema.id tsrUrl /schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv
 set payloadVcTI.credentialSubject.reservedAttributeId reservedAttributeId
 compute createVcJwt payloadVcTI {} ES256

package/dist/scripts/issueVcTnl

@@ -23,7 +23,7 @@ set payloadVcTnl.credentialSubject.nodes resultHealth.nodesOk
 
 # Other updates
 set payloadVcTnl.termsOfUse.id user.accreditationUrl
-set payloadVcTnl.credentialSchema.id ebsi: payloadVcTnl.credentialSubject.environment :trusted-schemas-registry:/schemas/z6pHzVWcE9hygBq8UWRXXyR8nRst6rUXMKUkTjMoh3sfJ
+set payloadVcTnl.credentialSchema.id ebsi: payloadVcTnl.credentialSubject.environment :trusted-schemas-registry:/schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 
 # Issue the credential
 vcTnl: compute createVcJwt payloadVcTnl {} ES256

package/dist/scripts/issue_CTRevocableCredential

@@ -5,7 +5,7 @@ payloadCTRevocableCredential: load assets/CTRevocableCredential.json
 set payloadCTRevocableCredential.issuer $1
 set payloadCTRevocableCredential.credentialSubject.id $2
 set payloadCTRevocableCredential.termsOfUse.id $3
-set payloadCTRevocableCredential.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadCTRevocableCredential.credentialSchema.id tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadCTRevocableCredential.credentialStatus.id tirUrl /issuers/ user.did /proxies/ $4 /credentials/status/ $5
 set payloadCTRevocableCredential.credentialStatus.statusListIndex $6
 set payloadCTRevocableCredential.credentialStatus.statusListCredential tirUrl /issuers/ user.did /proxies/ $4 /credentials/status/ $5

package/dist/scripts/issue_SelfAttestationSupportOffice

@@ -4,7 +4,7 @@
 payloadVc: load assets/CredentialToAttestVerifiableAuthorisationForTrustChain.json
 set payloadVc.issuer $1
 set payloadVc.credentialSubject.id $1
-set payloadVc.credentialSubject.accreditedFor[0].schemaId tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
-set payloadVc.credentialSchema.id tsrUrl /schemas/zjVFNvbEBPAr3a724DttioZpgZmNr75BBtRzZqk7pkDe
+set payloadVc.credentialSubject.accreditedFor[0].schemaId tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
+set payloadVc.credentialSchema.id tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVc.credentialSubject.reservedAttributeId $2
 compute createVcJwt payloadVc {} ES256

package/dist/scripts/issue_VerifiableAccreditationToAccredit

@@ -4,8 +4,8 @@
 payloadVcTAO: load assets/VerifiableAccreditationToAccredit.json
 set payloadVcTAO.issuer $1
 set payloadVcTAO.credentialSubject.id $2
-set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcTAO.termsOfUse.0.id $3
-set payloadVcTAO.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSchema.id tsrUrl /schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv
 set payloadVcTAO.credentialSubject.reservedAttributeId $4
 compute createVcJwt payloadVcTAO {} ES256

package/dist/scripts/issue_VerifiableAccreditationToAttest

@@ -4,8 +4,8 @@
 payloadVcTI: load assets/VerifiableAccreditationToAttest.json
 set payloadVcTI.issuer $1
 set payloadVcTI.credentialSubject.id $2
-set payloadVcTI.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcTI.termsOfUse.id $3
-set payloadVcTI.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSchema.id tsrUrl /schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv
 set payloadVcTI.credentialSubject.reservedAttributeId $4
 compute createVcJwt payloadVcTI {} ES256

package/dist/scripts/issue_VerifiableAuthorisationForTrustChain

@@ -5,6 +5,6 @@ payloadVcRootTAO: load assets/VerifiableAuthorisationForTrustChain.json
 set payloadVcRootTAO.issuer $1
 set payloadVcRootTAO.credentialSubject.id $2
 set payloadVcRootTAO.termsOfUse.id $3
-set payloadVcRootTAO.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcRootTAO.credentialSchema.id tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcRootTAO.credentialSubject.reservedAttributeId $4
 compute createVcJwt payloadVcRootTAO {} ES256

package/dist/scripts/issue_VerifiableAuthorisationToOnboard

@@ -5,5 +5,5 @@ payloadVcOnboard: load assets/VerifiableAuthorisationToOnboard.json
 set payloadVcOnboard.issuer $1
 set payloadVcOnboard.credentialSubject.id $2
 set payloadVcOnboard.termsOfUse.id $3
-set payloadVcOnboard.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcOnboard.credentialSchema.id tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 compute createVcJwt payloadVcOnboard {} ES256

package/dist/scripts/updateVcRootTAO

@@ -5,6 +5,6 @@ payloadVcRootTAO: load assets/VerifiableAuthorisationForTrustChain.json
 set payloadVcRootTAO.issuer user.did
 set payloadVcRootTAO.credentialSubject.id $1
 set payloadVcRootTAO.termsOfUse.id user.accreditationUrl
-set payloadVcRootTAO.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcRootTAO.credentialSchema.id tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcRootTAO.credentialSubject.reservedAttributeId $2
 compute createVcJwt payloadVcRootTAO {} ES256

package/dist/scripts/updateVcTAO

@@ -4,8 +4,8 @@
 payloadVcTAO: load assets/VerifiableAccreditationToAccredit.json
 set payloadVcTAO.issuer user.did
 set payloadVcTAO.credentialSubject.id $1
-set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcTAO.termsOfUse.0.id user.accreditationUrl
-set payloadVcTAO.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSchema.id tsrUrl /schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv
 set payloadVcTAO.credentialSubject.reservedAttributeId $2
 compute createVcJwt payloadVcTAO {} ES256

package/dist/scripts/updateVcTI

@@ -4,8 +4,8 @@
 payloadVcTI: load assets/VerifiableAccreditationToAttest.json
 set payloadVcTI.issuer user.did
 set payloadVcTI.credentialSubject.id $1
-set payloadVcTI.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSubject.accreditedFor.0.schemaId tsrUrl /schemas/zH74MKkYTbQ6ZfTxufi6A3Aw8giS4piGm8dpgxFmkJjmu
 set payloadVcTI.termsOfUse.id user.accreditationUrl
-set payloadVcTI.credentialSchema.id tsrUrl /schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSchema.id tsrUrl /schemas/zHXHLkJpZg4w9nt2GbEBbyE8uhkfirbmT3nF7mJ9kFnjv
 set payloadVcTI.credentialSubject.reservedAttributeId $2
 compute createVcJwt payloadVcTI {} ES256

package/dist/scripts/{wctv3 → wct}/accreditAndAuthorize

@@ -3,7 +3,7 @@ env test
 # create new issuer
 using user null
 using user
-using user ES256 did1 user.privateKeyHex
+using user ES256 did1 user.keys.ES256K.privateKeyHex
 
 # request credential to onboard
 vcOnboard: conformance getCredential onboard