@graphprotocol/graph-cli 0.52.1-alpha-20230719162130-b3c9686 → 0.52.1-alpha-20230719201219-dde01c9

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.52.1-alpha-20230719162130-b3c9686
+## 0.52.1-alpha-20230719201219-dde01c9
 
 ### Patch Changes
 
@@ -9,10 +9,10 @@
   Thanks [@saihaj](https://github.com/saihaj)! - only update `network.json` file during `graph add`
   if it exists
 
-- [#1402](https://github.com/graphprotocol/graph-tooling/pull/1402)
-  [`b3c9686`](https://github.com/graphprotocol/graph-tooling/commit/b3c96864a2566d45e75bcd858c1cae2df12b0275)
-  Thanks [@saihaj](https://github.com/saihaj)! - show a descriptive error message and do not hang if
-  there is a deploy key issue
+- [#1403](https://github.com/graphprotocol/graph-tooling/pull/1403)
+  [`dde01c9`](https://github.com/graphprotocol/graph-tooling/commit/dde01c95527b6473e0eda6a533aa524d83f41e7c)
+  Thanks [@saihaj](https://github.com/saihaj)! - do not ask for local path when trying to add more
+  contracts during init
 
 - [#1400](https://github.com/graphprotocol/graph-tooling/pull/1400)
   [`e7423aa`](https://github.com/graphprotocol/graph-tooling/commit/e7423aa5a73a5b8a7919f92c558c49fe61be9c23)

package/dist/commands/deploy.js

@@ -107,6 +107,8 @@ class DeployCommand extends core_1.Command {
                 required: true,
             });
         }
+        // eslint-disable-next-line @typescript-eslint/no-this-alias -- request needs it
+        const self = this;
         const deploySubgraph = async (ipfsHash) => {
             const spinner = gluegun_1.print.spin(`Deploying to Graph node ${requestUrl}`);
             client.request('subgraph_deploy', {
@@ -135,11 +137,7 @@ class DeployCommand extends core_1.Command {
       $ graph create --node ${node} ${subgraphName}`;
                         }
                     }
-                    if (jsonRpcError.message.match(/auth failure/)) {
-                        errorMessage += '\nYou may need to authenticate first.';
-                    }
-                    spinner.fail(errorMessage);
-                    this.exit(1);
+                    self.error(errorMessage, { exit: 1 });
                 }
                 else if (requestError) {
                     spinner.fail(`HTTP error deploying the subgraph ${requestError.code}`);
@@ -173,10 +171,7 @@ class DeployCommand extends core_1.Command {
         // 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,
-            });
+            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 = '';

package/dist/commands/init.js

@@ -277,7 +277,9 @@ async function processFromExampleInitForm({ directory: initDirectory, subgraphNa
                 initial: initSubgraphName,
                 validate: name => {
                     try {
-                        (0, subgraph_1.validateSubgraphName)(name, { allowSimpleName: initAllowSimpleName });
+                        (0, subgraph_1.validateSubgraphName)(name, {
+                            allowSimpleName: initAllowSimpleName,
+                        });
                         return true;
                     }
                     catch (e) {
@@ -360,7 +362,9 @@ async function processInitForm({ protocol: initProtocol, product: initProduct, s
                 initial: initSubgraphName,
                 validate: name => {
                     try {
-                        (0, subgraph_1.validateSubgraphName)(name, { allowSimpleName: initAllowSimpleName });
+                        (0, subgraph_1.validateSubgraphName)(name, {
+                            allowSimpleName: initAllowSimpleName,
+                        });
                         return true;
                     }
                     catch (e) {
@@ -819,7 +823,10 @@ async function initSubgraphFromContract({ protocolInstance, allowSimpleName, sub
             return;
         }
         while (addContract) {
-            addContract = await addAnotherContract.bind(this)({ protocolInstance, directory });
+            addContract = await addAnotherContract.bind(this)({
+                protocolInstance,
+                directory,
+            });
         }
     }
     printNextSteps.bind(this)({ subgraphName, directory }, { commands });
@@ -831,7 +838,6 @@ async function addAnotherContract({ protocolInstance, directory, }) {
     });
     const addContractConfirmation = addContractAnswer.toLowerCase() === 'y';
     if (addContractConfirmation) {
-        let abiFromFile = false;
         const ProtocolContract = protocolInstance.getContract();
         let contract = '';
         for (;;) {
@@ -844,15 +850,6 @@ async function addAnotherContract({ protocolInstance, directory, }) {
             }
             this.log(`✖ ${error}`);
         }
-        const localAbi = await core_1.ux.prompt('\nProvide local ABI path? (y/n)', {
-            required: true,
-            type: 'single',
-        });
-        abiFromFile = localAbi.toLowerCase() === 'y';
-        let abiPath = '';
-        if (abiFromFile) {
-            abiPath = await core_1.ux.prompt('\nABI file (path)', { required: true });
-        }
         const contractName = await core_1.ux.prompt('\nContract Name', {
             required: true,
             default: 'Contract',
@@ -864,14 +861,6 @@ async function addAnotherContract({ protocolInstance, directory, }) {
                 process.chdir(directory);
             }
             const commandLine = [contract, '--contract-name', contractName];
-            if (abiFromFile) {
-                if (abiPath.includes(directory)) {
-                    commandLine.push('--abi', path_1.default.normalize(abiPath.replace(directory, '')));
-                }
-                else {
-                    commandLine.push('--abi', abiPath);
-                }
-            }
             await add_1.default.run(commandLine);
         }
         catch (e) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.52.1-alpha-20230719162130-b3c9686",
+  "version": "0.52.1-alpha-20230719201219-dde01c9",
   "commands": {
     "add": {
       "id": "add",

package/package.json

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