Merge branch 'main' into fix/empty_coinbase

.github/testoolScripts/build.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -x
+
+export PATH=/home/ubuntu/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/snap/bin:/usr/local/go/bin/
+
+error() {
+  sudo poweroff
+}
+
+trap 'error' ERR
+
+cd zkevm-circuits/testool
+git submodule update --init --recursive ; git submodule update --checkout ; cargo build --release
+
+exit 0

.github/testoolScripts/cleanup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+profile="cirunner"
+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 "Shuting down instance..."
+aws ec2 stop-instances --profile $profile --instance-ids $runner
+
+exit 0

.github/testoolScripts/prepare.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -x
+
+error() {
+  sudo poweroff
+}
+
+trap 'error' ERR
+
+branch=$1
+
+rm -rf zkevm-circuits
+git clone https://github.com/privacy-scaling-explorations/zkevm-circuits.git
+cd zkevm-circuits/testool
+git checkout $branch
+ln -s /home/ubuntu/report report
+
+exit 0

.github/testoolScripts/run.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -x
+
+export PATH=/home/ubuntu/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/snap/bin:/usr/local/go/bin/
+
+error() {
+  sudo poweroff
+}
+
+trap 'error' ERR
+
+suite=$1
+
+cd zkevm-circuits/testool
+../target/release/testool --suite $suite --report
+
+exit 0

.github/testoolScripts/sync.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -x
+
+error() {
+  sudo poweroff
+}
+
+trap 'error' ERR
+
+cd report
+rm index.html
+for i in `ls -t *.html`; do echo "<a href=\"$i\">$i</a> <br>" >> index.html; done
+
+aws s3 sync . s3://testool-public/
+
+exit 0

.github/testoolScripts/wakeUpRunner.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+profile="cirunner"
+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)
+
+while true; do
+    runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner --query "Reservations[*].Instances[*].State.[Name]" --output text)
+    if [ $runner_status = "stopped" ]; then
+        aws ec2 start-instances --profile $profile --instance-ids $runner
+        exit 0
+    elif [ $runner_status = "running" ]; then
+        sleep 120
+        runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner --query "Reservations[*].Instances[*].State.[Name]" --output text)
+        if [ $runner_status = "running" ]; then
+            exit 0
+        fi
+    else
+        sleep 30
+    fi
+done

.github/workflows/github-pages.yml

@@ -0,0 +1,68 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ['main']
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: 'pages'
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      # Create a index.html outside of the subdirectories for requirement of GitHub pages
+      - name: Generate Docs
+        run: |
+          cargo doc --no-deps
+          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
+      - name: Archive artifact
+        shell: sh
+        run: |
+          chmod -c -R +rX "target/doc" |
+          while read line; do
+              echo "::warning title=Invalid file permissions automatically fixed::$line"
+          done
+          tar \
+            --dereference --hard-dereference \
+            --directory "target/doc" \
+            -cvf "$RUNNER_TEMP/artifact.tar" \
+            --exclude=.git \
+            --exclude=.github \
+            .
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: 'target/doc'
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

.github/workflows/integration.yml

@@ -28,7 +28,10 @@ concurrency:
 
 jobs:
   set-outputs:
-    if: github.event.pull_request.draft == false
+    if: github.event_name == 'schedule' ||
+        github.event_name == 'push' ||
+        github.event_name == 'workflow_dispatch' ||
+        contains(github.event.pull_request.labels.*.name, 'trigger-integration-tests')
 
     runs-on: ubuntu-latest
     outputs:

.github/workflows/labeler.yml

@@ -1,11 +1,14 @@
-name: "Pull Request Labeler"
+name: Pull Request Labeler
 on:
   - pull_request_target
 
 jobs:
   triage:
+    name: Triage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v3
+      - uses: actions/checkout@v2
+      - name: Labeler
+        uses: actions/labeler@v4
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"