@cef-ebsi/cli 1.0.0-alpha.7 → 1.0.0

package/dist/programs/migrateTsr.js

@@ -0,0 +1,158 @@
+/* eslint-disable no-constant-condition */
+/* eslint-disable no-continue */
+import fs from "fs";
+import { execCommand } from "../app.js";
+import { loadConfig } from "../config.js";
+const [fileName] = process.argv.slice(2);
+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;
+    try {
+        await execCommand(command);
+    }
+    catch (error) {
+        const { message } = error;
+        if (message.includes("nonce has already been used") ||
+            message.includes("replacement fee too low")) {
+            // try again after some seconds
+            await execCommand("wait 5");
+            await safeExecCommand(command, opts);
+            return;
+        }
+        if (message.includes("Revert reason: schemaId already exists") ||
+            message.includes("Revert reason: relationship already exists") ||
+            message.includes("Revert reason: vMethodId already exists")) {
+            // 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 });
+                }
+            }
+        }));
+        if (schemaIdListOld.links.next === schemaIdListOld.self ||
+            (pageEnd && pageAfter >= pageEnd))
+            break;
+        pageAfter += 1;
+        url = schemaIdListOld.links.next;
+    }
+    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 () => {
+    // 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;
+    }
+    else {
+        const { missingSchemas, errors: e } = await getMissingSchemas(1, 0, 50);
+        errors = e;
+        noMigrated = missingSchemas.map((s) => ({
+            schemaId: s,
+            success: [],
+            error: "",
+            pending: true,
+        }));
+    }
+    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;
+            }
+            else {
+                noMigrated[i] = {
+                    schemaId: "",
+                    success: [],
+                    error: "",
+                    pending: false,
+                };
+                migrated.push(schemaId);
+            }
+        }
+        saveFile();
+    }
+    noMigrated = noMigrated.filter((n) => n.pending);
+    saveFile();
+})()
+    .then(() => {
+    process.exit(0);
+})
+    .catch((error) => {
+    console.log(error);
+    process.exit(1);
+});
+//# sourceMappingURL=migrateTsr.js.map

package/dist/programs/migrateTsr.js.map

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

package/dist/scripts/accreditAndAuthorize/conformance/step1

@@ -1,35 +1,34 @@
-env conformance
-set domain https://api-conformance.ebsi.eu
-
-# create new issuer
-using user null
-using user
-using user ES256
-
-# request credential to onboard
-vcOnboard: conformance getCredential onboard
-set myIssuer user
-
-# register did document
-run registerDidDocument_ES256K_ES256 vcOnboard.vc
-
-# request VerifiableAccreditationToAttest (TI)
-vcTI: conformance getCredential ti
-
-# register the credential for TI
-t: authorisation auth tir_invite_presentation ES256 vcTI.vc
-using token t.access_token
-tir setAttributeData myIssuer.did vcTI.reservedAttributeId vcTI.vc
-set vcTI.url https://api-conformance.ebsi.eu/trusted-issuers-registry/v5/issuers/ myIssuer.did /attributes/ vcTI.reservedAttributeId
-
-view myIssuer
-# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Onboarding
-#   - Request VerifiableAuthorisationToOnboard
-#   - Register your DID Document into the DID Registry
-# 
-# - Get accredited as a Trusted Issuer
-#   - Request VerifiableAccreditationToAttest
+env conformance
+
+# create new issuer
+using user null
+using user
+using user ES256 did1 user.privateKeyHex
+
+# request credential to onboard
+vcOnboard: conformance getCredential onboard
+set myIssuer user
+
+# register did document
+run registerDidDocument_ES256K_ES256 vcOnboard.vc
+
+# request VerifiableAccreditationToAttest (TI)
+vcTI: conformance getCredential ti
+
+# register the credential for TI
+t: authorisation auth tir_invite_presentation ES256 vcTI.vc
+using token t.access_token
+tir setAttributeData myIssuer.did vcTI.reservedAttributeId vcTI.vc
+set vcTI.url tirUrl /issuers/ myIssuer.did /attributes/ vcTI.reservedAttributeId
+
+view myIssuer
+# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Onboarding
+#   - Request VerifiableAuthorisationToOnboard
+#   - Register your DID Document into the DID Registry
+# 
+# - Get accredited as a Trusted Issuer
+#   - Request VerifiableAccreditationToAttest
 #   - Register VerifiableAccreditationToAttest into the Trusted Issuers Registry

