@graphprotocol/graph-cli 0.59.0-alpha-20230928172030-9e0d14a → 0.59.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.59.0-alpha-20230928172030-9e0d14a
+## 0.59.0
 
 ### Minor Changes
 
@@ -10,10 +10,6 @@
 
 ### Patch Changes
 
-- [#1461](https://github.com/graphprotocol/graph-tooling/pull/1461)
-  [`a95cc2e`](https://github.com/graphprotocol/graph-tooling/commit/a95cc2e7adb2216c004311d2f5996840a746f905)
-  Thanks [@saihaj](https://github.com/saihaj)! - include user agent for CLI fetch calls
-
 - [#1470](https://github.com/graphprotocol/graph-tooling/pull/1470)
   [`4c1ca35`](https://github.com/graphprotocol/graph-tooling/commit/4c1ca35d7c5cf6ee3aae119d578978e55074f5e9)
   Thanks [@axiomatic-aardvark](https://github.com/axiomatic-aardvark)! - Update 'test' command to
@@ -32,16 +28,6 @@
   [`129d003`](https://github.com/graphprotocol/graph-tooling/commit/129d003838b9b138391835f5a03b21aa05c34e15)
   Thanks [@pustovalov](https://github.com/pustovalov)! - fix ABI api endpoint aurora networks
 
-- [#1461](https://github.com/graphprotocol/graph-tooling/pull/1461)
-  [`66cee74`](https://github.com/graphprotocol/graph-tooling/commit/66cee7421debef12b41744a270e586786daa4286)
-  Thanks [@saihaj](https://github.com/saihaj)! - send graph cli version as user agent for all third
-  party API calls
-
-- [#1461](https://github.com/graphprotocol/graph-tooling/pull/1461)
-  [`66cee74`](https://github.com/graphprotocol/graph-tooling/commit/66cee7421debef12b41744a270e586786daa4286)
-  Thanks [@saihaj](https://github.com/saihaj)! - send graph cli version as user agent for all ipfs
-  requests
-
 ## 0.58.0
 
 ### Minor Changes

package/dist/{src/command-helpers → command-helpers}/abi.js

@@ -5,12 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadAbiFromBlockScout = exports.getStartBlockForContract = exports.fetchTransactionByHashFromRPC = exports.fetchContractCreationHashWithRetry = exports.fetchDeployContractTransactionFromEtherscan = exports.loadStartBlockForContract = exports.loadAbiFromEtherscan = void 0;
 const immutable_1 = __importDefault(require("immutable"));
-const constants_1 = require("../constants");
-const fetch_1 = __importDefault(require("../fetch"));
+const fetch_1 = require("@whatwg-node/fetch");
 const spinner_1 = require("./spinner");
 const loadAbiFromEtherscan = async (ABICtor, network, address) => await (0, spinner_1.withSpinner)(`Fetching ABI from Etherscan`, `Failed to fetch ABI from Etherscan`, `Warnings while fetching ABI from Etherscan`, async () => {
     const scanApiUrl = getEtherscanLikeAPIUrl(network);
-    const result = await (0, fetch_1.default)(`${scanApiUrl}?module=contract&action=getabi&address=${address}`);
+    const result = await (0, fetch_1.fetch)(`${scanApiUrl}?module=contract&action=getabi&address=${address}`);
     const json = await result.json();
     // Etherscan returns a JSON object that has a `status`, a `message` and
     // a `result` field. The `status` is '0' in case of errors and '1' in
@@ -38,7 +37,7 @@ const fetchContractCreationHashWithRetry = async (url, retryCount) => {
     let json;
     for (let i = 0; i < retryCount; i++) {
         try {
-            const result = await (0, fetch_1.default)(url);
+            const result = await (0, fetch_1.fetch)(url);
             json = await result.json();
             if (json.status !== '0') {
                 return json;
@@ -58,11 +57,10 @@ const fetchTransactionByHashFromRPC = async (network, transactionHash) => {
         const RPCURL = getPublicRPCEndpoint(network);
         if (!RPCURL)
             throw new Error(`Unable to fetch RPC URL for ${network}`);
-        const result = await (0, fetch_1.default)(String(RPCURL), {
+        const result = await (0, fetch_1.fetch)(String(RPCURL), {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
-                ...constants_1.GRAPH_CLI_SHARED_HEADERS,
             },
             body: JSON.stringify({
                 jsonrpc: '2.0',
@@ -91,7 +89,7 @@ const getStartBlockForContract = async (network, address) => {
 };
 exports.getStartBlockForContract = getStartBlockForContract;
 const loadAbiFromBlockScout = async (ABICtor, network, address) => await (0, spinner_1.withSpinner)(`Fetching ABI from BlockScout`, `Failed to fetch ABI from BlockScout`, `Warnings while fetching ABI from BlockScout`, async () => {
-    const result = await (0, fetch_1.default)(`https://blockscout.com/${network.replace('-', '/')}/api?module=contract&action=getabi&address=${address}`);
+    const result = await (0, fetch_1.fetch)(`https://blockscout.com/${network.replace('-', '/')}/api?module=contract&action=getabi&address=${address}`);
     const json = await result.json();
     // BlockScout returns a JSON object that has a `status`, a `message` and
     // a `result` field. The `status` is '0' in case of errors and '1' in

package/dist/{src/command-helpers → command-helpers}/compiler.js

@@ -31,7 +31,6 @@ const url_1 = require("url");
 const toolbox = __importStar(require("gluegun"));
 const ipfs_http_client_1 = require("ipfs-http-client");
 const compiler_1 = __importDefault(require("../compiler"));
-const constants_1 = require("../constants");
 /**
  * Appends /api/v0 to the end of a The Graph IPFS URL
  */
@@ -62,13 +61,7 @@ The IPFS URL must be of the following format: http(s)://host[:port]/[path]`);
     }
     // Connect to the IPFS node (if a node address was provided)
     const ipfsClient = ipfs
-        ? (0, ipfs_http_client_1.create)({
-            url: appendApiVersionForGraph(ipfs.toString()),
-            headers: {
-                ...headers,
-                ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-            },
-        })
+        ? (0, ipfs_http_client_1.create)({ url: appendApiVersionForGraph(ipfs.toString()), headers })
         : undefined;
     return new compiler_1.default({
         ipfs: ipfsClient,

package/dist/{src/command-helpers → command-helpers}/node.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHostedServiceSubgraphId = exports.chooseNodeUrl = exports.normalizeNodeUrl = exports.validateNodeUrl = void 0;
 const url_1 = require("url");
 const gluegun_1 = require("gluegun");
-const constants_1 = require("../constants");
 const SUBGRAPH_STUDIO_URL = 'https://api.studio.thegraph.com/deploy/';
 const HOSTED_SERVICE_URL = 'https://api.thegraph.com/deploy/';
 const HOSTED_SERVICE_INDEX_NODE_URL = 'https://api.thegraph.com/index-node/graphql';
@@ -59,7 +58,7 @@ async function getHostedServiceSubgraphId({ subgraphName, }) {
         }),
         headers: {
             'content-type': 'application/json',
-            ...constants_1.GRAPH_CLI_SHARED_HEADERS,
+            'User-Agent': '@graphprotocol/graph-cli',
         },
     });
     const { data, errors } = await response.json();

package/dist/{src/commands → commands}/create.js

@@ -6,7 +6,6 @@ const core_1 = require("@oclif/core");
 const auth_1 = require("../command-helpers/auth");
 const jsonrpc_1 = require("../command-helpers/jsonrpc");
 const node_1 = require("../command-helpers/node");
-const constants_1 = require("../constants");
 class CreateCommand extends core_1.Command {
     async run() {
         const { args: { 'subgraph-name': subgraphName }, flags: { 'access-token': accessTokenFlag, node }, } = await this.parse(CreateCommand);
@@ -27,10 +26,7 @@ class CreateCommand extends core_1.Command {
         const accessToken = await (0, auth_1.identifyDeployKey)(node, accessTokenFlag);
         if (accessToken !== undefined && accessToken !== null) {
             // @ts-expect-error options property seems to exist
-            client.options.headers = {
-                ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-                Authorization: `Bearer ${accessToken}`,
-            };
+            client.options.headers = { Authorization: `Bearer ${accessToken}` };
         }
         const spinner = gluegun_1.print.spin(`Creating subgraph in Graph node: ${requestUrl}`);
         client.request('subgraph_create', { name: subgraphName }, (

package/dist/{src/commands → commands}/deploy.js

@@ -40,7 +40,6 @@ 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"));
 const headersFlag = core_1.Flags.custom({
     summary: 'Add custom headers that will be used by the IPFS HTTP client.',
@@ -87,10 +86,7 @@ class DeployCommand extends core_1.Command {
                 this.error('No deploy key available');
             }
             // @ts-expect-error options property seems to exist
-            client.options.headers = {
-                ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-                Authorization: 'Bearer ' + deployKey,
-            };
+            client.options.headers = { Authorization: 'Bearer ' + deployKey };
             const subgraphName = await core_1.ux.prompt('What is the name of the subgraph you want to deploy?', {
                 required: true,
             });
@@ -198,10 +194,7 @@ class DeployCommand extends core_1.Command {
         deployKey = await (0, auth_1.identifyDeployKey)(node, deployKey);
         if (deployKey !== undefined && deployKey !== null) {
             // @ts-expect-error options property seems to exist
-            client.options.headers = {
-                ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-                Authorization: 'Bearer ' + deployKey,
-            };
+            client.options.headers = { Authorization: 'Bearer ' + deployKey };
         }
         // Ask for label if not on hosted service
         let versionLabel = versionLabelFlag;
@@ -278,10 +271,7 @@ class DeployCommand extends core_1.Command {
             // 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: {
-                    ...headers,
-                    ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-                },
+                headers,
             });
             // Fetch the manifest from IPFS
             const manifestBuffer = ipfsClient.cat(ipfsHash);

package/dist/{src/commands → commands}/remove.js

@@ -6,7 +6,6 @@ const core_1 = require("@oclif/core");
 const auth_1 = require("../command-helpers/auth");
 const jsonrpc_1 = require("../command-helpers/jsonrpc");
 const node_1 = require("../command-helpers/node");
-const constants_1 = require("../constants");
 class RemoveCommand extends core_1.Command {
     async run() {
         const { args: { 'subgraph-name': subgraphName }, flags: { 'access-token': accessTokenFlag, node }, } = await this.parse(RemoveCommand);
@@ -27,10 +26,7 @@ class RemoveCommand extends core_1.Command {
         const accessToken = await (0, auth_1.identifyDeployKey)(node, accessTokenFlag);
         if (accessToken !== undefined && accessToken !== null) {
             // @ts-expect-error options property seems to exist
-            client.options.headers = {
-                ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-                Authorization: `Bearer ${accessToken}`,
-            };
+            client.options.headers = { Authorization: `Bearer ${accessToken}` };
         }
         const spinner = gluegun_1.print.spin(`Creating subgraph in Graph node: ${requestUrl}`);
         client.request('subgraph_remove', { name: subgraphName }, (

package/dist/{src/commands → commands}/test.js

@@ -11,8 +11,7 @@ const gluegun_1 = require("gluegun");
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const semver_1 = __importDefault(require("semver"));
 const core_1 = require("@oclif/core");
-const constants_1 = require("../constants");
-const fetch_1 = __importDefault(require("../fetch"));
+const fetch_1 = require("@whatwg-node/fetch");
 class TestCommand extends core_1.Command {
     async run() {
         const { args: { datasource }, flags: { coverage, docker, force, logs, recompile, version }, } = await this.parse(TestCommand);
@@ -49,9 +48,9 @@ class TestCommand extends core_1.Command {
         // Fetch the latest version tag if version is not specified with -v/--version or if the version is not cached
         if (opts.force || (!opts.version && !opts.latestVersion)) {
             this.log('Fetching latest version tag...');
-            const result = await (0, fetch_1.default)('https://api.github.com/repos/LimeChain/matchstick/releases/latest', {
+            const result = await (0, fetch_1.fetch)('https://api.github.com/repos/LimeChain/matchstick/releases/latest', {
                 headers: {
-                    ...constants_1.GRAPH_CLI_SHARED_HEADERS,
+                    'User-Agent': '@graphprotocol/graph-cli',
                 },
             });
             const json = await result.json();
@@ -282,7 +281,7 @@ async function dockerfile(dockerfilePath, versionOpt, latestVersion) {
     const spinner = gluegun_1.print.spin('Generating Dockerfile...');
     try {
         // Fetch the Dockerfile template content from the demo-subgraph repo
-        const content = await (0, fetch_1.default)('https://raw.githubusercontent.com/LimeChain/demo-subgraph/main/Dockerfile').then(response => {
+        const content = await (0, fetch_1.fetch)('https://raw.githubusercontent.com/LimeChain/demo-subgraph/main/Dockerfile').then(response => {
             if (response.ok) {
                 return response.text();
             }