Merge branch 'extension-into-branch' of https://github.com/privacy-sc…

…aling-explorations/zkevm-circuits into extension-into-branch
privacy-scaling-explorations · Apr 18, 2024 · 7e2c7c3 · 7e2c7c3
2 parents d325bf5 + cba233e
commit 7e2c7c3
Show file tree

Hide file tree

Showing 269 changed files with 14,663 additions and 4,183 deletions.
diff --git a/.github/testoolScripts/cleanup.sh b/.github/testoolScripts/cleanup.sh
@@ -6,7 +6,7 @@ runner_vpc_id="vpc-05dedcb650bd24f8d"
 # Get runner status
 runner=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[testool] Name=network-interface.vpc-id,Values=[$runner_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" --output text | xargs)
 
-echo "Reports: http://testool-public.s3-website.eu-central-1.amazonaws.com"
+echo "Reports: https://testool.pse.dev"
 echo "Shuting down instance..."
 aws ec2 stop-instances --profile $profile --instance-ids $runner
 

diff --git a/.github/workflows/geth-utils.yml b/.github/workflows/geth-utils.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20'
+        go-version: '1.21'
 
     - name: Format
       uses: Jerome1337/gofmt-action@v1.0.5

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -70,19 +70,9 @@ jobs:
         with:
           override: false
       - name: Setup golang
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: ~1.19
-      # Go cache for building geth-utils
-      - name: Go cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: ~1.21
       - name: Cargo cache
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
@@ -38,16 +38,10 @@ jobs:
         with:
           components: rustfmt, clippy
           override: false
-      # Go cache for building geth-utils
-      - name: Go cache
-        uses: actions/cache@v3
+      - name: Setup golang
+        uses: actions/setup-go@v4
         with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: lint-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: ~1.21
       - name: Cargo cache
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/main-tests.yml b/.github/workflows/main-tests.yml
@@ -46,19 +46,9 @@ jobs:
         with:
           override: false
       - name: Setup golang
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: ~1.19
-      # Go cache for building geth-utils
-      - name: Go cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: ~1.21
       - name: Cargo cache
         uses: actions/cache@v3
         with:
@@ -79,7 +69,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --verbose --release --all --all-features --exclude integration-tests --exclude circuit-benchmarks
+          args: --verbose --release --all --all-features --exclude integration-tests --exclude circuit-benchmarks -- --test-threads 24
       - name: Run testool internal tests
         uses: actions-rs/cargo@v1
         with:
@@ -104,19 +94,9 @@ jobs:
         with:
           override: false
       - name: Setup golang
-        uses: actions/setup-go@v3
-        with:
-          go-version: ~1.19
-      # Go cache for building geth-utils
-      - name: Go cache
-        uses: actions/cache@v3
+        uses: actions/setup-go@v4
         with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: ~1.21
       - name: Cargo cache
         uses: actions/cache@v3
         with:
@@ -155,16 +135,10 @@ jobs:
           override: false
       - name: Add target
         run: rustup target add x86_64-unknown-linux-gnu
-      # Go cache for building geth-utils
-      - name: Go cache
-        uses: actions/cache@v3
+      - name: Setup golang
+        uses: actions/setup-go@v4
         with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: ~1.21
       - name: Cargo cache
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/test-features.yml b/.github/workflows/test-features.yml
@@ -36,16 +36,10 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           override: false
-
-      # Go cache for building geth-utils
-      - name: Go cache
-        uses: actions/cache@v3
+      - name: Setup golang
+        uses: actions/setup-go@v4
         with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ github.workflow }}-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-
+          go-version: ~1.21
       - name: Cargo cache
         uses: actions/cache@v3
         with: