@graphprotocol/graph-cli 0.95.0-alpha-20250127115813-55c1f2bf474a247489f48edfcdcf9ccbb48a00ee → 0.95.0

package/CHANGELOG.md

@@ -1,23 +1,44 @@
 # @graphprotocol/graph-cli
 
-## 0.95.0-alpha-20250127115813-55c1f2bf474a247489f48edfcdcf9ccbb48a00ee
+## 0.95.0
 
 ### Minor Changes
 
-- [#1920](https://github.com/graphprotocol/graph-tooling/pull/1920)
-  [`0f5ced8`](https://github.com/graphprotocol/graph-tooling/commit/0f5ced8919ec85dde027bfb63cc3121c7bb3eeb3)
-  Thanks [@incrypto32](https://github.com/incrypto32)! - Add support for subgraph datasource in
-  `graph init`
+- [#1899](https://github.com/graphprotocol/graph-tooling/pull/1899)
+  [`8cdaf31`](https://github.com/graphprotocol/graph-tooling/commit/8cdaf31e78c7fb7bf7ef4f5380d0c72b2a05b08d)
+  Thanks [@0237h](https://github.com/0237h)! - Add support for Sourcify contract information lookup
 
 ### Patch Changes
 
-- [#1920](https://github.com/graphprotocol/graph-tooling/pull/1920)
-  [`55c1f2b`](https://github.com/graphprotocol/graph-tooling/commit/55c1f2bf474a247489f48edfcdcf9ccbb48a00ee)
-  Thanks [@incrypto32](https://github.com/incrypto32)! - dependencies updates:
+- [#1910](https://github.com/graphprotocol/graph-tooling/pull/1910)
+  [`15384e6`](https://github.com/graphprotocol/graph-tooling/commit/15384e6bd8af6ba2ad07e9eb5a637d148fb39867)
+  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
+
+  - Updated dependency [`undici@7.2.3` ↗︎](https://www.npmjs.com/package/undici/v/7.2.3) (from
+    `7.1.1`, in `dependencies`)
+
+- [#1914](https://github.com/graphprotocol/graph-tooling/pull/1914)
+  [`e63b483`](https://github.com/graphprotocol/graph-tooling/commit/e63b483612e74587b3d33b7ce6d5f3264096820f)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - dependencies updates:
+
   - Removed dependency
     [`binary-install@^1.1.0` ↗︎](https://www.npmjs.com/package/binary-install/v/1.1.0) (from
     `dependencies`)
 
+- [#1914](https://github.com/graphprotocol/graph-tooling/pull/1914)
+  [`e63b483`](https://github.com/graphprotocol/graph-tooling/commit/e63b483612e74587b3d33b7ce6d5f3264096820f)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - fix bug with graph test #1904
+
+- [#1903](https://github.com/graphprotocol/graph-tooling/pull/1903)
+  [`bcaad5e`](https://github.com/graphprotocol/graph-tooling/commit/bcaad5e077e485224c06842491145d05215f4c0e)
+  Thanks [@0237h](https://github.com/0237h)! - Fix `import.meta.url` not being parsed as path
+  properly
+
+- [#1918](https://github.com/graphprotocol/graph-tooling/pull/1918)
+  [`14ac25c`](https://github.com/graphprotocol/graph-tooling/commit/14ac25c1f08134d15410dad215cad8a9e941a105)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - fix bug with loud errors in
+  `graph test`
+
 ## 0.94.0
 
 ### Minor Changes

package/dist/command-helpers/contracts.d.ts

@@ -10,5 +10,10 @@ export declare class ContractService {
     getABI(ABICtor: typeof ABI, networkId: string, address: string): Promise<ABI>;
     getStartBlock(networkId: string, address: string): Promise<string>;
     getContractName(networkId: string, address: string): Promise<string>;
+    getFromSourcify(ABICtor: typeof ABI, networkId: string, address: string): Promise<{
+        abi: ABI;
+        startBlock: string;
+        name: string;
+    } | null>;
     private fetchTransactionByHash;
 }

package/dist/command-helpers/contracts.js

@@ -122,6 +122,45 @@ export class ContractService {
         }
         throw new Error(`Failed to fetch contract name for ${address}`);
     }
+    async getFromSourcify(ABICtor, networkId, address) {
+        try {
+            const network = this.registry.getNetworkById(networkId);
+            if (!network)
+                throw new Error(`Invalid network ${networkId}`);
+            if (!network.caip2Id.startsWith('eip155'))
+                throw new Error(`Invalid chainId, Sourcify API only supports EVM chains`);
+            const chainId = network.caip2Id.split(':')[1];
+            const url = `https://sourcify.dev/server/files/any/${chainId}/${address}`;
+            const json = await (await fetch(url).catch(error => {
+                throw new Error(`Sourcify API is unreachable: ${error}`);
+            })).json();
+            if (json) {
+                if ('error' in json)
+                    throw new Error(`Sourcify API error: ${json.error}`);
+                let metadata = json.files.find(e => e.name === 'metadata.json')?.content;
+                if (!metadata)
+                    throw new Error('Contract is missing metadata');
+                const tx_hash = json.files.find(e => e.name === 'creator-tx-hash.txt')?.content;
+                if (!tx_hash)
+                    throw new Error('Contract is missing tx creation hash');
+                const tx = await this.fetchTransactionByHash(networkId, tx_hash);
+                if (!tx?.blockNumber)
+                    throw new Error(`Can't fetch blockNumber from tx: ${JSON.stringify(tx)}`);
+                metadata = JSON.parse(metadata);
+                const contractName = Object.values(metadata.settings.compilationTarget)[0];
+                return {
+                    abi: new ABICtor(contractName, undefined, immutable.fromJS(metadata.output.abi)),
+                    startBlock: Number(tx.blockNumber).toString(),
+                    name: contractName,
+                };
+            }
+            throw new Error(`No result: ${JSON.stringify(json)}`);
+        }
+        catch (error) {
+            logger(`Failed to fetch from Sourcify: ${error}`);
+        }
+        return null;
+    }
     async fetchTransactionByHash(networkId, txHash) {
         const urls = this.getRpcUrls(networkId);
         if (!urls.length) {

package/dist/command-helpers/contracts.test.js

@@ -1,4 +1,5 @@
 import { describe, expect, test } from 'vitest';
+import EthereumABI from '../protocols/ethereum/abi.js';
 import { ContractService } from './contracts.js';
 import { loadRegistry } from './registry.js';
 // An object with some test cases for contract deployment block numbers
@@ -79,16 +80,76 @@ const TEST_CONTRACT_START_BLOCKS = {
     // clover: {
     // },
 };
-describe('getStartBlockForContract', { sequential: true }, async () => {
+const TEST_SOURCIFY_CONTRACT_INFO = {
+    mainnet: {
+        '0xc2EdaD668740f1aA35E4D8f227fB8E17dcA888Cd': {
+            name: 'MasterChef',
+            startBlock: 10_736_242,
+        },
+    },
+    optimism: {
+        '0xc35DADB65012eC5796536bD9864eD8773aBc74C4': {
+            name: 'BentoBoxV1',
+            startBlock: 7_019_815,
+        },
+    },
+    wax: {
+        account: {
+            name: null,
+            startBlock: null,
+        },
+    },
+    'non-existing chain': {
+        '0x0000000000000000000000000000000000000000': {
+            name: null,
+            startBlock: null,
+        },
+    },
+};
+// Retry helper with configurable number of retries
+async function retry(operation, maxRetries = 3, sleepMs = 5000) {
+    let lastError;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+        try {
+            return await operation();
+        }
+        catch (error) {
+            lastError = error;
+            if (attempt < maxRetries - 1) {
+                await new Promise(resolve => setTimeout(resolve, sleepMs));
+            }
+        }
+    }
+    throw lastError;
+}
+describe('getStartBlockForContract', { concurrent: true }, async () => {
     const registry = await loadRegistry();
     const contractService = new ContractService(registry);
     for (const [network, contracts] of Object.entries(TEST_CONTRACT_START_BLOCKS)) {
         for (const [contract, startBlockExp] of Object.entries(contracts)) {
-            test(`Returns the start block ${network} ${contract} ${startBlockExp}`, async () => {
-                //loop through the TEST_CONTRACT_START_BLOCKS object and test each network
-                const startBlock = await contractService.getStartBlock(network, contract);
+            test(`Returns the start block ${network} ${contract} ${startBlockExp}`, { timeout: 50_000 }, async ({ expect }) => {
+                const startBlock = await retry(() => contractService.getStartBlock(network, contract), 10);
                 expect(parseInt(startBlock)).toBe(startBlockExp);
-            }, { timeout: 10_000 });
+            });
+        }
+    }
+});
+describe('getFromSourcifyForContract', { concurrent: true }, async () => {
+    const registry = await loadRegistry();
+    const contractService = new ContractService(registry);
+    for (const [networkId, contractInfo] of Object.entries(TEST_SOURCIFY_CONTRACT_INFO)) {
+        for (const [contract, t] of Object.entries(contractInfo)) {
+            test(`Returns contract information ${networkId} ${contract} ${t.name} ${t.startBlock}`, { timeout: 50_000 }, async () => {
+                const result = await retry(() => contractService.getFromSourcify(EthereumABI, networkId, contract));
+                if (t.name === null && t.startBlock === null) {
+                    expect(result).toBeNull();
+                }
+                else {
+                    // Only check name and startBlock, omit API property from Sourcify results
+                    const { name, startBlock } = result;
+                    expect(t).toEqual({ name, startBlock: parseInt(startBlock) });
+                }
+            });
         }
     }
 });

package/dist/command-helpers/network.test.js

@@ -1,9 +1,10 @@
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import * as toolbox from 'gluegun';
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
 import yaml from 'yaml';
 import { initNetworksConfig, updateSubgraphNetwork } from './network.js';
-const SUBGRAPH_PATH_BASE = path.join(`${process.platform === 'win32' ? '' : '/'}${/file:\/{2,3}(.+)\/[^/]/.exec(import.meta.url)[1]}`, '..', '..', '..', '..', 'examples', 'example-subgraph');
+const SUBGRAPH_PATH_BASE = path.join(fileURLToPath(import.meta.url), '..', '..', '..', '..', '..', 'examples', 'example-subgraph');
 describe('initNetworksConfig', () => {
     beforeAll(async () => {
         await initNetworksConfig(SUBGRAPH_PATH_BASE, 'address');

package/dist/commands/add.js

@@ -58,10 +58,17 @@ export default class AddCommand extends Command {
             this.warn('`localhost` network detected, prompting user for inputs');
         const registry = await loadRegistry();
         const contractService = new ContractService(registry);
+        const sourcifyContractInfo = await contractService.getFromSourcify(EthereumABI, network, address);
         let startBlock = startBlockFlag ? parseInt(startBlockFlag).toString() : startBlockFlag;
         let contractName = contractNameFlag || DEFAULT_CONTRACT_NAME;
         let ethabi = null;
-        if (abi) {
+        if (sourcifyContractInfo) {
+            startBlock ??= sourcifyContractInfo.startBlock;
+            contractName =
+                contractName == DEFAULT_CONTRACT_NAME ? sourcifyContractInfo.name : contractName;
+            ethabi ??= sourcifyContractInfo.abi;
+        }
+        if (!ethabi && abi) {
             ethabi = EthereumABI.load(contractName, abi);
         }
         else {

package/dist/commands/init.js

@@ -18,10 +18,11 @@ import { withSpinner } from '../command-helpers/spinner.js';
 import { getSubgraphBasename } from '../command-helpers/subgraph.js';
 import { GRAPH_CLI_SHARED_HEADERS } from '../constants.js';
 import debugFactory from '../debug.js';
+import EthereumABI from '../protocols/ethereum/abi.js';
 import Protocol from '../protocols/index.js';
 import { abiEvents } from '../scaffold/schema.js';
 import Schema from '../schema.js';
-import { createIpfsClient, loadSubgraphSchemaFromIPFS, validateSubgraphNetworkMatch, } from '../utils.js';
+import { createIpfsClient, loadSubgraphSchemaFromIPFS } from '../utils.js';
 import { validateContract } from '../validation/index.js';
 import AddCommand from './add.js';
 const protocolChoices = Array.from(Protocol.availableProtocols().keys());
@@ -154,6 +155,7 @@ export default class InitCommand extends Command {
         if ((fromContract || spkgPath) && protocol && subgraphName && directory && network && node) {
             const registry = await loadRegistry();
             const contractService = new ContractService(registry);
+            const sourcifyContractInfo = await contractService.getFromSourcify(EthereumABI, network, fromContract);
             if (!protocolChoices.includes(protocol)) {
                 this.error(`Protocol '${protocol}' is not supported, choose from these options: ${protocolChoices.join(', ')}`, { exit: 1 });
             }
@@ -170,7 +172,9 @@ export default class InitCommand extends Command {
                 }
                 else {
                     try {
-                        abi = await contractService.getABI(ABI, network, fromContract);
+                        abi = sourcifyContractInfo
+                            ? sourcifyContractInfo.abi
+                            : await contractService.getABI(ABI, network, fromContract);
                     }
                     catch (e) {
                         this.exit(1);
@@ -369,7 +373,7 @@ async function processInitForm({ abi: initAbi, abiPath: initAbiPath, directory:
                             value: 'contract',
                         },
                         { message: 'Substreams', name: 'substreams', value: 'substreams' },
-                        { message: 'Subgraph', name: 'subgraph', value: 'subgraph' },
+                        // { message: 'Subgraph', name: 'subgraph', value: 'subgraph' },
                     ].filter(({ name }) => name),
                 });
                 return value;
@@ -433,18 +437,6 @@ async function processInitForm({ abi: initAbi, abiPath: initAbiPath, directory:
                 return value;
             },
         });
-        promptManager.addStep({
-            type: 'input',
-            name: 'ipfs',
-            message: `IPFS node to use for fetching subgraph manifest`,
-            initial: ipfsUrl,
-            skip: () => !isComposedSubgraph,
-            result: value => {
-                ipfsNode = value;
-                initDebugger.extend('processInitForm')('ipfs: %O', value);
-                return value;
-            },
-        });
         promptManager.addStep({
             type: 'input',
             name: 'source',
@@ -457,15 +449,7 @@ async function processInitForm({ abi: initAbi, abiPath: initAbiPath, directory:
             initial: initContract,
             validate: async (value) => {
                 if (isComposedSubgraph) {
-                    if (!ipfsNode) {
-                        return true;
-                    }
-                    const ipfs = createIpfsClient(ipfsNode);
-                    const { valid, error } = await validateSubgraphNetworkMatch(ipfs, value, network.id);
-                    if (!valid) {
-                        return error || 'Invalid subgraph network match';
-                    }
-                    return true;
+                    return value.startsWith('Qm') ? true : 'Subgraph deployment ID must start with Qm';
                 }
                 if (initFromExample !== undefined || !protocolInstance.hasContract()) {
                     return true;
@@ -482,11 +466,21 @@ async function processInitForm({ abi: initAbi, abiPath: initAbiPath, directory:
                     source = address;
                     return address;
                 }
+                const sourcifyContractInfo = await contractService.getFromSourcify(EthereumABI, network.id, address);
+                if (sourcifyContractInfo) {
+                    initStartBlock ??= sourcifyContractInfo.startBlock;
+                    initContractName ??= sourcifyContractInfo.name;
+                    initAbi ??= sourcifyContractInfo.abi;
+                    initDebugger.extend('processInitForm')("infoFromSourcify: '%s'/'%s'", initStartBlock, initContractName);
+                }
                 // If ABI is not provided, try to fetch it from Etherscan API
                 if (protocolInstance.hasABIs() && !initAbi) {
                     abiFromApi = await retryWithPrompt(() => withSpinner('Fetching ABI from contract API...', 'Failed to fetch ABI', 'Warning fetching ABI', () => contractService.getABI(protocolInstance.getABI(), network.id, address)));
                     initDebugger.extend('processInitForm')("abiFromEtherscan len: '%s'", abiFromApi?.name);
                 }
+                else {
+                    abiFromApi = initAbi;
+                }
                 // If startBlock is not provided, try to fetch it from Etherscan API
                 if (!initStartBlock) {
                     startBlock = await retryWithPrompt(() => withSpinner('Fetching start block from contract API...', 'Failed to fetch start block', 'Warning fetching start block', () => contractService.getStartBlock(network.id, address)));
@@ -501,6 +495,18 @@ async function processInitForm({ abi: initAbi, abiPath: initAbiPath, directory:
                 return address;
             },
         });
+        promptManager.addStep({
+            type: 'input',
+            name: 'ipfs',
+            message: `IPFS node to use for fetching subgraph manifest`,
+            initial: ipfsUrl,
+            skip: () => !isComposedSubgraph,
+            result: value => {
+                ipfsNode = value;
+                initDebugger.extend('processInitForm')('ipfs: %O', value);
+                return value;
+            },
+        });
         promptManager.addStep({
             type: 'input',
             name: 'spkg',
@@ -617,22 +623,6 @@ async function processInitForm({ abi: initAbi, abiPath: initAbiPath, directory:
             },
         });
         await promptManager.executeInteractive();
-        // Validate network matches if loading from IPFS
-        if (ipfsNode && source && source.startsWith('Qm')) {
-            const ipfs = createIpfsClient(ipfsNode);
-            try {
-                const { valid, error } = await validateSubgraphNetworkMatch(ipfs, source, network.id);
-                if (!valid) {
-                    throw new Error(error || 'Invalid subgraph network match');
-                }
-            }
-            catch (e) {
-                if (e instanceof Error) {
-                    print.error(`Failed to validate subgraph network: ${e.message}`);
-                }
-                throw e;
-            }
-        }
         return {
             abi: (abiFromApi || abiFromFile),
             protocolInstance,
@@ -851,9 +841,8 @@ async function initSubgraphFromContract({ protocolInstance, subgraphName, direct
             this.error(`Failed to load and parse subgraph schema: ${e.message}`, { exit: 1 });
         }
     }
-    if (!isComposedSubgraph &&
+    if (!protocolInstance.isComposedSubgraph() &&
         protocolInstance.hasABIs() &&
-        abi && // Add check for abi existence
         (abiEvents(abi).size === 0 ||
             // @ts-expect-error TODO: the abiEvents result is expected to be a List, how's it an array?
             abiEvents(abi).length === 0)) {
@@ -862,11 +851,6 @@ async function initSubgraphFromContract({ protocolInstance, subgraphName, direct
     }
     // Scaffold subgraph
     const scaffold = await withSpinner(`Create subgraph scaffold`, `Failed to create subgraph scaffold`, `Warnings while creating subgraph scaffold`, async (spinner) => {
-        initDebugger('Generating scaffold with ABI:', abi);
-        initDebugger('ABI data:', abi?.data);
-        if (abi) {
-            initDebugger('ABI events:', abiEvents(abi));
-        }
         const scaffold = await generateScaffold({
             protocolInstance,
             subgraphName,

package/dist/commands/local.js

@@ -2,6 +2,7 @@ import { spawn } from 'node:child_process';
 import http from 'node:http';
 import net from 'node:net';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import compose from 'docker-compose';
 import { filesystem, patching } from 'gluegun';
 import stripAnsi from 'strip-ansi';
@@ -67,7 +68,7 @@ export default class LocalCommand extends Command {
         const skipWaitForEthereum = skipWaitForEthereumTypo || skipWaitForEthereumGood;
         // Obtain the Docker Compose file for services that the tests run against
         const composeFile = composeFileFlag ||
-            path.join(`${process.platform === 'win32' ? '' : '/'}${/file:\/{2,3}(.+)\/[^/]/.exec(import.meta.url)[1]}`, '..', '..', 'resources', 'test', standaloneNode ? 'docker-compose-standalone-node.yml' : 'docker-compose.yml');
+            path.join(fileURLToPath(import.meta.url), '..', '..', '..', 'resources', 'test', standaloneNode ? 'docker-compose-standalone-node.yml' : 'docker-compose.yml');
         if (!filesystem.exists(composeFile)) {
             this.error(`Docker Compose file "${composeFile}" not found`, { exit: 1 });
         }

package/dist/commands/test.js

@@ -1,13 +1,15 @@
 import { exec, spawn } from 'node:child_process';
+import events from 'node:events';
+import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { Binary } from 'binary-install';
+import { pipeline } from 'node:stream/promises';
+import { fileURLToPath } from 'node:url';
 import { filesystem, patching, print, system } from 'gluegun';
 import yaml from 'js-yaml';
 import semver from 'semver';
 import { Args, Command, Flags } from '@oclif/core';
 import { GRAPH_CLI_SHARED_HEADERS } from '../constants.js';
-import fetch from '../fetch.js';
 export default class TestCommand extends Command {
     static description = 'Runs rust binary for subgraph testing.';
     static args = {
@@ -92,10 +94,10 @@ export default class TestCommand extends Command {
             });
         }
         if (opts.docker) {
-            runDocker.bind(this)(datasource, opts);
+            await runDocker.bind(this)(datasource, opts);
         }
         else {
-            runBinary.bind(this)(datasource, opts);
+            await runBinary.bind(this)(datasource, opts);
         }
     }
 }
@@ -113,19 +115,36 @@ function getLatestVersionFromCache(cachePath) {
 }
 async function runBinary(datasource, opts) {
     const coverageOpt = opts.coverage;
-    const forceOpt = opts.force;
     const logsOpt = opts.logs;
     const versionOpt = opts.version;
     const latestVersion = opts.latestVersion;
     const recompileOpt = opts.recompile;
-    const platform = await getPlatform.bind(this)(versionOpt || latestVersion, logsOpt);
-    const url = `https://github.com/LimeChain/matchstick/releases/download/${versionOpt || latestVersion}/${platform}`;
-    if (logsOpt) {
-        this.log(`Download link: ${url}`);
+    let binPath = '';
+    try {
+        const platform = await getPlatform.bind(this)(versionOpt || latestVersion, logsOpt);
+        const url = `https://github.com/LimeChain/matchstick/releases/download/${versionOpt || latestVersion}/${platform}`;
+        const binDir = path.join(path.dirname(fileURLToPath(import.meta.url)), 'node_modules', '.bin');
+        binPath = path.join(binDir, `matchstick-${platform}`);
+        if (logsOpt) {
+            this.log(`Download link: ${url}`);
+            this.log(`Binary path: ${binPath}`);
+        }
+        if (!fs.existsSync(binPath)) {
+            this.log(`Downloading matchstick binary: ${url}`);
+            await fs.promises.mkdir(binDir, { recursive: true });
+            const response = await fetch(url);
+            if (!response.ok)
+                throw new Error(`Status: ${response.statusText}`);
+            if (!response.body)
+                throw new Error('No response body received');
+            const fileStream = fs.createWriteStream(binPath);
+            await pipeline(response.body, fileStream);
+            await fs.promises.chmod(binPath, '755');
+        }
+    }
+    catch (e) {
+        this.error(`Failed to get matchstick binary: ${e.message}\nConsider using -d flag to run it in Docker instead:\n  graph test -d`, { exit: 1 });
     }
-    const binary = new Binary(platform, url, versionOpt || latestVersion);
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    forceOpt ? await binary.install(true) : await binary.install(false);
     const args = [];
     if (coverageOpt)
         args.push('-c');
@@ -133,14 +152,17 @@ async function runBinary(datasource, opts) {
         args.push('-r');
     if (datasource)
         args.push(datasource);
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    args.length > 0 ? binary.run(...args) : binary.run();
+    const child = spawn(binPath, args, { stdio: 'inherit' });
+    const [code] = await events.once(child, 'exit');
+    if (code !== 0) {
+        this.error('Matchstick exited with an error', { exit: 1 });
+    }
 }
 async function getPlatform(matchstickVersion, logsOpt) {
     const type = os.type();
     const arch = os.arch();
     const cpuCore = os.cpus()[0];
-    const isAppleSilicon = arch === 'arm64' && /Apple (M1|M2|M3|M4|processor)/.test(cpuCore.model);
+    const isAppleSilicon = arch === 'arm64' && /Apple (M[0-9]|processor)/.test(cpuCore.model);
     const linuxInfo = type === 'Linux' ? await getLinuxInfo.bind(this)() : {};
     const linuxDistro = linuxInfo.name;
     const release = linuxInfo.version || os.release();
@@ -156,7 +178,7 @@ async function getPlatform(matchstickVersion, logsOpt) {
                 }
                 return 'binary-macos-12';
             }
-            if (type === 'Linux' && majorVersion === 22) {
+            if (type === 'Linux' && (majorVersion === 22 || majorVersion === 24)) {
                 return 'binary-linux-22';
             }
         }
@@ -206,9 +228,6 @@ async function runDocker(datasource, opts) {
     const versionOpt = opts.version;
     const latestVersion = opts.latestVersion;
     const recompileOpt = opts.recompile;
-    // Remove binary-install binaries, because docker has permission issues
-    // when building the docker images
-    filesystem.remove('./node_modules/binary-install/bin');
     // Get current working directory
     const current_folder = filesystem.cwd();
     // Declate dockerfilePath with default location

package/dist/compiler/index.js

@@ -336,8 +336,6 @@ export default class Compiler {
         // ensure that the output directory exists
         fs.mkdirsSync(this.options.outputDir);
         return await withSpinner(`Write compiled subgraph to ${displayDir}`, `Failed to write compiled subgraph to ${displayDir}`, `Warnings while writing compiled subgraph to ${displayDir}`, async (spinner) => {
-            // Add debug log for initial subgraph state
-            compilerDebug('Initial subgraph state:', subgraph.toJS());
             // Copy schema and update its path
             subgraph = subgraph.updateIn(['schema', 'file'], schemaFile => {
                 const schemaFilePath = path.resolve(this.sourceDir, schemaFile);
@@ -347,28 +345,17 @@ export default class Compiler {
                 fs.copyFileSync(schemaFilePath, targetFile);
                 return path.relative(this.options.outputDir, targetFile);
             });
-            // Add debug log before processing data sources
-            compilerDebug('Processing dataSources:', subgraph.get('dataSources').toJS());
             // Copy data source files and update their paths
             subgraph = subgraph.update('dataSources', (dataSources) => dataSources.map(dataSource => {
-                // Add debug log for each data source
-                compilerDebug('Processing dataSource:', dataSource.toJS());
                 let updatedDataSource = dataSource;
                 if (this.protocol.hasABIs()) {
-                    // Add debug log for ABIs
-                    compilerDebug('Processing ABIs for dataSource:', dataSource.getIn(['mapping', 'abis'])?.toJS() || 'undefined');
-                    updatedDataSource = updatedDataSource.updateIn(['mapping', 'abis'], (abis) => {
-                        compilerDebug('ABIs value:', Array.isArray(abis) ? abis : 'undefined');
-                        if (!abis) {
-                            compilerDebug('No ABIs found for dataSource');
-                            return immutable.List();
-                        }
-                        return abis.map((abi) => abi.update('file', (abiFile) => {
-                            abiFile = path.resolve(this.sourceDir, abiFile);
-                            const abiData = this.ABI.load(abi.get('name'), abiFile);
-                            return path.relative(this.options.outputDir, this._writeSubgraphFile(abiFile, JSON.stringify(abiData.data.toJS(), null, 2), this.sourceDir, this.subgraphDir(this.options.outputDir, dataSource), spinner));
-                        }));
-                    });
+                    updatedDataSource = updatedDataSource
+                        // Write data source ABIs to the output directory
+                        .updateIn(['mapping', 'abis'], (abis) => abis.map((abi) => abi.update('file', (abiFile) => {
+                        abiFile = path.resolve(this.sourceDir, abiFile);
+                        const abiData = this.ABI.load(abi.get('name'), abiFile);
+                        return path.relative(this.options.outputDir, this._writeSubgraphFile(abiFile, JSON.stringify(abiData.data.toJS(), null, 2), this.sourceDir, this.subgraphDir(this.options.outputDir, dataSource), spinner));
+                    })));
                 }
                 if (protocol.name == 'substreams' || protocol.name == 'substreams/triggers') {
                     updatedDataSource = updatedDataSource

package/dist/protocols/subgraph/manifest.graphql

@@ -63,7 +63,6 @@ type ContractABI {
 type EntityHandler {
   handler: String!
   entity: String!
-  calls: JSON
 }
 
 type Graft {

package/dist/scaffold/index.d.ts

@@ -25,7 +25,7 @@ export default class Scaffold {
     startBlock?: string;
     spkgPath?: string;
     entities?: string[];
-    constructor({ protocol, abi, contract, network, contractName, startBlock, subgraphName, node, spkgPath, indexEvents, entities, }: ScaffoldOptions);
+    constructor(options: ScaffoldOptions);
     generatePackageJson(): Promise<string>;
     generatePackageJsonForSubstreams(): Promise<string>;
     generateManifest(): Promise<string>;

package/dist/scaffold/index.js

@@ -1,4 +1,3 @@
-import debugFactory from 'debug';
 import fs from 'fs-extra';
 import { strings } from 'gluegun';
 import prettier from 'prettier';
@@ -9,7 +8,6 @@ import { getGitIgnore } from './get-git-ignore.js';
 import { generateEventIndexingHandlers } from './mapping.js';
 import { abiEvents, generateEventType, generateExampleEntityType } from './schema.js';
 import { generateTestsFiles } from './tests.js';
-const scaffoldDebugger = debugFactory('graph-cli:scaffold');
 const GRAPH_CLI_VERSION = process.env.GRAPH_CLI_TESTS
     ? // JSON.stringify should remove this key, we will install the local
         // graph-cli for the tests using `npm link` instead of fetching from npm.
@@ -30,21 +28,18 @@ export default class Scaffold {
     startBlock;
     spkgPath;
     entities;
-    constructor({ protocol, abi, contract, network, contractName, startBlock, subgraphName, node, spkgPath, indexEvents, entities, }) {
-        this.protocol = protocol;
-        this.abi = abi;
-        this.contract = contract;
-        this.network = network;
-        this.contractName = contractName;
-        this.startBlock = startBlock;
-        this.subgraphName = subgraphName;
-        this.node = node;
-        this.spkgPath = spkgPath;
-        this.indexEvents = indexEvents;
-        this.entities = entities;
-        scaffoldDebugger('Scaffold constructor called with ABI:', abi);
-        scaffoldDebugger('ABI data:', abi?.data);
-        scaffoldDebugger('ABI file:', abi?.file);
+    constructor(options) {
+        this.protocol = options.protocol;
+        this.abi = options.abi;
+        this.indexEvents = options.indexEvents;
+        this.contract = options.contract;
+        this.network = options.network;
+        this.contractName = options.contractName;
+        this.subgraphName = options.subgraphName;
+        this.startBlock = options.startBlock;
+        this.node = options.node;
+        this.spkgPath = options.spkgPath;
+        this.entities = options.entities;
     }
     async generatePackageJson() {
         return await prettier.format(JSON.stringify({
@@ -155,21 +150,9 @@ dataSources:
             }), { parser: 'typescript', semi: false, trailingComma: 'none' });
     }
     async generateABIs() {
-        scaffoldDebugger('Generating ABIs...');
-        scaffoldDebugger('Protocol has ABIs:', this.protocol.hasABIs());
-        scaffoldDebugger('ABI data:', this.abi?.data);
-        scaffoldDebugger('ABI file:', this.abi?.file);
-        if (!this.protocol.hasABIs()) {
-            scaffoldDebugger('Protocol does not have ABIs, skipping ABI generation');
-            return;
-        }
-        if (!this.abi?.data) {
-            scaffoldDebugger('ABI data is undefined, skipping ABI generation');
-            return;
-        }
         return this.protocol.hasABIs()
             ? {
-                [`${this.contractName}.json`]: await prettier.format(JSON.stringify(this.abi.data), {
+                [`${this.contractName}.json`]: await prettier.format(JSON.stringify(this.abi?.data), {
                     parser: 'json',
                 }),
             }

package/dist/subgraph.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import fs from 'fs-extra';
 import * as graphql from 'graphql/language/index.js';
 import immutable from 'immutable';
@@ -31,7 +32,7 @@ export default class Subgraph {
             ]);
         }
         // Parse the default subgraph schema
-        const schema = graphql.parse(await fs.readFile(path.join(`${process.platform === 'win32' ? '' : '/'}${/file:\/{2,3}(.+)\/[^/]/.exec(import.meta.url)[1]}`, 'protocols', 
+        const schema = graphql.parse(await fs.readFile(path.join(fileURLToPath(import.meta.url), '..', 'protocols', 
         // TODO: substreams/triggers is a special case, should be handled better
         protocol.name === 'substreams/triggers' ? 'substreams' : protocol.name, `manifest.graphql`), 'utf-8'));
         // Obtain the root `SubgraphManifest` type from the schema

package/dist/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/constants.ts","../src/debug.ts","../src/fetch.ts","../src/index.ts","../src/migrations.ts","../src/schema.ts","../src/subgraph.ts","../src/type-generator.ts","../src/utils.ts","../src/version.ts","../src/watcher.ts","../src/codegen/schema.test.ts","../src/codegen/schema.ts","../src/codegen/template.ts","../src/codegen/typescript.ts","../src/codegen/util.test.ts","../src/codegen/util.ts","../src/codegen/types/conversions.ts","../src/codegen/types/index.test.ts","../src/codegen/types/index.ts","../src/command-helpers/auth.ts","../src/command-helpers/compiler.test.ts","../src/command-helpers/compiler.ts","../src/command-helpers/contracts.test.ts","../src/command-helpers/contracts.ts","../src/command-helpers/data-sources.ts","../src/command-helpers/file-resolver.test.ts","../src/command-helpers/file-resolver.ts","../src/command-helpers/fs.ts","../src/command-helpers/ipfs.ts","../src/command-helpers/jsonrpc.ts","../src/command-helpers/network.test.ts","../src/command-helpers/network.ts","../src/command-helpers/node.ts","../src/command-helpers/prompt-manager.ts","../src/command-helpers/registry.ts","../src/command-helpers/retry.ts","../src/command-helpers/scaffold.ts","../src/command-helpers/sort.test.ts","../src/command-helpers/sort.ts","../src/command-helpers/spinner.ts","../src/command-helpers/subgraph.ts","../src/command-helpers/version.test.ts","../src/command-helpers/version.ts","../src/commands/add.ts","../src/commands/auth.ts","../src/commands/binary-install.d.ts","../src/commands/build.ts","../src/commands/clean.ts","../src/commands/codegen.ts","../src/commands/create.ts","../src/commands/deploy.ts","../src/commands/init.ts","../src/commands/local.ts","../src/commands/publish.ts","../src/commands/remove.ts","../src/commands/test.ts","../src/compiler/asc.ts","../src/compiler/index.ts","../src/migrations/mapping_api_version_0_0_1.ts","../src/migrations/mapping_api_version_0_0_2.ts","../src/migrations/mapping_api_version_0_0_3.ts","../src/migrations/mapping_api_version_0_0_4.ts","../src/migrations/mapping_api_version_0_0_5.ts","../src/migrations/spec_version_0_0_2.ts","../src/migrations/spec_version_0_0_3.ts","../src/migrations/util/load-manifest.ts","../src/migrations/util/versions.ts","../src/protocols/contract.ts","../src/protocols/file_template.ts","../src/protocols/index.ts","../src/protocols/subgraph.ts","../src/protocols/arweave/subgraph.ts","../src/protocols/arweave/scaffold/manifest.ts","../src/protocols/arweave/scaffold/mapping.ts","../src/protocols/cosmos/subgraph.ts","../src/protocols/cosmos/scaffold/manifest.ts","../src/protocols/cosmos/scaffold/mapping.ts","../src/protocols/ethereum/abi.ts","../src/protocols/ethereum/contract.ts","../src/protocols/ethereum/subgraph.ts","../src/protocols/ethereum/type-generator.ts","../src/protocols/ethereum/codegen/abi.test.ts","../src/protocols/ethereum/codegen/abi.ts","../src/protocols/ethereum/codegen/template.ts","../src/protocols/ethereum/scaffold/manifest.ts","../src/protocols/ethereum/scaffold/mapping.ts","../src/protocols/near/contract.ts","../src/protocols/near/subgraph.ts","../src/protocols/near/scaffold/manifest.ts","../src/protocols/near/scaffold/mapping.ts","../src/protocols/subgraph/subgraph.ts","../src/protocols/subgraph/scaffold/manifest.ts","../src/protocols/subgraph/scaffold/mapping.ts","../src/protocols/substreams/subgraph.ts","../src/protocols/substreams/scaffold/manifest.ts","../src/scaffold/cosmos.test.ts","../src/scaffold/ethereum.test.ts","../src/scaffold/get-docker-file.ts","../src/scaffold/get-git-ignore.ts","../src/scaffold/index.ts","../src/scaffold/mapping.ts","../src/scaffold/near.test.ts","../src/scaffold/schema.ts","../src/scaffold/tests.ts","../src/validation/contract.ts","../src/validation/index.ts","../src/validation/manifest.ts","../src/validation/schema.test.ts","../src/validation/schema.ts"],"version":"5.7.2"}
+{"root":["../src/constants.ts","../src/debug.ts","../src/fetch.ts","../src/index.ts","../src/migrations.ts","../src/schema.ts","../src/subgraph.ts","../src/type-generator.ts","../src/utils.ts","../src/version.ts","../src/watcher.ts","../src/codegen/schema.test.ts","../src/codegen/schema.ts","../src/codegen/template.ts","../src/codegen/typescript.ts","../src/codegen/util.test.ts","../src/codegen/util.ts","../src/codegen/types/conversions.ts","../src/codegen/types/index.test.ts","../src/codegen/types/index.ts","../src/command-helpers/auth.ts","../src/command-helpers/compiler.test.ts","../src/command-helpers/compiler.ts","../src/command-helpers/contracts.test.ts","../src/command-helpers/contracts.ts","../src/command-helpers/data-sources.ts","../src/command-helpers/file-resolver.test.ts","../src/command-helpers/file-resolver.ts","../src/command-helpers/fs.ts","../src/command-helpers/ipfs.ts","../src/command-helpers/jsonrpc.ts","../src/command-helpers/network.test.ts","../src/command-helpers/network.ts","../src/command-helpers/node.ts","../src/command-helpers/prompt-manager.ts","../src/command-helpers/registry.ts","../src/command-helpers/retry.ts","../src/command-helpers/scaffold.ts","../src/command-helpers/sort.test.ts","../src/command-helpers/sort.ts","../src/command-helpers/spinner.ts","../src/command-helpers/subgraph.ts","../src/command-helpers/version.test.ts","../src/command-helpers/version.ts","../src/commands/add.ts","../src/commands/auth.ts","../src/commands/build.ts","../src/commands/clean.ts","../src/commands/codegen.ts","../src/commands/create.ts","../src/commands/deploy.ts","../src/commands/init.ts","../src/commands/local.ts","../src/commands/publish.ts","../src/commands/remove.ts","../src/commands/test.ts","../src/compiler/asc.ts","../src/compiler/index.ts","../src/migrations/mapping_api_version_0_0_1.ts","../src/migrations/mapping_api_version_0_0_2.ts","../src/migrations/mapping_api_version_0_0_3.ts","../src/migrations/mapping_api_version_0_0_4.ts","../src/migrations/mapping_api_version_0_0_5.ts","../src/migrations/spec_version_0_0_2.ts","../src/migrations/spec_version_0_0_3.ts","../src/migrations/util/load-manifest.ts","../src/migrations/util/versions.ts","../src/protocols/contract.ts","../src/protocols/file_template.ts","../src/protocols/index.ts","../src/protocols/subgraph.ts","../src/protocols/arweave/subgraph.ts","../src/protocols/arweave/scaffold/manifest.ts","../src/protocols/arweave/scaffold/mapping.ts","../src/protocols/cosmos/subgraph.ts","../src/protocols/cosmos/scaffold/manifest.ts","../src/protocols/cosmos/scaffold/mapping.ts","../src/protocols/ethereum/abi.ts","../src/protocols/ethereum/contract.ts","../src/protocols/ethereum/subgraph.ts","../src/protocols/ethereum/type-generator.ts","../src/protocols/ethereum/codegen/abi.test.ts","../src/protocols/ethereum/codegen/abi.ts","../src/protocols/ethereum/codegen/template.ts","../src/protocols/ethereum/scaffold/manifest.ts","../src/protocols/ethereum/scaffold/mapping.ts","../src/protocols/near/contract.ts","../src/protocols/near/subgraph.ts","../src/protocols/near/scaffold/manifest.ts","../src/protocols/near/scaffold/mapping.ts","../src/protocols/subgraph/subgraph.ts","../src/protocols/subgraph/scaffold/manifest.ts","../src/protocols/subgraph/scaffold/mapping.ts","../src/protocols/substreams/subgraph.ts","../src/protocols/substreams/scaffold/manifest.ts","../src/scaffold/cosmos.test.ts","../src/scaffold/ethereum.test.ts","../src/scaffold/get-docker-file.ts","../src/scaffold/get-git-ignore.ts","../src/scaffold/index.ts","../src/scaffold/mapping.ts","../src/scaffold/near.test.ts","../src/scaffold/schema.ts","../src/scaffold/tests.ts","../src/validation/contract.ts","../src/validation/index.ts","../src/validation/manifest.ts","../src/validation/schema.test.ts","../src/validation/schema.ts"],"version":"5.7.2"}

package/dist/utils.d.ts

@@ -1,14 +1,2 @@
 export declare const createIpfsClient: typeof import("kubo-rpc-client").create;
 export declare function loadSubgraphSchemaFromIPFS(ipfsClient: any, manifest: string): Promise<string>;
-export declare function loadManifestFromIPFS(ipfsClient: any, manifest: string): Promise<string>;
-/**
- * Validates that the network of a source subgraph matches the target network
- * @param ipfsClient IPFS client instance
- * @param sourceSubgraphId IPFS hash of the source subgraph
- * @param targetNetwork Network of the target subgraph being created
- * @returns Object containing validation result and error message if any
- */
-export declare function validateSubgraphNetworkMatch(ipfsClient: any, sourceSubgraphId: string, targetNetwork: string): Promise<{
-    valid: boolean;
-    error?: string;
-}>;

package/dist/utils.js

@@ -27,59 +27,3 @@ export async function loadSubgraphSchemaFromIPFS(ipfsClient, manifest) {
         throw Error(`Failed to load schema from IPFS ${manifest}`);
     }
 }
-export async function loadManifestFromIPFS(ipfsClient, manifest) {
-    try {
-        const manifestBuffer = ipfsClient.cat(manifest);
-        let manifestFile = '';
-        for await (const chunk of manifestBuffer) {
-            manifestFile += Buffer.from(chunk).toString('utf8');
-        }
-        return manifestFile;
-    }
-    catch (e) {
-        utilsDebug.extend('loadManifestFromIPFS')(`Failed to load manifest from IPFS ${manifest}`);
-        utilsDebug.extend('loadManifestFromIPFS')(e);
-        throw Error(`Failed to load manifest from IPFS ${manifest}`);
-    }
-}
-/**
- * Validates that the network of a source subgraph matches the target network
- * @param ipfsClient IPFS client instance
- * @param sourceSubgraphId IPFS hash of the source subgraph
- * @param targetNetwork Network of the target subgraph being created
- * @returns Object containing validation result and error message if any
- */
-export async function validateSubgraphNetworkMatch(ipfsClient, sourceSubgraphId, targetNetwork) {
-    try {
-        const manifestFile = await loadManifestFromIPFS(ipfsClient, sourceSubgraphId);
-        const manifestYaml = yaml.load(manifestFile);
-        // Extract network from data sources
-        const dataSources = manifestYaml.dataSources || [];
-        const templates = manifestYaml.templates || [];
-        const allSources = [...dataSources, ...templates];
-        if (allSources.length === 0) {
-            return { valid: true }; // No data sources to validate
-        }
-        // Get network from first data source
-        const sourceNetwork = allSources[0].network;
-        if (!sourceNetwork) {
-            return { valid: true }; // Network not specified in source, skip validation
-        }
-        const normalizedSourceNetwork = sourceNetwork.toLowerCase();
-        const normalizedTargetNetwork = targetNetwork.toLowerCase();
-        if (normalizedSourceNetwork !== normalizedTargetNetwork) {
-            return {
-                valid: false,
-                error: `Network mismatch: The source subgraph is indexing the '${sourceNetwork}' network, but you're creating a subgraph for '${targetNetwork}' network. When composing subgraphs, they must index the same network.`,
-            };
-        }
-        return { valid: true };
-    }
-    catch (e) {
-        utilsDebug.extend('validateSubgraphNetworkMatch')(`Failed to validate network match: ${e}`);
-        return {
-            valid: false,
-            error: e instanceof Error ? e.message : 'Failed to validate subgraph network',
-        };
-    }
-}

package/dist/version.js

@@ -1,9 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 const packageJson = JSON.parse(fs
     .readFileSync(
 // works even when bundled/built because the path to package.json is the same
-path.join(`${process.platform === 'win32' ? '' : '/'}${/file:\/{2,3}(.+)\/[^/]/.exec(import.meta.url)[1]}`, '..', 'package.json'))
+path.join(fileURLToPath(import.meta.url), '..', '..', 'package.json'))
     .toString());
 export const version = packageJson.version;
 export const nodeVersion = (packageJson.engines?.node ?? '');

package/oclif.manifest.json

@@ -1011,5 +1011,5 @@
       ]
     }
   },
-  "version": "0.95.0-alpha-20250127115813-55c1f2bf474a247489f48edfcdcf9ccbb48a00ee"
+  "version": "0.95.0"
 }

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.95.0-alpha-20250127115813-55c1f2bf474a247489f48edfcdcf9ccbb48a00ee",
+  "version": "0.95.0",
   "type": "module",
   "description": "CLI for building for and deploying to The Graph",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/graphprotocol/graph-tooling.git",
+    "directory": "packages/cli"
+  },
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
     "node": ">=20.18.1"
@@ -29,7 +34,6 @@
     "@pinax/graph-networks-registry": "^0.6.5",
     "@whatwg-node/fetch": "^0.10.1",
     "assemblyscript": "0.19.23",
-    "binary-install": "^1.1.0",
     "chokidar": "4.0.1",
     "debug": "4.3.7",
     "docker-compose": "1.1.0",
@@ -45,7 +49,7 @@
     "prettier": "3.4.2",
     "semver": "7.6.3",
     "tmp-promise": "3.0.3",
-    "undici": "7.1.1",
+    "undici": "7.2.3",
     "web3-eth-abi": "4.4.1",
     "yaml": "2.6.1"
   },
@@ -63,7 +67,8 @@
     "vitest": "^2.1.8"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "oclif": {
     "bin": "graph",