[WIP] feat: refactor arb-subgraph forta alert, updated packages

arb-subgraph/.eslintignore

@@ -0,0 +1,2 @@
+generated
+proto

arb-subgraph/.eslintrc.json

@@ -0,0 +1,14 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  "plugins": ["@typescript-eslint", "prettier"],
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "rules": {
+    "prettier/prettier": "error",
+    "curly": "error",
+    "semi": "off"
+  }
+}

arb-subgraph/.gitignore

@@ -6,3 +6,4 @@ forta.config.json
 *.log
 version.json
 .DS_Store
+src/generated

arb-subgraph/.prettierignore

@@ -0,0 +1,2 @@
+generated
+proto

arb-subgraph/.prettierrc.json

@@ -0,0 +1,7 @@
+{
+  "semi": false,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 120,
+  "tabWidth": 2
+}

arb-subgraph/Dockerfile

@@ -1,14 +1,13 @@
 # Build stage: compile Typescript to Javascript
-FROM node:16.17.1-alpine3.16 AS base
+FROM node:20.9.0-alpine3.18 AS base
 
 FROM base as builder
-WORKDIR /app
 
-COPY package*.json .yarnrc.yml yarn.lock ./
-COPY .yarn/releases ./.yarn/releases/
-RUN yarn install --immutable
+WORKDIR /app
 
 COPY . .
+RUN yarn install --immutable && yarn run build
+# Build app
 RUN yarn run build
 
 # Final stage: copy compiled Javascript from previous stage and install production dependencies
@@ -17,13 +16,9 @@ LABEL "network.forta.settings.agent-logs.enable"="true"
 ENV NODE_ENV=production
 WORKDIR /app
 
-RUN apk add --no-cache tini=0.19.0-r0
-
-COPY package*.json .yarnrc.yml yarn.lock ./
-COPY .yarn/releases ./.yarn/releases/
+COPY package*.json yarn.lock ./
 COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/dist ./src
 COPY version.json ./
 
-ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["yarn", "run", "start:prod"]

arb-subgraph/jest.config.js

@@ -1,6 +1,6 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-  preset: "ts-jest",
-  testEnvironment: "node",
-  testRegex: ".*\\.spec\\.ts$",
-};
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testRegex: '.*\\.spec\\.ts$',
+}

arb-subgraph/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "lido-arbitrum-bot",
+  "name": "arb-subgraph",
   "version": "0.0.1",
-  "description": "Forta Bot for Lido Apps on Arbitrum network",
+  "description": "Forta Bot for Lido The Graph billing account",
+  "license": "MIT",
   "chainIds": [
     42161
   ],
@@ -11,34 +12,67 @@
       "target": 5
     }
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "yarn run lint"
+    }
+  },
   "scripts": {
-    "update-version": "node scripts/write-version.js",
-    "build": "tsc --resolveJsonModule",
-    "start": "yarn run start:dev",
-    "start:dev": "nodemon --watch src --watch forta.config.json -e js,ts,json  --exec \"yarn run build && forta-agent run\"",
+    "update-version": "node ../utils/write-version.js",
+    "build": "tsc && yarn run copy-version",
+    "copy-version": "cp version.json dist",
+    "start": "yarn run update-version && yarn run start:dev",
+    "start:dev": "nodemon --watch src --watch forta.config.json -e js,ts,json  --exec \"yarn run build && yarn run copy-version && forta-agent run\"",
     "start:prod": "forta-agent run --prod",
     "tx": "yarn run build && forta-agent run --tx",
     "block": "yarn run build && forta-agent run --block",
     "range": "yarn run build && forta-agent run --range",
+    "alert": "yarn run build && forta-agent run --alert",
+    "sequence": "yarn run build && forta-agent run --sequence",
     "file": "yarn run build && forta-agent run --file",
     "publish": "yarn run update-version && forta-agent publish",
+    "info": "forta-agent info",
+    "logs": "forta-agent logs",
     "push": "yarn run update-version && forta-agent push",
     "disable": "forta-agent disable",
     "enable": "forta-agent enable",
     "keyfile": "forta-agent keyfile",
-    "test": "jest --passWithNoTests"
+    "stake": "forta-agent stake",
+    "test": "jest",
+    "generate-types": "typechain --target=ethers-v5 --out-dir=./src/generated ./src/abi/*",
+    "eslint:lint": "eslint ./src",
+    "eslint:format": "eslint ./src --fix",
+    "prettier:check": "prettier --check ./src",
+    "prettier:format": "prettier --write ./src",
+    "lint": "yarn run prettier:check && yarn run eslint:lint",
+    "format": "yarn run eslint:format && yarn run prettier:format",
+    "postinstall": "yarn generate-types"
   },
   "dependencies": {
-    "bignumber.js": "^9.0.1",
+    "bignumber.js": "^9.1.2",
     "forta-agent": "^0.1.48"
   },
   "devDependencies": {
+    "@typechain/ethers-v5": "^11.1.2",
+    "@tsconfig/node20": "^20.1.2",
     "@types/jest": "^29.1.2",
     "@types/nodemon": "^1.19.0",
-    "jest": "^29.2.0",
-    "nodemon": "^2.0.8",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "husky": "^8.0.3",
+    "jest": "^29.7.0",
+    "nodemon": "^3.0.1",
+    "prettier": "^3.1.0",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.3.4"
+    "typechain": "^8.3.2",
+    "typescript": "^5.3.2",
+    "@ethersproject/abi": "^5.0.0",
+    "@ethersproject/providers": "^5.0.0",
+    "ethers": "^5.1.3"
   },
-  "packageManager": "yarn@3.3.0"
+  "packageManager": "yarn@1.22.21"
 }

arb-subgraph/scripts/write-version.js

@@ -1,23 +1,14 @@
-const childProcess = require("child_process");
-const fs = require("fs");
+const childProcess = require('child_process')
+const fs = require('fs')
 
-const commitHash = childProcess
-  .execSync("git rev-parse HEAD")
-  .toString("utf-8")
-  .trim();
-const commitMsg = childProcess
-  .execSync("git log -1 --pretty=%B")
-  .toString("utf-8")
-  .trim();
-const gitStatusOutput = childProcess
-  .execSync("git status --porcelain")
-  .toString("utf-8")
-  .trim();
+const commitHash = childProcess.execSync('git rev-parse HEAD').toString('utf-8').trim()
+const commitMsg = childProcess.execSync('git log -1 --pretty=%B').toString('utf-8').trim()
+const gitStatusOutput = childProcess.execSync('git status --porcelain').toString('utf-8').trim()
 
-const commitHashShort = commitHash.substr(0, 7);
-const commitMsgShort = commitMsg.split("\n")[0];
-const isWdClean = gitStatusOutput === "";
-const commitHashSuffux = isWdClean ? "" : " [dirty]";
+const commitHashShort = commitHash.substr(0, 7)
+const commitMsgShort = commitMsg.split('\n')[0]
+const isWdClean = gitStatusOutput === ''
+const commitHashSuffux = isWdClean ? '' : ' [dirty]'
 
 const version = {
   desc: `${commitHashShort}${commitHashSuffux} (${commitMsgShort})`,
@@ -26,8 +17,8 @@ const version = {
   commitMsg,
   commitMsgShort,
   isWdClean,
-};
+}
 
-console.log("Writing to version.json:", JSON.stringify(version, null, "  "));
+console.log('Writing to version.json:', JSON.stringify(version, null, '  '))
 
-fs.writeFileSync("version.json", JSON.stringify(version));
+fs.writeFileSync('version.json', JSON.stringify(version))