Merge pull request #1063 from autonomys/chore/simplify-indexers-setup

Simplify indexers setup
autonomys · Jan 16, 2025 · 2f5987c · 2f5987c
2 parents 327c068 + 3a0f599
commit 2f5987c
Show file tree

Hide file tree

Showing 104 changed files with 2,610 additions and 6,391 deletions.
diff --git a/.vscode/astral.code-workspace b/.vscode/astral.code-workspace
@@ -13,12 +13,24 @@
       "path": "../indexers"
     },
     {
-      "name": "Indexer - Mainnet",
-      "path": "../indexers/mainnet"
+      "name": "Indexer - Consensus",
+      "path": "../indexers/consensus"
     },
     {
-      "name": "Indexer - Testnet Taurus",
-      "path": "../indexers/taurus"
+      "name": "Indexer - Leaderboard",
+      "path": "../indexers/leaderboard"
+    },
+    {
+      "name": "Indexer - Files",
+      "path": "../indexers/files"
+    },
+    {
+      "name": "Indexer - Staking",
+      "path": "../indexers/staking"
+    },
+    {
+      "name": "Indexer - API",
+      "path": "../indexers/api"
     },
     {
       "name": "Indexer - Taskboard",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -218,10 +218,10 @@ services:
       DB_HOST: ${DB_HOST}
       DB_PORT: ${DB_PORT}
     volumes:
-      - ./indexers/${NETWORK_ID}/consensus:/${NETWORK_ID}/consensus
+      - ./indexers/consensus:/consensus
     command:
       - ${SUB_COMMAND:-} # set SUB_COMMAND env variable to "test" to run tests
-      - -f=/${NETWORK_ID}/consensus
+      - -f=/consensus
       - --db-schema=consensus
       - --workers=4
       - --unsafe
@@ -257,10 +257,10 @@ services:
       DB_HOST: ${DB_HOST}
       DB_PORT: ${DB_PORT}
     volumes:
-      - ./indexers/${NETWORK_ID}/leaderboard:/${NETWORK_ID}/leaderboard
+      - ./indexers/leaderboard:/leaderboard
     command:
       - ${SUB_COMMAND:-} # set SUB_COMMAND env variable to "test" to run tests
-      - -f=/${NETWORK_ID}/leaderboard
+      - -f=/leaderboard
       - --db-schema=leaderboard
       - --workers=1
       - --batch-size=100
@@ -295,10 +295,10 @@ services:
       DB_HOST: ${DB_HOST}
       DB_PORT: ${DB_PORT}
     volumes:
-      - ./indexers/${NETWORK_ID}/staking:/${NETWORK_ID}/staking
+      - ./indexers/staking:/staking
     command:
       - ${SUB_COMMAND:-} # set SUB_COMMAND env variable to "test" to run tests
-      - -f=/${NETWORK_ID}/staking
+      - -f=/staking
       - --db-schema=staking
       - --workers=1
       - --unsafe
@@ -330,10 +330,10 @@ services:
       DB_HOST: ${DB_HOST}
       DB_PORT: ${DB_PORT}
     volumes:
-      - ./indexers/${NETWORK_ID}/files:/${NETWORK_ID}/files
+      - ./indexers/files:/files
     command:
       - ${SUB_COMMAND:-} # set SUB_COMMAND env variable to "test" to run tests
-      - -f=/${NETWORK_ID}/files
+      - -f=/files
       - --db-schema=files
       - --workers=1
       - --unsafe

diff --git a/indexers/mainnet/consensus/.gitignore → indexers/consensus/.gitignore b/indexers/mainnet/consensus/.gitignore → indexers/consensus/.gitignore
diff --git a/indexers/mainnet/consensus/LICENSE → indexers/consensus/LICENSE b/indexers/mainnet/consensus/LICENSE → indexers/consensus/LICENSE
diff --git a/indexers/mainnet/consensus/README.md → indexers/consensus/README.md b/indexers/mainnet/consensus/README.md → indexers/consensus/README.md
diff --git a/indexers/mainnet/consensus/package.json → indexers/consensus/package.json b/indexers/mainnet/consensus/package.json → indexers/consensus/package.json
diff --git a/indexers/mainnet/consensus/project.ts → indexers/consensus/project.ts b/indexers/mainnet/consensus/project.ts → indexers/consensus/project.ts
diff --git a/indexers/mainnet/consensus/schema.graphql → indexers/consensus/schema.graphql b/indexers/mainnet/consensus/schema.graphql → indexers/consensus/schema.graphql
diff --git a/indexers/mainnet/consensus/src/index.ts → indexers/consensus/src/index.ts b/indexers/mainnet/consensus/src/index.ts → indexers/consensus/src/index.ts
diff --git a/...xers/mainnet/consensus/src/mappings/db.ts → indexers/consensus/src/mappings/db.ts b/...xers/mainnet/consensus/src/mappings/db.ts → indexers/consensus/src/mappings/db.ts
diff --git a/.../mainnet/consensus/src/mappings/helper.ts → indexers/consensus/src/mappings/helper.ts b/.../mainnet/consensus/src/mappings/helper.ts → indexers/consensus/src/mappings/helper.ts
diff --git a/...consensus/src/mappings/mappingHandlers.ts → ...consensus/src/mappings/mappingHandlers.ts b/...consensus/src/mappings/mappingHandlers.ts → ...consensus/src/mappings/mappingHandlers.ts
diff --git a/...s/mainnet/consensus/src/mappings/types.ts → indexers/consensus/src/mappings/types.ts b/...s/mainnet/consensus/src/mappings/types.ts → indexers/consensus/src/mappings/types.ts
diff --git a/...s/mainnet/consensus/src/mappings/utils.ts → indexers/consensus/src/mappings/utils.ts b/...s/mainnet/consensus/src/mappings/utils.ts → indexers/consensus/src/mappings/utils.ts
diff --git a/indexers/mainnet/staking/tsconfig.json → indexers/consensus/tsconfig.json b/indexers/mainnet/staking/tsconfig.json → indexers/consensus/tsconfig.json
@@ -14,7 +14,7 @@
   },
   "include": [
     "src/**/*",
-    "../../node_modules/@subql/types-core/dist/global.d.ts",
-    "../../node_modules/@subql/types/dist/global.d.ts"
+    "../node_modules/@subql/types-core/dist/global.d.d.ts",
+    "../node_modules/@subql/types/dist/global.d.ts"
   ]
 }
