Horizon: post audit changes - no solidity!

.github/actions/setup/action.yml

@@ -6,14 +6,17 @@ runs:
   steps:
     - name: Install Foundry
       uses: foundry-rs/foundry-toolchain@v1
-    - name: Enable corepack for modern yarn
+    - name: Enable Corepack
       shell: bash
       run: corepack enable
     - name: Install Node.js
       uses: actions/setup-node@v4
       with:
         node-version: 18
-        cache: 'yarn'
+        cache: 'pnpm'
+    - name: Set up pnpm via Corepack
+      shell: bash
+      run: corepack prepare [email protected] --activate
     - name: Install dependencies
       shell: bash
-      run: yarn --immutable
+      run: pnpm install --frozen-lockfile

.github/workflows/build.yml

@@ -22,4 +22,4 @@ jobs:
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Build
-        run: yarn build || yarn build
+        run: pnpm build || pnpm build

.github/workflows/ci-contracts.yml

@@ -27,11 +27,11 @@ jobs:
       - name: Build
         run: |
           pushd packages/contracts
-          yarn build || yarn build
+          pnpm build || pnpm build
       - name: Run tests
         run: |
           pushd packages/contracts
-          yarn test:coverage
+          pnpm test:coverage
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:

.github/workflows/ci-data-edge.yml

@@ -25,6 +25,6 @@ jobs:
       - name: Build
         run: |
           pushd packages/data-edge
-          yarn build
+          pnpm build
       - name: Run tests
-        run: yarn test
+        run: pnpm test

.github/workflows/ci-hardhat-graph-protocol.yml

