Merge branch 'develop' into develop-contracts

contracts/.eslintignore → .eslintignore

@@ -10,8 +10,7 @@
 **/coverage
 **/dist
 **/node_modules
-**/types
-**/src/index.ts
+**/.graphclient
 **/.openzeppelin
 
 # files

.github/workflows/ci-default.yml

@@ -56,30 +56,34 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.x"
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8.9.0
       - name: Set up Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: "18.15.0"
-          cache: "yarn"
+          cache: "pnpm"
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
       - name: Install
         run: |
-          yarn install --immutable
+          pnpm install --frozen-lockfile
         # Always run this step so that all linting errors can be seen at once.
         if: always()
       - name: Build
         run: |
-          yarn build
+          pnpm run build
         # Always run this step so that all linting errors can be seen at once.
         if: always()
       - name: Lint
         run: |
-          yarn lint
+          pnpm run lint
         # Always run this step so that all linting errors can be seen at once.
         if: always()
       - name: Test
         run: |
-          yarn test
+          pnpm test
         # Always run this step so that all linting errors can be seen at once.
         if: always()

.github/workflows/deploy-defender.yml

@@ -10,7 +10,8 @@ on:
   # A push occurs to one of the matched branches.
   push:
     branches:
-      - main 
+      - main
+      - develop
     paths:
       - defender/**
   # Allows you to run this workflow manually from the Actions tab
@@ -20,21 +21,27 @@ jobs:
   deploy-defender:
     # NOTE: This name appears in GitHub's Checks API.
     name: deploy-defender
-    environment: deploy 
+    environment: deploy
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           fetch-depth: 1
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8.9.0
       - name: Set up Node.js 18
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: "pnpm"
           node-version: "18.x"
       - name: Install
-        run: yarn install --immutable
-      - name: Build the autotasks
-        run: yarn build:defender
-      - name: Deploy to OpenZeppelin Defender
-        run: yarn deploy:defender
+        run: pnpm install --frozen-lockfile
+      - name: Deploy Defender infra to testnets
+        if: github.ref == 'refs/heads/develop'
+        run: pnpm run deploy:defender:test
+      - name: Deploy Defender infra to mainnets
+        if: github.ref == 'refs/heads/main'
+        run: pnpm run deploy:defender:prod

.github/workflows/deploy-graph.yml

@@ -26,18 +26,22 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 1
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8.9.0
       - name: Set up Node.js 18
         uses: actions/setup-node@v3
         with:
-          cache: "yarn"
+          cache: "pnpm"
           node-version: "18.x"
       - name: Install
-        run: yarn install --immutable
+        run: pnpm install --frozen-lockfile
       - name: Build the subgraph
-        run: yarn build:graph
-      - name: Deploy the subgraph to goerli testnet
+        run: pnpm run build:graph
+      - name: Deploy the subgraph to testnets
         if: github.ref == 'refs/heads/develop'
-        run: yarn deploy:graph:goerli
-      - name: Deploy the subgraph to Optimism mainnet
+        run: pnpm run deploy:graph:test
+      - name: Deploy the subgraph to production
         if: github.ref == 'refs/heads/main'
-        run: yarn deploy:graph:optimism
+        run: pnpm run deploy:graph:prod

.npmrc

@@ -0,0 +1 @@
+link-workspace-packages=false

README.md

@@ -11,14 +11,17 @@ For more details, check out our [website](https://hypercerts.org/).
 ## Organization
 
 - `/contracts`: Smart contracts (Foundry+Hardhat)
+
   - Manually deployed via hardhat tasks
   - Note: This is not currently on CI/CD
-  - On Goerli:
-    - HypercertMinter (UUPS Proxy): [0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07](https://goerli.etherscan.io/address/0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07)
-    - Safe multi-sig: [0x8CD35a62fF56A91485eBF97491612F1552dbc1c9](https://goerli.etherscan.io/address/0x8CD35a62fF56A91485eBF97491612F1552dbc1c9)
-  - On Optimism:
-    - HypercertMinter (UUPS Proxy): [0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07](https://optimistic.etherscan.io/address/0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07)
-    - Safe multi-sig: [0x560adA72a80b4707e493cA8c3B7B7528930E7Be5](https://optimistic.etherscan.io/address/0x560adA72a80b4707e493cA8c3B7B7528930E7Be5)
+
+  | Network  | HypercertMinter (UUPS Proxy)                                                                                                     | Safe                                                                                                                             |
+  | -------- | -------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+  | Goerli   | [0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07](https://goerli.etherscan.io/address/0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07)     | [0x8CD35a62fF56A91485eBF97491612F1552dbc1c9](https://goerli.etherscan.io/address/0x8CD35a62fF56A91485eBF97491612F1552dbc1c9)     |
+  | Sepolia  | [0xa16DFb32Eb140a6f3F2AC68f41dAd8c7e83C4941](https://goerli.etherscan.io/address/0xa16DFb32Eb140a6f3F2AC68f41dAd8c7e83C4941)     | TBD                                                                                                                              |
+  | Celo     | [0x16bA53B74c234C870c61EFC04cD418B8f2865959](https://celoscan.io/address/0x16bA53B74c234C870c61EFC04cD418B8f2865959)             | TBD                                                                                                                              |
+  | Optimism | [0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07](https://optimistic.etherscan.io/address/0x822F17A9A5EeCFd66dBAFf7946a8071C265D1d07) | [0x560adA72a80b4707e493cA8c3B7B7528930E7Be5](https://optimistic.etherscan.io/address/0x560adA72a80b4707e493cA8c3B7B7528930E7Be5) |
+
 - `/cors-proxy`: CORS proxy for Cloudflare Workers
   - [via GitHub actions](https://github.com/hypercerts-org/hypercerts/actions/workflows/deploy-cors-proxy.yml)
 - `/defender`: OpenZeppelin Defender integration

contracts/.env.example

@@ -1,5 +1,6 @@
 # Deploy keys
 MNEMONIC="test test test test test test test test test test test junk"
+MNEMONIC_CELO=="test test test test test test test test test test test junk"
 INFURA_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
 ALCHEMY_OPTIMISM_URL="https://opt-mainnet.g.alchemy.com/v2/zzzzzzzzzzzzzzzzzzz"
 
@@ -10,6 +11,7 @@ OPENZEPPELIN_SECRET_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
 # Block explorer API keys
 ETHERSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
 OPTIMISTIC_ETHERSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
+CELOSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
 
 # Unused, ignore below
 POLYGONSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"

contracts/.eslintrc.yml

@@ -8,7 +8,6 @@ parserOptions:
   project: "./contracts/tsconfig.json"
 plugins:
   - "@typescript-eslint"
-root: true
 rules:
   "@typescript-eslint/no-floating-promises":
     - error

contracts/.gitignore

@@ -9,6 +9,7 @@
 **/build
 **/cache
 **/coverage
+**/contracts
 **/.coverage_artifacts
 **/.coverage_cache
 **/.coverage_contracts

contracts/.npmignore

@@ -1,4 +1,3 @@
 *
 !dist/**
-!package.json
-!README.md
+lib/