Merge branch 'main' into feature/of-504-user-metrics-in-subgraph-2

.github/workflows/test.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   run-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Execute Tests
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -5,10 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [v0.1.1] - 2025-01-09
 
 ### Added
 - `Reward` entity ([#76](https://github.com/open-format/subgraph/pull/76))
+- Support for different `FungibleToken` types ([#75](https://github.com/open-format/subgraph/pull/75))
+
+### Fixed
+- Bug with totalAwarded not updating on `Badge` entity ([#74](https://github.com/open-format/subgraph/pull/74))
 
 ### Deprecated
 - `Mission` and `Action` entities ([#76](https://github.com/open-format/subgraph/pull/76))

env/openformat-graph-node-staging/Dockerfile

@@ -0,0 +1,2 @@
+FROM graphprotocol/graph-node:v0.36.0
+RUN apt-get install -y socat

env/openformat-graph-node-staging/fly.toml

@@ -0,0 +1,57 @@
+# fly.toml app configuration file generated for openformat-turbo-graph-node-staging on 2025-01-08T19:31:39-05:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'openformat-turbo-graph-node-staging'
+primary_region = 'lhr'
+
+[env]
+  ipfs = "https://ipfs.satsuma.xyz"
+  ethereum = "turbo:https://rpc-0x4e45415f.aurora-cloud.dev"
+  GRAPH_LOG = "debug"
+
+[experimental]
+  allowed_public_ports = []
+
+[[services]]
+  http_checks = []
+  internal_port = 8000
+  protocol = "tcp"
+  script_checks = []
+
+  [[services.ports]]
+    force_https = true
+    handlers = ["http"]
+    port = 80
+
+  [[services.ports]]
+    handlers = ["tls", "http"]
+    port = 443
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 0
+    timeout = "2s"
+
+[[services]]
+  http_checks = []
+  internal_port = 8030
+  protocol = "tcp"
+  script_checks = []
+
+  [[services.ports]]
+    handlers = ["tls", "http"]
+    port = 8030
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 0
+    timeout = "2s"
+
+[[vm]]
+  memory = '1gb'
+  cpu_kind = 'shared'
+  cpus = 2

networks/arbitrum-one.json

@@ -0,0 +1,7 @@
+{
+  "network": "arbitrum-one",
+  "AppFactory": {
+    "startBlock": 21587443,
+    "address": "0x1F36176c0874686d6d480a90Ca039e789c7f7Fa3"
+  }
+}

networks/turbo.json

@@ -0,0 +1,7 @@
+{
+  "network": "turbo",
+  "AppFactory": {
+    "address": "0x7e405FbA4c29B8B05B5ecF97bA664729C34803B8",
+    "startBlock": 136726407
+  }
+}

package.json

@@ -4,48 +4,52 @@
   "scripts": {
     "reinstall": "rm -rf .pnp* && yarn",
     "clean": "rm -rf build/ generated/",
-
-    "prepare:mumbai": "mustache networks/mumbai.json subgraph.template.yaml subgraph.mumbai.yaml",
+
     "prepare:polygon": "mustache networks/polygon.json subgraph.template.yaml subgraph.polygon.yaml",
     "prepare:local": "mustache networks/local.json subgraph.template.yaml subgraph.local.yaml",
     "prepare:base-sepolia": "mustache networks/base-sepolia.json subgraph.template.yaml subgraph.base-sepolia.yaml",
     "prepare:base": "mustache networks/base.json subgraph.template.yaml subgraph.base.yaml",
     "prepare:aurora": "mustache networks/aurora.json subgraph.template.yaml subgraph.aurora.yaml",
     "prepare:aurora-testnet": "mustache networks/aurora-testnet.json subgraph.template.yaml subgraph.aurora-testnet.yaml",
     "prepare:arbitrum-sepolia": "mustache networks/arbitrum-sepolia.json subgraph.template.yaml subgraph.arbitrum-sepolia.yaml",
+    "prepare:arbitrum-one": "mustache networks/arbitrum-one.json subgraph.template.yaml subgraph.arbitrum-one.yaml",
     "prepare:arbitrum-sepolia-staging": "mustache networks/arbitrum-sepolia-staging.json subgraph.template.yaml subgraph.arbitrum-sepolia-staging.yaml",
-    "prepare:amoy": "mustache networks/amoy.json subgraph.template.yaml subgraph.amoy.yaml",
+    "prepare:polygon-amoy": "mustache networks/polygon-amoy.json subgraph.template.yaml subgraph.polygon-amoy.yaml",
+    "prepare:turbo": "mustache networks/turbo.json subgraph.template.yaml subgraph.turbo.yaml",
 
     "create:local": "graph create open-format-local --node http://0.0.0.0:8020",
-    "create:mumbai": "dotenv cross-var -- graph create open-format/mumbai --node https://admin:%GRAPH_NODE_PASSWORD%@%GRAPH_NODE_URL%",
     "create:aurora": "dotenv cross-var -- graph create open-format/aurora --node https://admin:%GRAPH_NODE_PASSWORD%@%GRAPH_NODE_URL%",
     "create:aurora-testnet": "dotenv cross-var -- graph create open-format/aurora-testnet --node https://admin:%GRAPH_NODE_PASSWORD%@%GRAPH_NODE_URL%",
+    "create:turbo": "graph create open-format-local --node http://127.0.0.1:8020",
 
-    "gen:mumbai": "graph codegen subgraph.mumbai.yaml",
     "gen:polygon": "graph codegen subgraph.polygon.yaml",
     "gen:base-sepolia": "graph codegen subgraph.base-sepolia.yaml",
     "gen:base": "graph codegen subgraph.base.yaml",
     "gen:aurora": "graph codegen subgraph.aurora.yaml",
     "gen:aurora-testnet": "graph codegen subgraph.aurora-testnet.yaml",
     "gen:arbitrum-sepolia": "graph codegen subgraph.arbitrum-sepolia.yaml",
     "gen:arbitrum-sepolia-staging": "graph codegen subgraph.arbitrum-sepolia-staging.yaml",
+    "gen:arbitrum-one": "graph codegen subgraph.arbitrum-one.yaml",
     "gen:local": "graph codegen subgraph.local.yaml",
-    "gen:amoy": "graph codegen subgraph.amoy.yaml",
+    "gen:polygon-amoy": "graph codegen subgraph.polygon-amoy.yaml",
+    "gen:turbo": "graph codegen subgraph.turbo.yaml",
 
     "deploy:local": "graph deploy open-format-local --ipfs http://0.0.0.0:5001 --node http://0.0.0.0:8020 subgraph.local.yaml",
-    "deploy:mumbai": "dotenv cross-var -- graph deploy --node https://admin:%GRAPH_NODE_PASSWORD%@%GRAPH_NODE_URL% --ipfs http://%IPFS_URL% open-format/mumbai subgraph.mumbai.yaml",
     "deploy:base-sepolia": "graph deploy --studio open-format-base-sepolia subgraph.base-sepolia.yaml",
     "deploy:base": "graph deploy --studio open-format-base subgraph.base.yaml",
     "deploy:aurora": "graph deploy --studio open-format-aurora subgraph.aurora.yaml",
     "deploy:aurora-testnet": "graph deploy --studio open-format-aurora-testnet subgraph.aurora-testnet.yaml",
+    "deploy:arbitrum-one": "graph deploy --studio open-format-arbitrum-one subgraph.arbitrum-one.yaml",
+    "deploy:arbitrum-sepolia": "graph deploy --studio open-format-arbitrum-sepolia subgraph.arbitrum-sepolia.yaml",
+    "deploy:turbo": "graph deploy open-format-local --ipfs https://ipfs.satsuma.xyz --node http://127.0.0.1:8020 subgraph.turbo.yaml",
 
     "remove:aurora-testnet": "dotenv cross-var -- graph remove --node https://admin:%GRAPH_NODE_PASSWORD%@%GRAPH_NODE_URL% open-format/aurora-testnet",
 
-    "deploy:polygon": "dotenv cross-var -- graph deploy open-format-polygon --version-label %ALCHEMY_SUBGRAPH_VERSION_POLYGON_MAINNET% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.polygon.yaml",
-    "deploy:amoy": "dotenv cross-var -- graph deploy open-format-amoy --version-label %ALCHEMY_SUBGRAPH_VERSION_POLYGON_AMOY% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.amoy.yaml",
+    "deploy-alchemy:polygon": "dotenv cross-var -- graph deploy open-format-polygon --version-label %ALCHEMY_SUBGRAPH_VERSION_POLYGON_MAINNET% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.polygon.yaml",
+    "deploy-alchemy:polygon-amoy": "dotenv cross-var -- graph deploy open-format-amoy --version-label %ALCHEMY_SUBGRAPH_VERSION_POLYGON_AMOY% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.amoy.yaml",
+    "deploy-alchemy:arbitrum-sepolia": "dotenv cross-var -- graph deploy open-format-arbitrum-sepolia --version-label %ALCHEMY_SUBGRAPH_VERSION_ARBITRUM_SEPOLIA% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.arbitrum-sepolia.yaml",
+    "deploy-alchemy:arbitrum-sepolia-staging": "dotenv cross-var -- graph deploy open-format-arbitrum-sepolia-staging --version-label %ALCHEMY_SUBGRAPH_VERSION_ARBITRUM_SEPOLIA_STAGING% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.arbitrum-sepolia-staging.yaml",
 
-    "deploy:arbitrum-sepolia": "dotenv cross-var -- graph deploy open-format-arbitrum-sepolia --version-label %ALCHEMY_SUBGRAPH_VERSION_ARBITRUM_SEPOLIA% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.arbitrum-sepolia.yaml",
-    "deploy:arbitrum-sepolia-staging": "dotenv cross-var -- graph deploy open-format-arbitrum-sepolia-staging --version-label %ALCHEMY_SUBGRAPH_VERSION_ARBITRUM_SEPOLIA_STAGING% --node https://subgraphs.alchemy.com/api/subgraphs/deploy --deploy-key %ALCHEMY_DEPLOY_KEY% --ipfs https://ipfs.satsuma.xyz subgraph.arbitrum-sepolia-staging.yaml",
     "build": "graph build",
     "auth": "graph auth https://api.thegraph.com/deploy/",