Subgraph Composition : Fix graph init for composed subgraphs #1920

incrypto32 · 2025-01-27T11:57:41Z

This PR enables graph init for composed subgraphs. It creates a new ipfs client to validate the source subgraph manifest

changeset-bot · 2025-01-27T11:57:45Z

🦋 Changeset detected

Latest commit: 3a75a7f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
@graphprotocol/graph-cli	Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

github-actions · 2025-01-27T11:58:31Z

🚀 Snapshot Release (`alpha`)

The latest changes of this PR are available as alpha on npm (based on the declared changesets):

Package	Version	Info
`@graphprotocol/graph-cli`	`0.96.0-alpha-20250130081352-3a75a7fd2231fb7cd2ed22c8020b1dd5539efa70`	npm ↗︎ unpkg ↗︎

cloudflare-workers-and-pages · 2025-01-27T12:05:06Z

Deploying graph-tooling with Cloudflare Pages

Latest commit:	`3a75a7f`
Status:	✅ Deploy successful!
Preview URL:	https://384fc2da.graph-tooling.pages.dev
Branch Preview URL:	https://krishna-comp-fixes.graph-tooling.pages.dev

View logs

YaroShkvorets · 2025-01-29T23:56:37Z

@incrypto32 could you fix the linter error?

YaroShkvorets · 2025-01-30T00:05:38Z

I think there are some issues with running github actions in your branch after #1919

Rebasing on top of the latest main should help.

incrypto32 · 2025-01-30T07:54:18Z

@YaroShkvorets i just rebase on top of main and the issue persists. I cant figure out what the lint issue is, also im not able to run the lint locally. Getting these error


