@graphprotocol/graph-cli 0.38.0-alpha-20230202071921-0765b2f → 0.38.0

package/CHANGELOG.md

@@ -1,9 +1,13 @@
 # @graphprotocol/graph-cli
 
-## 0.38.0-alpha-20230202071921-0765b2f
+## 0.38.0
 
 ### Minor Changes
 
+- [#1049](https://github.com/graphprotocol/graph-tooling/pull/1049)
+  [`18cf83f`](https://github.com/graphprotocol/graph-tooling/commit/18cf83fe1ec703fdc74fa03f898e2ca8b7e5f1fd)
+  Thanks [@incrypto32](https://github.com/incrypto32)! - Add startBlock prompt
+
 - [#1053](https://github.com/graphprotocol/graph-tooling/pull/1053)
   [`bc82507`](https://github.com/graphprotocol/graph-tooling/commit/bc8250763799ae2871c5d5b67c279c673329bcbc)
   Thanks [@saihaj](https://github.com/saihaj)! - Remove arbitrum-rinkeby to add arbitrum-goerli

package/dist/command-helpers/scaffold.js

@@ -24,7 +24,7 @@ const generateDataSource = async (protocol, contractName, network, contractAddre
     }))).asMutable();
 };
 exports.generateDataSource = generateDataSource;
-const generateScaffold = async ({ protocolInstance, abi, contract, network, subgraphName, indexEvents, contractName = 'Contract', node, }, spinner) => {
+const generateScaffold = async ({ protocolInstance, abi, contract, network, subgraphName, indexEvents, contractName = 'Contract', startBlock, node, }, spinner) => {
     (0, spinner_1.step)(spinner, 'Generate subgraph');
     const scaffold = new scaffold_1.default({
         protocol: protocolInstance,
@@ -33,6 +33,7 @@ const generateScaffold = async ({ protocolInstance, abi, contract, network, subg
         contract,
         network,
         contractName,
+        startBlock,
         subgraphName,
         node,
     });

package/dist/commands/init.js

@@ -70,6 +70,7 @@ ${chalk_1.default.dim('Options for --from-contract:')}
 
       --contract-name            Name of the contract (default: Contract)
       --index-events             Index contract events as entities
+      --start-block              Block number to start indexing from (default: 0)
 
 ${chalk_1.default.dim.underline('Ethereum:')}
 
@@ -87,7 +88,7 @@ ${chalk_1.default.dim.underline('Cosmos:')}
       --network <${availableNetworks.get('cosmos').join('|')}>
                                  Selects the network the contract is deployed to
 `;
-const processInitForm = async (toolbox, { protocol, product, studio, node, abi, allowSimpleName, directory, contract, indexEvents, fromExample, network, subgraphName, contractName, }) => {
+const processInitForm = async (toolbox, { protocol, product, studio, node, abi, allowSimpleName, directory, contract, indexEvents, fromExample, network, subgraphName, contractName, startBlock, }) => {
     let abiFromEtherscan = undefined;
     let abiFromFile = undefined;
     let protocolInstance;
@@ -249,6 +250,18 @@ const processInitForm = async (toolbox, { protocol, product, studio, node, abi,
                 }
             },
         },
+        {
+            type: 'input',
+            name: 'startBlock',
+            message: 'Start Block',
+            initial: startBlock || '0',
+            skip: () => fromExample !== undefined || startBlock,
+            validate: (value) => parseInt(value) >= 0,
+            result: (value) => {
+                startBlock = value;
+                return value;
+            },
+        },
         {
             type: 'input',
             name: 'contractName',
@@ -308,7 +321,7 @@ exports.default = {
         // Obtain tools
         const { print, system } = toolbox;
         // Read CLI parameters
-        let { protocol, product, studio, node, g, abi, allowSimpleName, fromContract, contractName, fromExample, h, help, indexEvents, network, } = toolbox.parameters.options;
+        let { protocol, product, studio, node, g, abi, allowSimpleName, fromContract, contractName, fromExample, h, help, indexEvents, network, startBlock, } = toolbox.parameters.options;
         node || (node = g);
         ({ node, allowSimpleName } = (0, node_1.chooseNodeUrl)({
             product,
@@ -415,6 +428,7 @@ exports.default = {
                 node,
                 studio,
                 product,
+                startBlock,
             }, { commands, addContract: false });
         }
         // Otherwise, take the user through the interactive form
@@ -432,6 +446,7 @@ exports.default = {
             network,
             subgraphName,
             contractName,
+            startBlock,
         });
         // Exit immediately when the form is cancelled
         if (inputs === undefined) {
@@ -467,6 +482,7 @@ exports.default = {
                 node,
                 studio: inputs.studio,
                 product: inputs.product,
+                startBlock: inputs.startBlock,
             }, { commands, addContract: true });
         }
     },
@@ -645,7 +661,7 @@ const initSubgraphFromExample = async (toolbox, { fromExample, allowSimpleName,
     }
     printNextSteps(toolbox, { subgraphName, directory }, { commands });
 };
-const initSubgraphFromContract = async (toolbox, { protocolInstance, allowSimpleName, subgraphName, directory, abi, network, contract, indexEvents, contractName, node, studio, product, }, { commands, addContract, }) => {
+const initSubgraphFromContract = async (toolbox, { protocolInstance, allowSimpleName, subgraphName, directory, abi, network, contract, indexEvents, contractName, node, studio, product, startBlock, }, { commands, addContract, }) => {
     const { print } = toolbox;
     // Fail if the subgraph name is invalid
     if (!revalidateSubgraphName(toolbox, subgraphName, { allowSimpleName })) {
@@ -688,6 +704,7 @@ const initSubgraphFromContract = async (toolbox, { protocolInstance, allowSimple
             contract,
             indexEvents,
             contractName,
+            startBlock,
             node,
         }, spinner);
         await (0, scaffold_1.writeScaffold)(scaffold, directory, spinner);

package/dist/protocols/ethereum/scaffold/manifest.js

@@ -7,7 +7,12 @@ exports.mapping = exports.source = void 0;
 const gluegun_1 = require("gluegun");
 const schema_1 = require("../../../scaffold/schema");
 const abi_1 = __importDefault(require("../abi"));
-const source = ({ contract, contractName }) => `
+const source = ({ contract, contractName, startBlock, }) => startBlock
+    ? `
+      address: '${contract}'
+      abi: ${contractName}
+      startBlock: ${startBlock}`
+    : `
       address: '${contract}'
       abi: ${contractName}`;
 exports.source = source;

package/dist/scaffold/ethereum.test.js

@@ -62,6 +62,7 @@ const scaffoldOptions = {
     contract: '0xf87e31492faf9a91b02ee0deaad50d51d56d5d4d',
     network: 'kovan',
     contractName: 'Contract',
+    startBlock: '12345',
 };
 const scaffold = new index_1.default(scaffoldOptions);
 const scaffoldWithIndexEvents = new index_1.default({
@@ -81,6 +82,7 @@ dataSources:
     source:
       address: "0xf87e31492faf9a91b02ee0deaad50d51d56d5d4d"
       abi: Contract
+      startBlock: 12345
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7

package/dist/scaffold/index.js

@@ -25,6 +25,7 @@ class Scaffold {
         this.network = options.network;
         this.contractName = options.contractName;
         this.subgraphName = options.subgraphName;
+        this.startBlock = options.startBlock;
         this.node = options.node;
     }
     generatePackageJson() {

package/package.json

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