diff --git a/indexers/mainnet/files/.gitignore → indexers/files/.gitignore b/indexers/mainnet/files/.gitignore → indexers/files/.gitignore
diff --git a/indexers/mainnet/files/LICENSE → indexers/files/LICENSE b/indexers/mainnet/files/LICENSE → indexers/files/LICENSE
diff --git a/indexers/mainnet/files/README.md → indexers/files/README.md b/indexers/mainnet/files/README.md → indexers/files/README.md
diff --git a/indexers/mainnet/files/package.json → indexers/files/package.json b/indexers/mainnet/files/package.json → indexers/files/package.json
diff --git a/indexers/mainnet/files/project.ts → indexers/files/project.ts b/indexers/mainnet/files/project.ts → indexers/files/project.ts
diff --git a/indexers/mainnet/files/schema.graphql → indexers/files/schema.graphql b/indexers/mainnet/files/schema.graphql → indexers/files/schema.graphql
diff --git a/indexers/mainnet/files/src/index.ts → indexers/files/src/index.ts b/indexers/mainnet/files/src/index.ts → indexers/files/src/index.ts
diff --git a/indexers/mainnet/files/src/mappings/db.ts → indexers/files/src/mappings/db.ts b/indexers/mainnet/files/src/mappings/db.ts → indexers/files/src/mappings/db.ts
diff --git a/...net/files/src/mappings/mappingHandlers.ts → ...ers/files/src/mappings/mappingHandlers.ts b/...net/files/src/mappings/mappingHandlers.ts → ...ers/files/src/mappings/mappingHandlers.ts
diff --git a/indexers/mainnet/files/src/mappings/types.ts → indexers/files/src/mappings/types.ts b/indexers/mainnet/files/src/mappings/types.ts → indexers/files/src/mappings/types.ts
diff --git a/indexers/taurus/leaderboard/tsconfig.json → indexers/files/tsconfig.json b/indexers/taurus/leaderboard/tsconfig.json → indexers/files/tsconfig.json
@@ -14,7 +14,7 @@
   },
   "include": [
     "src/**/*",
-    "../../node_modules/@subql/types-core/dist/global.d.ts",
-    "../../node_modules/@subql/types/dist/global.d.ts"
+    "../node_modules/@subql/types-core/dist/global.d.d.ts",
+    "../node_modules/@subql/types/dist/global.d.ts"
   ]
 }
