chore: merge dev into mainnet

.env.example

@@ -1,2 +1,5 @@
 RPC_MAINNET="https://eth.llamarpc.com"
-# RPC_MAINNET="https://mainnet.infura.io/v3/API-KEY"
+# RPC_MAINNET="https://mainnet.infura.io/v3/API-KEY"
+RPC_GOERLI="https://ethereum-goerli.publicnode.com"
+RPC_HOLESKY=""
+ETHERSCAN_API_KEY="API-KEY"

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,7 +11,7 @@ User stories are often expressed in a simple sentence, structured as follows: 'A
 
 **Actions**
 - [ ] An action item list describing the work to be done
-- [ ] Link to all of the related tasks needed to complete the feature. See the [tasks](https://github.com/Layr-Labs/docs/blob/949bd6b4ddd0ef08880c6775c2d9a6222e2e7eb3/.github/ISSUE_TEMPLATE/task.md) template.
+- [ ] Link to all of the related tasks needed to complete the feature. See the [tasks](https://github.com/Layr-Labs/eigenlayer-contracts/tree/master/.github/ISSUE_TEMPLATE/task.md) template.
 - [ ] Include everything in the definition of done e.g. unit tests and documentation
 
 **Acceptance criteria**

.github/ISSUE_TEMPLATE/task.md

@@ -7,7 +7,7 @@ labels: task
 ---
 
 ## Description
-Add a summary and description. Link to any parent [feature requests](https://github.com/Layr-Labs/docs/blob/c78dbcd9a4b229e367f11725ee6758271a65bad3/.github/ISSUE_TEMPLATE/feature_request.md) or [bug reports](https://github.com/Layr-Labs/docs/blob/c78dbcd9a4b229e367f11725ee6758271a65bad3/.github/ISSUE_TEMPLATE/bug_report.md). 
+Add a summary and description. Link to any parent [feature requests](https://github.com/Layr-Labs/eigenlayer-contracts/blob/master/.github/ISSUE_TEMPLATE/feature_request.md) or [bug reports](https://github.com/Layr-Labs/eigenlayer-contracts/blob/master/.github/ISSUE_TEMPLATE/bug_report.md). 
 
 ### Action Items
 - [ ] An action item list describing the work to be done

.github/workflows/certora-prover.yml

@@ -6,7 +6,7 @@ on:
       - master
       - release-v*
       - formal-verification
-      - fix-ci-errors
+      - m2-mainnet
   pull_request: {}
   workflow_dispatch: {}
 
@@ -38,21 +38,18 @@ jobs:
           python-version: '3.10'
           cache: 'pip'
       - name: Install java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          java-package: 'jre'
+          distribution: temurin
+          java-version: '17'
       - name: Install certora
-        run: pip install certora-cli==3.6.8.post3
+        run: pip install certora-cli
       - name: Install solc
         run: |
-          wget https://github.com/ethereum/solidity/releases/download/v0.8.12/solc-static-linux
-          sudo mv solc-static-linux /usr/local/bin/solc
-          chmod +x /usr/local/bin/solc
+          pip install solc-select
+          solc-select use 0.8.12 --always-install
       - name: Verify rule ${{ matrix.params }}
         run: |
-          touch certora/applyHarness.patch
-          make -C certora munged
           bash ${{ matrix.params }}
         env:
           CERTORAKEY: ${{ secrets.CERTORAKEY }}

.github/workflows/commitlint.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install node dependencies
+        run: |
+          npm install conventional-changelog-conventionalcommits
+          npm install [email protected]
+
+      - name: Validate current commit (last commit) with commitlint
+        if: github.event_name == 'push'
+        run: npx commitlint --from HEAD~1 --to HEAD --verbose
+
+      - name: Validate PR commits with commitlint
+        if: github.event_name == 'pull_request'
+        run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose

.github/workflows/run-deploy-scripts.yml

@@ -0,0 +1,38 @@
+name: Run Deploy Scripts
+# We run the deploy scripts just to make sure they work
+
+on:
+  push:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      # install foundry to run forge script. Should we run forge script in a container instead?
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Start Anvil chain
+        # need to start Anvil chain with -d to let the container run in the background
+        # if we start with 'anvil &' instead, the process stops when the step ends
+        run: docker run -d --rm -p 8545:8545 --entrypoint anvil ghcr.io/foundry-rs/foundry:nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a --host 0.0.0.0
+
+      - name: Wait for Anvil chain to start
+        run: sleep 3
+
+      # Run Forge script against the Anvil chain
+      - name: Run M2_Deploy_From_Scratch
+        run: |
+          forge script script/deploy/devnet/M2_Deploy_From_Scratch.s.sol --rpc-url http://localhost:8545 \
+            --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --broadcast \
+            --sig "run(string memory configFileName)" -- M2_deploy_from_scratch.anvil.config.json

.github/workflows/slither.yml

@@ -0,0 +1,24 @@
+name: Slither Analysis
+
+on:
+  push:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  analyze:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Run Slither
+        uses: crytic/[email protected]
+        id: slither
+        with:
+          sarif: results.sarif
+          fail-on: none
+
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: ${{ steps.slither.outputs.sarif }}

.github/workflows/testinparallel.yml

@@ -0,0 +1,65 @@
+name: Run Parallel
+
+on:
+  push:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Get list of .t.sol files in src/test
+      run: |
+        FILES=$(find src/test -type f -name '*.t.sol' | sed 's#src/test/##' | jq -R -s -c 'split("\n")[:-1]')
+        echo "::set-output name=matrix::$FILES"
+      id: set-matrix
+
+  run-tests:
+    needs: prepare
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
+      with:
+        version: nightly
+
+    - name: Run Forge build
+      run: |
+        forge --version
+        forge build --sizes
+      id: build
+
+    - name: Run unit tests
+      run: forge test --no-match-contract Integration
+      env:
+        RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
+        RPC_HOLESKY: ${{ secrets.RPC_HOLESKY }}
+        CHAIN_ID: ${{ secrets.CHAIN_ID }}
+
+    - name: Run integration tests
+      run: forge test --match-contract Integration
+      env:
+        RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
+        RPC_HOLESKY: ${{ secrets.RPC_HOLESKY }}
+        CHAIN_ID: ${{ secrets.CHAIN_ID }}
+
+    - name: Run integration mainnet fork tests
+      run: forge test --match-contract Integration
+      env:
+        FOUNDRY_PROFILE: "forktest"
+        RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
+        RPC_HOLESKY: ${{ secrets.RPC_HOLESKY }}
+        CHAIN_ID: ${{ secrets.CHAIN_ID }}

.gitignore

@@ -22,11 +22,24 @@ broadcast
 
 # Deployment tools
 /data
+.idea/
 
 # Certora Outputs
 .certora_internal/
 .certora_recent_jobs.json
 
 #script config file
 # script/M1_deploy.config.json
-script/output/M1_deployment_data.json
+script/output/M1_deployment_data.json
+/script/output/M2_deployment_data.json
+
+# autogenerated docs (you can generate these locally)
+/docs/docgen/
+
+script/misc
+
+test.sh
+
+# Surya outputs
+InheritanceGraph.png
+surya_report.md

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit ${1}

.prettierrc

@@ -0,0 +1,16 @@
+{
+  "plugins": ["prettier-plugin-solidity"],
+  "overrides": [
+    {
+      "files": "*.sol",
+      "options": {
+        "parser": "solidity-parse",
+        "printWidth": 120,
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false,
+        "bracketSpacing": false
+      }
+    }
+  ]
+}

.solhint.json

@@ -1,16 +1,21 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "max-line-length": ["warn",200],
+    "max-line-length": "off",
     "no-inline-assembly": "off",
     "reason-string": ["warn",{"maxLength":160}],
     "func-visibility": ["warn",{"ignoreConstructors":true}],
+    "explicit-types": ["warn","explicit"],
+    "quotes": ["warn","double"],
     "const-name-snakecase": "off",
     "not-rely-on-time": "off",
     "avoid-low-level-calls": "off",
     "contract-name-camelcase": "off",
     "func-name-mixedcase": "off",
     "var-name-mixedcase": "off",
-    "compiler-version": "off"
+    "compiler-version": "off",
+    "custom-errors": "off",
+    "no-global-import": "off",
+    "immutable-vars-naming": "off"
   }
 }

.solhintignore

@@ -0,0 +1 @@
+Slasher.sol

CONTRIBUTING.md

@@ -0,0 +1,36 @@
+
+## Requirements
+
+Foundry
+Git
+Node.js
+
+## Setup Repo 
+
+```bash
+git clone [email protected]:Layr-Labs/eigenlayer-contracts.git
+```
+
+### Install Dependencies
+
+```bash
+npm install
+
+npx husky install 
+
+forge install
+```
+
+### Pull Requests
+
+All tests must pass
+
+Commits must be linted
+
+A descriptive summary of the PR has been provided.
+
+### Environment Variables
+
+Some of the tests and features of this repository require environment variables to be set up.
+
+Copy the .env.example file to create a .env and populate it with the appropriate environment values that you have control over

LICENSE

@@ -9,12 +9,19 @@ Parameters
 
 Licensor:             Layr Labs, Inc.
 
-Licensed Work:        EigenLayer Contracts
+Licensed Work:        EigenLayer Core Contracts
                       The Licensed Work is (c) 2023 Layr Labs, Inc.
 
 Additional Use Grant: None.
 
-Change Date:          2025-05-01 (May 1st, 2025)
+Change Dates:
+
+- All commits at or prior to commit 6de01c6c16d6df44af15f0b06809dc160eac0ebf
+(i.e. committed to this repository on or before February 6, 2024, the date of
+the [v0.2.1-goerli-m2](https://github.com/Layr-Labs/eigenlayer-contracts/releases/tag/v0.2.1-goerli-m2) release)
+have a change date of 2025-05-01 (May 1st, 2025)
+- All commits after 6de01c6c16d6df44af15f0b06809dc160eac0ebf (i.e. committed to this
+repository after February 6, 2024) have a change date of 2027-02-06 (February 6th, 2027)
 
 Change License:       MIT