Merge branch 'feat/erc20-fees-on-arbitrator' into feat/interfaces-v2-rebased2

Author: jaybuidl

.github/workflows/deploy-subgraph.yml

@@ -11,6 +11,11 @@ on:
         options:
           - arbitrum-goerli
           - arbitrum
+      update:
+        description: Whether to update the subgraph with the current artifacts for the selected network.
+        required: true
+        default: true
+        type: boolean
 
 permissions:
   contents: read
@@ -33,16 +38,38 @@ jobs:
         with:
           node-version: 16
 
+      - name: Install Yarn if running locally
+        if: ${{ env.ACT }}
+        run: npm install -g yarn
+
       - name: Install the dependencies
         run: yarn install
 
+      - name: Install jq and yq
+        if: ${{ inputs.update }}  
+        run: |
+          mkdir bin
+          wget -qO bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64
+          wget -qO bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+          chmod a+x bin/jq bin/yq 
+
+      - name: Update the subgraph definition
+        if: ${{ inputs.update }}
+        run: |
+          export PATH=$PWD/../bin:$PATH
+          yarn update:${{ inputs.network }}
+        working-directory: subgraph
+
       - name: Build the subgraph
         run: |
           yarn codegen
           yarn build
-
+        working-directory: subgraph
+        
       - name: Authenticate with TheGraph
         run: yarn graph auth "${{ secrets.SUBGRAPH_AUTH_TOKEN }}" --product hosted-service
+        working-directory: subgraph
 
       - name: Deploy the subgraph
         run: yarn deploy:${{ inputs.network }}
+        working-directory: subgraph

.github/workflows/scorecards.yml

@@ -84,6 +84,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27
+        uses: github/codeql-action/upload-sarif@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
         with:
           sarif_file: results.sarif

contracts/.solhint.json

@@ -1,8 +1,13 @@
 {
   "extends": "solhint:recommended",
-  "plugins": ["prettier"],
+  "plugins": [
+    "prettier"
+  ],
   "rules": {
-    "compiler-version": ["error", "^0.8.0"],
+    "compiler-version": [
+      "error",
+      "^0.8.0"
+    ],
     "func-visibility": [
       "warn",
       {

contracts/package.json

@@ -41,19 +41,19 @@
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-solhint": "^3.0.1",
-    "@openzeppelin/contracts": "^4.9.1",
+    "@openzeppelin/contracts": "^4.9.2",
     "@typechain/ethers-v5": "^11.0.0",
     "@typechain/hardhat": "^7.0.0",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.36",
     "chai": "^4.3.7",
-    "dotenv": "^16.1.4",
+    "dotenv": "^16.3.1",
     "ethereumjs-util": "^7.1.5",
     "ethers": "^5.7.2",
     "hardhat": "^2.15.0",
     "hardhat-contract-sizer": "^2.10.0",
-    "hardhat-deploy": "^0.11.30",
+    "hardhat-deploy": "^0.11.31",
     "hardhat-deploy-ethers": "^0.4.0-next.1",
     "hardhat-deploy-tenderly": "^0.2.0",
     "hardhat-docgen": "^1.3.0",

contracts/tsconfig.json

@@ -1,5 +1,13 @@
 {
   "extends": "@kleros/kleros-v2-tsconfig/base.json",
-  "include": ["./src", "./scripts", "./test", "./typechain-types", "./deploy"],
-  "files": ["./hardhat.config.ts"]
+  "include": [
+    "./src",
+    "./scripts",
+    "./test",
+    "./typechain-types",
+    "./deploy"
+  ],
+  "files": [
+    "./hardhat.config.ts"
+  ]
 }

cspell.json

@@ -3,7 +3,11 @@
   "version": "0.2",
   "ignorePaths": [],
   "dictionaryDefinitions": [],
-  "dictionaries": ["en_US", "companies", "softwareTerms"],
+  "dictionaries": [
+    "en_US",
+    "companies",
+    "softwareTerms"
+  ],
   "words": [
     "arbitrum",
     "commitlint",

package.json

@@ -36,6 +36,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
+    "buffer": "^5.5.0",
     "conventional-changelog-cli": "^2.2.2",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.2",

prettier-config/package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "prettier": "^2.8.8",
     "prettier-plugin-solidity": "^1.1.3"
   },

scripts/act-subgraph.yml

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+act workflow_dispatch -j buildAndDeploy --input network=arbitrum-goerli,update=true

scripts/check-prerequisites.sh

@@ -11,10 +11,22 @@ function require() #cmd
   fi
 }
 
+# for the NPM and toolchain version management
+require volta
+
+# for the local subgraph node
 require docker
 require docker-compose
+
+# for some contracts utilities
+require cast
+require forge
+
+# for the subgraph and contracts utilities
 require jq
 require yq
-require volta
+
+# for the local testing of Github Actions
+require act
 
 exit $status