diff --git a/indexers/mainnet/leaderboard/.gitignore → indexers/leaderboard/.gitignore b/indexers/mainnet/leaderboard/.gitignore → indexers/leaderboard/.gitignore
diff --git a/indexers/mainnet/leaderboard/LICENSE → indexers/leaderboard/LICENSE b/indexers/mainnet/leaderboard/LICENSE → indexers/leaderboard/LICENSE
diff --git a/indexers/mainnet/leaderboard/README.md → indexers/leaderboard/README.md b/indexers/mainnet/leaderboard/README.md → indexers/leaderboard/README.md
diff --git a/indexers/mainnet/leaderboard/package.json → indexers/leaderboard/package.json b/indexers/mainnet/leaderboard/package.json → indexers/leaderboard/package.json
diff --git a/indexers/mainnet/leaderboard/project.ts → indexers/leaderboard/project.ts b/indexers/mainnet/leaderboard/project.ts → indexers/leaderboard/project.ts
diff --git a/indexers/mainnet/leaderboard/schema.graphql → indexers/leaderboard/schema.graphql b/indexers/mainnet/leaderboard/schema.graphql → indexers/leaderboard/schema.graphql
diff --git a/indexers/mainnet/leaderboard/src/index.ts → indexers/leaderboard/src/index.ts b/indexers/mainnet/leaderboard/src/index.ts → indexers/leaderboard/src/index.ts
diff --git a/...rs/mainnet/leaderboard/src/mappings/db.ts → indexers/leaderboard/src/mappings/db.ts b/...rs/mainnet/leaderboard/src/mappings/db.ts → indexers/leaderboard/src/mappings/db.ts
diff --git a/...aderboard/src/mappings/mappingHandlers.ts → ...aderboard/src/mappings/mappingHandlers.ts b/...aderboard/src/mappings/mappingHandlers.ts → ...aderboard/src/mappings/mappingHandlers.ts
diff --git a/indexers/taurus/staking/tsconfig.json → indexers/leaderboard/tsconfig.json b/indexers/taurus/staking/tsconfig.json → indexers/leaderboard/tsconfig.json
@@ -14,7 +14,7 @@
   },
   "include": [
     "src/**/*",
-    "../../node_modules/@subql/types-core/dist/global.d.ts",
-    "../../node_modules/@subql/types/dist/global.d.ts"
+    "../node_modules/@subql/types-core/dist/global.d.ts",
+    "../node_modules/@subql/types/dist/global.d.ts"
   ]
 }
diff --git a/indexers/lerna.json b/indexers/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "version": "0.0.0",
-  "packages": ["mainnet/*", "taurus/*", "db", "taskboard"],
+  "packages": ["*"],
   "npmClient": "yarn"
 }
