Merge pull request #587 from subspace/staging

Sync main branch with staging
autonomys · May 23, 2024 · c3eaab0 · c3eaab0
2 parents 8a9b9fa + b710138
commit c3eaab0
Show file tree

Hide file tree

Showing 670 changed files with 212,340 additions and 190,400 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: squid-blockexplorer
+        working-directory: indexers/squid-blockexplorer
     name: Run eslint, check typescript and run tests
     steps:
       - uses: actions/checkout@v3
@@ -18,11 +18,11 @@ jobs:
       - run: npm test
       - run: npm run lint
       - run: npm run build
-  ts-lint-and-build-client:
+  ts-lint-and-build-explorer:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: client
+        working-directory: explorer
     name: Run eslint and code style check
     steps:
       - name: Checkout 🛎️
@@ -31,7 +31,6 @@ jobs:
         run: |
           yarn install
           yarn lint:fix
-          yarn test
       - name: Build project 🔧
         run: yarn build
   ts-lint-and-build-health-check:

diff --git a/.github/workflows/gh-account-image.yml b/.github/workflows/gh-account-image.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Build processor image
         run: docker build . --target processor -t squid-processor --tag $PROCESSOR_NAME
-        working-directory: account-squid
+        working-directory: indexers/account-squid
 
       - name: Push processor image
         run: docker push $PROCESSOR_NAME
diff --git a/.github/workflows/gh-container-image.yml b/.github/workflows/gh-container-image.yml
@@ -29,11 +29,11 @@ jobs:
 
       - name: Build processor image
         run: docker build . --target processor -t squid-processor --tag $PROCESSOR_NAME
-        working-directory: squid-blockexplorer
+        working-directory: indexers/squid-blockexplorer
 
       - name: Build API server image
         run: docker build . --target query-node -t graphql-server --tag $API_SERVER_NAME
-        working-directory: squid-blockexplorer
+        working-directory: indexers/squid-blockexplorer
 
       - name: Build Health check image
         run: docker build . --file Dockerfile --tag $HEALTH_CHECK_NAME

diff --git a/.github/workflows/gh-deploy-main.yml b/.github/workflows/gh-deploy-main.yml
diff --git a/.github/workflows/gh-deploy-staging.yml b/.github/workflows/gh-deploy-staging.yml
diff --git a/.github/workflows/gh-general-squid-image.yml b/.github/workflows/gh-general-squid-image.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Build processor image
         run: docker build . --target processor -t squid-processor --tag $PROCESSOR_NAME
-        working-directory: general-squid
+        working-directory: indexers/general-squid
 
       - name: Push processor image
         run: docker push $PROCESSOR_NAME
diff --git a/.github/workflows/gh-rewards-image.yml b/.github/workflows/gh-rewards-image.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Build processor image
         run: docker build . --target processor -t squid-processor --tag $PROCESSOR_NAME
-        working-directory: rewards-squid
+        working-directory: indexers/rewards-squid
 
       - name: Push processor image
         run: docker push $PROCESSOR_NAME
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+DS_Store
+*/DS_Store
diff --git a/.vscode/astral.code-workspace b/.vscode/astral.code-workspace
@@ -8,24 +8,20 @@
       "name": "explorer",
       "path": "../explorer"
     },
-    {
-      "name": "client",
-      "path": "../client"
-    },
     {
       "name": "health-check",
       "path": "../health-check"
     },
     {
-      "name": "squid-blockexplorer",
-      "path": "../squid-blockexplorer"
+      "name": "indexers",
+      "path": "../indexers"
     }
   ],
   "settings": {
     "editor.codeActionsOnSave": {
-      "source.sortImports": true,
-      "source.fixAll.eslint": true,
-      "source.fixAll.tslint": true
+      "source.sortImports": "explicit",
+      "source.fixAll.eslint": "explicit",
+      "source.fixAll.tslint": "explicit"
     },
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "javascript.updateImportsOnFileMove.enabled": "always",

diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@
 ## Overview
 
 - [Explorer](./explorer/README.md) - Next.js app based on React and Tailwind CSS, uses Apollo Client to fetch data from Astral Subsquid
-- [Squid](./squid-blockexplorer/README.md) - backend app, utilizes [Subsquid Framework](https://docs.subsquid.io/overview/) for indexing and transforming chain data as well as exposing it using GraphQL
+- [Indexers](./indexers/README.md) - Includes various Subsquid indexers like blockexplorer-subsquid and other smaller Subsquid services.
 - [Health check](./health-check/README.md) - utility service to check health status of an internal service and expose it as a REST API endpoint
 
 ## Development
@@ -72,7 +72,7 @@ Ensure you have the following installed on your local development machine:
 - Node.js (v18.x or later)
 - Yarn (v2.x or later)
 
-You can check your Node and Yarn versions with `node -v` and `yarn -v` respectively.
+You can check your Node and Yarn versions with 'node -v' and 'yarn -v' respectively.
 
 ### Installation