Revert "Revert: Prover: bump to arithmetization beta-v0.8.0-rc6 (#362) (

#371)" (#418) This reverts commit 8be665e.
Consensys · Dec 10, 2024 · 0bcfa5e · 0bcfa5e
1 parent c511121
commit 0bcfa5e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 16 deletions.
diff --git a/constraints b/constraints
diff --git a/corset b/corset
diff --git a/prover/Makefile b/prover/Makefile
@@ -46,13 +46,6 @@ corset:
 zkevm/arithmetization/zkevm.bin: corset
 	cd ../constraints && $(CORSET) make zkevm.bin && mv zkevm.bin ../prover/zkevm/arithmetization
 
-##
-## Generate `define.go` based on the latest version of corset and the constraints
-##
-wizard: zkevm/define/define.go
-zkevm/define/define.go: corset
-	cd ../constraints && $(CORSET) make -B define.go && mv define.go ../prover/zkevm/arithmetization/define/define.go
-
 ##
 ## Generate the setup for the execution prover (to be run with S3 access)
 ##

diff --git a/prover/README.md b/prover/README.md
@@ -33,4 +33,4 @@ make setup
 ```
 ./integration/run.sh dev-mode
 ./integration/run.sh full-mode
-```
+```
diff --git a/prover/go.mod b/prover/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/consensys/compress v0.2.5
 	github.com/consensys/gnark v0.11.1-0.20240910135928-e8cb61d0be1d
 	github.com/consensys/gnark-crypto v0.14.1-0.20241007145620-e26bbdf97a4a
-	github.com/consensys/go-corset v0.0.0-20241009181119-b687f2ec84ed
+	github.com/consensys/go-corset v0.0.0-20241125005324-5cb0c289c021
 	github.com/crate-crypto/go-kzg-4844 v1.1.0
 	github.com/dlclark/regexp2 v1.11.2
 	github.com/fxamacker/cbor/v2 v2.7.0

diff --git a/prover/go.sum b/prover/go.sum
@@ -100,8 +100,8 @@ github.com/consensys/gnark v0.11.1-0.20240910135928-e8cb61d0be1d h1:TmNupI1+K5/L
 github.com/consensys/gnark v0.11.1-0.20240910135928-e8cb61d0be1d/go.mod h1:f9CH911SPCrbSZp5z9LYzJ3rZvI7mOUzzf48lCZO/5o=
 github.com/consensys/gnark-crypto v0.14.1-0.20241007145620-e26bbdf97a4a h1:yUHuYq+v1C3maTwnntLYhTDmboq3scSo1PQIl375/sE=
 github.com/consensys/gnark-crypto v0.14.1-0.20241007145620-e26bbdf97a4a/go.mod h1:F/hJyWBcTr1sWeifAKfEN3aVb3G4U5zheEC8IbWQun4=
-github.com/consensys/go-corset v0.0.0-20241009181119-b687f2ec84ed h1:tA+JpjGO3tB2+Q7lsrlDper2L5BcvgS2sNd6DLS2ViM=
-github.com/consensys/go-corset v0.0.0-20241009181119-b687f2ec84ed/go.mod h1:J64guTfpmfXl4Yk2D7lsWdYg0ilP+N8JWPudP7+sZpA=
+github.com/consensys/go-corset v0.0.0-20241125005324-5cb0c289c021 h1:zAPMHjY72pXmjuyb/niQ816pd+B9RAmZoL/W/f5uJSU=
+github.com/consensys/go-corset v0.0.0-20241125005324-5cb0c289c021/go.mod h1:J64guTfpmfXl4Yk2D7lsWdYg0ilP+N8JWPudP7+sZpA=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=

diff --git a/prover/zkevm/arithmetization/definition.go b/prover/zkevm/arithmetization/definition.go
@@ -176,10 +176,11 @@ func (s *schemaScanner) addConstraintInComp(name string, corsetCS schema.Constra
 
 		s.Comp.InsertLocal(0, ifaces.QueryID(name), wExpr)
 
-	case *constraint.RangeConstraint:
+	case *constraint.RangeConstraint[*air.ColumnAccess]:
 
+		bound := cs.Bound()
 		// #nosec G115 -- this bound will not overflow
-		s.Comp.InsertRange(0, ifaces.QueryID(name), s.compColumnByCorsetID(cs.Column()), int(cs.Bound()))
+		s.Comp.InsertRange(0, ifaces.QueryID(name), s.compColumnByCorsetID(cs.Target().Column), int(bound.Uint64()))
 
 	default:
 

diff --git a/prover/zkevm/arithmetization/zkevm.bin b/prover/zkevm/arithmetization/zkevm.bin
+38 −0		CHANGELOG.md
+1 −1		Cargo.lock
+1 −1		Cargo.toml
+10 −3		src/check.rs
+25 −12		src/column.rs
+22 −8		src/compiler/generator.rs
+2 −0		src/compiler/mod.rs
+3 −0		src/compiler/node.rs
+2 −0		src/compiler/parser/definitions.rs
+2 −0		src/compiler/parser/mod.rs
+19 −0		src/compiler/parser/parser.rs
+32 −12		src/exporters/besu.rs
+11 −9		src/exporters/besu_trace_columns.java
+126 −57		src/import.rs
+47 −8		src/inspect/mod.rs
+10 −0		src/main.rs
+17 −29		src/stdlib.lisp
+1 −1		tests/issue241_a.lisp
+2 −2		tests/issue241_c.lisp
+2 −2		tests/issue241_d.lisp
+1 −1		tests/issue241_e.lisp
+2 −0		tests/len_multiplier_1.accepts
+3 −0		tests/len_multiplier_1.lisp
+2 −0		tests/len_multiplier_1.rejects
+5 −0		tests/len_multiplier_2.lisp
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,4 @@ make setup @@
     ```
     ./integration/run.sh dev-mode
     ./integration/run.sh full-mode
-    ```
+    ```