diff --git a/indexers/mainnet/README.md b/indexers/mainnet/README.md
diff --git a/indexers/mainnet/consensus/tsconfig.json b/indexers/mainnet/consensus/tsconfig.json
diff --git a/indexers/mainnet/files/tsconfig.json b/indexers/mainnet/files/tsconfig.json
diff --git a/indexers/mainnet/yarn.lock b/indexers/mainnet/yarn.lock
diff --git a/indexers/package.json b/indexers/package.json
@@ -4,12 +4,7 @@
   "private": true,
   "main": "index.js",
   "license": "MIT",
-  "workspaces": [
-    "mainnet/*",
-    "taurus/*",
-    "db",
-    "taskboard"
-  ],
+  "workspaces": ["*"],
   "scripts": {
     "postinstall": "git submodule update --init --recursive",
     "bootstrap": "lerna run bootstrap",

diff --git a/indexers/patch.sh b/indexers/patch.sh
diff --git a/indexers/mainnet/staking/.gitignore → indexers/staking/.gitignore b/indexers/mainnet/staking/.gitignore → indexers/staking/.gitignore
diff --git a/indexers/mainnet/staking/LICENSE → indexers/staking/LICENSE b/indexers/mainnet/staking/LICENSE → indexers/staking/LICENSE
diff --git a/indexers/mainnet/staking/README.md → indexers/staking/README.md b/indexers/mainnet/staking/README.md → indexers/staking/README.md
diff --git a/indexers/mainnet/staking/package.json → indexers/staking/package.json b/indexers/mainnet/staking/package.json → indexers/staking/package.json
diff --git a/indexers/mainnet/staking/project.ts → indexers/staking/project.ts b/indexers/mainnet/staking/project.ts → indexers/staking/project.ts
diff --git a/indexers/mainnet/staking/schema.graphql → indexers/staking/schema.graphql b/indexers/mainnet/staking/schema.graphql → indexers/staking/schema.graphql
diff --git a/indexers/mainnet/staking/src/index.ts → indexers/staking/src/index.ts b/indexers/mainnet/staking/src/index.ts → indexers/staking/src/index.ts
diff --git a/...mainnet/staking/src/mappings/constants.ts → indexers/staking/src/mappings/constants.ts b/...mainnet/staking/src/mappings/constants.ts → indexers/staking/src/mappings/constants.ts
diff --git a/indexers/mainnet/staking/src/mappings/db.ts → indexers/staking/src/mappings/db.ts b/indexers/mainnet/staking/src/mappings/db.ts → indexers/staking/src/mappings/db.ts
diff --git a/...t/staking/src/mappings/mappingHandlers.ts → ...s/staking/src/mappings/mappingHandlers.ts b/...t/staking/src/mappings/mappingHandlers.ts → ...s/staking/src/mappings/mappingHandlers.ts
diff --git a/...rs/mainnet/staking/src/mappings/models.ts → indexers/staking/src/mappings/models.ts b/...rs/mainnet/staking/src/mappings/models.ts → indexers/staking/src/mappings/models.ts
diff --git a/...ers/mainnet/staking/src/mappings/types.ts → indexers/staking/src/mappings/types.ts b/...ers/mainnet/staking/src/mappings/types.ts → indexers/staking/src/mappings/types.ts
diff --git a/indexers/mainnet/leaderboard/tsconfig.json → indexers/staking/tsconfig.json b/indexers/mainnet/leaderboard/tsconfig.json → indexers/staking/tsconfig.json
@@ -14,7 +14,7 @@
   },
   "include": [
     "src/**/*",
-    "../../node_modules/@subql/types-core/dist/global.d.ts",
-    "../../node_modules/@subql/types/dist/global.d.ts"
+    "../node_modules/@subql/types-core/dist/global.d.ts",
+    "../node_modules/@subql/types/dist/global.d.ts"
   ]
 }
diff --git a/indexers/taurus/README.md b/indexers/taurus/README.md