Merge branch 'dev' into vesting-scheduler-1_2

.github/workflows/call.deploy-subgraph.yml

@@ -5,29 +5,32 @@ on:
     inputs:
       vendor:
         required: true
-        description: "Where to deploy subgraph to; superfluid, graph, or satsuma"
+        description: "Where to deploy subgraph to; superfluid, graph, satsuma, or goldsky"
         type: string
       deployment_env:
         required: true
         type: string
-        description: 'The subgraph deployment env: v1, dev, feature'
+        description: "The subgraph deployment env: v1, dev, feature"
       network:
         required: true
         type: string
-        description: 'The network you want to deploy to (matic, xdai, eth-mainnet, etc.) or `all` for all networks.'
+        description: "The network you want to deploy to (matic, xdai, eth-mainnet, etc.) or `all` for all networks."
 
     secrets:
       SUBGRAPH_URL_TEMPLATE:
-        description: 'Subgraph endpoint url template'
+        description: "Subgraph endpoint url template"
         required: false
       SATSUMA_DEPLOY_KEY:
-        description: 'Satsuma deploy key'
+        description: "Satsuma deploy key"
         required: false
       THE_GRAPH_ACCESS_TOKEN:
-        description: 'The Graph (hosted service) access token for deploying subgraphs'
+        description: "The Graph (hosted service) access token for deploying subgraphs"
+        required: false
+      GOLDSKY_API_KEY:
+        description: "Goldsky API key for deploying subgraphs"
         required: false
       SUPERFLUID_IPFS_API:
-        description: 'Superfluid IPFS API endpoint'
+        description: "Superfluid IPFS API endpoint"
         required: false
 
 jobs:
@@ -112,7 +115,7 @@ jobs:
       - uses: olegtarasov/[email protected]
         id: "getSubgraphTag"
         with:
-          tagRegex: "subgraph@(.*)" 
+          tagRegex: "subgraph@(.*)"
 
       # Version is the git tag or revision
       - name: "Deploy to a node"
@@ -126,3 +129,4 @@ jobs:
           SUPERFLUID_IPFS_API: ${{ secrets.SUPERFLUID_IPFS_API }}
           THE_GRAPH_ACCESS_TOKEN: ${{ secrets.THE_GRAPH_ACCESS_TOKEN }}
           SATSUMA_DEPLOY_KEY: ${{ secrets.SATSUMA_DEPLOY_KEY }}
+          GOLDSKY_API_KEY: ${{ secrets.GOLDSKY_API_KEY }}

.github/workflows/call.upload-coverage-reports.yml

@@ -3,7 +3,6 @@ name: Reusable Workflow | Upload Coverage Reports
 on:
   workflow_call:
 
-
 jobs:
   upload-coverage-reports:
     name: Upload coverage reports
@@ -19,7 +18,7 @@ jobs:
           name: ethereum-contracts-coverage
           path: packages/ethereum-contracts/coverage
       - name: Upload ethereum-contracts-coverage to codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4.2.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: packages/ethereum-contracts/coverage/lcov.info
@@ -33,10 +32,10 @@ jobs:
           name: sdk-core-coverage
           path: packages/sdk-core/coverage
       - name: Upload sdk-core-coverage to codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4.2.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: packages/sdk-core/coverage/lcov.info
           name: sdk-core-coverage
           flags: sdk-core
-          fail_ci_if_error: true
+          fail_ci_if_error: true

.github/workflows/handler.deploy-production-subgraphs.yml

@@ -52,3 +52,4 @@ jobs:
       SATSUMA_DEPLOY_KEY: ${{ secrets.SATSUMA_DEPLOY_KEY }}
       SUBGRAPH_URL_TEMPLATE: ${{ secrets.SUBGRAPH_URL_TEMPLATE }}
       SUPERFLUID_IPFS_API: ${{ secrets.SUPERFLUID_IPFS_API }}
+      GOLDSKY_API_KEY: ${{ secrets.GOLDSKY_API_KEY }}

flake.nix

@@ -66,6 +66,12 @@
     node18DevInputs = nodeDevInputsWith pkgs.nodejs_18;
     node20DevInputs = nodeDevInputsWith pkgs.nodejs_20;
 