package/dist/scripts/accreditAndAuthorize/conformance/step2

@@ -1,18 +1,18 @@
-# create a proxy
-conformance clientMockUpdateList 1 0 0
-t: authorisation auth tir_write_presentation ES256
-using token t.access_token
-set proxyData {"prefix":"","headers":{},"testSuffix":"/credentials/status/1"}
-set proxyData.prefix myIssuer.clientId
-tir addIssuerProxy myIssuer.did proxyData
-proxies: tir get /issuers/ myIssuer.did /proxies
-set user.proxyId proxies.items.0.proxyId
-set user.accreditationUrl vcTI.url
-conformance clientMockInitiate
-
-# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Issue & Revoke
-#   - Issue CTRevocable Credential with credentialStatus StatusList2021
+# create a proxy
+conformance clientMockUpdateList 1 0 0
+t: authorisation auth tir_write_presentation ES256
+using token t.access_token
+set proxyData {"prefix":"","headers":{},"testSuffix":"/credentials/status/1"}
+set proxyData.prefix myIssuer.clientId
+tir addIssuerProxy myIssuer.did proxyData
+proxies: tir get /issuers/ myIssuer.did /proxies
+set user.proxyId proxies.items.0.proxyId
+set user.accreditationUrl vcTI.url
+conformance clientMockInitiate
+
+# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Issue & Revoke
+#   - Issue CTRevocable Credential with credentialStatus StatusList2021
 #   - Validate the issued credential details

package/dist/scripts/accreditAndAuthorize/conformance/step3

@@ -1,9 +1,9 @@
-# revoke credential
-statusListIndex: compute statusListIndex did:ebsi:zhJARjPN69cEtgPxHen1Mid
-conformance clientMockUpdateList 1 statusListIndex 1
-
-# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Issue & Revoke
+# revoke credential
+statusListIndex: compute statusListIndex did:ebsi:zhJARjPN69cEtgPxHen1Mid
+conformance clientMockUpdateList 1 statusListIndex 1
+
+# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Issue & Revoke
 #   - Revoke the credential and confirm

package/dist/scripts/accreditAndAuthorize/conformance/step4

@@ -1,27 +1,27 @@
-# request VerifiableAccreditationToAccredit (TAO)
-vcTAO: conformance getCredential tao
-
-# register the credential for TAO
-t: authorisation auth tir_write_presentation ES256
-using token t.access_token
-tir setAttributeData myIssuer.did vcTAO.reservedAttributeId vcTAO.vc
-set vcTAO.url https://api-conformance.ebsi.eu/trusted-issuers-registry/v5/issuers/ myIssuer.did /attributes/ vcTAO.reservedAttributeId
-set user.accreditationUrl vcTAO.url
-conformance clientMockInitiate
-
-# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Request VerifiableAccreditationToAccredit
-#   - Request VerifiableAccreditationToAccredit
-# - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
-#   - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
-# - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
-#   - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
-#   - Validate the issuance was correct
-# - Issue VerifiableAccreditationToAttest for sub-account DID
-#   - Issue VerifiableAccreditationToAttest for sub-account DID
-#   - Validate the issuance was correct
-# - Issue VerifiableAccreditationToAccredit for sub-account DID
-#   - Issue VerifiableAccreditationToAccredit for sub-account DID
+# request VerifiableAccreditationToAccredit (TAO)
+vcTAO: conformance getCredential tao
+
+# register the credential for TAO
+t: authorisation auth tir_write_presentation ES256
+using token t.access_token
+tir setAttributeData myIssuer.did vcTAO.reservedAttributeId vcTAO.vc
+set vcTAO.url tirUrl /issuers/ myIssuer.did /attributes/ vcTAO.reservedAttributeId
+set user.accreditationUrl vcTAO.url
+conformance clientMockInitiate
+
+# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Request VerifiableAccreditationToAccredit
+#   - Request VerifiableAccreditationToAccredit
+# - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
+#   - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
+# - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
+#   - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
+#   - Validate the issuance was correct
+# - Issue VerifiableAccreditationToAttest for sub-account DID
+#   - Issue VerifiableAccreditationToAttest for sub-account DID
+#   - Validate the issuance was correct
+# - Issue VerifiableAccreditationToAccredit for sub-account DID
+#   - Issue VerifiableAccreditationToAccredit for sub-account DID
 #   - Validate the issuance was correct

