@graphprotocol/graph-cli 0.50.0-alpha-20230523132328-eb6bf7e → 0.50.0

package/CHANGELOG.md

@@ -1,9 +1,14 @@
 # @graphprotocol/graph-cli
 
-## 0.50.0-alpha-20230523132328-eb6bf7e
+## 0.50.0
 
 ### Minor Changes
 
+- [#1353](https://github.com/graphprotocol/graph-tooling/pull/1353)
+  [`125c687`](https://github.com/graphprotocol/graph-tooling/commit/125c6874e9d2fb67bf9f0211e9f9f306bc6fe55c)
+  Thanks [@saihaj](https://github.com/saihaj)! - Add a new `--ipfs-hash` flag to `graph deploy`
+  allowing to deploy a subgraph that is already compiled and uploaded to IPFS.
+
 - [#1335](https://github.com/graphprotocol/graph-tooling/pull/1335)
   [`7343f50`](https://github.com/graphprotocol/graph-tooling/commit/7343f50c0e2b767de04909e6020b88fea97ae3cd)
   Thanks [@saihaj](https://github.com/saihaj)! - For substreams generate the directory tree as
@@ -48,6 +53,10 @@
   - Updated dependency [`gluegun@5.1.2` ↗︎](https://www.npmjs.com/package/gluegun/v/5.1.2) (from
     `https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep`, in `dependencies`)
 
+- [#1351](https://github.com/graphprotocol/graph-tooling/pull/1351)
+  [`c7cf89c`](https://github.com/graphprotocol/graph-tooling/commit/c7cf89c2b7b60b39bd89473d8440ece2acdcb9a3)
+  Thanks [@saihaj](https://github.com/saihaj)! - return tuple arrays as a Bytes array in GraphQL
+
 - [#1329](https://github.com/graphprotocol/graph-tooling/pull/1329)
   [`308cb8a`](https://github.com/graphprotocol/graph-tooling/commit/308cb8af3fb2cabbad08f409d77481994a95865c)
   Thanks [@saihaj](https://github.com/saihaj)! - Point to new examples repo instead of old

package/dist/codegen/types/conversions.js

@@ -295,6 +295,7 @@ const ASSEMBLYSCRIPT_TO_VALUE = [
     ],
     ['Array<Array<string>>', /\[\[.*\]\]/, (code) => `Value.fromStringMatrix(${code})`],
     ['Array<Array<string | null>>', null, (code) => `Value.fromStringMatrix(${code})`],
+    ['Array<ethereum.Tuple>', '[Bytes]', (code) => `Value.fromArray(${code})`],
     // Arrays
     ['Array<Address>', '[Bytes]', (code) => `Value.fromBytesArray(${code})`],
     ['Array<Bytes>', '[Bytes]', (code) => `Value.fromBytesArray(${code})`],

package/dist/command-helpers/data-sources.d.ts

@@ -1,4 +1,5 @@
 import immutable from 'immutable';
 import Protocol from '../protocols';
 export declare const fromFilePath: (manifestPath: string) => Promise<any>;
+export declare function fromManifestString(manifest: string): any;
 export declare const fromManifest: (manifest: immutable.Map<any, any>, protocol: Protocol) => any;

package/dist/command-helpers/data-sources.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromManifest = exports.fromFilePath = void 0;
+exports.fromManifest = exports.fromManifestString = exports.fromFilePath = void 0;
+const js_yaml_1 = __importDefault(require("js-yaml"));
 const immutable_1 = __importDefault(require("immutable"));
 const load_manifest_1 = require("../migrations/util/load-manifest");
 // Loads manifest from file path and returns all:
@@ -15,6 +16,16 @@ const fromFilePath = async (manifestPath) => {
     return dataSources.concat(templates);
 };
 exports.fromFilePath = fromFilePath;
+// Loads manifest from file path and returns all:
+// - data sources
+// - templates
+// In a single list.
+function fromManifestString(manifest) {
+    // TODO: can we make it typesafe?
+    const { dataSources = [], templates = [] } = (js_yaml_1.default.safeLoad(manifest) || {});
+    return dataSources.concat(templates);
+}
+exports.fromManifestString = fromManifestString;
 const extractDataSourceByType = (manifest, dataSourceType, protocol) => manifest
     .get(dataSourceType, immutable_1.default.List())
     .reduce((dataSources, dataSource, dataSourceIndex) => protocol.isValidKindName(dataSource.get('kind'))

package/dist/commands/deploy.d.ts

@@ -14,6 +14,7 @@ export default class DeployCommand extends Command {
         'access-token': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'version-label': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         ipfs: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'ipfs-hash': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         headers: import("@oclif/core/lib/interfaces").OptionFlag<Record<string, string> | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'debug-fork': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

package/dist/commands/deploy.js

@@ -40,6 +40,7 @@ const node_1 = require("../command-helpers/node");
 const studio_1 = require("../command-helpers/studio");
 const version_1 = require("../command-helpers/version");
 const protocols_1 = __importDefault(require("../protocols"));
+const ipfs_http_client_1 = require("ipfs-http-client");
 const headersFlag = core_1.Flags.custom({
     summary: 'Add custom headers that will be used by the IPFS HTTP client.',
     aliases: ['hdr'],
@@ -49,7 +50,7 @@ const headersFlag = core_1.Flags.custom({
 const productOptions = ['subgraph-studio', 'hosted-service'];
 class DeployCommand extends core_1.Command {
     async run() {
-        const { args: { 'subgraph-name': subgraphNameArg, 'subgraph-manifest': manifest }, flags: { product: productFlag, studio, 'deploy-key': deployKeyFlag, 'access-token': accessToken, 'version-label': versionLabelFlag, ipfs, headers, node: nodeFlag, 'output-dir': outputDir, 'skip-migrations': skipMigrations, watch, 'debug-fork': debugFork, network, 'network-file': networkFile, }, } = await this.parse(DeployCommand);
+        const { args: { 'subgraph-name': subgraphNameArg, 'subgraph-manifest': manifest }, flags: { product: productFlag, studio, 'deploy-key': deployKeyFlag, 'access-token': accessToken, 'version-label': versionLabelFlag, ipfs, headers, node: nodeFlag, 'output-dir': outputDir, 'skip-migrations': skipMigrations, watch, 'debug-fork': debugFork, network, 'network-file': networkFile, 'ipfs-hash': ipfsHash, }, } = await this.parse(DeployCommand);
         const subgraphName = subgraphNameArg ||
             (await core_1.ux.prompt('What is the subgraph name?', {
                 required: true,
@@ -71,15 +72,6 @@ class DeployCommand extends core_1.Command {
                         },
                     ])
                         .then(({ product }) => product));
-        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 });
-        }
         const { node } = (0, node_1.chooseNodeUrl)({
             product,
             studio,
@@ -89,49 +81,8 @@ class DeployCommand extends core_1.Command {
             // shouldn't happen, but we do the check to satisfy TS
             this.error('No Graph node provided');
         }
-        let protocol;
-        try {
-            // Checks to make sure deploy doesn't run against
-            // older subgraphs (both apiVersion and graph-ts version).
-            //
-            // We don't want the deploy to run without these conditions
-            // because that would mean the CLI would try to compile code
-            // using the wrong AssemblyScript compiler.
-            await (0, version_1.assertManifestApiVersion)(manifest, '0.0.5');
-            await (0, version_1.assertGraphTsVersion)(path_1.default.dirname(manifest), '0.25.0');
-            const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifest);
-            protocol = protocols_1.default.fromDataSources(dataSourcesAndTemplates);
-        }
-        catch (e) {
-            this.error(e, { exit: 1 });
-        }
-        if (network) {
-            const identifierName = protocol.getContract().identifierName();
-            await (0, network_1.updateSubgraphNetwork)(manifest, network, networkFile, identifierName);
-        }
         const isStudio = node.match(/studio/);
         const isHostedService = node.match(/thegraph.com/) && !isStudio;
-        const compiler = (0, compiler_1.createCompiler)(manifest, {
-            ipfs,
-            headers,
-            outputDir,
-            outputFormat: 'wasm',
-            skipMigrations,
-            blockIpfsMethods: isStudio || undefined,
-            protocol,
-        });
-        // Exit with an error code if the compiler couldn't be created
-        if (!compiler) {
-            this.exit(1);
-            return;
-        }
-        // Ask for label if not on hosted service
-        let versionLabel = versionLabelFlag;
-        if (!versionLabel && !isHostedService) {
-            versionLabel = await core_1.ux.prompt('Which version label to use? (e.g. "v0.0.1")', {
-                required: true,
-            });
-        }
         const requestUrl = new url_1.URL(node);
         const client = (0, jsonrpc_1.createJsonRpcClient)(requestUrl);
         // Exit with an error code if the client couldn't be created
@@ -149,6 +100,13 @@ class DeployCommand extends core_1.Command {
             // @ts-expect-error options property seems to exist
             client.options.headers = { Authorization: 'Bearer ' + deployKey };
         }
+        // Ask for label if not on hosted service
+        let versionLabel = versionLabelFlag;
+        if (!versionLabel && !isHostedService) {
+            versionLabel = await core_1.ux.prompt('Which version label to use? (e.g. "v0.0.1")', {
+                required: true,
+            });
+        }
         // eslint-disable-next-line @typescript-eslint/no-this-alias -- request needs it
         const self = this;
         const deploySubgraph = async (ipfsHash) => {
@@ -175,8 +133,8 @@ class DeployCommand extends core_1.Command {
                         }
                         else {
                             errorMessage += `
-Make sure to create the subgraph first by running the following command:
-$ graph create --node ${node} ${subgraphName}`;
+      Make sure to create the subgraph first by running the following command:
+      $ graph create --node ${node} ${subgraphName}`;
                         }
                     }
                     self.error(errorMessage, { exit: 1 });
@@ -206,9 +164,79 @@ $ graph create --node ${node} ${subgraphName}`;
                     gluegun_1.print.info('\nSubgraph endpoints:');
                     gluegun_1.print.info(`Queries (HTTP):     ${queries}`);
                     gluegun_1.print.info(``);
+                    process.exit(0);
                 }
             });
         };
+        // we are provided the IPFS hash, so we deploy directly
+        if (ipfsHash) {
+            // Connect to the IPFS node (if a node address was provided)
+            const ipfsClient = (0, ipfs_http_client_1.create)({ url: (0, compiler_1.appendApiVersionForGraph)(ipfs.toString()), headers });
+            // Fetch the manifest from IPFS
+            const manifestBuffer = ipfsClient.cat(ipfsHash);
+            let manifestFile = '';
+            for await (const chunk of manifestBuffer) {
+                manifestFile += chunk.toString();
+            }
+            if (!manifestFile) {
+                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
+            // older subgraphs (both apiVersion and graph-ts version).
+            //
+            // We don't want the deploy to run without these conditions
+            // because that would mean the CLI would try to compile code
+            // using the wrong AssemblyScript compiler.
+            await (0, version_1.assertManifestApiVersion)(manifest, '0.0.5');
+            await (0, version_1.assertGraphTsVersion)(path_1.default.dirname(manifest), '0.25.0');
+            const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifest);
+            protocol = protocols_1.default.fromDataSources(dataSourcesAndTemplates);
+        }
+        catch (e) {
+            this.error(e, { exit: 1 });
+        }
+        if (network) {
+            const identifierName = protocol.getContract().identifierName();
+            await (0, network_1.updateSubgraphNetwork)(manifest, network, networkFile, identifierName);
+        }
+        const compiler = (0, compiler_1.createCompiler)(manifest, {
+            ipfs,
+            headers,
+            outputDir,
+            outputFormat: 'wasm',
+            skipMigrations,
+            blockIpfsMethods: isStudio || undefined,
+            protocol,
+        });
+        // Exit with an error code if the compiler couldn't be created
+        if (!compiler) {
+            this.exit(1);
+            return;
+        }
         if (watch) {
             await compiler.watchAndCompile(async (ipfsHash) => {
                 if (ipfsHash !== undefined) {
@@ -268,6 +296,10 @@ DeployCommand.flags = {
         char: 'i',
         default: ipfs_1.DEFAULT_IPFS_URL,
     }),
+    'ipfs-hash': core_1.Flags.string({
+        summary: 'IPFS hash of the subgraph manifest to deploy.',
+        required: false,
+    }),
     headers: headersFlag(),
     'debug-fork': core_1.Flags.string({
         summary: 'ID of a remote subgraph whose store will be GraphQL queried.',

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.50.0-alpha-20230523132328-eb6bf7e",
+  "version": "0.50.0",
   "commands": {
     "add": {
       "id": "add",
@@ -362,6 +362,13 @@
           "multiple": false,
           "default": "https://api.thegraph.com/ipfs/api/v0"
         },
+        "ipfs-hash": {
+          "name": "ipfs-hash",
+          "type": "option",
+          "summary": "IPFS hash of the subgraph manifest to deploy.",
+          "required": false,
+          "multiple": false
+        },
         "headers": {
           "name": "headers",
           "type": "option",

package/package.json

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