Feature add integrity sha on asset creation

package.json

@@ -75,6 +75,7 @@
     "capacitor-native-settings": "^4.0.3",
     "compressorjs": "^1.0.7",
     "cordova-plugin-purchase": "^11.0.0",
+    "ethers": "^6.8.1",
     "hammerjs": "^2.0.8",
     "immutable": "^4.0.0-rc.14",
     "lodash-es": "^4.17.21",

src/app/shared/collector/collector.service.ts

@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { CameraSource } from '@capacitor/camera';
+import { generateIntegritySha } from '../../utils/nit/nit';
 import { MediaStore } from '../media/media-store/media-store.service';
 import {
   Assets,
-  getSerializedSortedSignedMessage,
   Proof,
-  Signatures,
-  SignedMessage,
+  ProofMetadata,
+  SignResult,
   Truth,
 } from '../repositories/proof/proof';
 import { FactsProvider } from './facts/facts-provider';
@@ -25,17 +25,25 @@ export class CollectorService {
   async run(assets: Assets, capturedTimestamp: number, source: CameraSource) {
     const truth = await this.collectTruth(assets, capturedTimestamp);
     const proof = await Proof.from(this.mediaStore, assets, truth);
-    await this.generateSignature(proof, source);
+    proof.cameraSource = source;
+    await this.generateSignature(proof, proof.cameraSource);
     proof.isCollected = true;
     return proof;
   }
 
+  // FIXME: @sultanmyrza get cameraSource from proof.cameraSource instead of passing separately
+  // TODO: @sultanmyrza remove 2nd parameter and make sure all other places get called accordinglyt
   async generateSignature(proof: Proof, source: CameraSource) {
-    const recorder =
-      CaptureAppWebCryptoApiSignatureProvider.recorderFor(source);
-    const signedMessage = await proof.generateSignedMessage(recorder);
-    const signatures = await this.signMessage(signedMessage, source);
+    const recorder = CaptureAppWebCryptoApiSignatureProvider.recorderFor(
+      proof.cameraSource
+    );
+    const proofMetadata = await proof.generateProofMetadata(recorder);
+    const { signatures, integritySha } = await this.signProofMetadata(
+      proofMetadata,
+      source
+    );
     proof.setSignatures(signatures);
+    proof.setIntegritySha(integritySha);
     return proof;
   }
 
@@ -56,20 +64,20 @@ export class CollectorService {
     };
   }
 
-  private async signMessage(
-    message: SignedMessage,
+  private async signProofMetadata(
+    proofMetadata: ProofMetadata,
     source: CameraSource
-  ): Promise<Signatures> {
-    const serializedSortedSignedMessage =
-      getSerializedSortedSignedMessage(message);
-    return Object.fromEntries(
+  ): Promise<SignResult> {
+    const integritySha = await generateIntegritySha(proofMetadata);
+    const signatures = Object.fromEntries(
       await Promise.all(
         [...this.signatureProviders].map(async provider => [
           provider.idFor(source),
-          await provider.provide(serializedSortedSignedMessage),
+          await provider.provide(integritySha),
         ])
       )
     );
+    return { signatures, integritySha };
   }
 
   addFactsProvider(provider: FactsProvider) {

src/app/shared/collector/signature/capture-app-web-crypto-api-signature-provider/capture-app-web-crypto-api-signature-provider.service.spec.ts

@@ -3,9 +3,9 @@ import { defer } from 'rxjs';
 import { concatMapTo } from 'rxjs/operators';
 import { sortObjectDeeplyByKey } from '../../../../utils/immutable/immutable';
 import {
-  isSignature,
+  ProofMetadata,
   RecorderType,
-  SignedMessage,
+  isSignature,
 } from '../../../repositories/proof/proof';
 import { SharedTestingModule } from '../../../shared-testing.module';
 import { CaptureAppWebCryptoApiSignatureProvider } from './capture-app-web-crypto-api-signature-provider.service';
@@ -60,7 +60,7 @@ describe('CaptureAppWebCryptoApiSignatureProvider', () => {
   });
 
   it('should provide signature', async () => {
-    const signedMessage: SignedMessage = {
+    const ProofMetadata: ProofMetadata = {
       spec_version: '',
       recorder: RecorderType.Capture,
       created_at: 0,
@@ -69,10 +69,10 @@ describe('CaptureAppWebCryptoApiSignatureProvider', () => {
       caption: '',
       information: {},
     };
-    const serializedSortedSignedMessage = JSON.stringify(
-      sortObjectDeeplyByKey(signedMessage as any).toJSON()
+    const serializedSortedProofMetadata = JSON.stringify(
+      sortObjectDeeplyByKey(ProofMetadata as any).toJSON()
     );
-    const signature = await provider.provide(serializedSortedSignedMessage);
+    const signature = await provider.provide(serializedSortedProofMetadata);
 
     expect(isSignature(signature)).toBeTrue();
   });

src/app/shared/collector/signature/capture-app-web-crypto-api-signature-provider/capture-app-web-crypto-api-signature-provider.service.ts

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
 import { CameraSource } from '@capacitor/camera';
-import {
-  createEthAccount,
-  loadEthAccount,
-} from '../../../../utils/crypto/crypto';
+import { createEthAccount } from '../../../../utils/crypto/crypto';
+import { signWithIntegritySha } from '../../../../utils/nit/nit';
 import { PreferenceManager } from '../../../preference-manager/preference-manager.service';
 import { RecorderType, Signature } from '../../../repositories/proof/proof';
 import { SignatureProvider } from '../signature-provider';
@@ -72,12 +70,14 @@ export class CaptureAppWebCryptoApiSignatureProvider
     }
   }
 
-  async provide(serializedSortedSignedTargets: string): Promise<Signature> {
+  async provide(signMessage: string): Promise<Signature> {
     await this.initialize();
-    const account = loadEthAccount(await this.getPrivateKey());
-    const sign = account.sign(serializedSortedSignedTargets);
+    const signature = await signWithIntegritySha(
+      signMessage,
+      await this.getPrivateKey()
+    );
     const publicKey = await this.getPublicKey();
-    return { signature: sign.signature, publicKey };
+    return { signature, publicKey };
   }
 
   async getPublicKey() {