package/dist/scripts/accreditAndAuthorize/conformance/step5

@@ -1,13 +1,13 @@
-# revoke credential issued to subaccount
-subaccount: compute subaccountDid myIssuer.did
-attributes: tir get /issuers/ subaccount /attributes
-t: authorisation auth tir_write_presentation ES256
-using token t.access_token
-tir setAttributeMetadata subaccount attributes.items.0.id revoked myIssuer.did vcTAO.reservedAttributeId
-tir setAttributeMetadata subaccount attributes.items.1.id revoked myIssuer.did vcTAO.reservedAttributeId
-
-# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Revoke accreditations from sub-account DID
+# revoke credential issued to subaccount
+subaccount: compute subaccountDid myIssuer.did
+attributes: tir get /issuers/ subaccount /attributes
+t: authorisation auth tir_write_presentation ES256
+using token t.access_token
+tir setAttributeMetadata subaccount attributes.items.0.id revoked myIssuer.did vcTAO.reservedAttributeId
+tir setAttributeMetadata subaccount attributes.items.1.id revoked myIssuer.did vcTAO.reservedAttributeId
+
+# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Revoke accreditations from sub-account DID
 #   - Revoke accreditations from sub-account DID

package/dist/scripts/accreditAndAuthorize/conformance/step6

@@ -1,14 +1,14 @@
-# request VerifiableAuthorisationForTrustChain (Root TAO)
-vcRootTAO: conformance getCredential roottao ES256 vcOnboard.vc
-
-# register the credential for RootTAO
-t: authorisation auth tir_write_presentation ES256
-using token t.access_token
-tir setAttributeData myIssuer.did vcRootTAO.reservedAttributeId vcRootTAO.vc
-
-# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Request VerifiableAuthorisationForTrustChain
-#   - Request VerifiableAuthorisationForTrustChain
+# request VerifiableAuthorisationForTrustChain (Root TAO)
+vcRootTAO: conformance getCredential roottao ES256 vcOnboard.vc
+
+# register the credential for RootTAO
+t: authorisation auth tir_write_presentation ES256
+using token t.access_token
+tir setAttributeData myIssuer.did vcRootTAO.reservedAttributeId vcRootTAO.vc
+
+# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Request VerifiableAuthorisationForTrustChain
+#   - Request VerifiableAuthorisationForTrustChain
 #   - Register VerifiableAuthorisationForTrustChain into the Trusted Issuers Registry

package/dist/scripts/accreditAndAuthorize/conformance/step7

@@ -1,7 +1,7 @@
-# request CTAAQualificationCredential
-ctaaQualification: conformance getCredential qualification
-
-# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
+# request CTAAQualificationCredential
+ctaaQualification: conformance getCredential qualification
+
+# Go to https://hub.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
 # - Request CTAAQualificationCredential from Conformance Issuer

package/dist/scripts/accreditAndAuthorize/test/step1

