From 4bb1fd1d1a42db116f76b4bd88fd921a53443956 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 16:46:15 +0000 Subject: [PATCH 1/4] Add deployment scripts for arbitrum-one and arbitrum-sepolia graph studio --- networks/arbitrum-one.json | 7 +++++++ package.json | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 networks/arbitrum-one.json diff --git a/networks/arbitrum-one.json b/networks/arbitrum-one.json new file mode 100644 index 0000000..97ad691 --- /dev/null +++ b/networks/arbitrum-one.json @@ -0,0 +1,7 @@ +{ + "network": "arbitrum-one", + "AppFactory": { + "startBlock": 21587443, + "address": "0x1F36176c0874686d6d480a90Ca039e789c7f7Fa3" + } +} \ No newline at end of file diff --git a/package.json b/package.json index 44d4bc2..424795d 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "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", @@ -29,6 +30,7 @@ "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", @@ -38,14 +40,16 @@ "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", "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: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/", From 00b4b9955b2693d51ec99ab59cda69560e160ea8 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 16:47:00 +0000 Subject: [PATCH 2/4] clean up polygon testnet files and scripts --- networks/mumbai.json | 15 --------------- networks/{amoy.json => polygon-amoy.json} | 0 package.json | 15 +++++---------- 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 networks/mumbai.json rename networks/{amoy.json => polygon-amoy.json} (100%) diff --git a/networks/mumbai.json b/networks/mumbai.json deleted file mode 100644 index 8855646..0000000 --- a/networks/mumbai.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "network": "mumbai", - "StarFactory": { - "address": "0x429cB2c2A030952D3F5e10B534584aB49c303763", - "startBlock": 38765587 - }, - "ConstellationFactory": { - "address": "0x609401678A22F7e2c7AaFd817F6F5a0bbBf44e8F", - "startBlock": 38765602 - }, - "accessKey": { - "address": "0xf5af05cccc34f1ada59a7e4081e5f50f5e5747a2", - "startBlock": 40831050 - } -} diff --git a/networks/amoy.json b/networks/polygon-amoy.json similarity index 100% rename from networks/amoy.json rename to networks/polygon-amoy.json diff --git a/package.json b/package.json index 424795d..27fc78e 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,7 @@ "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", @@ -15,14 +14,12 @@ "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", "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%", - "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", @@ -32,10 +29,8 @@ "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", "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", @@ -45,8 +40,8 @@ "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", From 6328c0aade6505e4e580465e508a54e452e1f5b7 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 16:57:58 +0000 Subject: [PATCH 3/4] Update changelog with release v0.1.1 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d66c47e..fbcabe6 100644 --- a/CHANGELOG.md +++ b/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)) From 2e50b4808ab7f6edc03bf581c0f17fd8021faa74 Mon Sep 17 00:00:00 2001 From: george-openformat Date: Thu, 9 Jan 2025 17:09:02 +0000 Subject: [PATCH 4/4] Fix test workflow --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d92de34..7614bea 100644 --- a/.github/workflows/test.yml +++ b/.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