Merge branch 'main' into feature/flexible-subschema

examples/unique-hash.eg.ts

@@ -119,11 +119,11 @@ const spec = Spec(
     // we expose a unique hash of the credential data, to be used as nullifier
     // note: since the credential contains a 16 byte = 128 bit random ID, it has enough
     // entropy such that exposing this hash will not reveal the credential data
-    let ouputClaim = Operation.record({
+    let outputClaim = Operation.record({
       nullifier: Operation.hash(credential, appId),
     });
 
-    return { assert, ouputClaim };
+    return { assert, outputClaim };
   }
 );
 

package.json

@@ -44,7 +44,8 @@
     "@types/node": "^22.5.5",
     "prettier": "^2.3.2",
     "typescript": "^5.6.3",
-    "vite": "^4.3.9"
+    "vite": "^4.3.9",
+    "zod": "^3.23.8"
   },
   "peerDependencies": {
     "o1js": "^2.0.0"

src/credential-index.ts

@@ -56,7 +56,10 @@ const Credential = {
   toJSON(credential: StoredCredential) {
     let json = {
       version: credential.version,
-      witness: serializeNestedProvableValue(credential.witness),
+      witness:
+        credential.witness === undefined
+          ? { type: 'unsigned' }
+          : serializeNestedProvableValue(credential.witness),
       metadata: credential.metadata,
       credential: serializeNestedProvableValue(credential.credential),
     };

src/deserialize.ts

@@ -47,7 +47,7 @@ function convertSpecFromSerializable(parsedSpec: any): Spec {
     inputs,
     logic: {
       assert: deserializeNode(inputs, parsedSpec.logic.assert),
-      ouputClaim: deserializeNode(inputs, parsedSpec.logic.data),
+      outputClaim: deserializeNode(inputs, parsedSpec.logic.outputClaim),
     },
   };
 }

src/program-spec.ts

@@ -74,7 +74,7 @@ function Spec<Output, Inputs extends Record<string, Input>>(
     [K in keyof Inputs]: Node<GetData<Inputs[K]>>;
   }) => {
     assert?: Node<Bool>;
-    ouputClaim: Node<Output>;
+    outputClaim: Node<Output>;
   }
 ): Spec<Output, Inputs>;
 
@@ -115,10 +115,10 @@ function Spec<Output, Inputs extends Record<string, Input>>(
   }
   let logic = spec(inputNodes);
   let assertNode = logic.assert ?? Node.constant(Bool(true));
-  let ouputClaim: Node<Output> =
-    logic.ouputClaim ?? (Node.constant(undefined) as any);
+  let outputClaim: Node<Output> =
+    logic.outputClaim ?? (Node.constant(undefined) as any);
 
-  return { inputs, logic: { assert: assertNode, ouputClaim } };
+  return { inputs, logic: { assert: assertNode, outputClaim } };
 }
 
 const Operation = {
@@ -193,7 +193,7 @@ type Node<Data = any> =
 
 type OutputNode<Data = any> = {
   assert?: Node<Bool>;
-  ouputClaim?: Node<Data>;
+  outputClaim?: Node<Data>;
 };
 
 const Node = {
@@ -636,7 +636,7 @@ function privateInputTypes({ inputs }: Spec): NestedProvableFor<{
 
 function publicOutputType(spec: Spec): ProvablePure<any> {
   let root = dataInputTypes(spec);
-  let outputTypeNested = Node.evalType(root, spec.logic.ouputClaim);
+  let outputTypeNested = Node.evalType(root, spec.logic.outputClaim);
   let outputType = NestedProvable.get(outputTypeNested);
   assertPure(outputType);
   return outputType;

src/program.ts

@@ -78,7 +78,7 @@ function createProgram<S extends Spec>(
             credentialOutputs
           );
           let assertion = Node.eval(root, spec.logic.assert);
-          let outputClaim = Node.eval(root, spec.logic.ouputClaim);
+          let outputClaim = Node.eval(root, spec.logic.outputClaim);
           assertion.assertTrue('Program assertion failed!');
           return { publicOutput: outputClaim };
         },

src/serialize.ts

@@ -33,7 +33,7 @@ function convertSpecToSerializable(spec: Spec): Record<string, any> {
     inputs: serializeInputs(spec.inputs),
     logic: {
       assert: serializeNode(spec.logic.assert),
-      data: serializeNode(spec.logic.ouputClaim),
+      outputClaim: serializeNode(spec.logic.outputClaim),
     },
   };
 }