@graphprotocol/graph-cli 0.22.3 → 0.23.1

package/src/validation/index.js

@@ -1,4 +1,5 @@
 module.exports = {
   validateSchema: require('./schema').validateSchema,
   validateManifest: require('./manifest').validateManifest,
+  validateContractValues: require('./manifest').validateContractValues,
 }

package/src/validation/manifest.js

@@ -51,13 +51,24 @@ const validators = immutable.fromJS({
   ScalarTypeDefinition: (value, ctx) =>
     validators.get(ctx.getIn(['type', 'name', 'value']))(value, ctx),
 
-  UnionTypeDefinition: (value, ctx) =>
-    ctx
+  UnionTypeDefinition: (value, ctx) => {
+    const unionVariants = ctx
       .getIn(['type', 'types'])
-      .reduce(
-        (errors, type) => errors.concat(validateValue(value, ctx.set('type', type))),
-        List(),
-      ),
+
+    let errors = List()
+
+    for (const variantType of unionVariants) {
+      const variantErrors = validateValue(value, ctx.set('type', variantType))
+      // No errors found, union variant matched, early return
+      if (variantErrors.isEmpty()) {
+        return List()
+      }
+      errors = errors.push(variantErrors)
+    }
+
+    // Return errors from variant that matched the most
+    return List(errors.minBy(variantErrors => variantErrors.count()))
+  },
 
   NamedType: (value, ctx) =>
     validateValue(
@@ -199,9 +210,8 @@ const validateValue = (value, ctx) => {
   }
 }
 
-const validateDataSourceNetworks = value => {
-  let networks = [...value.dataSources, ...(value.templates || [])]
-    .filter(dataSource => dataSource.kind === 'ethereum/contract')
+const validateDataSourceForNetwork = (dataSources, protocol) =>
+  dataSources.filter(dataSource => protocol.isValidKindName(dataSource.kind))
     .reduce(
       (networks, dataSource) =>
         networks.update(dataSource.network, dataSources =>
@@ -210,28 +220,37 @@ const validateDataSourceNetworks = value => {
       immutable.OrderedMap(),
     )
 
-  return networks.size > 1
-    ? immutable.fromJS([
-        {
-          path: [],
-          message: `Conflicting networks used in data sources and templates:
+const validateDataSourceNetworks = (value, protocol) => {
+  const dataSources = [...value.dataSources, ...(value.templates || [])]
+
+  // Networks found valid for a protocol.
+  // By searching through all data sources and templates.
+  const networks = validateDataSourceForNetwork(dataSources, protocol)
+
+  if (networks.size > 1) {
+    return immutable.fromJS([
+      {
+        path: [],
+        message: `Conflicting networks used in data sources and templates:
 ${networks
   .map(
     (dataSources, network) =>
-      `  ${
+    `  ${
         network === undefined
           ? 'Data sources and templates having no network set'
-          : `Data sources and templates using '${network}'`
-      }:\n${dataSources.map(ds => `    - ${ds}`).join('\n')}`,
+        : `Data sources and templates using '${network}'`
+        }:\n${dataSources.map(ds => `    - ${ds}`).join('\n')}`,
   )
   .join('\n')}
 Recommendation: Make all data sources and templates use the same network name.`,
-        },
-      ])
-    : List()
+      },
+    ])
+  }
+
+  return List()
 }
 
-const validateManifest = (value, type, schema, { resolveFile }) => {
+const validateManifest = (value, type, schema, protocol, { resolveFile }) => {
   // Validate manifest using the GraphQL schema that defines its structure
   let errors =
     value !== null && value !== undefined
@@ -260,7 +279,38 @@ const validateManifest = (value, type, schema, { resolveFile }) => {
 
   // Validate that all data sources are for the same `network` (this includes
   // _no_ network at all)
-  return validateDataSourceNetworks(value)
+  return validateDataSourceNetworks(value, protocol)
 }
 
-module.exports = { validateManifest }
+const validateContractValues = (manifest, protocol, fieldName, validator, errorMessage) =>
+  manifest
+    .get('dataSources')
+    .filter(dataSource => protocol.isValidKindName(dataSource.get('kind')))
+    .reduce((errors, dataSource, dataSourceIndex) => {
+      let path = ['dataSources', dataSourceIndex, 'source', fieldName]
+
+      // No need to validate if the source has no contract field
+      if (!dataSource.get('source').has(fieldName)) {
+        return errors
+      }
+
+      let contractValue = dataSource.getIn(['source', fieldName])
+
+      // Validate whether the contract is valid
+      if (validator(contractValue)) {
+        return errors
+      } else {
+        return errors.push(
+          immutable.fromJS({
+            path,
+            message: `\
+Contract ${fieldName} is invalid: ${contractValue}${errorMessage ? `\n${errorMessage}` : ''}`,
+          }),
+        )
+      }
+    }, immutable.List())
+
+module.exports = {
+  validateManifest,
+  validateContractValues,
+}

package/src/validation/schema.js

@@ -20,6 +20,12 @@ const BUILTIN_SCALAR_TYPES = [
 const TYPE_SUGGESTIONS = [
   ['Address', 'Bytes'],
   ['address', 'Bytes'],
+  ['Account', 'String'],
+  ['account', 'String'],
+  ['AccountId', 'String'],
+  ['AccountID', 'String'],
+  ['accountId', 'String'],
+  ['accountid', 'String'],
   ['bytes', 'Bytes'],
   ['string', 'String'],
   ['bool', 'Boolean'],

package/subgraph-ethereum.yaml

@@ -0,0 +1,134 @@
+specVersion: 0.0.2
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: NiftyInk
+    network: xdai
+    source:
+      address: "0x49dE55fbA08af88f55EB797a456fdf76B151c8b0"
+      abi: NiftyInk
+      startBlock: 11296636
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - Ink
+        - Artist
+        - InkNumberLookUp
+      abis:
+        - name: NiftyInk
+          file: ./abis/NiftyInk.json
+      eventHandlers:
+        - event: newInk(uint256,indexed address,string,string,uint256)
+          handler: handlenewInk
+      callHandlers:
+        - function: setPrice(string,uint256)
+          handler: handleSetPrice
+        - function: setPriceFromSignature(string,uint256,bytes)
+          handler: handleSetPriceFromSignature
+      file: ./src/mapping.ts
+  - kind: ethereum/contract
+    name: NiftyToken
+    network: xdai
+    source:
+      address: "0xCF964c89f509a8c0Ac36391c5460dF94B91daba5"
+      abi: NiftyToken
+      startBlock: 11296637
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - Ink
+        - Token
+        - Sale
+        - Transfer
+      abis:
+        - name: NiftyToken
+          file: ./abis/NiftyToken.json
+        - name: NiftyInk
+          file: ./abis/NiftyInk.json
+      eventHandlers:
+        - event: Transfer(indexed address,indexed address,indexed uint256)
+          handler: handleTransfer
+        - event: boughtInk(uint256,string,address,uint256)
+          handler: handleBoughtInk
+        - event: mintedInk(uint256,string,address)
+          handler: handleMintedInk
+      callHandlers:
+        - function: setTokenPrice(uint256,uint256)
+          handler: handleSetTokenPrice
+      file: ./src/mapping.ts
+  #  - kind: ethereum/contract
+  #    name: NiftyMain
+  #    network: mainnet
+  #    source:
+  #      address: "0xc02697c417DdAcfbe5EdbF23eDad956BC883F4fb"
+  #      abi: NiftyMain
+  #      startBlock: 10609660
+  #    mapping:
+  #      kind: ethereum/events
+  #      apiVersion: 0.0.4
+  #      language: wasm/assemblyscript
+  #      entities:
+  #        - Token
+  #        - Transfer
+  #      abis:
+  #        - name: NiftyMain
+  #          file: ./abis/NiftyMain.json
+  #        - name: NiftyToken
+  #          file: ./abis/NiftyToken.json
+  #      eventHandlers:
+  #        - event: Transfer(indexed address,indexed address,indexed uint256)
+  #          handler: handleTransfer
+  #        - event: mintedInk(uint256,string,address)
+  #          handler: handleMintedOnMain
+  #      file: ./src/mapping.ts
+  - kind: ethereum/contract
+    name: NiftyMediator
+    network: xdai
+    source:
+      address: "0x73cA9C4e72fF109259cf7374F038faf950949C51"
+      abi: NiftyMediator
+      startBlock: 11296637
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - Token
+      abis:
+        - name: NiftyMediator
+          file: ./abis/NiftyMediator.json
+        - name: NiftyToken
+          file: ./abis/NiftyToken.json
+      eventHandlers:
+        - event: tokenSentViaBridge(uint256,bytes32)
+          handler: handleTokenSentViaBridge
+        - event: newPrice(uint256)
+          handler: handleNewRelayPrice
+      file: ./src/mapping.ts
+  - kind: ethereum/contract
+    name: Liker
+    network: xdai
+    source:
+      address: "0xBD0621dcb64e1EEd503f709422b019B2fA197aF6"
+      abi: Liker
+      startBlock: 11296637
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - InkLookUp
+        - Like
+        - Ink
+      abis:
+        - name: Liker
+          file: ./abis/Liker.json
+      eventHandlers:
+        - event: liked(uint256,address,uint256,uint256,address)
+          handler: handleLikedInk
+      file: ./src/mapping.ts

package/subgraph-near.yaml

@@ -0,0 +1,134 @@
+specVersion: 0.0.2
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: NiftyInk
+    network: xdai
+    source:
+      address: "0x49dE55fbA08af88f55EB797a456fdf76B151c8b0"
+      abi: NiftyInk
+      startBlock: 11296636
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - Ink
+        - Artist
+        - InkNumberLookUp
+      abis:
+        - name: NiftyInk
+          file: ./abis/NiftyInk.json
+      eventHandlers:
+        - event: newInk(uint256,indexed address,string,string,uint256)
+          handler: handlenewInk
+      callHandlers:
+        - function: setPrice(string,uint256)
+          handler: handleSetPrice
+        - function: setPriceFromSignature(string,uint256,bytes)
+          handler: handleSetPriceFromSignature
+      file: ./src/mapping.ts
+  - kind: ethereum/contract
+    name: NiftyToken
+    network: xdai
+    source:
+      address: "0xCF964c89f509a8c0Ac36391c5460dF94B91daba5"
+      abi: NiftyToken
+      startBlock: 11296637
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - Ink
+        - Token
+        - Sale
+        - Transfer
+      abis:
+        - name: NiftyToken
+          file: ./abis/NiftyToken.json
+        - name: NiftyInk
+          file: ./abis/NiftyInk.json
+      eventHandlers:
+        - event: Transfer(indexed address,indexed address,indexed uint256)
+          handler: handleTransfer
+        - event: boughtInk(uint256,string,address,uint256)
+          handler: handleBoughtInk
+        - event: mintedInk(uint256,string,address)
+          handler: handleMintedInk
+      callHandlers:
+        - function: setTokenPrice(uint256,uint256)
+          handler: handleSetTokenPrice
+      file: ./src/mapping.ts
+  #  - kind: ethereum/contract
+  #    name: NiftyMain
+  #    network: mainnet
+  #    source:
+  #      address: "0xc02697c417DdAcfbe5EdbF23eDad956BC883F4fb"
+  #      abi: NiftyMain
+  #      startBlock: 10609660
+  #    mapping:
+  #      kind: ethereum/events
+  #      apiVersion: 0.0.4
+  #      language: wasm/assemblyscript
+  #      entities:
+  #        - Token
+  #        - Transfer
+  #      abis:
+  #        - name: NiftyMain
+  #          file: ./abis/NiftyMain.json
+  #        - name: NiftyToken
+  #          file: ./abis/NiftyToken.json
+  #      eventHandlers:
+  #        - event: Transfer(indexed address,indexed address,indexed uint256)
+  #          handler: handleTransfer
+  #        - event: mintedInk(uint256,string,address)
+  #          handler: handleMintedOnMain
+  #      file: ./src/mapping.ts
+  - kind: ethereum/contract
+    name: NiftyMediator
+    network: xdai
+    source:
+      address: "0x73cA9C4e72fF109259cf7374F038faf950949C51"
+      abi: NiftyMediator
+      startBlock: 11296637
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - Token
+      abis:
+        - name: NiftyMediator
+          file: ./abis/NiftyMediator.json
+        - name: NiftyToken
+          file: ./abis/NiftyToken.json
+      eventHandlers:
+        - event: tokenSentViaBridge(uint256,bytes32)
+          handler: handleTokenSentViaBridge
+        - event: newPrice(uint256)
+          handler: handleNewRelayPrice
+      file: ./src/mapping.ts
+  - kind: ethereum/contract
+    name: Liker
+    network: xdai
+    source:
+      address: "0xBD0621dcb64e1EEd503f709422b019B2fA197aF6"
+      abi: Liker
+      startBlock: 11296637
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - InkLookUp
+        - Like
+        - Ink
+      abis:
+        - name: Liker
+          file: ./abis/Liker.json
+      eventHandlers:
+        - event: liked(uint256,address,uint256,uint256,address)
+          handler: handleLikedInk
+      file: ./src/mapping.ts

package/tests/cli/globalSetup.js

@@ -0,0 +1,6 @@
+const { npmLinkCli } = require('./util')
+
+module.exports = async () => {
+  process.env.GRAPH_CLI_TESTS = '1'
+  await npmLinkCli()
+}

package/tests/cli/globalTeardown.js

@@ -0,0 +1,6 @@
+const { npmUnlinkCli } = require('./util')
+
+module.exports = async () => {
+  delete process.env.GRAPH_CLI_TESTS
+  await npmUnlinkCli()
+}

package/tests/cli/init.test.js

@@ -1,6 +1,6 @@
 const fs = require('fs-extra')
 const path = require('path')
-const cliTest = require('./util').cliTest
+const { cliTest } = require('./util')
 
 describe('Init', () => {
   let baseDir = path.join(__dirname, 'init')

package/tests/cli/util.js

@@ -13,7 +13,7 @@ const cliTest = (title, args, testPath, options) => {
       let cwd =
         options !== undefined && options.cwd ? options.cwd : resolvePath(`./${testPath}`)
 
-      let [exitCode, stdout, stderr] = await runCli(args, cwd)
+      let [exitCode, stdout, stderr] = await runGraphCli(args, cwd)
 
       let expectedExitCode = undefined
       if (options !== undefined && options.exitCode !== undefined) {
@@ -55,18 +55,14 @@ const cliTest = (title, args, testPath, options) => {
   )
 }
 
-const runCli = async (args = [], cwd = process.cwd()) => {
-  // Resolve the path to graph.js
-  let graphCli = path.join(__dirname, '..', '..', 'bin', 'graph')
-
+const runCommand = async (command, args = [], cwd = process.cwd()) => {
   // Make sure to set an absolute working directory
   cwd = cwd[0] !== '/' ? path.resolve(__dirname, cwd) : cwd
 
   return new Promise((resolve, reject) => {
     let stdout = ''
     let stderr = ''
-    const command = `${graphCli} ${args.join(' ')}`
-    const child = spawn(command, { cwd })
+    const child = spawn(`${command} ${args.join(' ')}`, { cwd })
 
     child.on('error', error => {
       reject(error)
@@ -86,7 +82,20 @@ const runCli = async (args = [], cwd = process.cwd()) => {
   })
 }
 
+const runGraphCli = async (args, cwd) => {
+  // Resolve the path to graph.js
+  let graphCli = path.join(__dirname, '..', '..', 'bin', 'graph')
+
+  return await runCommand(graphCli, args, cwd)
+}
+
+const npmLinkCli = () => runCommand('npm', ['link'])
+
+const npmUnlinkCli = () => runCommand('npm', ['unlink'])
+
 module.exports = {
   cliTest,
-  runCli,
+  npmLinkCli,
+  npmUnlinkCli,
+  runGraphCli,
 }

package/tests/cli/validation/near-is-valid/schema.graphql

@@ -0,0 +1,8 @@
+type MyEntity @entity {
+  id: ID!
+  x: Account!
+}
+
+type Account @entity {
+  id: ID!
+}

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

@@ -0,0 +1,21 @@
+specVersion: 0.0.1
+repository: https://github.com/graphprotocol/near-subgraph
+description: NEAR subgraph
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: near
+    name: NearSubgraph
+    source:
+      account: wnear.flux-dev
+      startBlock: 1
+    mapping:
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      blockHandlers:
+        - handler: handleNewBlock
+      receiptHandlers:
+        - handler: handleReceipt

package/tests/cli/validation.test.js

@@ -144,6 +144,14 @@ describe('Validation', () => {
       exitCode: 1,
     },
   )
+  cliTest(
+    'NEAR is a valid chain',
+    ['codegen', '--skip-migrations'],
+    'validation/near-is-valid',
+    {
+      exitCode: 0,
+    },
+  )
   cliTest(
     'Deprecated template format gives nice error',
     ['codegen', '--skip-migrations'],