Merge branch 'main' into aba-windows-support

.github/workflows/sanitizers.yml

@@ -30,8 +30,13 @@ on:
       mode:
         required: false
         type: string
-        default: 'Y+M3B3 0.8.26'
-        description: 'Mode filter for the era-compiler-tester. For example: Y+M3B3 0.8.26'
+        default: 'Y+M3B3 0.8.28'
+        description: 'Mode filter for the era-compiler-tester. For example: Y+M3B3 0.8.28'
+      target:
+        required: false
+        type: string
+        default: 'eravm'
+        description: 'Target filter for the era-compiler-tester. Possible values are: `eravm` or `evm`'
 
 jobs:
   run-with-sanitizers:
@@ -88,6 +93,7 @@ jobs:
         run: |
           set -x
           ./target/${TARGET}/debug/compiler-tester \
+            --target "${{ inputs.target }}" \
             --zksolc "./target-zksolc/${TARGET}/debug/zksolc" \
             --zkvyper "./target-zkvyper/${TARGET}/debug/zkvyper" \
             --path '${{ inputs.path }}' \

.github/workflows/secrets-scanner.yaml

@@ -0,0 +1,19 @@
+name: Leaked Secrets Scan
+on:
+  pull_request:
+  merge_group:
+jobs:
+  TruffleHog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          fetch-depth: 0
+      - name: TruffleHog OSS
+        uses: trufflesecurity/trufflehog@7e78ca385fb82c19568c7a4b341c97d57d9aa5e1 # v3.82.2
+        with:
+          path: ./
+          base: ${{ github.event.repository.default_branch }}
+          head: HEAD
+          extra_args: --debug --only-verified

.github/workflows/tests.yaml

@@ -36,11 +36,6 @@ concurrency:
 
 jobs:
 
-  # Check for secrets leak in the repository
-  secrets-scanner:
-    uses: matter-labs/era-compiler-ci/.github/workflows/secrets-scanner.yaml@v1
-    secrets: inherit
-
   # Check for cargo issues
   cargo-check:
     runs-on: matterlabs-ci-runner-high-performance
@@ -133,7 +128,6 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     needs:
-      - secrets-scanner
       - cargo-check
       - integration-tests
       - benchmarks

.gitignore

@@ -1,29 +1,28 @@
+# IDE
+/.idea/
+/.vscode/
+
+# MacOS
+/**/.DS_Store
+
+# Backup files generated by rustfmt
+/**/*.rs.bk
+
 # Compiled files and executables
 /target*/
 
-# These are backup files generated by rustfmt
-**/*.rs.bk
+# Dependency locks
+# /Cargo.lock
+# /LLVM.lock
 
-# The LLVM framework source
+# LLVM framework source
 /llvm/
 
 # External compilers
-/solc-bin*/*
-/vyper-bin/*
+/solc-bin*/
+/vyper-bin*/
 
-# The debug, trace, benchmark artifacts
+# Debug and benchmark artifacts
 /debug/
-/trace/
-/**/*.json
-/**/*.txt
-
-# The dependency locks
-# /Cargo.lock
-# /LLVM.lock
-
-# IDE
-/.idea/
-/.vscode/
-
-# MacOS
-/**/.DS_Store
+/*.json
+/*.txt

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "tests"]
-	path = tests
-	url = https://github.com/matter-labs/era-compiler-tests
-	branch = main
+    path = tests
+    url = https://github.com/matter-labs/era-compiler-tests
+    branch = main
 [submodule "solidity"]
-	path = solidity
-	url = https://github.com/ethereum/solidity
-	branch = develop
+    path = solidity
+    url = https://github.com/ethereum/solidity
+    branch = develop
 [submodule "era-contracts"]
-	path = era-contracts
-	url = https://github.com/lambdaclass/era-contracts
-	branch = evm-equivalence-yul-new
+    path = era-contracts
+    url = https://github.com/matter-labs/era-contracts
+    branch = stable/evm-emulator