Trust registry and did:key

example/blob.js

@@ -20,7 +20,7 @@ async function writeAndReadBlob(dock, blobValue, dockDID, pair) {
     blob: blobValue,
   };
 
-  await dock.blob.new(blob, dockDID, pair, 1, { didModule: dock.did }, false);
+  await dock.blob.new(blob, dockDID, pair, { didModule: dock.did }, false);
 
   console.log('Blob written, reading from chain...');
 

example/dock-did.js

@@ -33,7 +33,7 @@ async function removeDID() {
   // Sign the DID removal with this key pair as this is the current key of the DID
   const pair = dock.keyring.addFromUri(firstKeySeed, null, 'sr25519');
 
-  return dock.did.remove(dockDID, dockDID, pair, 1, undefined, false);
+  return dock.did.remove(dockDID, dockDID, pair, undefined, false);
 }
 
 // This function assumes the DID has been written.
@@ -50,7 +50,7 @@ async function addServiceEndpoint() {
   const spId = u8aToHex(encoder.encode(spIdText));
   const originsText = ['https://foo.example.com'];
   const origins = originsText.map((u) => u8aToHex(encoder.encode(u)));
-  return dock.did.addServiceEndpoint(spId, spType, origins, dockDID, dockDID, pair, 1, undefined, false);
+  return dock.did.addServiceEndpoint(spId, spType, origins, dockDID, dockDID, pair, undefined, false);
 }
 
 // This function assumes the DID has been written.
@@ -62,7 +62,7 @@ async function addController() {
 
   const newController = createNewDockDID();
 
-  return dock.did.addControllers([newController], dockDID, dockDID, pair, 1, undefined, false);
+  return dock.did.addControllers([newController], dockDID, dockDID, pair, undefined, false);
 }
 
 // This function assumes the DID has been written.
