Renaming zkevm-constraints to linea-constraints + .gitmodules update

.github/workflows/gradle-ethereum-tests.yml

@@ -1,4 +1,4 @@
-name: gradle
+name: reference tests
 
 on:
   schedule:
@@ -52,11 +52,11 @@ jobs:
       - name: Generate block chain reference tests
         run:  ./gradlew :reference-tests:generateBlockchainReferenceTests -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
         env:
-          JAVA_OPTS: -Dorg.gradle.daemon=false -DZKEVM_BIN_ORIGINAL_PATH="zkevm-constraints/zkevm.bin"
+          JAVA_OPTS: -Dorg.gradle.daemon=false -DZKEVM_BIN_ORIGINAL_PATH="linea-constraints/zkevm.bin"
           CORSET_FLAGS: fields,expand,expand,expand
 
       - name: generate zkevm.bin
-        run: cd ./zkevm-constraints; make zkevm.bin -B; cd ..
+        run: cd ./linea-constraints; make zkevm.bin -B; cd ..
 
       - name: Run general reference tests
         run: ./gradlew referenceGeneralStateTests

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "zkevm-constraints"]
-	path = zkevm-constraints
-	url = git@github.com:Consensys/zkevm-constraints.git
+[submodule "linea-constraints"]
+	path = linea-constraints
+	url = https://github.com/Consensys/linea-constraints
 [submodule "reference-tests/src/test/resources/ethereum-tests"]
 	path = reference-tests/src/test/resources/ethereum-tests
 	url = https://github.com/ethereum/tests.git

Makefile

@@ -6,9 +6,9 @@ SHADOW_NODE_ROOT := "/home/ec2-user/shadow-node"
 DIST_NAME := "$(PROJECT_NAME)-$(VERSION)"
 DIST_JAR_PATH := "arithmetization/build/libs/$(DIST_NAME).jar"
 BESU_PLUGINS_PATH := "$(SHADOW_NODE_ROOT)/linea-besu/plugins"
-ZKEVM_BIN_VERSIONED_NAME := $(shell echo zkevm.bin-$(shell git -C zkevm-constraints rev-parse --short HEAD))
-ZKEVM_BIN_VERSIONED_PATH := "zkevm-constraints/$(ZKEVM_BIN_VERSIONED_NAME)"
-ZKEVM_BIN_ORIGINAL_PATH := "zkevm-constraints/zkevm.bin"
+ZKEVM_BIN_VERSIONED_NAME := $(shell echo zkevm.bin-$(shell git -C linea-constraints rev-parse --short HEAD))
+ZKEVM_BIN_VERSIONED_PATH := "linea-constraints/$(ZKEVM_BIN_VERSIONED_NAME)"
+ZKEVM_BIN_ORIGINAL_PATH := "linea-constraints/zkevm.bin"
 
 ACCOUNT_FRAGMENT_FILE_PATH := "arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/account/AccountFragment.java"
 
@@ -21,7 +21,7 @@ shadow-node-deploy:
 	@scp -r "$(DIST_JAR_PATH)" "$(node_address):$(BESU_PLUGINS_PATH)"
 	@sed -i -e 's/\/\/ this\.existsInfinity = /this\.existsInfinity = /g' $(ACCOUNT_FRAGMENT_FILE_PATH)
 	@echo ">>>>>>>>>>> Building zkevm.bin..."
-	@make -C zkevm-constraints zkevm.bin -B && cp "$(ZKEVM_BIN_ORIGINAL_PATH)" "$(ZKEVM_BIN_VERSIONED_PATH)"
+	@make -C linea-constraints zkevm.bin -B && cp "$(ZKEVM_BIN_ORIGINAL_PATH)" "$(ZKEVM_BIN_VERSIONED_PATH)"
 	@scp -r "$(ZKEVM_BIN_VERSIONED_PATH)" "$(node_address):$(SHADOW_NODE_ROOT)"
 	@ssh -t "$(node_address)" \
 		'cd $(SHADOW_NODE_ROOT); ln -sf $(ZKEVM_BIN_VERSIONED_NAME) zkevm.bin; find $(BESU_PLUGINS_PATH) ! -name $(DIST_NAME).jar -type f -exec rm -f {} +; zsh -l'

arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java

@@ -44,7 +44,7 @@ public class CorsetValidator {
   public record Result(boolean isValid, File traceFile, String corsetOutput) {}
 
   /** */
-  private static final String ZK_EVM_RELATIVE_PATH = "/zkevm-constraints/zkevm.bin";
+  private static final String ZK_EVM_RELATIVE_PATH = "/linea-constraints/zkevm.bin";
 
   /** Specifies the default zkEVM.bin file to use (including its path). */
   private String defaultZkEvm = null;

buildSrc/src/main/groovy/TraceFilesTask.groovy

@@ -22,7 +22,7 @@ abstract class TraceFilesTask extends Exec {
                      "-P", module.get(),
                      "-o", "${project.projectDir}/src/main/java/net/consensys/linea/zktracer/module/${moduleDir.getOrElse(module.get())}"
     ]
-    arguments.addAll(files.get().collect({"zkevm-constraints/${it}"}))
+    arguments.addAll(files.get().collect({"linea-constraints/${it}"}))
 
     workingDir project.rootDir
     executable "corset"

docs/get-started.md

@@ -25,7 +25,7 @@ echo "net.git-fetch-with-cli=true" >> .cargo/config.toml
 cargo install --git ssh://git@github.com/ConsenSys/corset --locked --force
 ```
 
-#### Step 5: Update constraints [submodule](https://github.com/Consensys/zkevm-constraints/)
+#### Step 5: Update constraints [submodule](https://github.com/Consensys/linea-constraints/)
 
 ```shell
 git submodule update --init --recursive
@@ -155,7 +155,7 @@ ______________________________________________________________________
 - JSON files can be debugged with the following command:
 
 ```shell
-corset check -T <JSON_FILE> -v zkevm-constraints/zkevm.bin
+corset check -T <JSON_FILE> -v linea-constraints/zkevm.bin
 ```
 
 ## Disable Corset expansion
@@ -169,4 +169,4 @@ be easily disabled in IntelliJ:
    ![idea_disable_corset_expansion.png](images/idea_disable_corset_expansion.png)
 
    and add `CORSET_FLAGS=` under `Environment Variables`.  This turns
-   off all expansion modes, including field arithmetic.
+   off all expansion modes, including field arithmetic.

gradle/corset.gradle

@@ -26,7 +26,7 @@ tasks.register('corsetExists') {
 
 tasks.register('buildZkevmBin', Exec) {
 //    dependsOn corsetExists
-    workingDir "${project.rootDir}/zkevm-constraints/"
+    workingDir "${project.rootDir}/linea-constraints/"
     commandLine 'make', 'zkevm.bin'
 
     //store the output instead of printing to the console