Fix CIs and scripts for subgraphs

Author: giacomognosis

.github/workflows/thegraph_dev_deploy.yml

@@ -4,29 +4,36 @@ on:
     workflow_dispatch:
       inputs:
         network:
-            description: "Network for Subgraph deployment - (Gnosis Chain or Ethereum)"
+            description: "Network for Subgraph deployment - Ethereum Mainnet (Mainnet) or Gnosis Chain (Gnosis)"
             required: true
             options:
-                - Ethereum
-                - Gnosis Chain
+                - mainnet
+                - gnosis
             type: choice
-  
-
-defaults:
-  run:
-    working-directory: subgraph/
+        type:
+          description: "Brige type: Home or Foreign"
+          required: true
+          options:
+              - home
+              - foreign
+          type: choice
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-
 jobs:
   deploy:
     name: Deployment
     runs-on: ubuntu-latest
     outputs:
       random_id: ${{ steps.random_id.outputs.random_id }}
+    env:
+      ACCESS_TOKEN: ${{ secrets.THEGRAPH_DEPLOY_API_KEY }}
+      TYPE: ${{ inputs.type }}
+      NETWORK: ${{ inputs.network }}
+      DEBUG: true
+      SUBGRAPH_NAME: gbc-bridge-${{ inputs.type }}
     steps:
       - uses: actions/checkout@v4
 
@@ -51,31 +58,18 @@ jobs:
         with:
             node-version-file: '.nvmrc'
 
-      - name: Install graph-cli & dependencies
+      - name: Install dependencies & build subgraphs
         run: |
-          yarn global add @graphprotocol/graph-cli
+          cd subgraph
           yarn install
-          
-      - name: Build Subgraph
-        run: yarn codegen && yarn build
-
-      - name: Authenticate to Subgraph Studio
-        run: graph auth --studio ${{ secrets.THEGRAPH_DEPLOY_API_KEY }}
-
-      - name: Deploy Subgraph for ETH Mainnet
-        if: ${{ inputs.network == 'Ethereum' }}
-        env:
-            SUBGRAPH_NAME: gbc-bridge-mainnet
-            ACCESS_TOKEN: ${{ secrets.THEGRAPH_DEPLOY_API_KEY }}
-        run: yarn deploy -l "${{ github.ref_name }}-${{ steps.random_id.outputs.random_id }}"
-
-      - name: Deploy Subgraph for Gnosis Chain
-        if: ${{ inputs.network == 'Gnosis Chain' }}
-        env:
-            SUBGRAPH_NAME: gbc-bridge-gnosis
-            ACCESS_TOKEN: ${{ secrets.THEGRAPH_DEPLOY_API_KEY }}
-        run: yarn deploy -l "${{ github.ref_name }}-${{ steps.random_id.outputs.random_id }}"
+          yarn codegen
+          yarn build
     
+      - name: Deploy Subgraphs
+        env:
+          SUBGRAPH_LABELS: "${{ github.ref_name }}-${{ steps.random_id.outputs.random_id }}"
+        run: |
+          yarn deploy
 
   notify:
     uses: ./.github/workflows/slack_release_notification.yml

subgraph/package.json

@@ -7,15 +7,16 @@
     "build": "./scripts/build.sh",
     "deploy": "./scripts/deploy.sh",
     "deploy:local": "./scripts/deploy-local.sh",
+    "deploy-test": "./scripts/deploy-test.sh",
     "test": "graph test"
   },
   "dependencies": {
-    "@graphprotocol/graph-cli": "^0.60.0",
+    "@graphprotocol/graph-cli": "^0.97.0",
     "@graphprotocol/graph-ts": "0.31.0",
-    "ejs":  "^3.1.10"
+    "ejs": "^3.1.10"
   },
   "devDependencies": {
     "matchstick-as": "0.5.0",
     "mustache": "^4.2.0"
   }
-}
+}

subgraph/scripts/build.sh

@@ -10,4 +10,4 @@ if [ -d "build" ]; then
 fi
 
 # Run build to generate deployable version
-graph build
+graph build

subgraph/scripts/codegen.sh

@@ -28,4 +28,4 @@ fi
 mustache $CONFIG_FILE $SUBGRAPH_TEMPLATE > subgraph.yaml
 
 # Run codegen to generate Types
-graph codegen
+graph codegen

subgraph/scripts/deploy-local.sh

@@ -25,4 +25,4 @@ GENERATED_FILE="subgraph.yaml"
 if [[ $DEBUG = false && -f $GENERATED_FILE ]]; then
   echo "Cleaning generated file"
   rm $GENERATED_FILE
-fi
+fi

subgraph/scripts/deploy.sh

@@ -5,17 +5,18 @@ source "./scripts/build.sh"
 
 if [ -z $SUBGRAPH_NAME ]; then echo "No Subgraph Name Environment Variable!"; exit 1; fi
 if [ -z $ACCESS_TOKEN ]; then echo "No ACCESS_TOKEN Environment Variable!"; exit 1; fi
+if [ -z $SUBGRAPH_LABELS ]; then echo "No SUBGRAPH_LABELS Environment Variable!"; exit 1; fi
 
-graph auth --product subgraph-studio $ACCESS_TOKEN
+graph auth --studio $ACCESS_TOKEN
 
 # @TODO deploying directly to $SUBGRAPH_NAME is prone to errors
 # @TODO use GRAPH_ADMIN_NODE_ENDPOINT var to deploy multiple envs (local, etc)
 echo "Deploying to $SUBGRAPH_NAME"
-graph deploy --product subgraph-studio $SUBGRAPH_NAME
+graph deploy --studio $SUBGRAPH_NAME -l $SUBGRAPH_LABELS
 
 # @TODO we might reuse subgraph.yaml only removing when TYPE is diff from previous
 GENERATED_FILE="subgraph.yaml"
 if [[ $DEBUG = false && -f $GENERATED_FILE ]]; then
   echo "Cleaning generated file"
   rm $GENERATED_FILE
-fi
+fi

subgraph/scripts/env.sh

@@ -5,7 +5,12 @@ set -o errexit
 
 # Exporting variables from the env file and making them available in the code below
 set -a
-source .env
+
+if [ -f .env ]; then
+  echo "Loading .env file"
+  source .env
+fi
+
 set +a
 
 # Type is required to Generate Specific subgraph.yaml
@@ -17,4 +22,4 @@ SUBGRAPH_TEMPLATE=subgraph-$TYPE.template.yaml
 CONFIG_FILE=config/$NETWORK.json
 
 if [ ! -f "$CONFIG_FILE" ]; then echo "Config $CONFIG_FILE file does not exist."; exit 1; fi
-if [ ! -f "$SUBGRAPH_TEMPLATE" ]; then echo "Template $SUBGRAPH_TEMPLATE file does not exist."; exit 1; fi
+if [ ! -f "$SUBGRAPH_TEMPLATE" ]; then echo "Template $SUBGRAPH_TEMPLATE file does not exist."; exit 1; fi