@@ -81,7 +81,7 @@ async function addKey() {
   vr.setAuthentication();
   const newDidKey = new DidKey(newPk, vr);
 
-  return dock.did.addKeys([newDidKey], dockDID, dockDID, pair, 1, undefined, false);
+  return dock.did.addKeys([newDidKey], dockDID, dockDID, pair, undefined, false);
 }
 
 async function getDIDDoc() {

example/revocation.js

@@ -40,20 +40,20 @@ async function createRegistry() {
 async function removeRegistry(pair) {
   console.log('Removing registry...');
 
-  await dock.revocation.removeRegistryWithOneOfPolicy(registryId, controllerDID, pair, 1, { didModule: dock.did }, false);
+  await dock.revocation.removeRegistryWithOneOfPolicy(registryId, controllerDID, pair, { didModule: dock.did }, false);
 
   console.log('Registry removed. All done.');
 }
 
 async function unrevoke(pair) {
   console.log('Trying to undo the revocation (unrevoke) of id:', revokeId);
-  const extrinsic = await dock.revocation.unrevokeCredentialWithOneOfPolicy(registryId, revokeId, controllerDID, pair, 1, { didModule: dock.did }, false);
+  const extrinsic = await dock.revocation.unrevokeCredentialWithOneOfPolicy(registryId, revokeId, controllerDID, pair, { didModule: dock.did }, false);
   await extrinsic;
 }
 
 async function revoke(pair) {
   console.log('Trying to revoke id:', revokeId);
-  const extrinsic = await dock.revocation.revokeCredentialWithOneOfPolicy(registryId, revokeId, controllerDID, pair, 1, { didModule: dock.did }, false);
+  const extrinsic = await dock.revocation.revokeCredentialWithOneOfPolicy(registryId, revokeId, controllerDID, pair, { didModule: dock.did }, false);
   await extrinsic;
 }
 

example/schema.js

@@ -88,7 +88,7 @@ async function main() {
   console.log('The schema is:', JSON.stringify(schema.toJSON(), null, 2));
   console.log('Writing schema to the chain with blob id of', schema.id, '...');
 
-  await schema.writeToChain(dock, dockDID, pair, 1, undefined, false);
+  await schema.writeToChain(dock, dockDID, pair, undefined, false);
 
   console.log(`Schema written, reading from chain (${schema.id})...`);
 

scripts/hit_1.js

@@ -77,7 +77,7 @@ async function sendAddKeyTxns(count, didPairs) {
     const newPair = dock.keyring.addFromUri(seed, null, 'sr25519');
     const publicKey = getPublicKeyFromKeyringPair(newPair);
     const didKey = new DidKey(publicKey, new VerificationRelationship());
-    const tx = await dock.did.createAddKeysTx([didKey], did, did, currentPair, 1);
+    const tx = await dock.did.createAddKeysTx([didKey], did, did, currentpair);
     txs.push(tx);
     j++;
   }
@@ -105,7 +105,7 @@ async function sendAddControllerTxns(count, didPairs) {
   while (txs.length < count) {
     const did = didPairs[j][0];
     const currentPair = didPairs[j][1];
-    const tx = await dock.did.createAddControllersTx([createNewDockDID()], did, did, currentPair, 1);
+    const tx = await dock.did.createAddControllersTx([createNewDockDID()], did, did, currentpair);
     txs.push(tx);
     j++;
   }
@@ -133,7 +133,7 @@ async function sendRemoveTxns(count, didPairs, waitForFinalization = true) {
   while (txs.length < count) {
     const did = didPairs[j][0];
     const currentPair = didPairs[j][1];
-    const tx = await dock.did.createRemoveTx(did, did, currentPair, 1);
+    const tx = await dock.did.createRemoveTx(did, did, currentpair);
     txs.push(tx);
     j++;
   }
@@ -166,7 +166,7 @@ async function sendBlobTxns(count, didPairs) {
       id: blobId,
       blob: randomAsHex(995),
     };
-    const tx = await dock.blob.createNewTx(blob, did, pair, 1, { didModule: dock.did });
+    const tx = await dock.blob.createNewTx(blob, did, pair, { didModule: dock.did });
     txs.push(tx);
     blobIds.push(blobId);
     j++;

scripts/master_voting/vote.js

@@ -2,7 +2,7 @@
 
 import { u8aToHex } from '@polkadot/util';
 import { connect, keypair } from '../helpers';
-import { getHexIdentifierFromDID } from '../../src/utils/did';
+import { typedHexDID } from '../../src/utils/did';
 import { getStateChange } from '../../src/utils/misc';
 
 require('dotenv').config();
@@ -45,7 +45,7 @@ async function main() {
 
   const round_no = parseIntChecked(process.argv[2]);
 
-  const did = getHexIdentifierFromDID(did);
+  const did = typedHexDID(dock.api, did);
 
   const proposal_filename = process.argv[3];
   const proposal_unparsed = await fsp.readFile(proposal_filename);
@@ -86,7 +86,7 @@ async function main() {
   console.log('');
 
   const encodedProposal = [...nc.api.createType('Call', proposal).toU8a()];
-  const nonce = await nc.didModule.getNextNonceForDID(did);
+  const nonce = await nc.didModule.getNextNonceForDid(did);
   const vote = { nonce, proposal: encodedProposal, round_no: actual_round_no };
   const encodedStateChange = getStateChange(nc.api, 'MasterVote', vote);
 

scripts/txn-pricing.js

@@ -59,15 +59,15 @@ async function dids() {
   const [, , dk1] = getDidPair();
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding DID key with all verification relationships');
-    await dock.did.addKeys([dk1], did, did, pair, 1, undefined, false);
+    await dock.did.addKeys([dk1], did, did, pair, undefined, false);
   });
 
   // Add DID key with only 1 verification relationship
   const [, , dk2] = getDidPair();
   dk2.verRels.setAuthentication();
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding DID key with only 1 verification relationship');
-    await dock.did.addKeys([dk2], did, did, pair, 1, undefined, false);
+    await dock.did.addKeys([dk2], did, did, pair, undefined, false);
   });
 
   // Add DID key with only 2 verification relationships
@@ -76,7 +76,7 @@ async function dids() {
   dk3.verRels.setAssertion();
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding DID key with only 2 verification relationships');
-    await dock.did.addKeys([dk3], did, did, pair, 1, undefined, false);
+    await dock.did.addKeys([dk3], did, did, pair, undefined, false);
   });
 
   // Add DID key with 3 verification relationships
@@ -86,7 +86,7 @@ async function dids() {
   dk4.verRels.setCapabilityInvocation();
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding DID key with 3 verification relationships');
-    await dock.did.addKeys([dk4], did, did, pair, 1, undefined, false);
+    await dock.did.addKeys([dk4], did, did, pair, undefined, false);
   });
 
   // Add 2 DID keys with only 1 verification relationship
@@ -96,7 +96,7 @@ async function dids() {
   dk6.verRels.setCapabilityInvocation();
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding 2 DID keys with only 1 verification relationship');
-    await dock.did.addKeys([dk5, dk6], did, did, pair, 1, undefined, false);
+    await dock.did.addKeys([dk5, dk6], did, did, pair, undefined, false);
   });
 
   // Add 3 DID keys with only 1 verification relationship
@@ -108,20 +108,20 @@ async function dids() {
   dk9.verRels.setAssertion();
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding 3 DID keys with only 1 verification relationship');
-    await dock.did.addKeys([dk7, dk8, dk9], did, did, pair, 1, undefined, false);
+    await dock.did.addKeys([dk7, dk8, dk9], did, did, pair, undefined, false);
   });
 
   const newControllers = [createNewDockDID(), createNewDockDID(), createNewDockDID()];
   // Add 1 controller
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding 1 controller');
-    await dock.did.addControllers([newControllers[0]], did, did, pair, 1, undefined, false);
+    await dock.did.addControllers([newControllers[0]], did, did, pair, undefined, false);
   });
 
   // Add 2 controllers
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding 2 controllers');
-    await dock.did.addControllers([newControllers[1], newControllers[2]], did, did, pair, 1, undefined, false);
+    await dock.did.addControllers([newControllers[1], newControllers[2]], did, did, pair, undefined, false);
   });
 
   const spType = new ServiceEndpointType();