Oops! Something went wrong! :(

ESLint: 9.19.0

Error: Cannot read config file: /Users/krishna/dev/work/edgeandnode/thegraph/graph-tooling/node_modules/.pnpm/@[email protected][email protected][email protected][email protected]/node_modules/@theguild/eslint-config/src/index.js
Error: Failed to patch ESLint because the calling module was not recognized.
If you are using a newer ESLint version that may be unsupported, please create a GitHub issue:
https://github.com/microsoft/rushstack/issues
Referenced from: 
    at Object.<anonymous> (/Users/krishna/dev/work/edgeandnode/thegraph/graph-tooling/node_modules/.pnpm/@[email protected]/node_modules/@rushstack/eslint-patch/lib/_patch-base.js:167:19)
    at Module._compile (node:internal/modules/cjs/loader:1469:14)
    at Module._extensions..js (node:internal/modules/cjs/loader:1548:10)
    at Module.load (node:internal/modules/cjs/loader:1288:32)
    at Module._load (node:internal/modules/cjs/loader:1104:12)
    at Module.require (node:internal/modules/cjs/loader:1311:19)
    at require (node:internal/modules/helpers:179:18)
    at Object.<anonymous> (/Users/krishna/dev/work/edgeandnode/thegraph/graph-tooling/node_modules/.pnpm/@[email protected]/node_modules/@rushstack/eslint-patch/lib/modern-module-resolution.js:11:23)
    at Module._compile (node:internal/modules/cjs/loader:1469:14)
    at Module._extensions..js (node:internal/modules/cjs/loader:1548:10)
    
    ```

YaroShkvorets · 2025-01-30T14:50:30Z

Looks like it's passing. Good for review now?

incrypto32 · 2025-01-30T15:19:21Z

@YaroShkvorets yes, ready for review

YaroShkvorets

Remove hidden: true from --ipfs flag on line 117
There doesn't seem to be a way to scaffold a subgraph-based subgraph in non-interactive way from command line. Is it possible?
this command does nothing and exits with code 0 without any error: graph init test test --from-contract=0x0 --protocol=subgraph --network=mainnet

YaroShkvorets · 2025-01-31T00:08:32Z

packages/cli/src/commands/init.ts

+      initial: ipfsUrl,
+      skip: () => !isComposedSubgraph,
+      result: value => {
+        ipfsNode = value;


Let's check that this is at least a valid URL

YaroShkvorets · 2025-01-31T00:26:39Z

packages/cli/src/commands/init.ts

        if (isComposedSubgraph) {
-          return value.startsWith('Qm') ? true : 'Subgraph deployment ID must start with Qm';
+          if (!ipfsNode) {


We shouldn't allow empty ipfsNode. Return corresponding error message.
Also, if we validate ipfsNode above this would be unnecessary.

YaroShkvorets · 2025-01-31T00:59:48Z

packages/cli/src/utils.ts

+    // Get network from first data source
+    const sourceNetwork = allSources[0].network;
+    if (!sourceNetwork) {
+      return { valid: true }; // Network not specified in source, skip validation


Is it possible?
And if possible, why is it valid?

YaroShkvorets · 2025-01-31T01:10:07Z

packages/cli/src/utils.ts

+    }
+
+    const normalizedSourceNetwork = sourceNetwork.toLowerCase();
+    const normalizedTargetNetwork = targetNetwork.toLowerCase();


I don't think we need to normalize here. If somehow our targetNetwork is Mainnet it shouldn't let us continue. Because in graph-node network ID is case-sensitive.

YaroShkvorets · 2025-01-31T01:51:58Z

packages/cli/src/commands/init.ts

@@ -822,6 +834,22 @@ async function processInitForm(

    await promptManager.executeInteractive();

+    // Validate network matches if loading from IPFS
+    if (ipfsNode && source?.startsWith('Qm')) {


Why not check for isComposedSubgraph instead?

I think we can move this validation into initSubgraphFromContract(). We are already creating ipfsClient anyway and doing some additional validations there. This method is to process init form.

incrypto32 force-pushed the krishna/comp-fixes branch from 55c1f2b to 111a264 Compare January 27, 2025 12:05

fordN assigned incrypto32 Jan 29, 2025

fordN added the area/cli label Jan 29, 2025

alex-pakalniskis requested a review from YaroShkvorets January 29, 2025 21:48

incrypto32 force-pushed the krishna/comp-fixes branch from 8e5191c to 2a7cf51 Compare January 30, 2025 07:44

incrypto32 added 5 commits January 30, 2025 11:51

Fix subgraphs without abi field failing to build

fddfea6

Fix graph init for composed subgraphs

6b9f04b

Add changeset

b065646

Fix validation not working

735b565

Support declared calls in manifest

600280d

incrypto32 force-pushed the krishna/comp-fixes branch from 2a7cf51 to 7efc3f2 Compare January 30, 2025 07:51

Lint fix

3a75a7f

incrypto32 force-pushed the krishna/comp-fixes branch from 7efc3f2 to 3a75a7f Compare January 30, 2025 08:13

YaroShkvorets requested changes Jan 31, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Subgraph Composition : Fix graph init for composed subgraphs #1920

Subgraph Composition : Fix graph init for composed subgraphs #1920

incrypto32 commented Jan 27, 2025 •

edited

Loading

changeset-bot bot commented Jan 27, 2025 •

edited

Loading

github-actions bot commented Jan 27, 2025 •

edited

Loading

cloudflare-workers-and-pages bot commented Jan 27, 2025 •

edited

Loading

YaroShkvorets commented Jan 29, 2025

YaroShkvorets commented Jan 30, 2025

incrypto32 commented Jan 30, 2025

YaroShkvorets commented Jan 30, 2025

incrypto32 commented Jan 30, 2025

YaroShkvorets left a comment

YaroShkvorets Jan 31, 2025

YaroShkvorets Jan 31, 2025

YaroShkvorets Jan 31, 2025

YaroShkvorets Jan 31, 2025

YaroShkvorets Jan 31, 2025

Subgraph Composition : Fix graph init for composed subgraphs #1920

Are you sure you want to change the base?

Subgraph Composition : Fix graph init for composed subgraphs #1920

Conversation

incrypto32 commented Jan 27, 2025 • edited Loading

changeset-bot bot commented Jan 27, 2025 • edited Loading

🦋 Changeset detected

github-actions bot commented Jan 27, 2025 • edited Loading

🚀 Snapshot Release (alpha)

cloudflare-workers-and-pages bot commented Jan 27, 2025 • edited Loading

Deploying graph-tooling with Cloudflare Pages

YaroShkvorets commented Jan 29, 2025

YaroShkvorets commented Jan 30, 2025

incrypto32 commented Jan 30, 2025

YaroShkvorets commented Jan 30, 2025

incrypto32 commented Jan 30, 2025

YaroShkvorets left a comment

Choose a reason for hiding this comment

YaroShkvorets Jan 31, 2025

Choose a reason for hiding this comment

YaroShkvorets Jan 31, 2025

Choose a reason for hiding this comment

YaroShkvorets Jan 31, 2025

Choose a reason for hiding this comment

YaroShkvorets Jan 31, 2025

Choose a reason for hiding this comment

YaroShkvorets Jan 31, 2025

Choose a reason for hiding this comment

incrypto32 commented Jan 27, 2025 •

edited

Loading

changeset-bot bot commented Jan 27, 2025 •

edited

Loading

github-actions bot commented Jan 27, 2025 •

edited

Loading

🚀 Snapshot Release (`alpha`)

cloudflare-workers-and-pages bot commented Jan 27, 2025 •

edited

Loading