@@ -0,0 +1,51 @@
+name: CI - packages/toolshed
+
+env:
+  CI: true
+
+on:
+  push:
+    branches: "*"
+    paths:
+      - packages/toolshed/**
+  pull_request:
+    branches: "*"
+    paths:
+      - packages/toolshed/**
+  workflow_dispatch:
+
+jobs:
+  test-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - name: Build contracts
+        run: |
+          pushd packages/contracts
+          pnpm build
+          popd
+      - name: Build horizon
+        run: |
+          pushd packages/horizon
+          pnpm build
+          popd
+      - name: Build subgraph service
+        run: |
+          pushd packages/subgraph-service
+          pnpm build
+          popd
+      - name: Build toolshed
+        run: |
+          pushd packages/toolshed
+          pnpm build
+          popd
+      - name: Build hardhat-graph-protocol
+        run: |
+          pushd packages/hardhat-graph-protocol
+          pnpm build
+          popd

.github/workflows/ci-horizon.yml

@@ -27,24 +27,29 @@ jobs:
       - name: Build contracts
         run: |
           pushd packages/contracts
-          yarn build
+          pnpm build
           popd
       - name: Build horizon
         run: |
           pushd packages/horizon
-          yarn build
+          pnpm build
           popd
       - name: Build subgraph service
         run: |
           pushd packages/subgraph-service
-          yarn build
+          pnpm build
+          popd
+      - name: Build toolshed
+        run: |
+          pushd packages/toolshed
+          pnpm build
           popd
       - name: Build hardhat-graph-protocol
         run: |
           pushd packages/hardhat-graph-protocol
-          yarn build
+          pnpm build
           popd
       - name: Run tests
         run: |
           pushd packages/horizon
-          yarn test
+          pnpm test

.github/workflows/ci-subgraph-service.yml

@@ -27,24 +27,29 @@ jobs:
       - name: Build contracts
         run: |
           pushd packages/contracts
-          yarn build
+          pnpm build
           popd
       - name: Build horizon
         run: |
           pushd packages/horizon
-          yarn build
+          pnpm build
           popd
       - name: Build subgraph service
         run: |
           pushd packages/subgraph-service
-          yarn build
+          pnpm build
+          popd
+      - name: Build toolshed
+        run: |
+          pushd packages/toolshed
+          pnpm build
           popd
       - name: Build hardhat-graph-protocol
         run: |
           pushd packages/hardhat-graph-protocol
-          yarn build
+          pnpm build
           popd
       - name: Run tests
         run: |
           pushd packages/subgraph-service
-          yarn test
+          pnpm test

.github/workflows/ci-token-dist.yml

@@ -28,8 +28,8 @@ jobs:
       - name: Build
         run: |
           pushd packages/token-distribution
-          yarn build
+          pnpm build
       - name: Run tests
         run: |
           pushd packages/token-distribution
-          yarn test
+          pnpm test

.github/workflows/ci-toolshed.yml

@@ -0,0 +1,46 @@
+name: CI - packages/toolshed
+
+env:
+  CI: true
+
+on:
+  push:
+    branches: "*"
+    paths:
+      - packages/toolshed/**
+  pull_request:
+    branches: "*"
+    paths:
+      - packages/toolshed/**
+  workflow_dispatch:
+
+jobs:
+  test-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - name: Build contracts
+        run: |
+          pushd packages/contracts
+          pnpm build
+          popd
+      - name: Build horizon
+        run: |
+          pushd packages/horizon
+          pnpm build
+          popd
+      - name: Build subgraph service
+        run: |
+          pushd packages/subgraph-service
+          pnpm build
+          popd
+      - name: Build toolshed
+        run: |
+          pushd packages/toolshed
+          pnpm build
+          popd

.github/workflows/publish.yml

@@ -8,8 +8,8 @@ on:
         required: true
         type: choice
         options:
-        - contracts
-        - sdk
+          - contracts
+          - sdk
       tag:
         description: 'Tag to publish'
         required: true
@@ -27,10 +27,10 @@ jobs:
           submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Set npm token for publishing
+        run: pnpm config set //registry.npmjs.org/:_authToken ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }}
       - name: Publish 🚀
         shell: bash
         run: |
           pushd packages/${{ inputs.package }}
-          yarn npm publish --tag ${{ inputs.tag }} --access public
-        env:
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }}
+          pnpm publish --tag ${{ inputs.tag }} --access public --no-git-checks

.github/workflows/verifydeployed.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Build
         run: |
           pushd packages/contracts
-          yarn build || yarn build
+          pnpm build || pnpm build
 
       - name: Save build artifacts
         uses: actions/upload-artifact@v3
@@ -55,14 +55,14 @@ jobs:
       - name: Build
         run: |
           pushd packages/contracts
-          yarn build || yarn build
+          pnpm build || pnpm build
       - name: Get build artifacts
         uses: actions/download-artifact@v3
         with:
           name: contract-artifacts
 
       - name: Verify contracts on Defender
-        run: cd packages/contracts && yarn hardhat --network ${{ inputs.network }} verify-defender ${{ inputs.contracts }}
+        run: cd packages/contracts && pnpm hardhat --network ${{ inputs.network }} verify-defender ${{ inputs.contracts }}
         env:
           DEFENDER_API_KEY: "${{ secrets.DEFENDER_API_KEY }}"
           DEFENDER_API_SECRET: "${{ secrets.DEFENDER_API_SECRET }}"

.gitignore

@@ -1,6 +1,7 @@
 # Logs
 yarn-debug.log*
 yarn-error.log*
+node.log
 
 # Dependency directories
 node_modules/
@@ -45,7 +46,9 @@ localNetwork.json
 arbitrum-addresses-local.json
 tx-*.log
 addresses-fork.json
-
+addresses-hardhat.json
+addresses-localhost.json
+addresses-local-network.json
 # Keys
 .keystore
 

README.md

@@ -29,7 +29,7 @@
 
 ## Packages
 
-This repository is a Yarn workspaces monorepo containing the following packages:
+This repository is a pnpm workspaces monorepo containing the following packages:
 
 | Package | Latest version | Description |
 | --- | --- | --- |
@@ -46,26 +46,22 @@ This repository is a Yarn workspaces monorepo containing the following packages:
 ## Development
 
 ### Setup
-To set up this project you'll need [git](https://git-scm.com) and [yarn](https://yarnpkg.com/) installed. Note that Yarn v4 is required to install the dependencies and build the project. 
+To set up this project you'll need [git](https://git-scm.com) and [pnpm](https://pnpm.io/) installed.
 
 From your command line:
 
 ```bash
-# Enable Yarn v4
-corepack enable
-yarn set version stable
-
 # Clone this repository
 $ git clone https://github.com/graphprotocol/contracts
 
 # Go into the repository
 $ cd contracts
 
 # Install dependencies
-$ yarn
+$ pnpm install
 
 # Build projects
-$ yarn build
+$ pnpm build
 ```
 
 ### Versioning and publishing packages
@@ -77,7 +73,7 @@ We use [changesets](https://github.com/changesets/changesets) to manage package
 A changeset is a file that describes the changes that have been made to the packages in the repository. To create a changeset, run the following command from the root of the repository:
 
 ```bash
-$ yarn changeset
+$ pnpm changeset
 ```
 
 Changeset files are stored in the `.changeset` directory until they are packaged into a release. You can commit these files and even merge them into your main branch without publishing a release.
@@ -87,7 +83,7 @@ Changeset files are stored in the `.changeset` directory until they are packaged
 When you are ready to create a new package release, run the following command to package all changesets, this will also bump package versions and dependencies:
 
 ```bash
-$ yarn changeset version
+$ pnpm changeset version
 ```
 
 ### Step 3: Tagging the release
@@ -97,7 +93,7 @@ __Note__: this step is meant to be run on the main branch.
 After creating a package release, you will need to tag the release commit with the version number. To do this, run the following command from the root of the repository:
 
 ```bash
-$ yarn changeset tag
+$ pnpm changeset tag
 $ git push --follow-tags
 ```
 
@@ -109,7 +105,7 @@ Packages are published and distributed via NPM. To publish a package, run the fo
 
 ```bash
 # Publish the package
-$ yarn npm publish --access public --tag <tag>
+$ pnpm npm publish --access public --tag <tag>
 ```
 
 Alternatively, there is a GitHub action that can be manually triggered to publish a package.