@graphprotocol/graph-cli 0.62.0 → 0.62.1-alpha-20231124170720-3199a59

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphprotocol/graph-cli
 
+## 0.62.1-alpha-20231124170720-3199a59
+
+### Patch Changes
+
+- [#1521](https://github.com/graphprotocol/graph-tooling/pull/1521)
+  [`51376c2`](https://github.com/graphprotocol/graph-tooling/commit/51376c29b39fac46910680e66e6f42672e8f3c71)
+  Thanks [@saihaj](https://github.com/saihaj)! - remove studio network validation checks
+
 ## 0.62.0
 
 ### Minor Changes

package/dist/commands/deploy.js

@@ -38,7 +38,6 @@ const ipfs_1 = require("../command-helpers/ipfs");
 const jsonrpc_1 = require("../command-helpers/jsonrpc");
 const network_1 = require("../command-helpers/network");
 const node_1 = require("../command-helpers/node");
-const studio_1 = require("../command-helpers/studio");
 const version_1 = require("../command-helpers/version");
 const constants_1 = require("../constants");
 const protocols_1 = __importDefault(require("../protocols"));
@@ -293,27 +292,9 @@ class DeployCommand extends core_1.Command {
                 this.error(`Could not find subgraph manifest at IPFS hash ${ipfsHash}`, { exit: 1 });
             }
             await ipfsClient.pin.add(ipfsHash);
-            try {
-                const dataSourcesAndTemplates = DataSourcesExtractor.fromManifestString(manifestFile);
-                for (const { network } of dataSourcesAndTemplates) {
-                    (0, studio_1.validateStudioNetwork)({ studio, product, network });
-                }
-            }
-            catch (e) {
-                this.error(e, { exit: 1 });
-            }
             await deploySubgraph(ipfsHash);
             return;
         }
-        try {
-            const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifest);
-            for (const { network } of dataSourcesAndTemplates) {
-                (0, studio_1.validateStudioNetwork)({ studio, product, network });
-            }
-        }
-        catch (e) {
-            this.error(e, { exit: 1 });
-        }
         let protocol;
         try {
             // Checks to make sure deploy doesn't run against

package/dist/commands/init.js

@@ -37,7 +37,6 @@ const network_1 = require("../command-helpers/network");
 const node_1 = require("../command-helpers/node");
 const scaffold_1 = require("../command-helpers/scaffold");
 const spinner_1 = require("../command-helpers/spinner");
-const studio_1 = require("../command-helpers/studio");
 const subgraph_1 = require("../command-helpers/subgraph");
 const debug_1 = __importDefault(require("../debug"));
 const protocols_1 = __importDefault(require("../protocols"));
@@ -144,8 +143,6 @@ class InitCommand extends core_1.Command {
                 subgraphName,
                 contractName,
                 node,
-                studio,
-                product,
                 startBlock,
                 spkgPath,
                 skipInstall,
@@ -212,8 +209,6 @@ class InitCommand extends core_1.Command {
                 indexEvents: answers.indexEvents,
                 contractName: answers.contractName,
                 node,
-                studio: answers.studio,
-                product: answers.product,
                 startBlock: answers.startBlock,
                 spkgPath: answers.spkgPath,
                 skipInstall,
@@ -831,7 +826,7 @@ async function initSubgraphFromExample({ fromExample, allowSimpleName, subgraphN
     }
     printNextSteps.bind(this)({ subgraphName, directory }, { commands });
 }
-async function initSubgraphFromContract({ protocolInstance, allowSimpleName, subgraphName, directory, abi, network, contract, indexEvents, contractName, node, studio, product, startBlock, spkgPath, skipInstall, }, { commands, addContract, }) {
+async function initSubgraphFromContract({ protocolInstance, allowSimpleName, subgraphName, directory, abi, network, contract, indexEvents, contractName, node, startBlock, spkgPath, skipInstall, }, { commands, addContract, }) {
     const isSubstreams = protocolInstance.name === 'substreams';
     // Fail if the subgraph name is invalid
     if (!revalidateSubgraphName.bind(this)(subgraphName, { allowSimpleName })) {
@@ -849,15 +844,6 @@ async function initSubgraphFromContract({ protocolInstance, allowSimpleName, sub
         // Fail if the ABI does not contain any events
         this.error(`ABI does not contain any events`, { exit: 1 });
     }
-    // We can validate this before the scaffold because we receive
-    // the network from the form or via command line argument.
-    // We don't need to read the manifest in this case.
-    try {
-        (0, studio_1.validateStudioNetwork)({ studio, product, network });
-    }
-    catch (e) {
-        this.error(e, { exit: 1 });
-    }
     // Scaffold subgraph
     const scaffold = await (0, spinner_1.withSpinner)(`Create subgraph scaffold`, `Failed to create subgraph scaffold`, `Warnings while creating subgraph scaffold`, async (spinner) => {
         const scaffold = await (0, scaffold_1.generateScaffold)({

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.62.0",
+  "version": "0.62.1-alpha-20231124170720-3199a59",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.62.0",
+  "version": "0.62.1-alpha-20231124170720-3199a59",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {

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

@@ -1,6 +0,0 @@
-export declare const allowedStudioNetworks: readonly ["mainnet", "rinkeby", "goerli", "gnosis", "chapel", "optimism-goerli", "clover", "fantom", "matic", "fantom-testnet", "arbitrum-goerli", "fuji", "celo-alfajores", "mumbai", "aurora-testnet", "near-testnet", "optimism", "optimism-goerli", "theta-testnet-001", "osmo-test-4", "base-testnet", "base", "celo", "arbitrum-one", "arbitrum-sepolia", "avalanche", "zksync-era", "zksync-era-testnet", "sepolia", "polygon-zkevm-testnet", "polygon-zkevm", "scroll-sepolia", "scroll"];
-export declare const validateStudioNetwork: ({ studio, product, network, }: {
-    studio?: string | boolean | undefined;
-    product?: string | undefined;
-    network?: string | undefined;
-}) => void;

package/dist/command-helpers/studio.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateStudioNetwork = exports.allowedStudioNetworks = void 0;
-exports.allowedStudioNetworks = [
-    'mainnet',
-    'rinkeby',
-    'goerli',
-    'gnosis',
-    'chapel',
-    'optimism-goerli',
-    'clover',
-    'fantom',
-    'matic',
-    'fantom-testnet',
-    'arbitrum-goerli',
-    'fuji',
-    'celo-alfajores',
-    'mumbai',
-    'aurora-testnet',
-    'near-testnet',
-    'optimism',
-    'optimism-goerli',
-    'theta-testnet-001',
-    'osmo-test-4',
-    'base-testnet',
-    'base',
-    'celo',
-    'arbitrum-one',
-    'arbitrum-sepolia',
-    'avalanche',
-    'zksync-era',
-    'zksync-era-testnet',
-    'sepolia',
-    'polygon-zkevm-testnet',
-    'polygon-zkevm',
-    'scroll-sepolia',
-    'scroll',
-];
-const validateStudioNetwork = ({ studio, product, network, }) => {
-    const isStudio = studio || product === 'subgraph-studio';
-    const isAllowedNetwork = !network ||
-        exports.allowedStudioNetworks.includes(
-        // @ts-expect-error we're checking if the network is allowed
-        network);
-    if (isStudio && !isAllowedNetwork) {
-        throw new Error(`The Subgraph Studio only allows subgraphs for these networks: ${exports.allowedStudioNetworks.join(', ')}`);
-    }
-};
-exports.validateStudioNetwork = validateStudioNetwork;

package/dist/command-helpers/studio.test.d.ts

@@ -1 +0,0 @@
-export {};

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

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const studio_1 = require("./studio");
-describe('Version Command Helpers', () => {
-    describe('validateStudioNetwork', () => {
-        describe("When it's studio", () => {
-            test("And it's Ethereum mainnet", () => {
-                expect(() => (0, studio_1.validateStudioNetwork)({
-                    studio: true,
-                    network: 'mainnet',
-                })).not.toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${studio_1.allowedStudioNetworks.join(', ')}`));
-            });
-            test("And it's Gnosis chain", () => {
-                expect(() => (0, studio_1.validateStudioNetwork)({
-                    studio: true,
-                    network: 'gnosis',
-                })).not.toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${studio_1.allowedStudioNetworks.join(', ')}`));
-            });
-            test('And no network is passed', () => {
-                expect(() => (0, studio_1.validateStudioNetwork)({
-                    studio: true,
-                    network: undefined,
-                })).not.toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${studio_1.allowedStudioNetworks.join(', ')}`));
-            });
-            test("And it's NOT an allowed network", () => {
-                expect(() => (0, studio_1.validateStudioNetwork)({
-                    product: 'subgraph-studio',
-                    network: 'moonriver',
-                })).toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${studio_1.allowedStudioNetworks.join(', ')}`));
-            });
-        });
-        describe("When it's NOT studio", () => {
-            test("And it's Rinkeby", () => {
-                expect(() => (0, studio_1.validateStudioNetwork)({
-                    studio: false,
-                    network: 'rinkeby',
-                })).not.toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${studio_1.allowedStudioNetworks.join(', ')}`));
-            });
-            test("And it's NOT an allowed network", () => {
-                expect(() => (0, studio_1.validateStudioNetwork)({
-                    product: 'hosted-service',
-                    network: 'celo',
-                })).not.toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${studio_1.allowedStudioNetworks.join(', ')}`));
-            });
-        });
-    });
-});