Feat/submit

config/witness-demo/wan.json

@@ -5,4 +5,4 @@
         "curls": ["tcp://witness-demo:5632/", "http://witness-demo:5642/"]
     },
     "iurls": []
-}
+}

config/witness-demo/wes.json

@@ -5,4 +5,4 @@
     },
     "dt": "2022-01-20T12:57:59.823350+00:00",
     "iurls": []
-}
+}

config/witness-demo/wil.json

@@ -5,4 +5,4 @@
     },
     "dt": "2022-01-20T12:57:59.823350+00:00",
     "iurls": []
-}
+}

config/witness-demo/wit.json

@@ -5,4 +5,4 @@
     },
     "dt": "2022-01-20T12:57:59.823350+00:00",
     "iurls": []
-}
+}

config/witness-demo/wub.json

@@ -5,4 +5,4 @@
     },
     "dt": "2022-01-20T12:57:59.823350+00:00",
     "iurls": []
-}
+}

config/witness-demo/wyz.json

@@ -5,4 +5,4 @@
     },
     "dt": "2022-01-20T12:57:59.823350+00:00",
     "iurls": []
-}
+}

docker-compose.yaml

@@ -80,7 +80,7 @@ services:
         depends_on:
             vlei-server:
                 condition: service_healthy
-            keria:
-                condition: service_healthy
+            # keria:
+            #     condition: service_healthy
             witness-demo:
                 condition: service_healthy

examples/integration-scripts/credentials.test.ts

@@ -129,6 +129,28 @@ test('single signature credentials', async () => {
         return updateRegistry;
     });
 
+    // await step('Resubmit identity to witnesses', async () => {
+    //     const subResult = await issuerClient
+    //         .identifiers().submit({ name: issuerAid.name });
+
+    //     await waitOperation(issuerClient, await subResult.op());
+    //     let registries = await issuerClient.registries().list(issuerAid.name);
+    //     const registry: { name: string; regk: string } = registries[0];
+    //     assert.equal(registries.length, 1);
+    //     assert.equal(registry.name, registryName);
+
+    //     await issuerClient
+    //         .registries()
+    //         .rename(issuerAid.name, registryName, updatedRegistryName);
+
+    //     registries = await issuerClient.registries().list(issuerAid.name);
+    //     let updateRegistry: { name: string; regk: string } = registries[0];
+    //     assert.equal(registries.length, 1);
+    //     assert.equal(updateRegistry.name, updatedRegistryName);
+
+    //     return updateRegistry;
+    // });
+
     await step('issuer can get schemas', async () => {
         const issuerQviSchema = await issuerClient
             .schemas()
@@ -262,6 +284,7 @@ test('single signature credentials', async () => {
             recipient: issuerAid.prefix,
             datetime: createTimestamp(),
         });
+
         const op = await holderClient
             .ipex()
             .submitAdmit(holderAid.name, admit, sigs, aend, [issuerAid.prefix]);
@@ -604,4 +627,4 @@ test('single signature credentials', async () => {
 
         assert.equal(issuerCredential.status.s, '1');
     });
-}, 90000);
+}, 900000);

examples/integration-scripts/delegation-multisig.test.ts

@@ -18,6 +18,7 @@ import {
     addEndRoleMultisig,
     delegateMultisig,
     startMultisigIncept,
+    waitAndMarkNotification,
 } from './utils/multisig-utils';
 import { step } from './utils/test-step';
 

examples/integration-scripts/multisig-vlei-issuance.test.ts

@@ -7,6 +7,7 @@ import signify, {
     randomNonce,
     Salter,
     HabState,
+    SignifyClient,
 } from 'signify-ts';
 import { resolveEnvironment } from './utils/resolve-env';
 import {
@@ -80,6 +81,8 @@ const ECR_RULES = Saider.saidify({
     },
 })[1];
 