@@ -1,35 +1,34 @@
-env test
-set domain https://api-test.ebsi.eu
-
-# create new issuer
-using user null
-using user
-using user ES256
-
-# request credential to onboard
-vcOnboard: conformance getCredential onboard
-set myIssuer user
-
-# register did document
-run registerDidDocument_ES256K_ES256 vcOnboard.vc
-
-# request VerifiableAccreditationToAttest (TI)
-vcTI: conformance getCredential ti
-
-# register the credential for TI
-t: authorisation auth tir_invite_presentation ES256 vcTI.vc
-using token t.access_token
-tir setAttributeData myIssuer.did vcTI.reservedAttributeId vcTI.vc
-set vcTI.url https://api-test.ebsi.eu/trusted-issuers-registry/v5/issuers/ myIssuer.did /attributes/ vcTI.reservedAttributeId
-
-view myIssuer
-# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Onboarding
-#   - Request VerifiableAuthorisationToOnboard
-#   - Register your DID Document into the DID Registry
-# 
-# - Get accredited as a Trusted Issuer
-#   - Request VerifiableAccreditationToAttest
+env test
+
+# create new issuer
+using user null
+using user
+using user ES256 did1 user.privateKeyHex
+
+# request credential to onboard
+vcOnboard: conformance getCredential onboard
+set myIssuer user
+
+# register did document
+run registerDidDocument_ES256K_ES256 vcOnboard.vc
+
+# request VerifiableAccreditationToAttest (TI)
+vcTI: conformance getCredential ti
+
+# register the credential for TI
+t: authorisation auth tir_invite_presentation ES256 vcTI.vc
+using token t.access_token
+tir setAttributeData myIssuer.did vcTI.reservedAttributeId vcTI.vc
+set vcTI.url tirUrl /issuers/ myIssuer.did /attributes/ vcTI.reservedAttributeId
+
+view myIssuer
+# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Onboarding
+#   - Request VerifiableAuthorisationToOnboard
+#   - Register your DID Document into the DID Registry
+# 
+# - Get accredited as a Trusted Issuer
+#   - Request VerifiableAccreditationToAttest
 #   - Register VerifiableAccreditationToAttest into the Trusted Issuers Registry

package/dist/scripts/accreditAndAuthorize/test/step2

@@ -1,18 +1,18 @@
-# create a proxy
-conformance clientMockUpdateList 1 0 0
-t: authorisation auth tir_write_presentation ES256
-using token t.access_token
-set proxyData {"prefix":"","headers":{},"testSuffix":"/credentials/status/1"}
-set proxyData.prefix myIssuer.clientId
-tir addIssuerProxy myIssuer.did proxyData
-proxies: tir get /issuers/ myIssuer.did /proxies
-set user.proxyId proxies.items.0.proxyId
-set user.accreditationUrl vcTI.url
-conformance clientMockInitiate
-
-# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Issue & Revoke
-#   - Issue CTRevocable Credential with credentialStatus StatusList2021
+# create a proxy
+conformance clientMockUpdateList 1 0 0
+t: authorisation auth tir_write_presentation ES256
+using token t.access_token
+set proxyData {"prefix":"","headers":{},"testSuffix":"/credentials/status/1"}
+set proxyData.prefix myIssuer.clientId
+tir addIssuerProxy myIssuer.did proxyData
+proxies: tir get /issuers/ myIssuer.did /proxies
+set user.proxyId proxies.items.0.proxyId
+set user.accreditationUrl vcTI.url
+conformance clientMockInitiate
+
+# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Issue & Revoke
+#   - Issue CTRevocable Credential with credentialStatus StatusList2021
 #   - Validate the issued credential details

package/dist/scripts/accreditAndAuthorize/test/step3

@@ -1,9 +1,9 @@
-# revoke credential
-statusListIndex: compute statusListIndex did:ebsi:ztTYEydcPQ2SrKoghHqxBfK
-conformance clientMockUpdateList 1 statusListIndex 1
-
-# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Issue & Revoke
+# revoke credential
+statusListIndex: compute statusListIndex did:ebsi:ztTYEydcPQ2SrKoghHqxBfK
+conformance clientMockUpdateList 1 statusListIndex 1
+
+# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Issue & Revoke
 #   - Revoke the credential and confirm

