@graphprotocol/graph-cli 0.30.0 → 0.30.3

package/package.json

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

package/src/command-helpers/scaffold.js

@@ -33,7 +33,6 @@ const generateScaffold = async (
     subgraphName,
     indexEvents,
     contractName = 'Contract',
-    dataSourceName,
     node,
   },
   spinner,
@@ -48,7 +47,6 @@ const generateScaffold = async (
     network,
     contractName,
     subgraphName,
-    dataSourceName,
     node,
   })
 
@@ -81,12 +79,12 @@ const writeScaffold = async (scaffold, directory, spinner) => {
   await writeScaffoldDirectory(scaffold, directory, spinner)
 }
 
-const writeABI = async (abi, contractName, abiPath = `./abis/${contractName}.json`) => {
+const writeABI = async (abi, contractName) => {
   let data = prettier.format(JSON.stringify(abi.data), {
     parser: 'json',
   })
 
-  await fs.writeFile(abiPath, data, { encoding: 'utf-8' })
+  await fs.writeFile(`./abis/${contractName}.json`, data, { encoding: 'utf-8' })
 }
 
 const writeSchema = async (abi, protocol, schemaPath, entities) => {

package/src/commands/add.js

@@ -95,7 +95,7 @@ module.exports = {
     let { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(ethabi, entities, contractName, mergeEntities)
     ethabi.data = abiData
 
-    await writeABI(ethabi, contractName, abi)
+    await writeABI(ethabi, contractName)
     await writeSchema(ethabi, protocol, result.getIn(['schema', 'file']), collisionEntities)
     await writeMapping(ethabi, protocol, contractName, collisionEntities)
 

package/src/commands/init.js

@@ -179,7 +179,7 @@ const processInitForm = async (
     //
     // protocols that don't support contract
     // - arweave
-    // - tendermint
+    // - cosmos
     {
       type: 'input',
       name: 'contract',
@@ -718,7 +718,6 @@ const initSubgraphFromContract = async (
     contract,
     indexEvents,
     contractName,
-    dataSourceName,
     node,
     studio,
     product,
@@ -773,7 +772,6 @@ const initSubgraphFromContract = async (
           contract,
           indexEvents,
           contractName,
-          dataSourceName,
           node,
         },
         spinner,

package/src/commands/test.js

@@ -13,12 +13,12 @@ const HELP = `
 ${chalk.bold('graph test')} ${chalk.dim('[options]')} ${chalk.bold('<datasource>')}
 
 ${chalk.dim('Options:')}
-  -c, --coverage                Run the tests in coverage mode. Works with v0.2.1 and above
+  -c, --coverage                Run the tests in coverage mode
   -d, --docker                  Run the tests in a docker container(Note: Please execute from the root folder of the subgraph)
   -f  --force                   Binary - overwrites folder + file when downloading. Docker - rebuilds the docker image
   -h, --help                    Show usage information
   -l, --logs                    Logs to the console information about the OS, CPU model and download url (debugging purposes)
-  -r, --recompile               Force-recompile tests (Not available in 0.2.2 and earlier versions)
+  -r, --recompile               Force-recompile tests
   -v, --version <tag>           Choose the version of the rust binary that you want to be downloaded/used
   `
 
@@ -43,16 +43,16 @@ module.exports = {
       version,
     } = toolbox.parameters.options
 
-    let opts = new Map()
+    let opts = {}
     // Support both long and short option variants
-    opts.set("coverage", coverage || c)
-    opts.set("docker", docker || d)
-    opts.set("force", force || f)
-    opts.set("help", help || h)
-    opts.set("logs", logs || l)
-    opts.set("recompile", recompile || r)
-    opts.set("version", version || v)
-
+    opts.coverage = coverage || c
+    opts.docker = docker || d
+    opts.force = force || f
+    opts.help = help || h
+    opts.logs = logs || l
+    opts.recompile = recompile || r
+    opts.version = version || v
+    opts.testsFolder = './tests'
     // Fix if a boolean flag (e.g -c, --coverage) has an argument
     try {
       fixParameters(toolbox.parameters, {
@@ -76,18 +76,49 @@ module.exports = {
     }
 
     let datasource = toolbox.parameters.first || toolbox.parameters.array[0]
-
     // Show help text if requested
-    if (opts.get("help")) {
+    if (opts.help) {
       print.info(HELP)
       return
     }
 
-    let result = await fetch('https://api.github.com/repos/LimeChain/matchstick/releases/latest')
-    let json = await result.json()
-    opts.set("latestVersion", json.tag_name)
+    // Check if matchstick.yaml config exists
+    if(filesystem.exists('matchstick.yaml')) {
+      try {
+        // Load the config
+        let config = await yaml.load(filesystem.read('matchstick.yaml', 'utf8'))
+
+        // Check if matchstick.yaml and testsFolder not null
+        if(config && config.testsFolder) {
+          // assign test folder from matchstick.yaml if present
+          opts.testsFolder = config.testsFolder
+        }
+      } catch (error) {
+        print.info('A problem occurred while reading matchstick.yaml. Please attend to the errors below:')
+        print.error(error.message)
+        process.exit(1)
+      }
+    }
+
+    opts.cachePath = path.join(opts.testsFolder, '.latest.json')
+    setVersionFromCache(opts)
+
+    // Fetch the latest version tag if version is not specified with -v/--version or if the version is not cached
+    if (opts.force || (!opts.version && !opts.latestVersion)) {
+      print.info("Fetching latest version tag")
+      let result = await fetch('https://api.github.com/repos/LimeChain/matchstick/releases/latest')
+      let json = await result.json()
+      opts.latestVersion = json.tag_name
+
+      filesystem.file(opts.cachePath, {
+        content: {
+          version: json.tag_name,
+          timestamp: Date.now()
+        }
+      })
+    }
 
-    if(opts.get("docker")) {
+    if(opts.docker) {
       runDocker(datasource, opts)
     } else {
       runBinary(datasource, opts)
@@ -95,13 +126,25 @@ module.exports = {
   }
 }
 
+async function setVersionFromCache(opts) {
+  if(filesystem.exists(opts.cachePath) == 'file') {
+    let cached = filesystem.read(opts.cachePath, 'json')
+    // Get the cache age in days
+    let cacheAge = (Date.now() - cached.timestamp) / (1000 * 60 * 60 * 24)
+    // If cache age is less than 1 day, use the cached version
+    if (cacheAge < 1) {
+      opts.latestVersion = cached.version
+    }
+  }
+}
+
 async function runBinary(datasource, opts) {
-  let coverageOpt = opts.get("coverage")
-  let forceOpt = opts.get("force")
-  let logsOpt = opts.get("logs")
-  let versionOpt = opts.get("version")
-  let latestVersion = opts.get("latestVersion")
-  let recompileOpt = opts.get("recompile")
+  let coverageOpt = opts.coverage
+  let forceOpt = opts.force
+  let logsOpt = opts.logs
+  let versionOpt = opts.version
+  let latestVersion = opts.latestVersion
+  let recompileOpt = opts.recompile
 
   const platform = await getPlatform(logsOpt)
 
@@ -126,10 +169,10 @@ async function getPlatform(logsOpt) {
   const arch = os.arch()
   const cpuCore = os.cpus()[0]
   const isM1 = (arch === 'arm64' && /Apple (M1|processor)/.test(cpuCore.model))
-  const linuxInfo = type === 'Linux' ? await getLinuxInfo() : new Map()
-  const linuxDistro = linuxInfo.get('name')
-  const release = linuxInfo.get('version') || os.release()
-  const majorVersion = parseInt(linuxInfo.get('version'), 10) || semver.major(release)
+  const linuxInfo = type === 'Linux' ? await getLinuxInfo() : {}
+  const linuxDistro = linuxInfo.name
+  const release = linuxInfo.version || os.release()
+  const majorVersion = parseInt(linuxInfo.version, 10) || semver.major(release)
 
   if (logsOpt) {
     print.info(`OS type: ${linuxDistro || type}\nOS arch: ${arch}\nOS release: ${release}\nOS major version: ${majorVersion}\nCPU model: ${cpuCore.model}`)
@@ -148,6 +191,8 @@ async function getPlatform(logsOpt) {
     } else if (type === 'Linux') {
       if (majorVersion === 18) {
         return 'binary-linux-18'
+      } if (majorVersion === 22) {
+        return 'binary-linux-22'
       } else {
         return 'binary-linux-20'
       }
@@ -163,13 +208,13 @@ async function getLinuxInfo() {
   try {
     let result = await system.run("cat /etc/*-release | grep -E '(^VERSION|^NAME)='", {trim: true})
     let infoArray = result.replace(/['"]+/g, '').split('\n').map(p => p.split('='))
-    let infoMap = new Map();
+    let linuxInfo = {}
 
     infoArray.forEach((val) => {
-      infoMap.set(val[0].toLowerCase(), val[1])
+      linuxInfo[val[0].toLowerCase()] = val[1]
     });
 
-    return infoMap
+    return linuxInfo
   } catch (error) {
     print.error(`Error fetching the Linux version:\n ${error}`)
     process.exit(1)
@@ -177,39 +222,21 @@ async function getLinuxInfo() {
 }
 
 async function runDocker(datasource, opts) {
-  let coverageOpt = opts.get("coverage")
-  let forceOpt = opts.get("force")
-  let versionOpt = opts.get("version")
-  let latestVersion = opts.get("latestVersion")
-  let recompileOpt = opts.get("recompile")
+  let coverageOpt = opts.coverage
+  let forceOpt = opts.force
+  let versionOpt = opts.version
+  let latestVersion = opts.latestVersion
+  let recompileOpt = opts.recompile
 
   // Remove binary-install-raw binaries, because docker has permission issues
   // when building the docker images
-  await filesystem.remove("./node_modules/binary-install-raw/bin")
+  await filesystem.remove('./node_modules/binary-install-raw/bin')
 
   // Get current working directory
   let current_folder = await filesystem.cwd()
 
   // Declate dockerfilePath with default location
-  let dockerfilePath = "./tests/.docker/Dockerfile"
-
-  // Check if matchstick.yaml config exists
-  if(filesystem.exists('matchstick.yaml')) {
-    try {
-      // Load the config
-      let config = await yaml.load(filesystem.read('matchstick.yaml', 'utf8'))
-
-      // Check if matchstick.yaml is not empty
-      if(config != null) {
-        // If a custom tests folder is declared update dockerfilePath
-        dockerfilePath = path.join(config.testsFolder || 'tests', '.docker/Dockerfile')
-      }
-    } catch (error) {
-      print.info('A problem occurred while reading matchstick.yaml. Please attend to the errors below:')
-      print.error(error.message)
-      process.exit(1)
-    }
-  }
+  let dockerfilePath = path.join(opts.testsFolder || 'tests', '.docker/Dockerfile')
 
   // Check if the Dockerfil already exists
   let dockerfileExists = filesystem.exists(dockerfilePath)

package/src/migrations.js

@@ -6,10 +6,8 @@ const MIGRATIONS = [
   require('./migrations/mapping_api_version_0_0_3'),
   require('./migrations/mapping_api_version_0_0_4'),
   require('./migrations/mapping_api_version_0_0_5'),
-  require('./migrations/mapping_api_version_0_0_6'),
   require('./migrations/spec_version_0_0_2'),
   require('./migrations/spec_version_0_0_3'),
-  require('./migrations/spec_version_0_0_4'),
 ]
 
 const applyMigrations = async options =>

package/src/protocols/cosmos/scaffold/manifest.js

@@ -8,7 +8,7 @@ const mapping = () => `
         - ExampleEntity
       blockHandlers:
         - handler: handleBlock
-      file: ./src/mapping.ts`
+      file: ./src/contract.ts`
 
 module.exports = {
   source,

package/src/scaffold/cosmos.test.js

@@ -7,7 +7,7 @@ const protocol = new Protocol('cosmos')
 const scaffoldOptions = {
   protocol,
   network: 'cosmoshub-4',
-  dataSourceName: 'CosmosHub'
+  contractName: 'CosmosHub'
 }
 
 const scaffold = new Scaffold(scaffoldOptions)
@@ -33,7 +33,7 @@ dataSources:
         - ExampleEntity
       blockHandlers:
         - handler: handleBlock
-      file: ./src/mapping.ts
+      file: ./src/contract.ts
 `)
   })
 

package/src/scaffold/ethereum.test.js

@@ -76,8 +76,7 @@ const scaffoldOptions = {
   abi: TEST_ABI,
   contract: '0xf87e31492faf9a91b02ee0deaad50d51d56d5d4d',
   network: 'kovan',
-  contractName: 'Contract',
-  dataSourceName: 'Contract'
+  contractName: 'Contract'
 }
 
 const scaffold = new Scaffold(scaffoldOptions)

package/src/scaffold/index.js

@@ -26,7 +26,6 @@ module.exports = class Scaffold {
     this.network = options.network
     this.contractName = options.contractName
     this.subgraphName = options.subgraphName
-    this.dataSourceName = options.dataSourceName
     this.node = options.node
   }
 
@@ -68,7 +67,7 @@ schema:
   file: ./schema.graphql
 dataSources:
   - kind: ${this.protocol.name}
-    name: ${this.dataSourceName}
+    name: ${this.contractName}
     network: ${this.network}
     source: ${protocolManifest.source(this)}
     mapping: ${protocolManifest.mapping(this)}

package/src/scaffold/near.test.js

@@ -8,8 +8,7 @@ const scaffoldOptions = {
   protocol,
   contract: 'abc.def.near',
   network: 'near-mainnet',
-  contractName: 'Contract',
-  dataSourceName: 'Contract'
+  contractName: 'Contract'
 }
 
 const scaffold = new Scaffold(scaffoldOptions)

package/src/migrations/mapping_api_version_0_0_6.js

@@ -1,74 +0,0 @@
-const fs = require('fs-extra')
-const semver = require('semver')
-const toolbox = require('gluegun/toolbox')
-const yaml = require('js-yaml')
-const { loadManifest } = require('./util/load-manifest')
-const { getGraphTsVersion } = require('./util/versions')
-
-// If any of the manifest apiVersions are 0.0.6, replace them with 0.0.7
-module.exports = {
-  name: 'Bump mapping apiVersion from 0.0.6 to 0.0.7',
-  predicate: async ({ sourceDir, manifestFile }) => {
-    // Obtain the graph-ts version, if possible
-    let graphTsVersion
-    try {
-      graphTsVersion = await getGraphTsVersion(sourceDir)
-    } catch (_) {
-      // If we cannot obtain the version, return a hint that the graph-ts
-      // hasn't been installed yet
-      return 'graph-ts dependency not installed yet'
-    }
-
-    let manifest = loadManifest(manifestFile)
-    return (
-      // Only migrate if the graph-ts version is >= 0.27.0...
-      // Coerce needed because we may be dealing with an alpha version
-      // and in the `semver` library this would not return true on equality.
-      semver.gte(semver.coerce(graphTsVersion), '0.27.0') &&
-      // ...and we have a manifest with mapping > apiVersion = 0.0.6
-      manifest &&
-      typeof manifest === 'object' &&
-      Array.isArray(manifest.dataSources) &&
-      (manifest.dataSources.reduce(
-        (hasOldMappings, dataSource) =>
-          hasOldMappings ||
-          (typeof dataSource === 'object' &&
-            dataSource.mapping &&
-            typeof dataSource.mapping === 'object' &&
-            dataSource.mapping.apiVersion === '0.0.6'),
-        false,
-      ) ||
-        (Array.isArray(manifest.templates) &&
-          manifest.templates.reduce(
-            (hasOldMappings, template) =>
-              hasOldMappings ||
-              (typeof template === 'object' &&
-                template.mapping &&
-                typeof template.mapping === 'object' &&
-                template.mapping.apiVersion === '0.0.6'),
-            false,
-          )))
-    )
-  },
-  apply: async ({ manifestFile }) => {
-    // Make sure we catch all variants; we could load the manifest
-    // and replace the values in the data structures here; unfortunately
-    // writing that back to the file messes with the formatting more than
-    // we'd like; that's why for now, we use a simple patching approach
-    await toolbox.patching.replace(
-      manifestFile,
-      new RegExp('apiVersion: 0.0.6', 'g'),
-      'apiVersion: 0.0.7',
-    )
-    await toolbox.patching.replace(
-      manifestFile,
-      new RegExp("apiVersion: '0.0.6'", 'g'),
-      "apiVersion: '0.0.7'",
-    )
-    await toolbox.patching.replace(
-      manifestFile,
-      new RegExp('apiVersion: "0.0.6"', 'g'),
-      'apiVersion: "0.0.7"',
-    )
-  },
-}

package/src/migrations/spec_version_0_0_4.js

@@ -1,25 +0,0 @@
-const fs = require('fs-extra')
-const toolbox = require('gluegun/toolbox')
-const yaml = require('js-yaml')
-const { loadManifest } = require('./util/load-manifest')
-
-// Spec version 0.0.5 let event handlers require transaction receipt
-// data to be accessed in the runtime.
-module.exports = {
-  name: 'Bump manifest specVersion from 0.0.4 to 0.0.5',
-  predicate: async ({ sourceDir, manifestFile }) => {
-    let manifest = await loadManifest(manifestFile)
-    return (
-      manifest &&
-      typeof manifest === 'object' &&
-      manifest.specVersion &&
-      manifest.specVersion === '0.0.4'
-    )
-  },
-  apply: async ({ manifestFile }) => {
-    await toolbox.patching.patch(manifestFile, {
-      insert: 'specVersion: 0.0.5',
-      replace: new RegExp(`specVersion: ['"]?0.0.4['"]?`),
-    })
-  },
-}