@graphprotocol/graph-cli 0.31.0 → 0.32.0

package/README.md

@@ -16,6 +16,7 @@ As of today, the command line interface supports the following commands:
 - `graph auth` — Stores a [Graph Node](https://github.com/graphprotocol/graph-node) access token in the system's keychain.
 - `graph local` — Runs tests against a [Graph Node](https://github.com/graphprotocol/graph-node) test environment (using Ganache by default).
 - `graph test` — Downloads and runs the [Matchstick](https://github.com/LimeChain/matchstick) rust binary in order to test a subgraph.
+- `graph add` - Adds a new datasource to the yaml file and writes the necessary changes to other files - schema.graphql, abi and mapping.
 
 ## How It Works
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "license": "(Apache-2.0 OR MIT)",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {

package/src/commands/add.js

@@ -19,12 +19,12 @@ ${chalk.dim('Options:')}
       --abi <path>              Path to the contract ABI (default: download from Etherscan)
       --contract-name           Name of the contract (default: Contract)
       --merge-entities          Whether to merge entities with the same name (default: false)
-      --network-file <path>     Networks file (default: "./networks.json")
+      --network-file <path>     Networks config file path (default: "./networks.json")
   -h, --help                    Show usage information
 `
 
 module.exports = {
-  description: 'Creates a new subgraph with basic scaffolding',
+  description: 'Adds a new datasource to a subgraph',
   run: async toolbox => {
     // Obtain tools
     let { print, system } = toolbox
@@ -104,7 +104,7 @@ module.exports = {
     await writeMapping(ethabi, protocol, contractName, collisionEntities)
 
     let dataSources = result.get('dataSources')
-    let dataSource = await generateDataSource(protocol, 
+    let dataSource = await generateDataSource(protocol,
       contractName, network, address, ethabi)
 
     // Handle the collisions edge case by copying another data source yaml data
@@ -181,12 +181,12 @@ const updateEventNamesOnCollision = (ethabi, entities, contractName, mergeEntiti
     if (dataRow.get('type') === 'event'){
       if (entities.indexOf(dataRow.get('name')) !== -1) {
         if (entities.indexOf(`${contractName}${dataRow.get('name')}`) !== -1) {
-          print.error(`Contract name ('${contractName}') 
+          print.error(`Contract name ('${contractName}')
             + event name ('${dataRow.get('name')}') entity already exists.`)
           process.exitCode = 1
           return
         }
-        
+
         if (mergeEntities) {
           collisionEntities.push(dataRow.get('name'))
           abiData = abiData.asImmutable().delete(i) // needs to be immutable when deleting, yes you read that right - https://github.com/immutable-js/immutable-js/issues/1901

package/src/commands/build.js

@@ -17,8 +17,8 @@ Options:
   -t, --output-format <format>  Output format for mappings (wasm, wast) (default: wasm)
       --skip-migrations         Skip subgraph migrations (default: false)
   -w, --watch                   Regenerate types when subgraph files change (default: false)
-      --network <name>          Network to use from networks.json
-      --network-file <path>    Networks file (default: "./networks.json")
+      --network <name>          Network configuration to use from the networks config file
+      --network-file <path>     Networks config file path (default: "./networks.json")
 `
 
 module.exports = {

package/src/commands/deploy.js

@@ -14,6 +14,7 @@ const { assertManifestApiVersion, assertGraphTsVersion } = require('../command-h
 const DataSourcesExtractor = require('../command-helpers/data-sources')
 const { validateStudioNetwork } = require('../command-helpers/studio')
 const Protocol = require('../protocols')
+const { updateSubgraphNetwork } = require('../command-helpers/network')
 
 const HELP = `
 ${chalk.bold('graph deploy')} [options] ${chalk.bold('<subgraph-name>')} ${chalk.bold(
@@ -35,6 +36,8 @@ Options:
   -o,   --output-dir <path>       Output directory for build results (default: build/)
         --skip-migrations         Skip subgraph migrations (default: false)
   -w,   --watch                   Regenerate types when subgraph files change (default: false)
+        --network <name>          Network configuration to use from the networks config file
+        --network-file <path>     Networks config file path (default: "./networks.json")
 `
 
 const processForm = async (
@@ -52,7 +55,7 @@ const processForm = async (
       name: 'product',
       message: 'Product for which to deploy',
       choices: ['subgraph-studio', 'hosted-service'],
-      skip: 
+      skip:
         product === 'subgraph-studio' ||
         product === 'hosted-service' ||
         studio !== undefined || node !== undefined,
@@ -101,6 +104,8 @@ module.exports = {
       w,
       watch,
       debugFork,
+      network,
+      networkFile,
     } = toolbox.parameters.options
 
     // Support both long and short option variants
@@ -141,6 +146,10 @@ module.exports = {
       manifest !== undefined && manifest !== ''
         ? manifest
         : filesystem.resolve('subgraph.yaml')
+    networkFile =
+      networkFile !== undefined && networkFile !== ''
+        ? networkFile
+        : filesystem.resolve("networks.json")
 
     try {
       const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifest)
@@ -223,6 +232,11 @@ module.exports = {
       return
     }
 
+    if (network) {
+      let identifierName = protocol.getContract().identifierName()
+      await updateSubgraphNetwork(toolbox, manifest, network, networkFile, identifierName)
+    }
+
     const isStudio = node.match(/studio/)
     const isHostedService = node.match(/thegraph.com/) && !isStudio
 

package/src/protocols/near/manifest.graphql

@@ -33,6 +33,12 @@ type DataSource {
 type ContractSource {
   account: String
   startBlock: BigInt
+  accounts: PartialAccount
+}
+
+type PartialAccount {
+  prefixes: [String!]
+  suffixes: [String!]
 }
 
 type ContractMapping {

package/tests/cli/validation/near-is-valid/subgraph.yaml

@@ -10,6 +10,14 @@ dataSources:
     source:
       account: wnear.flux-dev
       startBlock: 1
+      accounts:
+        prefixes:
+          - some-prefix
+          - a-prefix.with-dot
+        suffixes:
+          - suffix.near
+          - near
+          - another-suffix.testnet
     mapping:
       apiVersion: 0.0.5
       language: wasm/assemblyscript