ClaimId generator should be taking the node's own NodeId

Author: CMCDragonkai

src/claims/utils.ts

@@ -7,7 +7,7 @@ import type {
   SignatureData,
   ClaimIntermediary,
 } from './types';
-import type { NodeIdEncoded } from '../nodes/types';
+import type { NodeId, NodeIdEncoded } from '../nodes/types';
 import type { PublicKeyPem, PrivateKeyPem } from '../keys/types';
 import type { POJO } from '../types';
 import type { GeneralJWSInput } from 'jose';
@@ -492,10 +492,14 @@ function decodeClaimId(claimIdEncoded: string): ClaimId | undefined {
   return claimId;
 }
 
-function createClaimIdGenerator(nodeId: NodeIdEncoded, lastClaimId?: ClaimId) {
+/**
+ * Generator for `ClaimId`
+ * Make sure the `nodeId` is set to this node's own `NodeId`
+ */
+function createClaimIdGenerator(nodeId: NodeId, lastClaimId?: ClaimId) {
   const generator = new IdSortable<ClaimId>({
     lastId: lastClaimId,
-    nodeId: IdInternal.fromString(nodeId).toBuffer(),
+    nodeId,
   });
   return () => generator.get();
 }

src/sigchain/Sigchain.ts

@@ -19,7 +19,6 @@ import {
 } from '@matrixai/async-init/dist/CreateDestroyStartStop';
 import * as sigchainErrors from './errors';
 import * as claimsUtils from '../claims/utils';
-import { utils as nodesUtils } from '../nodes';
 
 interface Sigchain extends CreateDestroyStartStop {}
 @CreateDestroyStartStop(
@@ -138,7 +137,7 @@ class Sigchain {
     // Creating the ID generator
     const latestId = await this.getLatestClaimId();
     this.generateClaimId = claimsUtils.createClaimIdGenerator(
-      nodesUtils.encodeNodeId(this.keyManager.getNodeId()),
+      this.keyManager.getNodeId(),
       latestId,
     );
     this.logger.info(`Started ${this.constructor.name}`);

tests/client/service/identitiesClaim.test.ts

@@ -23,6 +23,7 @@ import * as identitiesPB from '@/proto/js/polykey/v1/identities/identities_pb';
 import * as clientUtils from '@/client/utils/utils';
 import * as keysUtils from '@/keys/utils';
 import * as claimsUtils from '@/claims/utils';
+import * as nodesUtils from '@/nodes/utils';
 import * as validationErrors from '@/validation/errors';
 import * as testUtils from '../../utils';
 import TestProvider from '../../identities/TestProvider';
@@ -47,7 +48,9 @@ describe('identitiesClaim', () => {
     provider: testToken.providerId,
     identity: testToken.identityId,
   };
-  const claimId = claimsUtils.createClaimIdGenerator(claimData.node)();
+  const claimId = claimsUtils.createClaimIdGenerator(
+    nodesUtils.decodeNodeId(claimData.node)!,
+  )();
   let mockedGenerateKeyPair: jest.SpyInstance;
   let mockedGenerateDeterministicKeyPair: jest.SpyInstance;
   let mockedAddClaim: jest.SpyInstance;