Reorganize data types #2

Author: adamczykm

minauth-plugins/minauth-verified-zkdocument-plugin/src/claim.ts

@@ -1,21 +1,5 @@
 import { CircuitString, Field, Poseidon } from 'o1js';
-import { z } from 'zod';
-import { ClaimStruct, IClaimStruct } from './data/claims.js';
-import { FieldsSchema } from './data/simple.js';
-import { ClaimSchema_, ClaimStandard } from './data/transit-cred.js';
-
-
-export interface IClaim<V> {
-  get name(): string;
-  get value(): V;
-  get fieldsValue(): Field[];
-  get standard(): ClaimStandard;
-}
-
-export const claimToStruct = (claim: IClaim<any>): IClaimStruct => {
-  const l = claim.fieldsValue.length;
-  return ClaimStruct(l).fromFields(claim.fieldsValue);
-};
+import { ClaimStandard } from './data/transit/cred';
 
 export const claimStandardHash = (standard: ClaimStandard): Field => {
   const idHash = Poseidon.hash(
@@ -26,11 +10,3 @@ export const claimStandardHash = (standard: ClaimStandard): Field => {
   ]);
   return Poseidon.hash([idHash, optsHash]);
 };
-
-// ==========================================
-// inline tests
-
-const TypeCheckerTestSchema = ClaimSchema_(z.number());
-type TypeCheckerTestType = z.infer<typeof TypeCheckerTestSchema>;
-const typeCheckerTestValue = undefined as unknown as TypeCheckerTestType;
-typeCheckerTestValue satisfies IClaim<number>;

minauth-plugins/minauth-verified-zkdocument-plugin/src/credential.ts

@@ -1,98 +1,15 @@
 import { CircuitString, Field, Poseidon, PrivateKey } from 'o1js';
 import * as o1js from 'o1js';
-import { z } from 'zod';
-import {
-  ClaimSchema,
-  ClaimStandardSchema,
-  IClaim,
-  claimStandardHash
-} from './claim.js';
-import {
-  CredSubjectId,
-  CredSubjectIdSchema,
-  IssuerIdSchema,
-  VCredIdSchema
-} from './data/ids.js';
-import {
-  FieldSchema,
-  SignatureB58,
-  SignatureSchema,
-  UnixTimestampSchema
-} from './data/simple.js';
 import { arraysAreEqual } from './helpers/utils.js';
-import { Issuer } from './issuer.js';
-import { VCredStruct, VCredStructUnsigned } from './data/vcred.js';
 import { Logger } from 'tslog';
+import { CredSubjectId, Credential, CredentialData, CredentialSchema, CredentialStandard } from './data/transit/cred.js';
+import { claimStandardHash } from './claim.js';
+import { mkVCredStruct } from './data/o1js/vcred.js';
+import { SignatureSchema } from './data/transit/common.js';
+import { Issuer } from './issuer.js';
 
 const log = new Logger({ name: 'credential.ts' });
 
-// =============== Credential Trasit Types ==================
-
-// ---------------- Credential Standard  ----------------
-
-export const CredentialStandardSchema = z.object({
-  standardId: z.string().min(2),
-  description: z.string().min(2),
-  schema: z
-    .record(z.string().min(2), ClaimStandardSchema)
-    .refine((schema) => Object.keys(schema).length > 0, {
-      message: 'Must define at least one claim.'
-    })
-});
-
-export type CredentialStandard = z.infer<typeof CredentialStandardSchema>;
-
-// ---------------- Credential Data  ----------------
-
-export const CredentialDataSchema = z.object({
-  claims: z
-    .record(z.string().min(1), ClaimSchema(z.unknown()))
-    .refine((claims) => Object.keys(claims).length > 0, {
-      message: 'Must define at least one claim.'
-    }),
-  id: VCredIdSchema,
-  issuer: IssuerIdSchema,
-  issuanceDate: UnixTimestampSchema,
-  expirationDate: UnixTimestampSchema,
-  subject: CredSubjectIdSchema,
-  credentialStandardHash: FieldSchema
-});
-
-export type CredentialData = z.infer<typeof CredentialDataSchema>;
-
-// ---------------- Credential  ----------------
-
-export const CredentialSchema = CredentialDataSchema.extend({
-  signature: SignatureSchema
-});
-
-export type Credential = z.infer<typeof CredentialSchema>;
-
-// =============== To fields-encoded types ===============
-
-export const mkStructCredentialUnsigned = (credential: CredentialData) => {
-  log.debug('Entering mkStructCredentialUnsigned...', credential);
-  return VCredStructUnsigned(
-    Object.values(credential.claims).map((claim) => claim.fieldsValue.length)
-  ).schema.parse({
-    ...credential,
-    claims: Object.values(credential.claims).map((claim) => ({
-      claimValue: claim.fieldsValue
-    }))
-  });
-};
-
-// signed version
-export const mkStructCredential = (credential: Credential) => {
-  return VCredStruct(
-    Object.values(credential.claims).map((claim) => claim.fieldsValue.length)
-  ).schema.parse({
-    ...credential,
-    claims: Object.values(credential.claims).map((claim) => ({
-      claimValue: claim.fieldsValue
-    }))
-  });
-};
 
 export const checkCredentialStandardConformance = (
   credential: Credential,
@@ -139,10 +56,10 @@ export const verifyAndIssueCredential =
     log.debug('Entering verifyAndIssueCredential...');
 
     log.debug('Converting the credential data to o1js fields.');
-    const flds = mkStructCredentialUnsigned(credentialData).toFields();
+    const flds = mkVCredStruct(credentialData).toFields();
 
     log.debug('Creating signature for the fields data');
-    const signature: SignatureB58 = SignatureSchema.parse(
+    const signature = SignatureSchema.parse(
       o1js.Signature.create(privateKey, flds).toBase58()
     );
 
@@ -163,24 +80,16 @@ export const verifyAndIssueCredential =
 
     // additional assertions
     // issuer pubkey matches the private key
-    if (!issuer.pubkey.equals(privateKey.toPublicKey())) {
+    if (issuer.pubkey !== privateKey.toPublicKey().toBase58()) {
       throw new Error('Issuer pubkey does not match the private key');
     }
 
     // credential subject public key matches the given subject public key
-    if (!credential.subject.pubkey.equals(subject.pubkey)) {
+    if (credential.subject.pubkey !== subject.pubkey) {
       throw new Error('Subject does not match the credential subject');
     }
 
     return {
       credential
     };
   };
-
-// ==========================================
-// inline tests
-
-const TypeCheckerTestSchema = ClaimSchema(z.number());
-type TypeCheckerTestType = z.infer<typeof TypeCheckerTestSchema>;
-const typeCheckerTestValue = undefined as unknown as TypeCheckerTestType;
-typeCheckerTestValue satisfies IClaim<number>;