FriWitness

HerodotusDev · Dec 31, 2023 · deddf85 · deddf85
1 parent d13b6b1
commit deddf85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/runner/src/parser.lalrpop b/runner/src/parser.lalrpop
@@ -11,13 +11,23 @@ CairoParserOutputInner: Exprs = {
     <n:Num> => Exprs(vec![Expr::Value(n)]),
     "[" <n:Comma<CairoParserOutputInner>> "]" => Exprs(vec![Expr::Array(n.iter().flat_map(|x| x.iter().cloned()).collect())]),
     StructName "()" => Exprs(Vec::new()),
+    "FriWitness" "(" "layers=" "[" <n:Comma<FriWitnessLayers>> "]" ")" => Exprs(vec![Expr::Array(n.iter().flat_map(|x| x.iter().cloned()).collect())]),
     StructName "(" <n:Comma<Arg>> ")" => Exprs(n.iter().flat_map(|x| x.iter().cloned()).collect()),
 };
 
 Arg: Exprs = {
     ArgName "=" <n:CairoParserOutputInner> => n,
 };
 
+FriWitnessLayers: Exprs = {
+    <n:Num> "," "[" <a:Comma<Num>> "]" => Exprs(vec![Expr::Value(n)].into_iter().chain(a.into_iter().map(|x| Expr::Value(x))).collect()),
+    StructName "(" ArgName "=" StructName "(" <n:FriWitnessLayersArgs> ")" ")" => n,
+};
+
+FriWitnessLayersArgs: Exprs = {
+    ArgName "=" <n:Num> "," ArgName "=" "[" <a:Comma<Num>> "]" => Exprs(vec![Expr::Value(n)].into_iter().chain(a.into_iter().map(|x| Expr::Value(x))).collect()),
+};
+
 Comma<T>: Vec<T> = {
     <mut v:(<T> ",")*> <e:T?> => match e {
         None => v,

diff --git a/src/input_structs/stark_witness.cairo b/src/input_structs/stark_witness.cairo
@@ -5,6 +5,7 @@ struct StarkWitness {
     interaction: TableCommitmentWitness,
     composition_decommitment: TableDecommitment,
     composition_witness: TableCommitmentWitness,
+    fri_witness: FriWitness,
 }
 
 #[derive(Drop, Serde)]
@@ -37,5 +38,5 @@ struct VectorCommitmentWitness {
 
 #[derive(Drop, Serde)]
 struct FriWitness {
-    layers: Array<Array<felt252>>,
+    layers: Array<felt252>,
 }