+const idQVI = 'QVI';
+
 test('multisig-vlei-issuance', async function run() {
     /**
      * The abbreviations used in this script follows GLEIF vLEI
@@ -303,9 +306,9 @@ test('multisig-vlei-issuance', async function run() {
     // Skip if a QVI AID has already been incepted.
     let aidQVIbyQAR1, aidQVIbyQAR2, aidQVIbyQAR3: HabState;
     try {
-        aidQVIbyQAR1 = await clientQAR1.identifiers().get('QVI');
-        aidQVIbyQAR2 = await clientQAR2.identifiers().get('QVI');
-        aidQVIbyQAR3 = await clientQAR3.identifiers().get('QVI');
+        aidQVIbyQAR1 = await clientQAR1.identifiers().get(idQVI);
+        aidQVIbyQAR2 = await clientQAR2.identifiers().get(idQVI);
+        aidQVIbyQAR3 = await clientQAR3.identifiers().get(idQVI);
     } catch {
         const rstates = [aidQAR1.state, aidQAR2.state, aidQAR3.state];
         const states = rstates;
@@ -326,7 +329,7 @@ test('multisig-vlei-issuance', async function run() {
             clientQAR1,
             aidQAR1,
             [aidQAR2, aidQAR3],
-            'QVI',
+            idQVI,
             kargsMultisigAID,
             true
         );
@@ -335,15 +338,15 @@ test('multisig-vlei-issuance', async function run() {
             clientQAR2,
             aidQAR2,
             [aidQAR1, aidQAR3],
-            'QVI',
+            idQVI,
             kargsMultisigAID
         );
         kargsMultisigAID.mhab = aidQAR3;
         const multisigAIDOp3 = await createAIDMultisig(
             clientQAR3,
             aidQAR3,
             [aidQAR1, aidQAR2],
-            'QVI',
+            idQVI,
             kargsMultisigAID
         );
 
@@ -401,16 +404,18 @@ test('multisig-vlei-issuance', async function run() {
 
         await waitAndMarkNotification(clientQAR1, '/multisig/icp');
 
-        aidQVIbyQAR1 = await clientQAR1.identifiers().get('QVI');
-        aidQVIbyQAR2 = await clientQAR2.identifiers().get('QVI');
-        aidQVIbyQAR3 = await clientQAR3.identifiers().get('QVI');
+        aidQVIbyQAR1 = await clientQAR1.identifiers().get(idQVI);
+        aidQVIbyQAR2 = await clientQAR2.identifiers().get(idQVI);
+        aidQVIbyQAR3 = await clientQAR3.identifiers().get(idQVI);
     }
     assert.equal(aidQVIbyQAR1.prefix, aidQVIbyQAR2.prefix);
     assert.equal(aidQVIbyQAR1.prefix, aidQVIbyQAR3.prefix);
     assert.equal(aidQVIbyQAR1.name, aidQVIbyQAR2.name);
     assert.equal(aidQVIbyQAR1.name, aidQVIbyQAR3.name);
     const aidQVI = aidQVIbyQAR1;
 
+    // witnessAgain(clientQAR1,idQVI,aidQVIbyQAR1.prefix,witnessIds[0],'dip');
+
     // Add endpoint role authorization for all QARs' agents.
     // Skip if they have already been authorized.
     let [oobiQVIbyQAR1, oobiQVIbyQAR2, oobiQVIbyQAR3] = await Promise.all([
@@ -666,6 +671,8 @@ test('multisig-vlei-issuance', async function run() {
     assert.equal(qviCred.sad.d, qviCredbyQAR2.sad.d);
     assert.equal(qviCred.sad.d, qviCredbyQAR3.sad.d);
 
+    // witnessAgain(clientQAR1,idQVI,aidQVIbyQAR1.prefix,witnessIds[0],'dip');
+
     // Create a multisig AID for the LE.
     // Skip if a LE AID has already been incepted.
     let aidLEbyLAR1, aidLEbyLAR2, aidLEbyLAR3: HabState;
@@ -858,6 +865,8 @@ test('multisig-vlei-issuance', async function run() {
     assert.equal(qviRegistrybyQAR1[0].name, qviRegistrybyQAR3[0].name);
     const qviRegistry = qviRegistrybyQAR1[0];
 
+    // witnessAgain(clientQAR1,idQVI,aidQVI.prefix,witnessIds[0],'ixn');
+
     // QVI issues a LE vLEI credential to the LE.
     // Skip if the credential has already been issued.
     let leCredbyQAR1 = await getIssuedCredential(

examples/integration-scripts/singlesig-vlei-issuance.test.ts

@@ -112,7 +112,7 @@ const CRED_RETRY_DEFAULTS = {
     maxSleep: 10000,
     minSleep: 1000,
     maxRetries: undefined,
-    timeout: 30000,
+    timeout: 60000,
 };
 
 function createTimestamp() {
@@ -473,7 +473,7 @@ test('singlesig-vlei-issuance', async function run() {
 
     await assertOperations(gleifClient, qviClient, leClient, roleClient);
     await warnNotifications(gleifClient, qviClient, leClient, roleClient);
-}, 360000);
+}, 3600000);
 
 async function getOrCreateRegistry(
     client: SignifyClient,

examples/integration-scripts/utils/multisig-utils.ts

@@ -491,4 +491,4 @@ export async function startMultisigIncept(
             participants
         );
     return op1;
-}
+}

examples/integration-scripts/utils/test-util.ts

@@ -518,3 +518,28 @@ export async function waitOperation<T = any>(
 
     return op;
 }
+
+export async function witnessAgain(client: SignifyClient, idName: string, prefix: string, witId: string, numOobis: number, eType: string) {
+    // force submit again to witnesses
+    const subRes = await client.identifiers().submit_id(idName);
+
+    await waitOperation(client, await subRes);
+    const subRegId = await client.identifiers().get(idName);
+    assert.equal(subRegId.state.b.length, numOobis);
+    assert.equal(subRegId.state.b[0], witId);
+
+    const oobisWit = await client.oobis().get(idName, 'witness');
+    expect(oobisWit.oobis).toHaveLength(numOobis);
+
+    const oobiWit1 = oobisWit.oobis[0]
+    expect(oobiWit1).toContain(
+        `/oobi/${prefix}/witness/${witId}`
+    );
+
+    const oobiSubRes = await client.oobis().resolve(oobiWit1);
+    const oobiSub = await waitOperation(client, oobiSubRes);
+    expect(JSON.stringify(oobiSub['response']["b"][0])).toEqual(`\"${witId}\"`);
+    expect(JSON.stringify(oobiSub['response']["et"])).toEqual(`\"${eType}\"`);
+
+    return subRegId
+}

examples/integration-scripts/witness.test.ts

@@ -2,9 +2,11 @@
 import { strict as assert } from 'assert';
 import signify from 'signify-ts';
 import { resolveEnvironment } from './utils/resolve-env';
-import { resolveOobi, waitOperation } from './utils/test-util';
+import { resolveOobi, waitOperation, witnessAgain } from './utils/test-util';
+import { step } from './utils/test-step';
 
 const WITNESS_AID = 'BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha';
+const ID1_NAME = 'aid1'
 const { url, bootUrl, witnessUrls } = resolveEnvironment();
 
 test('test witness', async () => {
@@ -32,39 +34,86 @@ test('test witness', async () => {
     console.log('Witness OOBI resolved');
 
     // Client 1 creates AID with 1 witness
-    let icpResult1 = await client1.identifiers().create('aid1', {
+    const  icpRes = await client1.identifiers().create(ID1_NAME, {
         toad: 1,
         wits: [WITNESS_AID],
     });
-    await waitOperation(client1, await icpResult1.op());
-    let aid1 = await client1.identifiers().get('aid1');
-    console.log('AID:', aid1.prefix);
-    assert.equal(aid1.state.b.length, 1);
-    assert.equal(aid1.state.b[0], WITNESS_AID);
-
-    icpResult1 = await client1.identifiers().rotate('aid1');
-    await waitOperation(client1, await icpResult1.op());
-    aid1 = await client1.identifiers().get('aid1');
-    assert.equal(aid1.state.b.length, 1);
-    assert.equal(aid1.state.b[0], WITNESS_AID);
+    await waitOperation(client1, await icpRes.op());
+    const aidIcp = await client1.identifiers().get(ID1_NAME);
+    console.log('AID:', aidIcp.prefix);
+    assert.equal(aidIcp.state.b.length, 1);
+    assert.equal(aidIcp.state.b[0], WITNESS_AID);
+
+    const oobisWit = await client1.oobis().get(ID1_NAME, 'witness');
+    expect(oobisWit.oobis).toHaveLength(1);
+
+    const oobiWit1 = oobisWit.oobis[0]
+    expect(oobiWit1).toContain(
+        `/oobi/${aidIcp.prefix}/witness/BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha`
+    );
+
+    const oobiResolve = await client1.oobis().resolve(oobiWit1);
+    const oobiResult = await waitOperation(client1, oobiResolve);
+    expect(JSON.stringify(oobiResult['response']["b"][0])).toEqual(`\"${WITNESS_AID}\"`);
+
+    const rotRes = await client1.identifiers().rotate(ID1_NAME);
+    await waitOperation(client1, await rotRes.op());
+    const aidRot = await client1.identifiers().get(ID1_NAME);
+    assert.equal(aidRot.state.b.length, 1);
+    assert.equal(aidRot.state.b[0], WITNESS_AID);
+
+    const ooobiRotRes = await client1.oobis().resolve(oobiWit1);
+    const oobiRot = await waitOperation(client1, ooobiRotRes);
+    expect(JSON.stringify(oobiRot['response']["b"][0])).toEqual(`\"${WITNESS_AID}\"`);
 
     // Remove witness
-    icpResult1 = await client1
+    const rotCutRes = await client1
         .identifiers()
-        .rotate('aid1', { cuts: [WITNESS_AID] });
-    await waitOperation(client1, await icpResult1.op());
-    aid1 = await client1.identifiers().get('aid1');
-    assert.equal(aid1.state.b.length, 0);
+        .rotate(ID1_NAME, { cuts: [WITNESS_AID] });
+    await waitOperation(client1, await rotCutRes.op());
+    const aidRemWit = await client1.identifiers().get(ID1_NAME);
+    assert.equal(aidRemWit.state.b.length, 0);
 
-    // Add witness again
+    const ooobiRotCutRes = await client1.oobis().resolve(oobiWit1);
+    const oobiRotCut = await waitOperation(client1, ooobiRotCutRes);
+    expect(JSON.stringify(oobiRotCut['response']["b"][0])).toEqual(undefined);
 
-    icpResult1 = await client1
+    // Add witness again
+    const rotAddRes = await client1
         .identifiers()
-        .rotate('aid1', { adds: [WITNESS_AID] });
-
-    await waitOperation(client1, await icpResult1.op());
-    aid1 = await client1.identifiers().get('aid1');
-    assert.equal(aid1.state.b.length, 1);
-    assert.equal(aid1.state.b.length, 1);
-    assert.equal(aid1.state.b[0], WITNESS_AID);
-}, 60000);
+        .rotate(ID1_NAME, { adds: [WITNESS_AID] });
+
+    await waitOperation(client1, await rotAddRes.op());
+    const rotAddId = await client1.identifiers().get(ID1_NAME);
+    assert.equal(rotAddId.state.b.length, 1);
+    assert.equal(rotAddId.state.b.length, 1);
+    assert.equal(rotAddId.state.b[0], WITNESS_AID);
+
+    const ooobiRotAddRes = await client1.oobis().resolve(oobiWit1);
+    const oobiRotAdd = await waitOperation(client1, ooobiRotAddRes);
+    expect(JSON.stringify(oobiRotAdd['response']["b"][0])).toEqual(`\"${WITNESS_AID}\"`);
+
+    // try force submit again to witnesses
+    const subId = await witnessAgain(client1,ID1_NAME,aidIcp.prefix,WITNESS_AID,1,'rot');
+
+    const registry = await step('Create registry', async () => {
+        const registryName = 'vLEI-test-registry';
+        const regResult = await client1
+            .registries()
+            .create({ name: subId.name, registryName: registryName });
+
+        await waitOperation(client1, await regResult.op());
+        let registries = await client1.registries().list(subId.name);
+        const registry: { name: string; regk: string } = registries[0];
+        assert.equal(registries.length, 1);
+        assert.equal(registry.name, registryName);
+    })
+
+    const ooobiRegRes = await client1.oobis().resolve(oobiWit1);
+    const oobiReg = await waitOperation(client1, ooobiRegRes);
+    expect(JSON.stringify(oobiReg['response']["b"][0])).toEqual(`\"${WITNESS_AID}\"`);
+    expect(JSON.stringify(oobiReg['response']["et"])).toEqual(`\"ixn\"`);
+
+    // force submit again to witnesses
+    await witnessAgain(client1,ID1_NAME,aidIcp.prefix,WITNESS_AID,1,'ixn');
+}, 600000);