Hawthorne001
diff --git a/‎.github/workflows/1155-deployments.yml‎
Lines changed: 0 additions & 19 deletions b/‎.github/workflows/1155-deployments.yml‎
Lines changed: 0 additions & 19 deletions
diff --git a/‎.github/workflows/1155.yml‎
Lines changed: 0 additions & 36 deletions b/‎.github/workflows/1155.yml‎
Lines changed: 0 additions & 36 deletions
diff --git a/‎.github/workflows/contract.yml‎
Lines changed: 61 additions & 0 deletions b/‎.github/workflows/contract.yml‎
Lines changed: 61 additions & 0 deletions
diff --git a/‎.github/workflows/contracts.yml‎
Lines changed: 45 additions & 7 deletions b/‎.github/workflows/contracts.yml‎
Lines changed: 45 additions & 7 deletions
diff --git a/‎.github/workflows/coverage.yml‎
Lines changed: 12 additions & 5 deletions b/‎.github/workflows/coverage.yml‎
Lines changed: 12 additions & 5 deletions
diff --git a/‎.github/workflows/deployment.yml‎
Lines changed: 29 additions & 0 deletions b/‎.github/workflows/deployment.yml‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎.github/workflows/protocol-rewards.yml‎
Lines changed: 0 additions & 29 deletions b/‎.github/workflows/protocol-rewards.yml‎
Lines changed: 0 additions & 29 deletions
diff --git a/‎.github/workflows/slither.yml‎
Lines changed: 48 additions & 0 deletions b/‎.github/workflows/slither.yml‎
Lines changed: 48 additions & 0 deletions
diff --git a/‎.github/workflows/sparks.yml‎
Lines changed: 0 additions & 29 deletions b/‎.github/workflows/sparks.yml‎
Lines changed: 0 additions & 29 deletions
@@ -0,0 +1,61 @@
+name: "Contract"
+on:
+  workflow_call:
+    inputs:
+        package_folder:
+          required: true
+          type: string
+        coverage_args:
+          required: false
+          type: string
+        name:
+          required: true
+          type: string
+        ignore_coverage_files:
+          required: false
+          type: string
+        skip_storage_layout:
+          type: boolean
+          default: false
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+    with:
+      package_folder: ${{ inputs.package_folder }}
+
+  test:
+    needs: build
+    uses: ./.github/workflows/test.yml
+    with:
+      package_folder: ${{ inputs.package_folder }}
+      name: ${{ inputs.name }}
+
+  storage_layout:
+    needs: build
+    uses: ./.github/workflows/storage_layout.yml
+    if: ${{ inputs.skip_storage_layout == false }}
+    with:
+      package_folder: ${{ inputs.package_folder }}
+      name: ${{ inputs.name }}
+
+  contract_sizes:
+    needs: build
+    uses: ./.github/workflows/contract_sizes.yml
+    with:
+      package_folder: ${{ inputs.package_folder }}
+      name: ${{ inputs.name }}
+  
+  slither:
+    needs: build
+    uses: ./.github/workflows/slither.yml
+    with:
+      package_folder: ${{ inputs.package_folder }}
+
+  coverage:
+    uses: ./.github/workflows/coverage.yml
+    secrets: inherit
+    with:
+      package_folder: ${{ inputs.package_folder }}
+      files_to_ignore: ${{ inputs.ignore_coverage_files }}
+      coverage_args: ${{ inputs.coverage_args }}
@@ -3,20 +3,58 @@ name: "Contracts"
 on: "push"
 
 jobs:
+  contracts-erc20z:
+    name: ERC20Z Contracts
+    uses: ./.github/workflows/contract.yml
+    secrets: inherit
+    with:
+      package_folder: packages/erc20z
+      name: ERC20Z
+      ignore_coverage_files: '"*lib*" "*Zora1155*" "*uniswap*"'
+      # fixes stack too deep temporarily
+      coverage_args: "--ir-minimum"
+      skip_storage_layout: true
+
   contracts-1155:
     name: 1155 Contracts
-    uses: ./.github/workflows/1155.yml
-
-  contracts-1155-deployments:
-    name: 1155 Deployments
-    uses: ./.github/workflows/1155-deployments.yml
+    uses: ./.github/workflows/contract.yml
     secrets: inherit
