@graphprotocol/graph-cli 0.34.0-alpha.0 → 0.35.0-alpha.0

package/examples/basic-event-handlers/node_modules/@graphprotocol/graph-ts/chain/ethereum.ts

@@ -22,7 +22,6 @@ export namespace ethereum {
     FIXED_ARRAY = 7,
     ARRAY = 8,
     TUPLE = 9,
-    MATRIX = 10,
   }
 
   /**
@@ -104,8 +103,12 @@ export namespace ethereum {
     }
 
     toMatrix(): Array<Array<Value>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
-      return changetype<Array<Array<Value>>>(this.data as u32)
+      let valueArray = this.toArray()
+      let out = new Array<Array<Value>>(valueArray.length)
+      for (let i: i32 = 0; i < valueArray.length; i++) {
+        out[i] = valueArray[i].toArray()
+      }
+      return out
     }
 
     toTupleArray<T extends Tuple>(): Array<T> {
@@ -122,7 +125,6 @@ export namespace ethereum {
     }
 
     toTupleMatrix<T extends Tuple>(): Array<Array<T>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
       let valueMatrix = this.toMatrix()
       let out = new Array<Array<T>>(valueMatrix.length)
       for (let i: i32 = 0; i < valueMatrix.length; i++) {
@@ -213,7 +215,6 @@ export namespace ethereum {
     }
 
     toBooleanMatrix(): Array<Array<boolean>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
       let valueMatrix = this.toMatrix()
       let out = new Array<Array<boolean>>(valueMatrix.length)
       for (let i: i32 = 0; i < valueMatrix.length; i++) {
@@ -226,7 +227,6 @@ export namespace ethereum {
     }
 
     toBytesMatrix(): Array<Array<Bytes>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
       let valueMatrix = this.toMatrix()
       let out = new Array<Array<Bytes>>(valueMatrix.length)
       for (let i: i32 = 0; i < valueMatrix.length; i++) {
@@ -239,7 +239,6 @@ export namespace ethereum {
     }
 
     toAddressMatrix(): Array<Array<Address>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
       let valueMatrix = this.toMatrix()
       let out = new Array<Array<Address>>(valueMatrix.length)
       for (let i: i32 = 0; i < valueMatrix.length; i++) {
@@ -252,7 +251,6 @@ export namespace ethereum {
     }
 
     toStringMatrix(): Array<Array<string>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
       let valueMatrix = this.toMatrix()
       let out = new Array<Array<string>>(valueMatrix.length)
       for (let i: i32 = 0; i < valueMatrix.length; i++) {
@@ -265,7 +263,6 @@ export namespace ethereum {
     }
 
     toI32Matrix(): Array<Array<i32>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
       let valueMatrix = this.toMatrix()
       let out = new Array<Array<i32>>(valueMatrix.length)
       for (let i: i32 = 0; i < valueMatrix.length; i++) {
@@ -278,7 +275,6 @@ export namespace ethereum {
     }
 
     toBigIntMatrix(): Array<Array<BigInt>> {
-      assert(this.kind == ValueKind.MATRIX, 'Ethereum value is not a matrix.')
       let valueMatrix = this.toMatrix()
       let out = new Array<Array<BigInt>>(valueMatrix.length)
       for (let i: i32 = 0; i < valueMatrix.length; i++) {
@@ -336,7 +332,11 @@ export namespace ethereum {
     }
 
     static fromMatrix(values: Array<Array<Value>>): Value {
-      return new Value(ValueKind.MATRIX, changetype<u32>(values))
+      let innerOut = new Array<Value>(values.length)
+      for (let i: i32 = 0; i < innerOut.length; i++) {
+        innerOut[i] = Value.fromArray(values[i])
+      }
+      return Value.fromArray(innerOut)
     }
 
     static fromTupleArray(values: Array<Tuple>): Value {

package/examples/basic-event-handlers/node_modules/@graphprotocol/graph-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graphprotocol/graph-ts",
   "description": "TypeScript/AssemblyScript library for writing subgraph mappings for The Graph",
-  "version": "0.28.0-alpha.0",
+  "version": "0.28.0",
   "module": "index.ts",
   "types": "index.ts",
   "main": "index.ts",

package/examples/basic-event-handlers/package.json

@@ -9,7 +9,7 @@
     "deploy-test": "../../bin/graph deploy test/basic-event-handlers --version-label v0.0.1 --ipfs http://localhost:15001 --node http://127.0.0.1:18020"
   },
   "devDependencies": {
-    "@graphprotocol/graph-ts": "0.28.0-alpha.0",
+    "@graphprotocol/graph-ts": "0.28.0",
     "apollo-fetch": "^0.7.0"
   },
   "dependencies": {

package/examples/basic-event-handlers/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.28.0-alpha.0":
-  version "0.28.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.28.0-alpha.0.tgz#2d687842c42a25b306e49591cecc413af5ded91f"
-  integrity sha512-3ZaYh8Xs9cMGcfW8ft+HR0rpT1/SM3wRnUsyPHjPpdVaOykjRTz5noRKYkYFw8r6tdlC+xIWc34/Qp6RaT9SBg==
+"@graphprotocol/graph-ts@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.28.0.tgz#4229ad10b9a956c76f126bb08a856c556eedef22"
+  integrity sha512-Qug3KpmqZ/KOg3FFBOtD74GAK/9AkR7lTxoEYMdx3jZ/+fi9oOSDod2vEkLOjUxsE7yZOseNqiXOxeU0XGqJWw==
   dependencies:
     assemblyscript "0.19.10"
 

package/examples/example-subgraph/package.json

@@ -7,7 +7,7 @@
     "build-wast": "../../bin/graph build -t wast subgraph.yaml"
   },
   "devDependencies": {
-    "@graphprotocol/graph-ts": "0.28.0-alpha.0"
+    "@graphprotocol/graph-ts": "0.28.0"
   },
   "resolutions": {
     "assemblyscript": "0.19.10"

package/examples/example-subgraph/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.28.0-alpha.0":
-  version "0.28.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.28.0-alpha.0.tgz#2d687842c42a25b306e49591cecc413af5ded91f"
-  integrity sha512-3ZaYh8Xs9cMGcfW8ft+HR0rpT1/SM3wRnUsyPHjPpdVaOykjRTz5noRKYkYFw8r6tdlC+xIWc34/Qp6RaT9SBg==
+"@graphprotocol/graph-ts@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.28.0.tgz#4229ad10b9a956c76f126bb08a856c556eedef22"
+  integrity sha512-Qug3KpmqZ/KOg3FFBOtD74GAK/9AkR7lTxoEYMdx3jZ/+fi9oOSDod2vEkLOjUxsE7yZOseNqiXOxeU0XGqJWw==
   dependencies:
     assemblyscript "0.19.10"
 

package/package.json

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

package/src/codegen/types/conversions.js

@@ -179,7 +179,6 @@ const ASSEMBLYSCRIPT_TO_ETHEREUM_VALUE = [
     code => `ethereum.Value.fromTupleArray(${code})`,
   ],
   
-  // ethereumToAsc
   // Multi dimentional arrays
 
   [

package/src/codegen/util.js

@@ -18,13 +18,17 @@ const isTupleType = t => {
 }
 
 const containsTupleType = t => {
-  return isTupleType(t) || isTupleArrayType(t)
+  return isTupleType(t) || isTupleArrayType(t) || isTupleMatrixType(t)
 }
 
 const isTupleArrayType = t => {
   return t.match(/^tuple\[([0-9]+)?\]$/)
 }
 
+const isTupleMatrixType = t => {
+  return t.match(/^tuple\[([0-9]+)?\]\[([0-9]+)?\]$/)
+}
+
 const unrollTuple = ({ path, index, value }) =>
   value.components.reduce((acc, component, index) => {
     let name = component.name || `value${index}`
@@ -44,5 +48,6 @@ module.exports = {
   disambiguateNames,
   isTupleType,
   isTupleArrayType,
+  isTupleMatrixType,
   unrollTuple,
 }

package/src/command-helpers/abi.js

@@ -65,6 +65,7 @@ const getEtherscanLikeAPIUrl = (network) => {
     case "mbase": return `https://api-moonbase.moonscan.io/api`
     case "avalanche": return `https://api.snowtrace.io/api`;
     case "fuji": return `https://api-testnet.snowtrace.io/api`;
+    case "gnosis": return `https://api.gnosisscan.io/api`;
     default: return `https://api-${network}.etherscan.io/api`
   }
 }

package/src/command-helpers/spinner.js

@@ -28,8 +28,14 @@ const withSpinner = async (text, errorText, warningText, f) => {
   try {
     let result = await f(spinner)
     if (typeof result === 'object') {
+      let hasError = Object.keys(result).indexOf('error') >= 0
       let hasWarning = Object.keys(result).indexOf('warning') >= 0
       let hasResult = Object.keys(result).indexOf('result') >= 0
+
+      if (hasError) {
+        spinner.fail(`${errorText}: ${result.error}`)
+        return hasResult ? result.result : result
+      }
       if (hasWarning && hasResult) {
         if (result.warning !== null) {
           spinner.warn(`${warningText}: ${result.warning}`)

package/src/command-helpers/studio.js

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

package/src/command-helpers/studio.test.js

@@ -12,10 +12,19 @@ describe('Version Command Helpers', () => {
           .toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${allowedStudioNetworks.join(', ')}`))
       })
 
-      test("And it's NOT Ethereum mainnet", () => {
+      test("And it's Gnosis chain", () => {
+        expect(() => validateStudioNetwork({
+          studio: true,
+          network: 'gnosis',
+        }))
+          .not
+          .toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${allowedStudioNetworks.join(', ')}`))
+      })
+
+      test("And it's NOT an allowed network", () => {
         expect(() => validateStudioNetwork({
           product: 'subgraph-studio',
-          network: 'xdai',
+          network: 'celo',
         }))
           .toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${allowedStudioNetworks.join(', ')}`))
       })
@@ -31,10 +40,10 @@ describe('Version Command Helpers', () => {
           .toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${allowedStudioNetworks.join(', ')}`))
       })
 
-      test("And it's NOT Ethereum mainnet", () => {
+      test("And it's NOT an allowed network", () => {
         expect(() => validateStudioNetwork({
           product: 'hosted-service',
-          network: 'xdai',
+          network: 'celo',
         }))
           .not
           .toThrow(new Error(`The Subgraph Studio only allows subgraphs for these networks: ${allowedStudioNetworks.join(', ')}`))

package/src/commands/init.js

@@ -24,6 +24,8 @@ const Protocol = require('../protocols')
 const protocolChoices = Array.from(Protocol.availableProtocols().keys())
 const availableNetworks = Protocol.availableNetworks()
 
+const DEFAULT_EXAMPLE_SUBGRAPH = 'ethereum/gravatar'
+
 const HELP = `
 ${chalk.bold('graph init')} [options] [subgraph-name] [directory]
 
@@ -40,7 +42,7 @@ ${chalk.dim('Options:')}
 ${chalk.dim('Choose mode with one of:')}
 
       --from-contract <contract> Creates a scaffold based on an existing contract
-      --from-example             Creates a scaffold based on an example subgraph
+      --from-example [example]   Creates a scaffold based on an example subgraph
 
 ${chalk.dim('Options for --from-contract:')}
 
@@ -106,7 +108,7 @@ const processInitForm = async (
       message: 'Product for which to initialize',
       choices: ['subgraph-studio', 'hosted-service'],
       skip: () =>
-        protocol === 'near' ||
+        protocol === 'arweave' || protocol === 'cosmos' || protocol === 'near' ||
         product === 'subgraph-studio' ||
         product === 'hosted-service' ||
         studio !== undefined || node !== undefined,
@@ -280,9 +282,6 @@ const loadAbiFromFile = async (ABI, filename) => {
 
 module.exports = {
   description: 'Creates a new subgraph with basic scaffolding',
-  options: {
-    boolean: ['from-example'],
-  },
   run: async toolbox => {
     // Obtain tools
     let { print, system } = toolbox
@@ -317,7 +316,6 @@ module.exports = {
     let subgraphName, directory
     try {
       ;[subgraphName, directory] = fixParameters(toolbox.parameters, {
-        fromExample,
         allowSimpleName,
         help,
         h,
@@ -368,7 +366,7 @@ module.exports = {
     if (fromExample && subgraphName && directory) {
       return await initSubgraphFromExample(
         toolbox,
-        { allowSimpleName, directory, subgraphName, studio, product },
+        { fromExample, allowSimpleName, directory, subgraphName, studio, product },
         { commands },
       )
     }
@@ -455,6 +453,7 @@ module.exports = {
       await initSubgraphFromExample(
         toolbox,
         {
+          fromExample: fromExample,
           subgraphName: inputs.subgraphName,
           directory: inputs.directory,
           studio: inputs.studio,
@@ -588,7 +587,7 @@ Make sure to visit the documentation on https://thegraph.com/docs/ for further i
 
 const initSubgraphFromExample = async (
   toolbox,
-  { allowSimpleName, subgraphName, directory, studio, product },
+  { fromExample, allowSimpleName, subgraphName, directory, studio, product },
   { commands },
 ) => {
   let { filesystem, print, system } = toolbox
@@ -612,10 +611,32 @@ const initSubgraphFromExample = async (
     `Failed to clone example subgraph`,
     `Warnings while cloning example subgraph`,
     async spinner => {
-      await system.run(
-        `git clone http://github.com/graphprotocol/example-subgraph ${directory}`,
-      )
-      return true
+      // Create a temporary directory
+      const prefix = path.join(os.tmpdir(), 'example-subgraph-')
+      const tmpDir = fs.mkdtempSync(prefix)
+
+      try {
+        await system.run(
+          `git clone http://github.com/graphprotocol/example-subgraphs ${tmpDir}`
+        )
+
+        // If an example is not specified, use the default one
+        if (fromExample === undefined || fromExample === true) {
+          fromExample = DEFAULT_EXAMPLE_SUBGRAPH
+        }
+
+        const exampleSubgraphPath = path.join(tmpDir, fromExample);
+
+        if (!filesystem.exists(exampleSubgraphPath)) {
+          return { result: false, error: `Example not found: ${fromExample}` }
+        }
+
+        filesystem.copy(exampleSubgraphPath, directory)
+        return true
+      }
+      finally {
+        filesystem.remove(tmpDir)
+      }
     },
   )
   if (!cloned) {

package/src/protocols/ethereum/abi.js

@@ -5,6 +5,7 @@ const path = require('path')
 const AbiCodeGenerator = require('./codegen/abi')
 
 const TUPLE_ARRAY_PATTERN = /^tuple\[([0-9]*)\]$/
+const TUPLE_MATRIX_PATTERN = /^tuple\[([0-9]*)\]\[([0-9]*)\]$/
 
 const buildOldSignatureParameter = input => {
   return input.get('type') === 'tuple'
@@ -27,6 +28,13 @@ const buildSignatureParameter = input => {
       .get('components')
       .map(component => buildSignatureParameter(component))
       .join(',')})[${length ? length : ''}]`
+  } else if (input.get('type').match(TUPLE_MATRIX_PATTERN)) {
+    const length1 = input.get('type').match(TUPLE_MATRIX_PATTERN)[1]
+    const length2 = input.get('type').match(TUPLE_MATRIX_PATTERN)[2]
+    return `(${input.get('indexed') ? 'indexed ' : ''}${input
+      .get('components')
+      .map(component => buildSignatureParameter(component))
+      .join(',')})[${length1 ? length1 : ''}][${length2 ? length2 : ''}]`
   } else {
     return `${input.get('indexed') ? 'indexed ' : ''}${input.get('type')}`
   }

package/src/protocols/ethereum/codegen/abi.js

@@ -362,7 +362,11 @@ module.exports = class AbiCodeGenerator {
     let tupleGetter = tsCodegen.method(
       `get ${name}`,
       [],
-      util.isTupleArrayType(type) ? `Array<${tupleClassName}>` : tupleClassName,
+      util.isTupleMatrixType(type)
+      ? `Array<Array<${tupleClassName}>>`
+      : util.isTupleArrayType(type)
+      ? `Array<${tupleClassName}>`
+      : tupleClassName,
       `
       return ${
         isTupleType ? `changetype<${tupleClassName}>(${returnValue})` : `${returnValue}`
@@ -686,6 +690,13 @@ module.exports = class AbiCodeGenerator {
     const type = inputOrOutput.get('type')
     return util.isTupleType(type)
       ? this._tupleTypeName(inputOrOutput, index, tupleParentType, this.abi.name)
+      : util.isTupleMatrixType(type)
+      ? `Array<Array<${this._tupleTypeName(
+          inputOrOutput,
+          index,
+          tupleParentType,
+          this.abi.name,
+        )}>>`
       : util.isTupleArrayType(type)
       ? `Array<${this._tupleTypeName(
           inputOrOutput,

package/src/protocols/index.js

@@ -46,7 +46,7 @@ module.exports = class Protocol {
         'goerli',
         'poa-core',
         'poa-sokol',
-        'xdai',
+        'gnosis',
         'matic',
         'mumbai',
         'fantom',

package/src/scaffold/index.js

@@ -53,7 +53,7 @@ module.exports = class Scaffold {
         },
         dependencies: {
           '@graphprotocol/graph-cli': GRAPH_CLI_VERSION,
-          '@graphprotocol/graph-ts': `0.28.0-alpha.0`,
+          '@graphprotocol/graph-ts': `0.28.0`,
         },
         devDependencies: this.protocol.hasEvents() ? { 'matchstick-as': `0.5.0`} : undefined,
       }),

package/src/subgraph.js

@@ -100,17 +100,18 @@ module.exports = class Subgraph {
   }
 
   static validateRepository(manifest, { resolveFile }) {
-    return manifest.get('repository') !==
-      'https://github.com/graphprotocol/example-subgraph'
-      ? immutable.List()
-      : immutable.List().push(
+    const repository = manifest.get('repository')
+
+    return /^https:\/\/github\.com\/graphprotocol\/example-subgraphs?$/.test(repository)
+      ? immutable.List().push(
           immutable.fromJS({
             path: ['repository'],
             message: `\
-The repository is still set to https://github.com/graphprotocol/example-subgraph.
+The repository is still set to ${repository}.
 Please replace it with a link to your subgraph source code.`,
           }),
         )
+      : immutable.List()
   }
 
   static validateDescription(manifest, { resolveFile }) {

package/src/validation/manifest.js

@@ -247,7 +247,7 @@ const validateValue = (value, ctx) => {
 // [
 //   { name: 'contract0', kind: 'ethereum/contract', network: 'mainnet' },
 //   { name: 'contract1', kind: 'ethereum', network: 'mainnet' },
-//   { name: 'contract2', kind: 'ethereum/contract', network: 'xdai' },
+//   { name: 'contract2', kind: 'ethereum/contract', network: 'gnosis' },
 //   { name: 'contract3', kind: 'near', network: 'near-mainnet' },
 // ]
 //
@@ -255,7 +255,7 @@ const validateValue = (value, ctx) => {
 // {
 //   ethereum: {
 //     mainnet: ['contract0', 'contract1'],
-//     xdai: ['contract2'],
+//     gnosis: ['contract2'],
 //   },
 //   near: {
 //     'near-mainnet': ['contract3'],

package/tests/cli/init.test.js

@@ -15,6 +15,7 @@ describe('Init', () => {
         'ethereum',
         '--studio',
         '--from-example',
+        'ethereum/gravatar',
         'user/example-subgraph',
         path.join(ethereumBaseDir, 'from-example'),
       ],