Skip to content

Commit

Permalink
Merge pull request #1629 from o1-labs/merge/o1js-main-develop
Browse files Browse the repository at this point in the history
Merge o1js-main one last time
  • Loading branch information
mitschabaude committed May 17, 2024
2 parents 8cf3b08 + 9e76d3c commit 750ffd5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions src/lib/proof-system/prover-keys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function parseHeader(
methods: MethodInterface[],
header: SnarkKeyHeader
): CacheHeader {
let hash = Pickles.util.fromMlString(header[1][2][8]);
let hash = Pickles.util.fromMlString(header[1][2][7]);
switch (header[0]) {
case KeyType.StepProvingKey:
case KeyType.StepVerificationKey: {
Expand Down Expand Up @@ -211,9 +211,8 @@ type MlSnarkKeysHeader = [
headerVersion: number,
kind: [_: 0, type: MlString, identifier: MlString],
constraintConstants: unknown,
commits: unknown,
commit: MlString,
length: number,
commitDate: MlString,
constraintSystemHash: MlString,
identifyingHash: MlString
];
Expand Down
2 changes: 1 addition & 1 deletion src/mina
Submodule mina updated 144 files
4 changes: 2 additions & 2 deletions tests/vk-regression/vk-regression.json
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@
}
},
"verificationKey": {
"data": "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",
"hash": "12697506505683930771562355619882993515591767596875424801784257474849667200879"
"data": "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",
"hash": "25623831254983213172744462801407311873591580962193188412810615740754024675774"
}
}
}

0 comments on commit 750ffd5

Please sign in to comment.