+    # CI inputs
+    ciInputs = with pkgs; [
+      # codecov requries gnupg binary
+      gnupg
+    ];
+
     # minimem development shell
     minimumDevInputs = commonDevInputs ++ ethDevInputs ++ node18DevInputs;
 
@@ -132,17 +138,18 @@
         ++ whitehatInputs
         ++ specInputs;
     };
+
     # CI shells
     devShells.ci-node18 = mkShell {
-      buildInputs = commonDevInputs ++ ethDevInputs ++ node18DevInputs;
+      buildInputs = ciInputs ++ commonDevInputs ++ ethDevInputs ++ node18DevInputs;
     };
     devShells.ci-node20 = mkShell {
-      buildInputs = commonDevInputs ++ ethDevInputs ++ node20DevInputs;
+      buildInputs = ciInputs ++ commonDevInputs ++ ethDevInputs ++ node20DevInputs;
     };
     devShells.ci-spec-ghc92 = ci-spec-with-ghc ghcVer92;
     devShells.ci-spec-ghc94 = ci-spec-with-ghc ghcVer94;
     devShells.ci-hot-fuzz = mkShell {
-      buildInputs = with pkgs; commonDevInputs ++ ethDevInputs ++ [
+      buildInputs = with pkgs; ciInputs ++ commonDevInputs ++ ethDevInputs ++ [
         slither-analyzer
         echidna
       ];

packages/subgraph/package.json

@@ -50,8 +50,8 @@
         "cloc": "cloc src"
     },
     "dependencies": {
-        "@graphprotocol/graph-cli": "0.67.4",
-        "@graphprotocol/graph-ts": "0.32.0",
+        "@graphprotocol/graph-cli": "0.69.1",
+        "@graphprotocol/graph-ts": "0.34.0",
         "@superfluid-finance/sdk-core": "^0.6.13",
         "mustache": "^4.2.0"
     },

packages/subgraph/src/mappingHelpers.ts

@@ -148,6 +148,12 @@ export function getOrInitSuperToken(
         return token as Token;
     }
 
+    if (token.symbol == "") {
+        const tokenContract = SuperToken.bind(tokenAddress);
+        const symbolResult = tokenContract.try_symbol();
+        token.symbol = symbolResult.reverted ? "" : symbolResult.value;
+    }
+
     token.save();
 
     return token as Token;

packages/subgraph/tasks/deploy.sh

@@ -5,8 +5,10 @@ set -eux
 JQ="jq"
 
 # shellcheck disable=SC2207
-GRAPH_CLI="npx --package=@graphprotocol/graph-cli -- graph"
-SUPPORTED_VENDORS=( "graph" "satsuma" "superfluid" )
+GRAPH_CLI="npx --package=@graphprotocol/graph-cli --yes -- graph"
+# shellcheck disable=SC2207
+GOLDSKY_CLI="npx --package=@goldskycom/cli --yes -- goldsky"
+SUPPORTED_VENDORS=( "graph" "satsuma" "superfluid" "goldsky" )
 
 # list of supported networks by vendor
 
@@ -16,11 +18,14 @@ GRAPH_NETWORKS=( $($JQ -r .[] ./hosted-service-networks.json) ) || exit 1
 SATSUMA_NETWORKS=( "polygon-mainnet" "xdai-mainnet" "eth-mainnet" "eth-sepolia" "optimism-mainnet" "base-mainnet")
 # shellcheck disable=SC2034
 SUPERFLUID_NETWORKS=( "polygon-mainnet" "xdai-mainnet" "base-mainnet" "optimism-mainnet" "arbitrum-one" "celo-mainnet" "bsc-mainnet" "avalanche-c" "optimism-sepolia" "scroll-sepolia" "scroll-mainnet")
+# shellcheck disable=SC2034
+GOLDSKY_NETWORKS=( "polygon-mainnet" "xdai-mainnet" "base-mainnet" "optimism-mainnet" "arbitrum-one" "celo-mainnet" "bsc-mainnet" "avalanche-c" "optimism-sepolia" "scroll-sepolia" "scroll-mainnet")
 
 declare -A VENDOR_NETWORKS=(
     ["graph"]="${GRAPH_NETWORKS[@]}"
     ["satsuma"]="${SATSUMA_NETWORKS[@]}"
     ["superfluid"]="${SUPERFLUID_NETWORKS[@]}"
+    ["goldsky"]="${GOLDSKY_NETWORKS[@]}"
 )
 
 VENDOR=""
@@ -29,7 +34,7 @@ DEPLOYMENT_ENV=""
 VERSION_LABEL=""
 
 print_usage_and_exit() {
-    echo "Usage: $0 -o graph|satsuma|superfluid -n <network_name> -r <deployment_env> -v <version_label>"
+    echo "Usage: $0 -o graph|satsuma|superfluid|goldsky -n <network_name> -r <deployment_env> -v <version_label>"
     exit 1
 }
 
@@ -115,6 +120,22 @@ deploy_to_superfluid() {
         --ipfs "$SUPERFLUID_IPFS_API"
 }
 
+deploy_to_goldsky() {
+    local network="$1"
+    local subgraphName="protocol-$DEPLOYMENT_ENV-$network/1.0.0"
+    # TODO: use tagging?
+    # TODO: how to handle versions?
+
+    $GRAPH_CLI build
+    # Note: when using Graph CLI to deploy, it implicitly triggers build too, but Goldsky CLI doesn't.
+
+    echo "********* Deploying $network subgraph $subgraphName to Goldsky. **********"
+    $GOLDSKY_CLI subgraph deploy \
+        "$subgraphName" \
+        --path . \
+        --token "$GOLDSKY_API_KEY"
+}
+
 # Vendor specific function dispatcher
 # Expected arguments:
 # $1 - vendor
@@ -149,6 +170,9 @@ deploy_to() {
     superfluid)
         deploy_to_superfluid "$network"
         ;;
+    goldsky)
+        deploy_to_goldsky "$network"
+        ;;
     *)
         print_usage_and_exit
         ;;

