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

Updating TS Risc0 journal parsing #243

Merged
merged 3 commits into from
Oct 25, 2024
Merged

Updating TS Risc0 journal parsing #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2839b4
updating parsingUtils.ts and adding test to risc0 proof
luiz-lvj Oct 25, 2024
96a1b8f
Merge pull request #6 from luiz-lvj/ts_risc0
luiz-lvj Oct 25, 2024
f1d562b
Merge branch 'main' into main
feltroidprime Oct 25, 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
33 changes: 24 additions & 9 deletions tools/npm/garaga_ts/src/node/starknet/groth16ContractGenerator/parsingUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export interface Groth16Proof {
publicInputs: bigint[],
curveId?: CurveId,
imageId?: Uint8Array,
journalDigest?: Uint8Array
journal?: Uint8Array
}

export interface Groth16VerifyingKey {
Expand Down Expand Up @@ -51,6 +51,12 @@ interface ReceiptClaim {
tagDigest?: Uint8Array;
}

export class KeyPatternNotFoundError extends Error {
constructor(message: string) {
super(message);
this.name = "KeyPatternNotFoundError";
}
}



Expand Down Expand Up @@ -188,6 +194,7 @@ export const parseGroth16ProofFromObject = (data: any, publicInputsData?: bigint

try{


const sealHex = toHexStr(findItemFromKeyPatterns(proof, ['seal']));
const imageIdHex = toHexStr(findItemFromKeyPatterns(proof, [ 'image_id']));
const journalHex = toHexStr(findItemFromKeyPatterns(proof, ['journal']));
Expand Down Expand Up @@ -217,7 +224,12 @@ export const parseGroth16ProofFromObject = (data: any, publicInputsData?: bigint
throw new Error(`Invalid public inputs format: ${publicInputsData}`);
}
} else{
publicInputs = findItemFromKeyPatterns(data, ['public']);

try {
publicInputs = findItemFromKeyPatterns(data, ['public']);
} catch(err){
throw new Error(`Error: ${err}`);
}
}
const a = tryParseG1PointFromKey(proof, ['a'], curveId);
const b = tryParseG2PointFromKey(proof, ['b'], curveId);
Expand All @@ -243,18 +255,21 @@ export const parseGroth16ProofFromObject = (data: any, publicInputsData?: bigint
}


export const createGroth16ProofFromRisc0 = (seal: Uint8Array, imageId: Uint8Array, journal: Uint8Array,
export const createGroth16ProofFromRisc0 = (seal: Uint8Array, imageId: Uint8Array, journalBytes: Uint8Array,
controlRoot: bigint = RISC0_CONTROL_ROOT, bn254ControlId: bigint = RISC0_BN254_CONTROL_ID): Groth16Proof => {

if(imageId.length <= 32){
if(imageId.length > 32){
throw new Error("imageId must be 32 bytes")
}

const [constrolRoot0, controlRoot1] = splitDigest(controlRoot);

const proof = seal.slice(4);
const journalDigest = createHash("sha256").update(journal).digest();
const claimDigest = digestReceiptClaim(ok(imageId, journalDigest));


const journal = createHash("sha256").update(journalBytes).digest();

const claimDigest = digestReceiptClaim(ok(imageId, journal));

const [claim0, claim1] = splitDigest(claimDigest);

Expand Down Expand Up @@ -288,7 +303,7 @@ export const createGroth16ProofFromRisc0 = (seal: Uint8Array, imageId: Uint8Arra
bn254ControlId
],
imageId,
journalDigest
journal
}
if(checkGroth16Proof(groth16Proof)){
return groth16Proof;
Expand Down Expand Up @@ -329,7 +344,6 @@ export const checkGroth16VerifyingKey = (vk: Groth16VerifyingKey): boolean => {

const digestReceiptClaim = (receipt: ReceiptClaim): Uint8Array => {
const { tagDigest, input, preStateDigest, postStateDigest, output, exitCode } = receipt;

// Concatenating all parts into one Buffer
const data = Buffer.concat([
tagDigest!,
Expand Down Expand Up @@ -362,6 +376,7 @@ function ok(imageId: Uint8Array, journalDigest: Uint8Array): ReceiptClaim {

// Create and return the ReceiptClaim object
return {
tagDigest: createHash('sha256').update(Buffer.from("risc0.ReceiptClaim")).digest(),
preStateDigest: imageId,
postStateDigest: SYSTEM_STATE_ZERO_DIGEST,
exitCode,
Expand Down Expand Up @@ -494,7 +509,7 @@ const findItemFromKeyPatterns = (data: { [key: string]: any }, keyPatterns: stri
if(bestMatch){
return bestMatch;
}
throw new Error(`No key found with patterns ${keyPatterns}`);
throw new KeyPatternNotFoundError(`No key found with patterns ${keyPatterns}`);
}

export const getPFromCurveId = (curveId: CurveId): bigint => {
Expand Down
1 change: 1 addition & 0 deletions tools/npm/garaga_ts/tests/starknet/groth16VkProofParsing.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ describe('Groth16 Parsing Tests', () => {
const proofPaths = [
`${PATH}/proof_bn254.json`,
`${PATH}/proof_bls.json`,
`${PATH}/proof_risc0.json`
];

test.each(proofPaths)('should parse proof from %s', (proofPath) => {
Expand Down
Loading