Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring V2 up to date #296

Closed
wants to merge 14 commits into from
Closed

Bring V2 up to date #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5288f34
fix(provable-generic.ts): add validation to check obj and typeObj len…
ymekuria Jul 16, 2024
a30ef12
feat(provable-generic.ts): add a check to ensure obj is an array befo…
ymekuria Jul 16, 2024
b9ff1ab
feat(provable-generic.ts): add more specific error message when obj i…
ymekuria Jul 16, 2024
7705ca8
feat(provable-generic.ts): update error message when typeObj and obj …
ymekuria Jul 16, 2024
a98e6cf
refactor(provable-generic.ts): remove redundant 'new' keyword from Er…
ymekuria Jul 18, 2024
1f95223
Merge branch main into feature/tofields-array-handling
ymekuria Jul 26, 2024
4287203
update tofields
ymekuria Jul 29, 2024
6898001
feat(provable-generic.ts): add hasProvable check for typeObj in toFields
ymekuria Jul 29, 2024
9c30012
Merge branch 'main' into feature/tofields-array-handling
ymekuria Aug 14, 2024
3d00e34
fix mono<>poly morphism use
Trivo25 Aug 19, 2024
667b9dd
Merge branch 'main' into fix/polymorphism
Trivo25 Aug 19, 2024
791a368
Merge pull request #292 from o1-labs/fix/polymorphism
Trivo25 Aug 21, 2024
35b2a61
Merge branch 'main' into feature/tofields-array-handling
ymekuria Aug 21, 2024
84e3196
Merge pull request #285 from o1-labs/feature/tofields-array-handling
ymekuria Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/provable-generic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,17 @@ function createDerivers<Field>(): {

if (hasProvable(typeObj)) return typeObj.provable.toFields(obj);

if (Array.isArray(typeObj))
if (Array.isArray(typeObj)) {
if (!Array.isArray(obj)) {
throw Error(`Expected an array for type, but got ${typeof obj}`);
}
if (typeObj.length !== obj.length) {
throw Error(
`Expected array length ${typeObj.length}, but got ${obj.length}`
);
}
return typeObj.map((t, i) => toFields(t, obj[i])).flat();
}

if (isProvable(typeObj)) return typeObj.toFields(obj);

Expand Down
2 changes: 1 addition & 1 deletion ocaml/lib/local_ledger.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ let account_to_json =
lazy (Mina_base.Account.deriver @@ Fields_derivers_zkapps.o ())
in
let to_json (account : Mina_base.Account.t) : Js.Unsafe.any =
account
Mina_base.Account.to_poly account
|> Fields_derivers_zkapps.to_json (Lazy.force deriver)
|> Yojson.Safe.to_string |> Js.string |> Util.json_parse
in
Expand Down
Loading