package/dist/scripts/accreditAndAuthorize/test/step4

@@ -1,27 +1,27 @@
-# request VerifiableAccreditationToAccredit (TAO)
-vcTAO: conformance getCredential tao
-
-# register the credential for TAO
-t: authorisation auth tir_write_presentation ES256
-using token t.access_token
-tir setAttributeData myIssuer.did vcTAO.reservedAttributeId vcTAO.vc
-set vcTAO.url https://api-test.ebsi.eu/trusted-issuers-registry/v5/issuers/ myIssuer.did /attributes/ vcTAO.reservedAttributeId
-set user.accreditationUrl vcTAO.url
-conformance clientMockInitiate
-
-# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Request VerifiableAccreditationToAccredit
-#   - Request VerifiableAccreditationToAccredit
-# - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
-#   - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
-# - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
-#   - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
-#   - Validate the issuance was correct
-# - Issue VerifiableAccreditationToAttest for sub-account DID
-#   - Issue VerifiableAccreditationToAttest for sub-account DID
-#   - Validate the issuance was correct
-# - Issue VerifiableAccreditationToAccredit for sub-account DID
-#   - Issue VerifiableAccreditationToAccredit for sub-account DID
+# request VerifiableAccreditationToAccredit (TAO)
+vcTAO: conformance getCredential tao
+
+# register the credential for TAO
+t: authorisation auth tir_write_presentation ES256
+using token t.access_token
+tir setAttributeData myIssuer.did vcTAO.reservedAttributeId vcTAO.vc
+set vcTAO.url tirUrl /issuers/ myIssuer.did /attributes/ vcTAO.reservedAttributeId
+set user.accreditationUrl vcTAO.url
+conformance clientMockInitiate
+
+# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Request VerifiableAccreditationToAccredit
+#   - Request VerifiableAccreditationToAccredit
+# - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
+#   - Register VerifiableAccreditationToAccredit into the Trusted Issuers Registry
+# - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
+#   - Issue VerifiableAuthorisationToOnboard for Conformance Issuer's sub-account DID
+#   - Validate the issuance was correct
+# - Issue VerifiableAccreditationToAttest for sub-account DID
+#   - Issue VerifiableAccreditationToAttest for sub-account DID
+#   - Validate the issuance was correct
+# - Issue VerifiableAccreditationToAccredit for sub-account DID
+#   - Issue VerifiableAccreditationToAccredit for sub-account DID
 #   - Validate the issuance was correct

package/dist/scripts/accreditAndAuthorize/test/step5

@@ -1,13 +1,13 @@
-# revoke credential issued to subaccount
-subaccount: compute subaccountDid myIssuer.did
-attributes: tir get /issuers/ subaccount /attributes
-t: authorisation auth tir_write_presentation ES256
-using token t.access_token
-tir setAttributeMetadata subaccount attributes.items.0.id revoked myIssuer.did vcTAO.reservedAttributeId
-tir setAttributeMetadata subaccount attributes.items.1.id revoked myIssuer.did vcTAO.reservedAttributeId
-
-# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
-# and validate the following tests:
-# 
-# - Revoke accreditations from sub-account DID
+# revoke credential issued to subaccount
+subaccount: compute subaccountDid myIssuer.did
+attributes: tir get /issuers/ subaccount /attributes
+t: authorisation auth tir_write_presentation ES256
+using token t.access_token
+tir setAttributeMetadata subaccount attributes.items.0.id revoked myIssuer.did vcTAO.reservedAttributeId
+tir setAttributeMetadata subaccount attributes.items.1.id revoked myIssuer.did vcTAO.reservedAttributeId
+
+# Go to https://hub-test.ebsi.eu/wallet-conformance/accredit-authorise/flow
+# and validate the following tests:
+# 
+# - Revoke accreditations from sub-account DID
 #   - Revoke accreditations from sub-account DID