@@ -133,13 +133,13 @@ async function dids() {
   // Add 1 service endpoint with 1 origin
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding 1 service endpoint with 1 origin');
-    await dock.did.addServiceEndpoint(spId1, spType, origins1, did, did, pair, 1, undefined, false);
+    await dock.did.addServiceEndpoint(spId1, spType, origins1, did, did, pair, undefined, false);
   });
 
   // Add 1 service endpoint with 2 origins
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding 1 service endpoint with 2 origins');
-    await dock.did.addServiceEndpoint(spId2, spType, origins2, did, did, pair, 1, undefined, false);
+    await dock.did.addServiceEndpoint(spId2, spType, origins2, did, did, pair, undefined, false);
   });
 
   // Adding a new DID which doesn't control itself but controlled by one other controller
@@ -167,43 +167,43 @@ async function dids() {
   const [, , dk__] = getDidPair();
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding DID key with all verification relationships to a DID that doesnt control itself');
-    await dock.did.addKeys([dk__], did1, did, pair, 1, undefined, false);
+    await dock.did.addKeys([dk__], did1, did, pair, undefined, false);
   });
 
   // Removing 1 key
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Removing 1 key');
-    await dock.did.removeKeys([2], did, did, pair, 1, undefined, false);
+    await dock.did.removeKeys([2], did, did, pair, undefined, false);
   });
 
   // Removing 2 keys
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Removing 2 keys');
-    await dock.did.removeKeys([3, 4], did, did, pair, 1, undefined, false);
+    await dock.did.removeKeys([3, 4], did, did, pair, undefined, false);
   });
 
   // Removing 1 controller
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Removing 1 controller');
-    await dock.did.removeControllers([newControllers[0]], did, did, pair, 1, undefined, false);
+    await dock.did.removeControllers([newControllers[0]], did, did, pair, undefined, false);
   });
 
   // Removing 2 controllers
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Removing 2 controllers');
-    await dock.did.removeControllers([newControllers[1], newControllers[2]], did, did, pair, 1, undefined, false);
+    await dock.did.removeControllers([newControllers[1], newControllers[2]], did, did, pair, undefined, false);
   });
 
   // Removing 1 service endpoint
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Removing service endpoint');
-    await dock.did.removeServiceEndpoint(spId1, did, did, pair, 1, undefined, false);
+    await dock.did.removeServiceEndpoint(spId1, did, did, pair, undefined, false);
   });
 
   // Remove DID
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Removing DID');
-    await dock.did.remove(did, did, pair, 1, undefined, false);
+    await dock.did.remove(did, did, pair, undefined, false);
   });
 }
 
