Merge pull request #150 from o1-labs/fix/struct-to-fields

Fix Struct.toFields()
o1-labs · Sep 19, 2023 · 03e1b6e · 03e1b6e
2 parents 1b07374 + ffaaf33
commit 03e1b6e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/lib/provable-generic.ts b/lib/provable-generic.ts
@@ -9,7 +9,7 @@ export { createProvable, createHashInput, ProvableConstructor };
 
 type ProvableConstructor<Field> = <A>(
   typeObj: A,
-  options?: { customObjectKeys?: string[]; isPure?: boolean }
+  options?: { isPure?: boolean }
 ) => GenericProvableExtended<InferProvable<A, Field>, InferJson<A>, Field>;
 
 function createProvable<Field>(): ProvableConstructor<Field> {
@@ -25,13 +25,13 @@ function createProvable<Field>(): ProvableConstructor<Field> {
 
   function provable<A>(
     typeObj: A,
-    options?: { customObjectKeys?: string[]; isPure?: boolean }
+    options?: { isPure?: boolean }
   ): ProvableExtended<InferProvable<A, Field>, InferJson<A>> {
     type T = InferProvable<A, Field>;
     type J = InferJson<A>;
     let objectKeys =
       typeof typeObj === 'object' && typeObj !== null
-        ? options?.customObjectKeys ?? Object.keys(typeObj).sort()
+        ? Object.keys(typeObj)
         : [];
     let nonCircuitPrimitives = new Set([
       Number,

diff --git a/lib/provable-snarky.ts b/lib/provable-snarky.ts
@@ -46,14 +46,12 @@ const HashInput = {
 
 function provable<A>(
   typeObj: A,
-  options?: { customObjectKeys?: string[]; isPure?: boolean }
+  options?: { isPure?: boolean }
 ): ProvableExtended<InferProvable<A>, InferJson<A>> {
   type T = InferProvable<A>;
   type J = InferJson<A>;
   let objectKeys =
-    typeof typeObj === 'object' && typeObj !== null
-      ? options?.customObjectKeys ?? Object.keys(typeObj).sort()
-      : [];
+    typeof typeObj === 'object' && typeObj !== null ? Object.keys(typeObj) : [];
   let nonCircuitPrimitives = new Set([
     Number,
     String,
@@ -222,11 +220,10 @@ function provable<A>(
 }
 
 function provablePure<A>(
-  typeObj: A,
-  options: { customObjectKeys?: string[] } = {}
+  typeObj: A
 ): ProvablePure<InferProvable<A>> &
   ProvableExtension<InferProvable<A>, InferJson<A>> {
-  return provable(typeObj, { ...options, isPure: true }) as any;
+  return provable(typeObj, { isPure: true }) as any;
 }
 
 // some type inference helpers

diff --git a/mina-transaction/derived-leaves.ts b/mina-transaction/derived-leaves.ts
@@ -83,16 +83,11 @@ function derivedLeafTypes<Field, Bool>({
   };
 
   const AuthRequired = {
-    ...provable(
-      { constant: Bool, signatureNecessary: Bool, signatureSufficient: Bool },
-      {
-        customObjectKeys: [
-          'constant',
-          'signatureNecessary',
-          'signatureSufficient',
-        ],
-      }
-    ),
+    ...provable({
+      constant: Bool,
+      signatureNecessary: Bool,
+      signatureSufficient: Bool,
+    }),
     emptyValue(): AuthRequired {
       return {
         constant: Bool(true),