Merge pull request #845 from autonomys/main

Sync main w/ prod

.env

@@ -1,6 +1,9 @@
-DB_NAME=squid
 DB_USER=postgres
-DB_PASSWORD=postgres-indexer
+DB_PASSWORD=postgres
 DB_PORT=5432
 
+DB_CONSENSUS=consensus
+DB_LEADERBOARD=leaderboard
+DB_STAKING=staking
+
 HASURA_GRAPHQL_ADMIN_SECRET=helloworld

.gitignore

@@ -1,2 +1,7 @@
 DS_Store
-*/DS_Store
+*/DS_Store
+
+node_modules
+
+# local env files
+.env

.vscode/astral.code-workspace

@@ -16,25 +16,13 @@
       "name": "indexers",
       "path": "../indexers"
     },
-    {
-      "name": "indexer - General Squid",
-      "path": "../indexers/general-squid"
-    },
-    {
-      "name": "indexer - Account Squid",
-      "path": "../indexers/account-squid"
-    },
     {
       "name": "indexer - Staking Squid",
       "path": "../indexers/staking-squid"
     },
     {
       "name": "indexer - Leaderboard Squid",
       "path": "../indexers/leaderboard-squid"
-    },
-    {
-      "name": "indexer - Rewards Squid",
-      "path": "../indexers/rewards-squid"
     }
   ],
   "settings": {
@@ -53,6 +41,8 @@
     "cSpell.words": [
       "autonomys",
       "autoid",
+      "hasura",
+      "deregister",
       "extrinsics",
       "gemini",
       "graphiql",

.vscode/settings.json

@@ -14,6 +14,8 @@
   "cSpell.words": [
     "autonomys",
     "autoid",
+    "hasura",
+    "deregister",
     "extrinsics",
     "gemini",
     "graphiql",

docker-compose.yml

@@ -5,11 +5,11 @@ services:
     container_name: explorer-db
     image: postgres:14
     environment:
-      POSTGRES_DB: ${DB_NAME}
-      POSTGRES_USER: ${DB_USER}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
     ports:
       - "${DB_PORT}:${DB_PORT}"
+    volumes:
+      - ./indexers/db/docker-entrypoint-initdb.d/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
 
   graphql-engine:
     container_name: explorer-graphql
@@ -18,8 +18,11 @@ services:
       - "db"
     restart: always
     environment:
-      HASURA_GRAPHQL_METADATA_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@db:${DB_PORT}/${DB_NAME}
-      HASURA_GRAPHQL_ENABLE_CONSOLE: "true"
+      HASURA_GRAPHQL_METADATA_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@db:${DB_PORT}/${DB_CONSENSUS}
+      HASURA_GRAPHQL_CONSENSUS_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@db:${DB_PORT}/${DB_CONSENSUS}
+      HASURA_GRAPHQL_LEADERBOARD_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@db:${DB_PORT}/${DB_LEADERBOARD}
+      HASURA_GRAPHQL_STAKING_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@db:${DB_PORT}/${DB_STAKING}
+      HASURA_GRAPHQL_ENABLE_CONSOLE: "false"
       HASURA_GRAPHQL_DEV_MODE: "true"
       # HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets
       HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET}

explorer/codegen.ts

@@ -6,6 +6,11 @@ dotenv.config()
 
 const config: CodegenConfig = {
   generates: {
+    './gql/types/accounts.ts': {
+      schema: defaultIndexer.squids.accounts,
+      documents: ['./src/**/accounts.query.ts'],
+      plugins: ['typescript', 'typescript-operations'],
+    },
     './gql/types/leaderboard.ts': {
       schema: defaultIndexer.squids.leaderboard,
       documents: ['./src/**/leaderboard.query.ts'],