@@ -232,16 +232,16 @@ async function revocation() {
       revokeIds.add(randomAsHex(32));
     }
 
-    const [update, sig, nonce] = await dock.revocation.createSignedRevoke(registryId, revokeIds, did, pair, 1, { didModule: dock.did });
-    const revTx = dock.revocation.createRevokeTx(update, [[sig, nonce]]);
+    const [update, sig, nonce] = await dock.revocation.createSignedRevoke(registryId, revokeIds, did, pair, { didModule: dock.did });
+    const revTx = dock.revocation.createRevokeTx(update, [[nonce, sig]]);
     console.info(`Payment info of ${count} revocation is ${(await revTx.paymentInfo(account.address))}`);
     await printFeePaid(dock.api, account.address, async () => {
       await dock.signAndSend(revTx, false);
     });
   }
 
-  const [update, sig, nonce] = await dock.revocation.createSignedRemove(registryId, did, pair, 1, { didModule: dock.did });
-  const revTx = dock.revocation.createRemoveRegistryTx(update, [[sig, nonce]]);
+  const [update, sig, nonce] = await dock.revocation.createSignedRemove(registryId, did, pair, { didModule: dock.did });
+  const revTx = dock.revocation.createRemoveRegistryTx(update, [[nonce, sig]]);
   console.info(`Payment info of removing registry is ${(await revTx.paymentInfo(account.address))}`);
 
   await printFeePaid(dock.api, account.address, async () => {
@@ -274,7 +274,7 @@ async function blobs() {
   };
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Blob write');
-    await dock.blob.new(blob, did, pair, 1, { didModule: dock.did }, false);
+    await dock.blob.new(blob, did, pair, { didModule: dock.did }, false);
   });
 }
 
@@ -295,7 +295,7 @@ async function bbsPlus() {
     const params = BBSPlusModule.prepareAddParameters(bytes, undefined, label);
     await printFeePaid(dock.api, account.address, async () => {
       console.info(`Add BBS+ params with ${attributeCount} attributes`);
-      await dock.bbsPlusModule.addParams(params, did, pair, 1, { didModule: dock.did }, false);
+      await dock.bbsPlusModule.addParams(params, did, pair, { didModule: dock.did }, false);
     });
   }
 
@@ -304,19 +304,19 @@ async function bbsPlus() {
   const pk = BBSPlusModule.prepareAddPublicKey(u8aToHex(kp.publicKey.bytes), undefined, [did, 1]);
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Add a BBS+ key');
-    await dock.bbsPlusModule.addPublicKey(pk, did, did, pair, 1, { didModule: dock.did }, false);
+    await dock.bbsPlusModule.addPublicKey(pk, did, did, pair, { didModule: dock.did }, false);
   });
 
   // Remove public key
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Remove BBS+ key');
-    await dock.bbsPlusModule.removePublicKey(2, did, did, pair, 1, { didModule: dock.did }, false);
+    await dock.bbsPlusModule.removePublicKey(2, did, did, pair, { didModule: dock.did }, false);
   });
 
   // Remove params
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Remove BBS+ params');
-    await dock.bbsPlusModule.removeParams(1, did, pair, 1, { didModule: dock.did }, false);
+    await dock.bbsPlusModule.removeParams(1, did, pair, { didModule: dock.did }, false);
   });
 }
 
