From 6f9b145636748cf1eb74d0d528a1666b64db0f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20B=C3=A9gassat?= Date: Wed, 4 Sep 2024 07:59:35 +0200 Subject: [PATCH 1/4] fix: renamed zkevm-constraints to linea-constraints + .gitmodules update --- .gitmodules | 6 +++--- linea-constraints | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 160000 linea-constraints diff --git a/.gitmodules b/.gitmodules index 2ae80c055d..8c83045bbd 100644 --- a/.gitmodules +++ b/.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 diff --git a/linea-constraints b/linea-constraints new file mode 160000 index 0000000000..c9e660b0fa --- /dev/null +++ b/linea-constraints @@ -0,0 +1 @@ +Subproject commit c9e660b0fa57e20c61d950a74c7c6366fbffe3a2 From 6f5d81cd6434a289b6406342578ac0d38dccbd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20B=C3=A9gassat?= Date: Wed, 4 Sep 2024 08:27:24 +0200 Subject: [PATCH 2/4] done ? Someone should review :) --- Makefile | 8 ++++---- .../java/net/consensys/linea/corset/CorsetValidator.java | 2 +- buildSrc/src/main/groovy/TraceFilesTask.groovy | 2 +- docs/get-started.md | 6 +++--- gradle/corset.gradle | 2 +- zkevm-constraints | 1 - 6 files changed, 10 insertions(+), 11 deletions(-) delete mode 160000 zkevm-constraints diff --git a/Makefile b/Makefile index 591a5399f2..5982179933 100644 --- a/Makefile +++ b/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' diff --git a/arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java b/arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java index e491e9d58f..56aead688a 100644 --- a/arithmetization/src/main/java/net/consensys/linea/corset/CorsetValidator.java +++ b/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; diff --git a/buildSrc/src/main/groovy/TraceFilesTask.groovy b/buildSrc/src/main/groovy/TraceFilesTask.groovy index 72b111aa3c..b5b0813818 100644 --- a/buildSrc/src/main/groovy/TraceFilesTask.groovy +++ b/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" diff --git a/docs/get-started.md b/docs/get-started.md index 6f43565cfa..e54b0bb7ac 100644 --- a/docs/get-started.md +++ b/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 -v zkevm-constraints/zkevm.bin +corset check -T -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. \ No newline at end of file + off all expansion modes, including field arithmetic. diff --git a/gradle/corset.gradle b/gradle/corset.gradle index bf54bfbe5c..03a69f5fd7 100644 --- a/gradle/corset.gradle +++ b/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 diff --git a/zkevm-constraints b/zkevm-constraints deleted file mode 160000 index 546f26e106..0000000000 --- a/zkevm-constraints +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 546f26e1065adbd9658e871d21232e9dff071511 From 18bee5baf895ce87c7eda02d17531878bab05135 Mon Sep 17 00:00:00 2001 From: FlorianHuc Date: Wed, 4 Sep 2024 09:40:48 +0200 Subject: [PATCH 3/4] update ethereum tests run. --- .github/workflows/gradle-ethereum-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-ethereum-tests.yml b/.github/workflows/gradle-ethereum-tests.yml index e0604c807a..989e571fb9 100644 --- a/.github/workflows/gradle-ethereum-tests.yml +++ b/.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 From 2a8012e923dcc1b659bfe31b696a210ffc33c3c3 Mon Sep 17 00:00:00 2001 From: FlorianHuc Date: Wed, 4 Sep 2024 09:44:31 +0200 Subject: [PATCH 4/4] Adding comment for windows users. --- docs/get-started.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/get-started.md b/docs/get-started.md index e54b0bb7ac..6517b15977 100644 --- a/docs/get-started.md +++ b/docs/get-started.md @@ -31,6 +31,8 @@ cargo install --git ssh://git@github.com/ConsenSys/corset --locked --force git submodule update --init --recursive ``` +Note: Windows user may have to run 'git config core.protectNTFS false' command within the linea-constraints folder to bypass CON.* file names being reserved. + #### Step 6: Install [pre-commit](https://pre-commit.com/) ```shell