yarn.lock

@@ -1499,10 +1499,10 @@
   optionalDependencies:
     "@trufflesuite/bigint-buffer" "1.1.9"
 
-"@graphprotocol/graph-cli@0.67.4":
-  version "0.67.4"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.67.4.tgz#da8fd87c20c64bb3ab78664bd2af0ab965f9d12f"
-  integrity sha512-U2LDemWwmYUxf7PloAcDPXK1UeceRphGJJKrhNbDZB32hlp3LY+GI6HnRK4F9Oeri2azB3t3/humNxIDgbim0w==
+"@graphprotocol/graph-cli@0.69.1":
+  version "0.69.1"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.69.1.tgz#2ea248fb1636b46afb6101236e3f387e9d2f3275"
+  integrity sha512-PekTli4hsBkF48y2NA2ufNjtdG/VL4N+E7GAavNXxFmSHM9VoCWbR4OBeJ93dAOpgHRGyx8yO1NE9DDT7yEZsg==
   dependencies:
     "@float-capital/float-subgraph-uncrashable" "^0.0.0-alpha.4"
     "@oclif/core" "2.8.6"
@@ -1532,10 +1532,10 @@
     which "2.0.2"
     yaml "1.10.2"
 
-"@graphprotocol/graph-ts@0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.32.0.tgz#36f8cd8e4ef42c3c32536cceb9995ab990f51d29"
-  integrity sha512-YfKLT2w+ItXD/VPYQiAKtINQONVsAOkcqVFMHlhUy0fcEBVWuFBT53hJNI0/l5ujQa4TSxtzrKW/7EABAdgI8g==
+"@graphprotocol/graph-ts@0.34.0":
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.34.0.tgz#ca47398295b114f25b412faa364b98af31fa2bb7"
+  integrity sha512-gnhjai65AV4YMYe9QHGz+HP/jdzI54z/nOfEXZFfh6m987EP2iy3ycLXrTi+ahcogHH7vtoWFdXbUzZbE8bCAg==
   dependencies:
     assemblyscript "0.19.10"