Merge with main

privacy-scaling-explorations · Feb 2, 2024 · 879d1b6 · 879d1b6
2 parents c017424 + 90eebff
commit 879d1b6
Show file tree

Hide file tree

Showing 350 changed files with 68,300 additions and 4,076 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,2 +1,5 @@
 [target.'cfg(target_os="macos")']
 rustflags = ["-C", "link-args=-framework CoreFoundation -framework Security"]
+
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-C", "link-arg=-Wl,--allow-multiple-definition"]
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -35,7 +35,7 @@ The target readers could be future developers, reviewers, and auditors. By readi
 
 MUST: Reference the issue to resolve
 
-### Single responsability
+### Single responsibility
 
 Is RECOMMENDED to create single responsibility commits, but not mandatory.
 

diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -33,7 +33,7 @@ jobs:
       # Create a index.html outside of the subdirectories for requirement of GitHub pages
       - name: Generate Docs
         run: |
-          cargo doc --no-deps
+          cargo doc --no-deps --workspace --exclude integration-tests
           echo "<meta http-equiv=\"refresh\" content=\"0; url=zkevm_circuits\">" > target/doc/index.html
       # Archive the artifact with the correct permissions
       # https://github.com/actions/deploy-pages/issues/188

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -93,6 +93,10 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Update git submodule
+        run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
+      - name: Install openssl
+        run: sudo apt-get install -y pkg-config libssl-dev        
       # Run an initial build in a separate step to split the build time from execution time
       - name: Build bins
         run: cargo build --bin gen_blockchain_data

diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
@@ -59,6 +59,16 @@ jobs:
             target/
           key: lint-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Install solc
+        run: |
+          sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
+          sudo chmod +x /usr/bin/solc
+      - name: Update ERC20 git submodule
+        run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
+      - name: Cargo build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
       - name: Check code format
         uses: actions-rs/cargo@v1
         with:

diff --git a/.github/workflows/main-tests.yml b/.github/workflows/main-tests.yml
@@ -38,6 +38,9 @@ jobs:
     runs-on: ["${{github.run_id}}", self-hosted, c5.9xlarge]
 
     steps:
+      - name: Install OpenSSL lib
+        run: sudo apt-get -y install libssl-dev
+
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -66,6 +69,12 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install solc
+        run: |
+          sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
+          sudo chmod +x /usr/bin/solc
+      - name: Update ERC20 git submodule
+        run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
       - name: Run light tests # light tests are run in parallel
         uses: actions-rs/cargo@v1
         with:
@@ -87,6 +96,9 @@ jobs:
     runs-on: ["${{github.run_id}}", self-hosted, c5.9xlarge]
 
     steps:
+      - name: Install OpenSSL lib
+        run: sudo apt-get -y install libssl-dev
+
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -115,6 +127,12 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install solc
+        run: |
+          sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
+          sudo chmod +x /usr/bin/solc
+      - name: Update ERC20 git submodule
+        run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
       - name: Run heavy tests # heavy tests are run serially to avoid OOM
         uses: actions-rs/cargo@v1
         with:
@@ -157,6 +175,12 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: build-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install solc
+        run: |
+          sudo wget -O /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.21/solc-static-linux
+          sudo chmod +x /usr/bin/solc
+      - name: Update ERC20 git submodule
+        run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts
       - name: cargo build
         uses: actions-rs/cargo@v1
         with:

diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -0,0 +1,65 @@
+name: WASM
+
+on:
+  merge_group:
+  pull_request:
+    types: [synchronize, opened, reopened, ready_for_review]
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+## `actions-rs/toolchain@v1` overwrite set to false so that
+## `rust-toolchain` is always used and the only source of truth.
+
+jobs:
+  skip_check:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          cancel_others: 'true'
+          concurrent_skipping: 'same_content_newer'
+          paths_ignore: '["**/README.md"]'
+
+  build:
+    needs: [skip_check]
+    if: |
+      github.event.pull_request.draft == false &&
+      (github.event.action == 'ready_for_review' || needs.skip_check.outputs.should_skip != 'true')
+
+    name: Build
+    runs-on: ["${{github.run_id}}", self-hosted, c5.9xlarge]
+
+    steps:
+      - name: Install OpenSSL lib
+        run: sudo apt-get -y install libssl-dev
+
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          override: false
+          components: rust-src
+      - name: Cargo cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Build WASM
+        env:
+          RUSTFLAGS: '-C target-feature=+atomics,+bulk-memory'
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --verbose --release --package zkevm-circuits --no-default-features --target wasm32-unknown-unknown -Z build-std=panic_abort,std
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 *.png
 .DS_Store
 .vscode
-.idea
+.idea
+*.log
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 	update = none
 	path = integration-tests/contracts/vendor/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "light-client-poc/go-ethereum"]
+	path = light-client-poc/go-ethereum
+	url = https://github.com/adria0/go-ethereum
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ @@
     *.png
     .DS_Store
     .vscode
-    .idea
+    .idea
+    *.log