flexible fromValue

o1-labs · Nov 27, 2023 · 4fb53e4 · 4fb53e4
1 parent 07d117e
commit 4fb53e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/from-layout.ts b/lib/from-layout.ts
@@ -356,7 +356,7 @@ function ProvableFromLayout<
       toValue(value: T): TValue {
         return toValue(typeData, value);
       },
-      fromValue(value: TValue): T {
+      fromValue(value: TValue | T): T {
         return fromValue(typeData, value);
       },
     };

diff --git a/lib/generic.ts b/lib/generic.ts
@@ -26,7 +26,7 @@ type GenericProvable<T, TValue, Field> = {
   sizeInFields(): number;
   check: (x: T) => void;
   toValue: (x: T) => TValue;
-  fromValue: (x: TValue) => T;
+  fromValue: (x: T | TValue) => T;
 };
 interface GenericProvablePure<T, TValue, Field>
   extends GenericProvable<T, TValue, Field> {

diff --git a/mina-transaction/derived-leaves.ts b/mina-transaction/derived-leaves.ts
@@ -142,8 +142,11 @@ function createTokenSymbol<
     toValue(t: TokenSymbol<Field>): string {
       return self.toJSON(t);
     },
-    fromValue(s: string): TokenSymbol<Field> {
-      return self.fromJSON(s);
+    fromValue(s: string | TokenSymbol<Field>): TokenSymbol<Field> {
+      if (typeof s === 'string') {
+        return self.fromJSON(s);
+      }
+      return s;
     },
   };
   return self;