@graphprotocol/graph-cli 0.33.0 → 0.33.1

package/package.json

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

package/src/codegen/template.js

@@ -1,11 +1,18 @@
 const immutable = require('immutable')
+const IpfsFileTemplateCodeGen = require('../protocols/ipfs/codegen/file_template')
 
 const tsCodegen = require('./typescript')
 
 module.exports = class DataSourceTemplateCodeGenerator {
   constructor(template, protocol) {
     this.template = template
-    this.protocolTemplateCodeGen = protocol.getTemplateCodeGen(template)
+    let kind = template.get('kind')
+
+    if (kind.split('/')[0] == protocol.name) {
+      this.protocolTemplateCodeGen = protocol.getTemplateCodeGen(template)
+    } else if (kind == "file/ipfs") {
+      this.protocolTemplateCodeGen = new IpfsFileTemplateCodeGen(template)
+    }
   }
 
   generateModuleImports() {

package/src/command-helpers/scaffold.js

@@ -128,17 +128,23 @@ const writeMapping = async (abi, protocol, contractName, entities) => {
   })
 }
 
-const writeTestsFiles = async (abi, contractName) => {
-  // If a contract is added to a subgraph that has no tests folder
-  await fs.ensureDir('./tests/')
+const writeTestsFiles = async (abi, protocol, contractName) => {
+  const hasEvents = protocol.hasEvents()
+  const events = hasEvents
+    ? abiEvents(abi).toJS()
+    : []
+
+  if(events.length > 0) {
+    // If a contract is added to a subgraph that has no tests folder
+    await fs.ensureDir('./tests/')
 
-  const events = abiEvents(abi).toJS()
-  const testsFiles = generateTestsFiles(contractName, events, true)
+    const testsFiles = generateTestsFiles(contractName, events, true)
 
-  for (const [fileName, content] of Object.entries(testsFiles)) {
-    await fs.writeFile(`./tests/${fileName}`, content, {
-      encoding: 'utf-8',
-    })
+    for (const [fileName, content] of Object.entries(testsFiles)) {
+      await fs.writeFile(`./tests/${fileName}`, content, {
+        encoding: 'utf-8',
+      })
+    }
   }
 }
 

package/src/command-helpers/studio.js

@@ -1,4 +1,4 @@
-const allowedStudioNetworks = ['mainnet', 'rinkeby']
+const allowedStudioNetworks = ['mainnet', 'rinkeby', 'goerli']
 
 const validateStudioNetwork = ({ studio, product, network }) => {
   let isStudio = studio || product === 'subgraph-studio'

package/src/commands/add.js

@@ -102,10 +102,7 @@ module.exports = {
     await writeABI(ethabi, contractName)
     await writeSchema(ethabi, protocol, result.getIn(['schema', 'file']), collisionEntities)
     await writeMapping(ethabi, protocol, contractName, collisionEntities)
-
-    if (protocol.hasEvents()) {
-      await writeTestsFiles(ethabi, contractName)
-    }
+    await writeTestsFiles(ethabi, protocol, contractName)
 
     let dataSources = result.get('dataSources')
     let dataSource = await generateDataSource(protocol,

package/src/commands/test.js

@@ -168,7 +168,7 @@ async function getPlatform(logsOpt) {
   const type = os.type()
   const arch = os.arch()
   const cpuCore = os.cpus()[0]
-  const isM1 = (arch === 'arm64' && /Apple (M1|processor)/.test(cpuCore.model))
+  const isAppleSilicon = (arch === 'arm64' && /Apple (M1|M2|processor)/.test(cpuCore.model))
   const linuxInfo = type === 'Linux' ? await getLinuxInfo() : {}
   const linuxDistro = linuxInfo.name
   const release = linuxInfo.version || os.release()
@@ -178,11 +178,11 @@ async function getPlatform(logsOpt) {
     print.info(`OS type: ${linuxDistro || type}\nOS arch: ${arch}\nOS release: ${release}\nOS major version: ${majorVersion}\nCPU model: ${cpuCore.model}`)
   }
 
-  if (arch === 'x64' || isM1) {
+  if (arch === 'x64' || isAppleSilicon) {
     if (type === 'Darwin') {
       if (majorVersion === 18 || majorVersion === 19) {
         return 'binary-macos-10.15' // GitHub dropped support for macOS 10.14 in Actions, but it seems 10.15 binary works on 10.14 too
-      } else if (isM1) {
+      } else if (isAppleSilicon) {
         return 'binary-macos-11-m1'
       }
       return 'binary-macos-11'

package/src/protocols/index.js

@@ -42,9 +42,7 @@ module.exports = class Protocol {
       arweave: ['arweave-mainnet'],
       ethereum: [
         'mainnet',
-        'kovan',
         'rinkeby',
-        'ropsten',
         'goerli',
         'poa-core',
         'poa-sokol',
@@ -74,9 +72,11 @@ module.exports = class Protocol {
       near: ['near-mainnet', 'near-testnet'],
       cosmos: [
         'cosmoshub-4',
-        'theta-testnet-001',
+        'theta-testnet-001', // CosmosHub testnet
         'osmosis-1',
-        'osmo-test-4'
+        'osmo-test-4',       // Osmosis testnet
+        'juno-1', 
+        'uni-3'              // Juno testnet
       ],
     })
   }

package/src/protocols/ipfs/codegen/file_template.js

@@ -0,0 +1,40 @@
+const tsCodegen = require('../../../codegen/typescript')
+
+module.exports = class IpfsFileTemplateCodeGen {
+  constructor(template) {
+    this.template = template
+  }
+
+  generateModuleImports() {
+    return []
+  }
+
+  generateCreateMethod() {
+    const name = this.template.get('name')
+
+    return tsCodegen.staticMethod(
+      'create',
+      [tsCodegen.param('cid', tsCodegen.namedType('string'))],
+      tsCodegen.namedType('void'),
+      `
+      DataSourceTemplate.create('${name}', [cid])
+      `,
+    )
+  }
+
+  generateCreateWithContextMethod() {
+    const name = this.template.get('name')
+
+    return tsCodegen.staticMethod(
+      'createWithContext',
+      [
+        tsCodegen.param('cid', tsCodegen.namedType('string')),
+        tsCodegen.param('context', tsCodegen.namedType('DataSourceContext')),
+      ],
+      tsCodegen.namedType('void'),
+      `
+      DataSourceTemplate.createWithContext('${name}', [cid], context)
+      `,
+    )
+  }
+}

package/src/scaffold/index.js

@@ -55,9 +55,7 @@ module.exports = class Scaffold {
           '@graphprotocol/graph-cli': GRAPH_CLI_VERSION,
           '@graphprotocol/graph-ts': `0.27.0`,
         },
-        devDependencies: {
-          'matchstick-as': `0.5.0`,
-        },
+        devDependencies: this.protocol.hasEvents() ? { 'matchstick-as': `0.5.0`} : undefined,
       }),
       { parser: 'json' },
     )
@@ -143,8 +141,13 @@ dataSources:
   }
 
   generateTests() {
-    return this.protocol.hasEvents()
-      ?  generateTestsFiles(this.contractName, abiEvents(this.abi).toJS(), this.indexEvents)
+    const hasEvents = this.protocol.hasEvents()
+    const events = hasEvents
+      ? abiEvents(this.abi).toJS()
+      : []
+
+    return events.length > 0
+      ?  generateTestsFiles(this.contractName, events, this.indexEvents)
       : undefined
   }
 

package/src/subgraph.js

@@ -216,20 +216,26 @@ More than one template named '${name}', template names must be unique.`,
   static async load(filename, { protocol, skipValidation } = { skipValidation: false }) {
     // Load and validate the manifest
     let data = null
+    let has_file_data_sources = false
 
     if (filename.match(/.js$/)) {
       data = require(path.resolve(filename))
     } else {
-      data = yaml.parse(await fs.readFile(filename, 'utf-8'))
+      let raw_data = await fs.readFile(filename, 'utf-8')
+      has_file_data_sources = raw_data.includes('kind: file')
+      data = yaml.parse(raw_data)
     }
 
     // Helper to resolve files relative to the subgraph manifest
     let resolveFile = maybeRelativeFile =>
       path.resolve(path.dirname(filename), maybeRelativeFile)
 
-    let manifestErrors = await Subgraph.validate(data, protocol, { resolveFile })
-    if (manifestErrors.size > 0) {
-      throwCombinedError(filename, manifestErrors)
+    // TODO: Validation for file data sources
+    if (!has_file_data_sources) {
+      let manifestErrors = await Subgraph.validate(data, protocol, { resolveFile })
+      if (manifestErrors.size > 0) {
+        throwCombinedError(filename, manifestErrors)
+      }
     }
 
     let manifest = immutable.fromJS(data)