Try merge v3.0.0 (#19)

* hotfix: forbid enforced gateway (scroll-tech#101)

Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

* chore: bump version 2.0.1 (scroll-tech#102)

* ci: bump GitHub Action versions (scroll-tech#107)

* ci: add Slither static-analysis  (scroll-tech#103)

Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

* new `ScrollChainCommitmentVerifier` (scroll-tech#95)

Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

* build(deps): bump base-x from 3.0.9 to 3.0.11 (scroll-tech#108)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* add L2SystemContract (scroll-tech#114)

* feat: add e2e devnet deployment scripts (scroll-tech#97)

* feat: add pause controller (scroll-tech#117)

* feat: consider EIP-7623 floor gas in message queue (scroll-tech#118)

* feat: add L1SystemConfig events (scroll-tech#119)

* feat: require top-level call to commitAndFinalizeBatch (scroll-tech#120)

* feat: add new zkevm verifier for Feynman upgrade (scroll-tech#123)

* feat(feynman): update L1GasPriceOracle (scroll-tech#124)

* remove unused contracts and functions (scroll-tech#110)

Co-authored-by: Péter Garamvölgyi <peter@scroll.io>

* fix: allow only top level call in commitAndFinalizeBatch (scroll-tech#126)

* feat: support resetPauseCooldownPeriod (scroll-tech#127)

* fix conflicts part 1

fix conflicts part2

fix conflict part3

fix compile part1

fix compile part2

fix compile part3

register V8 verifier: feynman upgrade

todo revert this after test

fix rollup-config missing endpoint

remove debug log

add -vvvv

set batch size to 10

some fix

fix read private key

use a small batch size 5, so the l2-sequencer won't get stuck

* fix: read from file still required while run gen-configs

* improve verify.sh

* use deterministic foundry version v1.3.0-rc2

* fix rollup-config.json gas_price_oracle_contract_address

* remove --resume

* set BATCH_SIZE=7

* fix bug: missing L2_SYSTEM_CONFIG

other missing fields in genesis.json

* set genesisStateRoot default to null

set missingHeaderFieldsSHA256 default to null //TODO

* replace scrolltech with dogeos69

* verify.sh add L2SystemConfig

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Xi Lin <zimpha@gmail.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: Souhail M. <65525816+mssassii@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Morty <70688412+yiweichi@users.noreply.github.com>

Author: 6 people

.github/workflows/contracts.yml

@@ -35,7 +35,7 @@ jobs:
           persist-credentials: false
 
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # v1.3.1
+        uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
         with:
           version: nightly
 
@@ -84,7 +84,7 @@ jobs:
         run : lcov --rc branch_coverage=1 --remove ./lcov.info -o ./lcov.info.pruned 'src/mocks/*' 'src/test/*' 'scripts/*' 'node_modules/*' 'lib/*' --ignore-errors unused,unused
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
@@ -136,4 +136,59 @@ jobs:
         run: npx hardhat compile
 
       - name: Run hardhat tests
-        run: npx hardhat test
+        run: npx hardhat test
+
+  slither:
+    if: github.event.pull_request.draft == false
+    needs: foundry
+    runs-on: ubuntu-latest
+    permissions:
+      statuses: write
+      security-events: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          persist-credentials: false
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - run: yarn install --frozen-lockfile
+
+      - uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
+        with:
+          version: nightly
+
+      - name: Build contracts
+        run: forge build --build-info --out out --evm-version cancun
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - run: |
+          python -m pip install --upgrade pip
+          pip install slither-analyzer==0.11.3
+
+      - name: Run Slither (High severity gate)
+        run: |
+          slither . \
+            --filter-paths "src/test/*|src/mocks/*|scripts/*|node_modules" \
+            --foundry-out-directory out \
+            --exclude-dependencies \
+            --exclude-medium \
+            --exclude-low \
+            --exclude-informational \
+            --fail-high \
+            --json slither-report.json \
+            --markdown-root slither-report.md
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: slither-static-analysis
+          path: |
+            slither-report.json
+            slither-report.md

.github/workflows/docker-release.yml

@@ -73,7 +73,9 @@ jobs:
 
       - name: Build deploy image
         id: build_deploy_image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
+        env:
+          REPOSITORY: ${{ env.DOCKER_REPOSITORY }}
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           platforms: linux/amd64,linux/arm64
           push: true
@@ -85,7 +87,9 @@ jobs:
 
       - name: Build gen image
         id: build_gen_image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
+        env:
+          REPOSITORY: ${{ env.DOCKER_REPOSITORY }}
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           platforms: linux/amd64,linux/arm64
           push: true

.github/workflows/zizmor.yml

@@ -23,7 +23,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5.3.1
+        uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
 
       - name: Run zizmor
         run: uvx zizmor --format sarif . > results.sarif

.gitignore

@@ -19,3 +19,9 @@ broadcast
 
 # Visual Studio Code
 .vscode
+
+# OS
+.DS_Store
+
+# config
+scripts/deterministic/config/config-contracts.toml

docker/Dockerfile.base

@@ -22,7 +22,7 @@ RUN curl -L https://foundry.paradigm.xyz | bash
 ENV PATH="/root/.foundry/bin:${PATH}"
 
 # Run foundryup to update Foundry
-RUN foundryup
+RUN foundryup -i v1.3.0-rc2
 
 # copy dependencies
 COPY ./lib /contracts/lib

docker/Dockerfile.gen-configs

@@ -8,15 +8,7 @@ SHELL ["/bin/bash", "-c"]
 WORKDIR /contracts
 
 # copy script configs
-COPY ./docker/templates/balance-checker-config.json /contracts/docker/templates/balance-checker-config.json
-COPY ./docker/templates/bridge-history-config.json /contracts/docker/templates/bridge-history-config.json
-COPY ./docker/templates/chain-monitor-config.json /contracts/docker/templates/chain-monitor-config.json
-COPY ./docker/templates/config-contracts.toml /contracts/docker/templates/config-contracts.toml
-COPY ./docker/templates/coordinator-config.json /contracts/docker/templates/coordinator-config.json
-COPY ./docker/templates/genesis.json /contracts/docker/templates/genesis.json
-COPY ./docker/templates/rollup-config.json /contracts/docker/templates/rollup-config.json
-COPY ./docker/templates/rollup-explorer-backend-config.json /contracts/docker/templates/rollup-explorer-backend-config.json
-COPY ./docker/templates/admin-system-backend-config.json /contracts/docker/templates/admin-system-backend-config.json
+COPY ./docker/templates/ /contracts/docker/templates/
 
 COPY ./docker/scripts/gen-configs.sh /contracts/docker/scripts/gen-configs.sh
 

docker/scripts/build.sh

@@ -2,6 +2,7 @@
 
 latest_commit=$(git log -1 --pretty=format:%H)
 tag=${latest_commit}
+
 REPO="dogeos69/scroll-stack-contracts"
 echo "Using Docker image tag: $tag"
 echo ""

docker/scripts/deploy.sh

@@ -1,65 +1,46 @@
 #!/bin/sh
+# Enable timestamped execution trace to show progress with time and line numbers
+export PS4='$(date "+%Y-%m-%dT%H:%M:%S%z") ${0##*/}:${LINENO}: '
 echo "=== SCRIPT START ==="
 export FOUNDRY_EVM_VERSION="cancun"
 export FOUNDRY_BYTECODE_HASH="none"
-set -e
+set -ex
 
-echo "Environment variables:"
-echo "FOUNDRY_EVM_VERSION: $FOUNDRY_EVM_VERSION"
-echo "FOUNDRY_BYTECODE_HASH: $FOUNDRY_BYTECODE_HASH"
-echo "BATCH_SIZE: $BATCH_SIZE"
-
-if [ "${L1_RPC_ENDPOINT}" = "" ]; then
-    echo "L1_RPC_ENDPOINT is not set"
-    L1_RPC_ENDPOINT="http://host.docker.internal:8543"
-fi
+CONFIG_FILE="./volume/config.toml"
 
-if [ "$L2_RPC_ENDPOINT" = "" ]; then
-    echo "L2_RPC_ENDPOINT is not set"
-    L2_RPC_ENDPOINT="http://host.docker.internal:8545"
-fi
-
-if [ "${BATCH_SIZE}" = "" ]; then
-    BATCH_SIZE="100"
-fi
+# Set default values for environment variables if they are not set
+L1_RPC_ENDPOINT="${L1_RPC_ENDPOINT}"
+L2_RPC_ENDPOINT="${L2_RPC_ENDPOINT}"
+# Using a smaller batch size as a compromise between the slow but reliable --slow flag and the fast but potentially unreliable default.
+BATCH_SIZE="7"
 
 echo "using L1_RPC_ENDPOINT = $L1_RPC_ENDPOINT"
 echo "using L2_RPC_ENDPOINT = $L2_RPC_ENDPOINT"
+echo "Environment variables:"
+echo "FOUNDRY_EVM_VERSION: $FOUNDRY_EVM_VERSION"
+echo "FOUNDRY_BYTECODE_HASH: $FOUNDRY_BYTECODE_HASH"
+echo "BATCH_SIZE: $BATCH_SIZE"
 
 # simulate L1
 echo ""
 echo "simulating on L1"
-forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L1_RPC_ENDPOINT" --sig "run(string,string)" "L1" "verify-config" || exit 1
+forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L1_RPC_ENDPOINT" --sig "run(string,string)" "L1" "verify-config" 
+
+# deploy L1
+echo ""
+echo "deploying on L1"
+forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L1_RPC_ENDPOINT" --batch-size "${BATCH_SIZE}" --sig "run(string,string)" "L1" "verify-config" --broadcast --json 
+
 
 # simulate L2
 echo ""
 echo "simulating on L2"
-forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L2_RPC_ENDPOINT" --sig "run(string,string)" "L2" "verify-config" --legacy || exit 1
+forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L2_RPC_ENDPOINT" --sig "run(string,string)" "L2" "verify-config" --legacy
 
-# deploy L1
-echo ""
-echo "deploying on L1"
-forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L1_RPC_ENDPOINT" --batch-size "$BATCH_SIZE" --sig "run(string,string)" "L1" "verify-config" --broadcast || exit 1
 
 # deploy L2
 echo ""
 echo "deploying on L2"
-forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L2_RPC_ENDPOINT"  --batch-size "$BATCH_SIZE" --sig "run(string,string)" "L2" "verify-config" --broadcast --legacy || exit 1
-
-# log broadcast files
-
-echo "=== START BROADCAST FILES ==="
-echo "Current directory: $(pwd)"
-echo "Broadcast files location: broadcast/DeployScroll.s.sol/*/*"
-echo "Found files:"
-ls -la broadcast/DeployScroll.s.sol/*/* || echo "No files found"
-echo "Broadcast files content:"
+forge script scripts/deterministic/DeployScroll.s.sol:DeployScroll --rpc-url "$L2_RPC_ENDPOINT"  --batch-size "$BATCH_SIZE" --sig "run(string,string)" "L2" "verify-config" --broadcast --legacy --json
 
-for file in broadcast/DeployScroll.s.sol/*/*; do
-  if [ -f "$file" ]; then
-    echo "$file:"
-    cat "$file"
-    echo ""
-  fi
-done
-echo "=== END BROADCAST FILES ==="
+echo "=== SCRIPT END ==="

docker/scripts/gen-configs.sh

@@ -49,25 +49,25 @@ echo "generating rollup-config.yaml"
 forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateRollupConfig || exit 1
 format_config_file "./volume/rollup-config.yaml"
 
-echo ""
-echo "generating coordinator-config.yaml"
-forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateCoordinatorConfig || exit 1
-format_config_file "./volume/coordinator-config.yaml"
+# echo ""
+# echo "generating coordinator-config.yaml"
+# forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateCoordinatorConfig || exit 1
+# format_config_file "./volume/coordinator-config.yaml"
 
 echo ""
 echo "generating chain-monitor-config.yaml"
 forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateChainMonitorConfig || exit 1
 format_config_file "./volume/chain-monitor-config.yaml"
 
-echo ""
-echo "generating bridge-history-config.yaml"
-forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateBridgeHistoryConfig || exit 1
-format_config_file "./volume/bridge-history-config.yaml"
+# echo ""
+# echo "generating bridge-history-config.yaml"
+# forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateBridgeHistoryConfig || exit 1
+# format_config_file "./volume/bridge-history-config.yaml"
 
-echo ""
-echo "generating balance-checker-config.yaml"
-forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateBalanceCheckerConfig || exit 1
-format_config_file "./volume/balance-checker-config.yaml"
+# echo ""
+# echo "generating balance-checker-config.yaml"
+# forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateBalanceCheckerConfig || exit 1
+# format_config_file "./volume/balance-checker-config.yaml"
 
 echo ""
 echo "generating frontend-config.yaml"
@@ -79,7 +79,7 @@ echo "generating rollup-explorer-backend-config.yaml"
 forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateRollupExplorerBackendConfig || exit 1
 format_config_file "./volume/rollup-explorer-backend-config.yaml"
 
-echo ""
-echo "generating admin-system-backend-config.yaml"
-forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateAdminSystemBackendConfig || exit 1
-format_config_file "./volume/admin-system-backend-config.yaml"
+# echo ""
+# echo "generating admin-system-backend-config.yaml"
+# forge script scripts/deterministic/GenerateConfigs.s.sol:GenerateAdminSystemBackendConfig || exit 1
+# format_config_file "./volume/admin-system-backend-config.yaml"