@@ -334,30 +334,30 @@ async function accumulator() {
   const params = AccumulatorModule.prepareAddParameters(bytes, undefined, label);
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Accumulator params write');
-    await dock.accumulatorModule.addParams(params, did, pair, 1, { didModule: dock.did }, false);
+    await dock.accumulatorModule.addParams(params, did, pair, { didModule: dock.did }, false);
   });
 
   const kp = Accumulator.generateKeypair(new AccumulatorParams(hexToU8a(params.bytes)));
 
   const pk = AccumulatorModule.prepareAddPublicKey(u8aToHex(kp.publicKey.bytes), undefined, [did, 1]);
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Accumulator key write');
-    await dock.accumulatorModule.addPublicKey(pk, did, pair, 1, { didModule: dock.did }, false);
+    await dock.accumulatorModule.addPublicKey(pk, did, pair, { didModule: dock.did }, false);
   });
 
   const accumulatorPos = PositiveAccumulator.initialize(new AccumulatorParams(hexToU8a(params.bytes)), kp.secretKey);
   const accumulatorIdPos = randomAsHex(32);
   const accumulatedPos = u8aToHex(accumulatorPos.accumulated);
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding a positive accumulator');
-    await dock.accumulatorModule.addPositiveAccumulator(accumulatorIdPos, accumulatedPos, [did, 1], did, pair, 1, { didModule: dock.did }, false);
+    await dock.accumulatorModule.addPositiveAccumulator(accumulatorIdPos, accumulatedPos, [did, 1], did, pair, { didModule: dock.did }, false);
   });
 
   const accumulatorIdUni = randomAsHex(32);
   const accumulatedUni = u8aToHex(accumulatorPos.accumulated);
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Adding a universal accumulator');
-    await dock.accumulatorModule.addUniversalAccumulator(accumulatorIdUni, accumulatedUni, [did, 1], 10000, did, pair, 1, { didModule: dock.did }, false);
+    await dock.accumulatorModule.addUniversalAccumulator(accumulatorIdUni, accumulatedUni, [did, 1], 10000, did, pair, { didModule: dock.did }, false);
   });
 
   const start = 10;
@@ -372,20 +372,20 @@ async function accumulator() {
     let witUpd = u8aToHex(WitnessUpdatePublicInfo.new(hexToU8a(accumulated), members, [], kp.secretKey).value);
     await printFeePaid(dock.api, account.address, async () => {
       console.info(`Updating a positive accumulator with ${members.length} additions`);
-      await dock.accumulatorModule.updateAccumulator(accumulatorIdPos, accumulated, { additions: members.map((m) => u8aToHex(m)), witnessUpdateInfo: witUpd }, did, pair, 1, { didModule: dock.did }, false);
+      await dock.accumulatorModule.updateAccumulator(accumulatorIdPos, accumulated, { additions: members.map((m) => u8aToHex(m)), witnessUpdateInfo: witUpd }, did, pair, { didModule: dock.did }, false);
     });
 
     witUpd = u8aToHex(WitnessUpdatePublicInfo.new(hexToU8a(accumulated), [], members, kp.secretKey).value);
 
     await printFeePaid(dock.api, account.address, async () => {
       console.info(`Updating a positive accumulator with ${members.length} removals`);
-      await dock.accumulatorModule.updateAccumulator(accumulatorIdPos, accumulated, { removals: members.map((m) => u8aToHex(m)), witnessUpdateInfo: witUpd }, did, pair, 1, { didModule: dock.did }, false);
+      await dock.accumulatorModule.updateAccumulator(accumulatorIdPos, accumulated, { removals: members.map((m) => u8aToHex(m)), witnessUpdateInfo: witUpd }, did, pair, { didModule: dock.did }, false);
     });
   }
 
   await printFeePaid(dock.api, account.address, async () => {
     console.info('Removing a positive accumulator');
-    await dock.accumulatorModule.removeAccumulator(accumulatorIdPos, did, pair, 1, { didModule: dock.did }, false);
+    await dock.accumulatorModule.removeAccumulator(accumulatorIdPos, did, pair, { didModule: dock.did }, false);
   });
 }