@graphprotocol/graph-cli 0.42.0-rc-20230223152152-ba48e50 → 0.42.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.42.0-rc-20230223152152-ba48e50
+## 0.42.0
 
 ### Minor Changes
 
@@ -8,6 +8,10 @@
   [`2ebd032`](https://github.com/graphprotocol/graph-tooling/commit/2ebd0326cab00efc9abad7ad4287cee20a8cfea2)
   Thanks [@incrypto32](https://github.com/incrypto32)! - Add base scan URL
 
+- [#1068](https://github.com/graphprotocol/graph-tooling/pull/1068)
+  [`1e3195d`](https://github.com/graphprotocol/graph-tooling/commit/1e3195d365bd445f8bd6ba3f1c3b66be20510b94)
+  Thanks [@incrypto32](https://github.com/incrypto32)! - Add startblock auto fetch for `add` command
+
 - [#1079](https://github.com/graphprotocol/graph-tooling/pull/1079)
   [`570eb22`](https://github.com/graphprotocol/graph-tooling/commit/570eb225fad705998cca3998879a6a1140a73143)
   Thanks [@incrypto32](https://github.com/incrypto32)! - Remove optimism-kovan, Add optimism-goerli

package/dist/command-helpers/scaffold.js

@@ -15,9 +15,9 @@ const mapping_1 = require("../scaffold/mapping");
 const schema_1 = require("../scaffold/schema");
 const tests_1 = require("../scaffold/tests");
 const spinner_1 = require("./spinner");
-const generateDataSource = async (protocol, contractName, network, contractAddress, abi) => {
+const generateDataSource = async (protocol, contractName, network, contractAddress, abi, startBlock) => {
     const protocolManifest = protocol.getManifestScaffold();
-    return immutable_1.Map.of('kind', protocol.name, 'name', contractName, 'network', network, 'source', yaml_1.default.parse(prettier_1.default.format(protocolManifest.source({ contract: contractAddress, contractName }), {
+    return immutable_1.Map.of('kind', protocol.name, 'name', contractName, 'network', network, 'source', yaml_1.default.parse(prettier_1.default.format(protocolManifest.source({ contract: contractAddress, contractName, startBlock }), {
         parser: 'yaml',
     })), 'mapping', yaml_1.default.parse(prettier_1.default.format(protocolManifest.mapping({ abi, contractName }), {
         parser: 'yaml',

package/dist/commands/add.js

@@ -40,12 +40,13 @@ const abi_2 = __importDefault(require("../protocols/ethereum/abi"));
 const subgraph_1 = __importDefault(require("../subgraph"));
 class AddCommand extends core_1.Command {
     async run() {
-        const { args: { address, 'subgraph-manifest': manifestPath }, flags: { abi, 'contract-name': contractName, 'merge-entities': mergeEntities, 'network-file': networksFile, }, } = await this.parse(AddCommand);
+        const { args: { address, 'subgraph-manifest': manifestPath }, flags: { abi, 'contract-name': contractName, 'merge-entities': mergeEntities, 'network-file': networksFile, 'start-block': startBlockFlag, }, } = await this.parse(AddCommand);
         const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifestPath);
         const protocol = protocols_1.default.fromDataSources(dataSourcesAndTemplates);
         const manifest = await subgraph_1.default.load(manifestPath, { protocol });
         const network = manifest.result.getIn(['dataSources', 0, 'network']);
         const result = manifest.result.asMutable();
+        let startBlock = startBlockFlag;
         const entities = getEntities(manifest);
         const contractNames = getContractNames(manifest);
         if (contractNames.includes(contractName)) {
@@ -61,6 +62,13 @@ class AddCommand extends core_1.Command {
         else {
             ethabi = await (0, abi_1.loadAbiFromEtherscan)(abi_2.default, network, address);
         }
+        try {
+            startBlock || (startBlock = Number(await (0, abi_1.loadStartBlockForContract)(network, address)).toString());
+        }
+        catch (error) {
+            // If we can't get the start block, we'll just leave it out of the manifest
+            // TODO: Ask the user for the start block
+        }
         const { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(ethabi, entities, contractName, mergeEntities);
         ethabi.data = abiData;
         await (0, scaffold_1.writeABI)(ethabi, contractName);
@@ -68,7 +76,7 @@ class AddCommand extends core_1.Command {
         await (0, scaffold_1.writeMapping)(ethabi, protocol, contractName, collisionEntities);
         await (0, scaffold_1.writeTestsFiles)(ethabi, protocol, contractName);
         const dataSources = result.get('dataSources');
-        const dataSource = await (0, scaffold_1.generateDataSource)(protocol, contractName, network, address, ethabi);
+        const dataSource = await (0, scaffold_1.generateDataSource)(protocol, contractName, network, address, ethabi, startBlock);
         // Handle the collisions edge case by copying another data source yaml data
         if (mergeEntities && onlyCollisions) {
             const firstDataSource = dataSources.get(0);
@@ -113,6 +121,10 @@ AddCommand.flags = {
         summary: 'Path to the contract ABI.',
         default: '*Download from Etherscan*',
     }),
+    'start-block': core_1.Flags.string({
+        summary: 'The block number to start indexing events from.',
+        default: '*Zero*',
+    }),
     'contract-name': core_1.Flags.string({
         summary: 'Name of the contract.',
         default: 'Contract',

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.42.0-rc-20230223152152-ba48e50",
+  "version": "0.42.0",
   "commands": {
     "add": {
       "id": "add",
@@ -24,6 +24,13 @@
           "multiple": false,
           "default": "*Download from Etherscan*"
         },
+        "start-block": {
+          "name": "start-block",
+          "type": "option",
+          "summary": "The block number to start indexing events from.",
+          "multiple": false,
+          "default": "*Zero*"
+        },
         "contract-name": {
           "name": "contract-name",
           "type": "option",

package/package.json

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