chore(repo): promote contracts to root and update CI

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -1,26 +1,30 @@
 name: Bug Report
 description: Create a bug report for the Hypercerts protocol
-labels: ['type:bug']
+labels: ["type:bug"]
 body:
   - type: markdown
     attributes:
-      value: If you leave out sections there is a high likelihood it will be moved to the [GitHub Discussions](https://github.com/Network-Goods/hypercerts/discussions).
+      value:
+        If you leave out sections there is a high likelihood it will be moved to the [GitHub
+        Discussions](https://github.com/Network-Goods/hypercerts/discussions).
   - type: dropdown
     attributes:
       label: Which area(s) of Hypercerts are affected? (leave empty if unsure)
       multiple: true
       options:
-        - 'Smart Contracts'
-        - 'SDK'
-        - 'Frontend Dapp'
-        - 'Docs'
-        - 'The Graph integration'
-        - 'OpenZeppelin Defender integration'
-        - 'Other'
+        - "Smart Contracts"
+        - "SDK"
+        - "Frontend Dapp"
+        - "Docs"
+        - "The Graph integration"
+        - "OpenZeppelin Defender integration"
+        - "Other"
   - type: textarea
     attributes:
       label: To Reproduce
-      description: Steps to reproduce the behavior, please provide a clear description of how to reproduce the issue. Screenshots can be provided in the issue body below.
+      description:
+        Steps to reproduce the behavior, please provide a clear description of how to reproduce the issue. Screenshots
+        can be provided in the issue body below.
     validations:
       required: true
   - type: textarea
@@ -37,4 +41,6 @@ body:
       required: true
   - type: markdown
     attributes:
-      value: Before posting the issue go through the steps you've written down to make sure the steps provided are detailed and clear. Contributors should be able to follow the steps provided in order to reproduce the bug.
+      value:
+        Before posting the issue go through the steps you've written down to make sure the steps provided are detailed
+        and clear. Contributors should be able to follow the steps provided in order to reproduce the bug.

.github/ISSUE_TEMPLATE/2.feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature Request
 description: Create a feature request
-labels: 'type:featurerequest'
+labels: ["type:featurerequest"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/3.docs_request.yml

@@ -1,13 +1,13 @@
-name: 'Docs Request'
+name: "Docs Request"
 description: A request to update or improve documentation
-title: 'Docs: '
-labels:
-  - 'category:docs'
+title: "Docs: "
+labels: ["category:docs"]
 body:
   - type: textarea
     attributes:
       label: What is the improvement or update you wish to see?
-      description: 'Example: I would like to see more examples of how to use the SDK to detect hypercert claim collisions.'
+      description:
+        "Example: I would like to see more examples of how to use the SDK to detect hypercert claim collisions."
     validations:
       required: true
   - type: textarea
@@ -19,6 +19,6 @@ body:
   - type: input
     attributes:
       label: Does the docs page already exist? Please link to it.
-      description: 'Example: https://hypercerts.org/docs/api-reference/'
+      description: "Example: https://hypercerts.org/docs/api-reference/"
     validations:
       required: false

.github/ISSUE_TEMPLATE/9.other.yml

@@ -1,4 +1,4 @@
-name: 'Other'
+name: "Other"
 description: For internal use only
 body:
   - type: textarea

.github/workflows/ci-default.yml

@@ -3,11 +3,18 @@ name: ci-default
 env:
   INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
   ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
+  FOUNDRY_PROFILE: "ci"
 
 # Trigger the workflow when:
 on:
-  # A push occurs to one of the matched branches.
+  pull_request:
+    branches:
+      - "main"
+      - "dev"
   push:
+    branches:
+      - "main"
+      - "dev"
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -20,42 +27,97 @@ jobs:
   lint-and-test:
     # NOTE: This name appears in GitHub's Checks API.
     name: test
-    environment: testing
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          # Check out pull request's HEAD commit instead of the merge commit to
-          # prevent gitlint from failing due to too long commit message titles,
-          # e.g. "Merge 3e621938d65caaa67f8e35d145335d889d470fc8 into 19a39b2f66cd7a165082d1486b2f1eb36ec2354a".
-          ref: ${{ github.event.pull_request.head.sha }}
-          # Fetch all history so gitlint can check the relevant commits.
-          fetch-depth: "0"
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Log content of lib/openzeppelin-contracts-upgradeable/package.json
+        run: |
+          cat lib/openzeppelin-contracts-upgradeable/package.json
+
+      - name: Debug submodule state
+        run: |
+          echo "1. Current directory structure:"
+          ls -la
+          echo "\n2. Content of .gitmodules:"
+          cat .gitmodules
+          echo "\n3. Submodule status before:"
+          git submodule status
+          echo "\n4. Initialize submodules:"
+          git submodule update --init --recursive
+          echo "\n5. Submodule status after init:"
+          git submodule status
+          echo "\n6. List lib directory:"
+          ls -la lib/
+          echo "\n7. Entering submodule:"
+          cd lib/openzeppelin-contracts-upgradeable
+          git remote -v
+          git fetch --all --tags --force
+          git tag -l
+          git checkout 2d081f24cac1a867f6f73d512f2022e1fa987854
+          cd ../..
+
+      - name: Debug tags
+        run: |
+          cd lib/openzeppelin-contracts-upgradeable
+          git tag -l
+          cd ../..
+
+      - name: Debug OpenZeppelin version
+        run: |
+          cd lib/openzeppelin-contracts-upgradeable
+          echo "Current git status:"
+          git status
+          echo "\nCurrent commit hash:"
+          git rev-parse HEAD
+          echo "\nCurrent tag:"
+          git describe --tags
+          echo "\nAvailable branches:"
+          git branch -a
+
+      - name: Debug directory structure
+        run: |
+          ls -la lib/openzeppelin-contracts-upgradeable/contracts/utils/cryptography/
+          pwd
+
+      - name:
+          Log content of lib/openzeppelin-contracts-upgradeable/contracts/utils/cryptography/MerkleProofUpgradeable.sol
+        run: |
+          cat lib/openzeppelin-contracts-upgradeable/contracts/utils/cryptography/MerkleProofUpgradeable.sol
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
       - run: corepack enable
+
       - name: Set up Node.js 18
         uses: actions/setup-node@v4
         with:
           cache: "pnpm"
 
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-      - name: Install
+      - name: Install dependencies
         run: |
-          pnpm install
+          pnpm i
         # Always run this step so that all linting errors can be seen at once.
         if: always()
-      - name: Build
+
+      - name: Build packages
         run: |
-          pnpm run build
+          pnpm build
         # Always run this step so that all linting errors can be seen at once.
         if: always()
-      - name: Lint
+
+      - name: Lint code
         run: |
-          pnpm run lint
+          pnpm lint
         # Always run this step so that all linting errors can be seen at once.
         if: always()
-      - name: Test
+
+      - name: Test contracts
         run: |
           pnpm test
         # Always run this step so that all linting errors can be seen at once.

contracts/.github/workflows/slither.yml → .github/workflows/slither.yml

@@ -1,14 +1,7 @@
 name: Static Analysis
 
 on:
-  push:
-    branches:
-      - "main"
-      - "dev"
-  pull_request:
-    branches:
-      - "main"
-      - "dev"
+  workflow_dispatch:
 
 jobs:
   analyze:

.gitignore

@@ -1,46 +1,44 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+# directories
+node_modules
+**/artifacts
+**/build
+**/cache
+**/coverage
+**/contracts
+**/.coverage_artifacts
+**/.coverage_cache
+**/.coverage_contracts
+**/dist
+**/deployments/localhost
+**/out*
+**/typechain
+**/types
+**/cache**
+**/abi
+**/rollup-cache
 
-# dependencies
-**/node_modules/
-.pnp/
+# files
+*.env
+*.log
 .pnp.*
+coverage.json
 npm-debug.log*
-.pnpm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-.yarn/*
-!.yarn/patches
-!.yarn/releases
-!.yarn/plugins
-!.yarn/sdks
-!.yarn/versions
-
-# testing
-coverage/
-.eslintcache
-
-# builds
-out/
-build/
-dist/
-.turbo/
-.next/
-.docusaurus/
-
-# files
+**/.openzeppelin/*-31337.json
 .DS_Store
-*.pem
-*.env
-.env*.local
-*.log
-coverage.json
+/.idea
+test*.svg
+lcov.info
+
+# broadcasts
+!/broadcast
+/broadcast/*
+/broadcast/*/31337/
 
-# typescript
-*.tsbuildinfo
-next-env.d.ts
-.idea/
-.vscode/
-graph/.test.subgraph.yaml
+# platform specific
+shell.nix
 
-# playwright
-playwright-report/
+# IDES
+.idea
+.vscode

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "lib/murky"]
+	path = lib/murky
+	url = https://github.com/dmfxyz/murky
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/prb-test"]
+	path = lib/prb-test
+	url = https://github.com/paulrberg/prb-test/

.husky/pre-commit

@@ -1,4 +1,6 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
 
-pnpm format:staged
+pnpm dlx lint-staged
+forge snapshot 
+pnpm docs

.lintstagedrc

@@ -1,7 +1,4 @@
 {
-  "**/*.{js,jsx,ts,tsx,sol}": [
-    "eslint --ignore-path .gitignore --ignore-path .lintstagedignore",
-    "prettier --write"
-  ],
-  "**/*.{md,json}": ["prettier --write"]
+  "*.{js,json,md,ts,yml}": ["prettier --config ./.prettierrc.yml --write"],
+  "*.{sol}": ["forge fmt"]
 }