+    with:
+      package_folder: packages/1155-contracts
+      ignore_coverage_files: '"*DeploymentConfig*" "*Redeem*" "*deployment*" "*packages*" "*test*"'
+      name: 1155 Contracts
 
   contracts-protocol-rewards:
     name: Protocol Rewards
-    uses: ./.github/workflows/protocol-rewards.yml
+    uses: ./.github/workflows/contract.yml
+    secrets: inherit
+    with:
+      package_folder: packages/protocol-rewards
+      name: Rewards
+      ignore_coverage_files: '"*lib*"'
+      skip_storage_layout: true
 
   contracts-sparks:
     name: Sparks
-    uses: ./.github/workflows/sparks.yml
+    uses: ./.github/workflows/contract.yml
+    secrets: inherit
+    with:
+      package_folder: packages/sparks
+      ignore_coverage_files: '"*Ownable*" "*Mock*" "*BatchDataHelper*" "*test*"'
+      skip_storage_layout: true
+      name: Sparks
+
+  contracts-1155-deployments:
+    name: 1155 Deployments
+    uses: ./.github/workflows/deployment.yml
+    secrets: inherit
+    with:
+      package_folder: packages/1155-deployments
+      precache: "pnpm run generate"
+
+  contracts-sparks-deployments:
+    name: Sparks Deployments
+    uses: ./.github/workflows/deployment.yml
     secrets: inherit
+    with:
+      package_folder: packages/sparks-deployments
@@ -1,17 +1,20 @@
 on:
   workflow_call:
     inputs:
-      package:
+      package_folder:
         required: true
         type: string
       files_to_ignore:
         required: false
         type: string
         default: ""
+      coverage_args:
+        required: false
+        type: string
+        default: ""
 
 env:
-  # Setting an environment variable with the value of a configuration variable
-  package_folder: packages/${{ inputs.package }}
+  package_folder: ${{ inputs.package_folder }}
   FOUNDRY_PROFILE: ci
 
 jobs:
@@ -32,11 +35,15 @@ jobs:
       - name: Cache build
         uses: ./.github/actions/cache_foundry_build
         with:
-          package_folder: packages/${{ inputs.package }}
+          package_folder: ${{ env.package_folder }}
           foundry_profile: coverage
 
       - name: Run Forge coverage
-        run: cd $package_folder && forge coverage --report lcov
+        run: cd $package_folder && forge coverage --report lcov ${{ inputs.coverage_args }}
+        env:
+          TENDERLY_KEY: ${{ secrets.TENDERLY_KEY }}
+          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
+          CONDUIT_KEY: ${{ secrets.CONDUIT_KEY }}
 
       - name: Setup LCOV
         uses: hrishikesh-kadam/setup-lcov@v1
 
@@ -0,0 +1,29 @@
+name: "1155"
+on:
+  workflow_call:
+    inputs:
+        package_folder:
+          required: true
+          type: string
+        name:
+          required: false
+          type: string
+        precache:
+          required: false
+          type: string
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+    with:
+      package_folder: ${{ inputs.package_folder }}
+      precache: ${{ inputs.precache }}
+
+  test:
+    needs: build
+    uses: ./.github/workflows/test.yml
+    secrets: inherit
+    with:
+      package_folder: ${{ inputs.package_folder }}
+      precache: ${{ inputs.precache }}
+      name: ${{ inputs.name }}
@@ -0,0 +1,48 @@
+on:
+  workflow_call:
+    inputs:
+      package_folder:
+        required: true
+        type: string
+      slither_args:
+        required: false
+        type: string
+        default: ""
+
+env:
+  package_folder: ${{ inputs.package_folder }}
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  check:
+    strategy:
+      fail-fast: true
+
+    name: Slither
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install node deps and foundry
+        uses: ./.github/actions/setup_deps
+
+      - name: Cache build
+        uses: ./.github/actions/cache_foundry_build
+        with:
+          package_folder: ${{ env.package_folder }}
+          foundry_profile: coverage
+      
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10' 
+
+      - name: Install Slither
+        run: python3 -m pip install slither-analyzer
+
+      - name: Run slither
+        working-directory: ${{ env.package_folder }}
+        continue-on-error: true # disable failing the build for outputs with slither
+        run: slither . --filter-paths "node_modules|src/uniswap|src/interfaces/uniswap"
+