fix: honor --contract-name and --start-block

.changeset/heavy-socks-cross.md

@@ -0,0 +1,5 @@
+---
+'@graphprotocol/graph-cli': patch
+---
+
+Fix `graph add` flag parameters parsing

packages/cli/src/commands/add.ts

@@ -79,18 +79,9 @@ export default class AddCommand extends Command {
     const registry = await loadRegistry();
     const contractService = new ContractService(registry);
 
-    let startBlock = startBlockFlag;
+    let startBlock = startBlockFlag ? parseInt(startBlockFlag).toString() : startBlockFlag;
     let contractName = contractNameFlag;
 
-    const entities = getEntities(manifest);
-    const contractNames = getContractNames(manifest);
-    if (contractNames.includes(contractName)) {
-      this.error(
-        `Datasource or template with name ${contractName} already exists, please choose a different name.`,
-        { exit: 1 },
-      );
-    }
-
     let ethabi = null;
     if (abi) {
       ethabi = EthereumABI.load(contractName, abi);
@@ -139,7 +130,6 @@ export default class AddCommand extends Command {
 
     try {
       if (isLocalHost) throw Error; // Triggers user prompting without waiting for Etherscan lookup to fail
-
       startBlock ||= Number(await contractService?.getStartBlock(network, address)).toString();
     } catch (error) {
       // we cannot ask user to do prompt in test environment
@@ -163,7 +153,6 @@ export default class AddCommand extends Command {
 
     try {
       if (isLocalHost) throw Error; // Triggers user prompting without waiting for Etherscan lookup to fail
-
       contractName = (await contractService?.getContractName(network, address)) ?? '';
     } catch (error) {
       // not asking user to do prompt in test environment
@@ -184,6 +173,15 @@ export default class AddCommand extends Command {
       }
     }
 
+    const entities = getEntities(manifest);
+    const contractNames = getContractNames(manifest);
+    if (contractNames.includes(contractName)) {
+      this.error(
+        `Datasource or template with name ${contractName} already exists, please choose a different name.`,
+        { exit: 1 },
+      );
+    }
+
     await writeABI(ethabi, contractName);
 
     const { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(

packages/cli/tests/cli/add.test.ts

@@ -19,6 +19,8 @@ describe('Add command', () => {
         '0x2E645469f354BB4F5c8a05B3b30A929361cf77eC',
         '--contract-name',
         'Gravatar',
+        '--start-block',
+        '6175244',
         '--abi',
         `${EXAMPLE_SUBGRAPH_PATH}/abis/Gravity.json`,
       ],

packages/cli/tests/cli/add/expected/subgraph.yaml

@@ -32,6 +32,7 @@ dataSources:
     source:
       address: "0x2E645469f354BB4F5c8a05B3b30A929361cf77eC"
       abi: Gravatar
+      startBlock: 6175244
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7

renovate.json

@@ -16,11 +16,7 @@
   "rebaseWhen": "conflicted",
   "packageRules": [
     {
-      "excludePackagePatterns": [
-        "typescript",
-        "typedoc*",
-        "^@theguild/"
-      ],
+      "excludePackagePatterns": ["typescript", "typedoc*", "^@theguild/"],
       "matchPackagePatterns": ["*"],
       "matchUpdateTypes": ["minor", "patch"],
       "groupName": "all non-major dependencies",