feat: integrate with alpha.7 (#102)

Author: 0xtsukino

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tlsn-extension",
-  "version": "0.1.0.6",
+  "version": "0.1.0.700",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.4.2",
     "tailwindcss": "^3.3.3",
-    "tlsn-js": "0.1.0-alpha.6.2",
+    "tlsn-js": "0.1.0-alpha.7.1",
     "tlsn-js-v5": "npm:[email protected]"
   },
   "devDependencies": {

package.json

@@ -1,7 +1,7 @@
 import { ContentScriptTypes, RPCClient } from './rpc';
 import { RequestHistory } from '../Background/rpc';
 import { PluginConfig, PluginMetadata } from '../../utils/misc';
-import { Proof } from '../../utils/types';
+import { PresentationJSON } from '../../utils/types';
 
 const client = new RPCClient();
 
@@ -27,7 +27,7 @@ class TLSN {
     return resp || [];
   }
 
-  async getProof(id: string): Promise<Proof | null> {
+  async getProof(id: string): Promise<PresentationJSON | null> {
     const resp = await client.call(ContentScriptTypes.get_proof, {
       id,
     });
@@ -52,7 +52,7 @@ class TLSN {
         [k: string]: string;
       };
     },
-  ): Promise<Proof> {
+  ): Promise<PresentationJSON> {
     const resp = await client.call(ContentScriptTypes.notarize, {
       url,
       method: requestOptions?.method,

pnpm-lock.yaml

@@ -3,19 +3,20 @@ import * as Comlink from 'comlink';
 import { OffscreenActionTypes } from './types';
 import {
   NotaryServer,
-  Prover as _Prover,
-  NotarizedSession as _NotarizedSession,
-  TlsProof as _TlsProof,
+  Prover as TProver,
+  Presentation as TPresentation,
+  Transcript,
 } from 'tlsn-js';
 import { verify } from 'tlsn-js-v5';
 
 import { urlify } from '../../utils/misc';
 import { BackgroundActiontype } from '../Background/rpc';
 import browser from 'webextension-polyfill';
-import { Proof, ProofV1 } from '../../utils/types';
+import { PresentationJSON } from '../../utils/types';
+import { PresentationJSON as PresentationJSONa7 } from 'tlsn-js/build/types';
 import { Method } from 'tlsn-js/wasm/pkg';
 
-const { init, Prover, NotarizedSession, TlsProof }: any = Comlink.wrap(
+const { init, Prover, Presentation }: any = Comlink.wrap(
   new Worker(new URL('./worker.ts', import.meta.url)),
 );
 
@@ -111,7 +112,7 @@ const Offscreen = () => {
           }
           case BackgroundActiontype.verify_prove_request: {
             (async () => {
-              const proof: Proof = request.data.proof;
+              const proof: PresentationJSON = request.data.proof;
               const result: { sent: string; recv: string } =
                 await verifyProof(proof);
 
@@ -194,7 +195,7 @@ async function createProof(options: {
   id: string;
   secretHeaders: string[];
   secretResps: string[];
-}): Promise<ProofV1> {
+}): Promise<PresentationJSONa7> {
   const {
     url,
     method = 'GET',
@@ -211,7 +212,7 @@ async function createProof(options: {
 
   const hostname = urlify(url)?.hostname || '';
   const notary = NotaryServer.from(notaryUrl);
-  const prover: _Prover = await new Prover({
+  const prover: TProver = await new Prover({
     id,
     serverDns: hostname,
     maxSentData,
@@ -260,24 +261,21 @@ async function createProof(options: {
     ),
   };
 
-  const session: _NotarizedSession = await new NotarizedSession(
-    await prover.notarize(commit),
-  );
-
-  const proofHex = await session.proof(commit);
-  const proof: ProofV1 = {
-    version: '1.0',
-    meta: {
-      notaryUrl,
-      websocketProxyUrl,
-    },
-    data: proofHex,
-  };
-  return proof;
+  const notarizationOutputs = await prover.notarize(commit);
+
+  const presentation = (await new Presentation({
+    attestationHex: notarizationOutputs.attestation,
+    secretsHex: notarizationOutputs.secrets,
+    notaryUrl: notarizationOutputs.notaryUrl,
+    websocketProxyUrl: notarizationOutputs.websocketProxyUrl,
+    reveal: commit,
+  })) as TPresentation;
+  const presentationJSON = await presentation.json();
+  return presentationJSON;
 }
 
 async function verifyProof(
-  proof: Proof,
+  proof: PresentationJSON,
 ): Promise<{ sent: string; recv: string }> {
   let result: { sent: string; recv: string };
 
@@ -286,12 +284,17 @@ async function verifyProof(
       result = await verify(proof);
       break;
     }
-    case '1.0': {
-      const tlsProof: _TlsProof = await new TlsProof(proof.data);
-      result = await tlsProof.verify({
-        typ: 'P256',
-        key: await NotaryServer.from(proof.meta.notaryUrl).publicKey(),
+    case '0.1.0-alpha.7': {
+      const presentation: TPresentation = await new Presentation(proof.data);
+      const verifierOutput = await presentation.verify();
+      const transcript = new Transcript({
+        sent: verifierOutput.transcript.sent,
+        recv: verifierOutput.transcript.recv,
       });
+      result = {
+        sent: transcript.sent(),
+        recv: transcript.recv(),
+      };
       break;
     }
   }

src/entries/Content/content.ts

@@ -1,9 +1,8 @@
 import * as Comlink from 'comlink';
-import init, { Prover, NotarizedSession, TlsProof } from 'tlsn-js';
+import init, { Prover, Presentation } from 'tlsn-js';
 
 Comlink.expose({
   init,
   Prover,
-  NotarizedSession,
-  TlsProof,
+  Presentation,
 });

src/entries/Offscreen/Offscreen.tsx

@@ -26,7 +26,7 @@ export async function getMaxRecv() {
 }
 
 export async function getNotaryApi() {
-  return await get(NOTARY_API_LS_KEY, 'https://notary.pse.dev/v0.1.0-alpha.6');
+  return await get(NOTARY_API_LS_KEY, 'https://notary.pse.dev/v0.1.0-alpha.7');
 }
 
 export async function getProxyApi() {

src/entries/Offscreen/worker.ts

@@ -1,18 +1,10 @@
-export type Proof = ProofV0 | ProofV1;
+import { PresentationJSON as PresentationJSONa7 } from 'tlsn-js/build/types';
 
-export type ProofV0 = {
+export type PresentationJSON = PresentationJSONa5 | PresentationJSONa7;
+
+export type PresentationJSONa5 = {
   version?: undefined;
   session: any;
   substrings: any;
   notaryUrl: string;
 };
-
-export type ProofV1 = {
-  version: '1.0';
-  data: string;
-  meta: {
-    notaryUrl: string;
-    websocketProxyUrl: string;
-    pluginUrl?: string;
-  };
-};

src/utils/storage.ts

@@ -83,6 +83,9 @@ var options = {
             loader: "sass-loader",
             options: {
               sourceMap: true,
+              sassOptions: {
+                silenceDeprecations: ["legacy-js-api"],
+              }
             },
           },
         ],