@graphprotocol/graph-cli 0.23.1 → 0.24.1

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

@@ -69,6 +69,89 @@ For examples of `graph-ts` in use take a look at one of the following subgraphs:
 * https://github.com/graphprotocol/aragon-subgraph
 * https://github.com/graphprotocol/dharma-subgraph  
 
+## Release process
+
+The steps to create a new version of the `graph-ts` are:
+
+1. Decide which version number you'll be rolling out. You can check the differences between the current `master` branch and the latest release.
+2. Create a PR with the commit generated by `npm version <VERSION> [<PREID>]`.
+3. Once that's approved and merged to `master`, you can publish it to `npm` and push the git tags as well.
+4. Last but not least, create a Github Release refering to the pushed git tag, linking to the PRs involved.
+
+Helpful links:
+
+- [Semver official docs](https://semver.org/)
+- [`npm version` docs](https://docs.npmjs.com/cli/v7/commands/npm-version)
+- [`npm publish` docs](https://docs.npmjs.com/cli/v7/commands/npm-publish)
+- [`npm unpublish` docs](https://docs.npmjs.com/cli/v7/commands/npm-unpublish)
+- [`npm deprecate` docs](https://docs.npmjs.com/cli/v7/commands/npm-deprecate)
+
+### Stable release example
+
+Current version: `0.34.9`.
+Desired release: `0.35.0`.
+
+To create the PR:
+```
+git checkout -b <BRANCH>
+
+npm version minor
+
+git push --set-upstream <REMOTE> <BRANCH>
+```
+
+Once that's approved and merged, you can update your local `master` and:
+
+```
+npm publish
+
+npm push --tags
+```
+
+### Alpha release example
+
+Current version: `0.29.2`.
+Desired release: `0.30.0-alpha.0`.
+
+To create the PR:
+```
+git checkout -b <BRANCH>
+
+npm version preminor --preid alpha
+
+git push --set-upstream <REMOTE> <BRANCH>
+```
+
+Once that's approved and merged, you can update your local `master` and:
+
+```
+npm publish --tag alpha
+
+npm push --tags
+```
+
+### Alpha pre-release example
+
+Current version: `0.30.0-alpha.0`.
+Desired release: `0.30.0-alpha.1`.
+
+To create the PR:
+```
+git checkout -b <BRANCH>
+
+npm version prerelease --preid alpha
+
+git push --set-upstream <REMOTE> <BRANCH>
+```
+
+Once that's approved and merged, you can update your local `master` and:
+
+```
+npm publish --tag alpha
+
+npm push --tags
+```
+
 ## License
 
 Copyright &copy; 2018 Graph Protocol, Inc. and contributors.

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

@@ -339,6 +339,7 @@ export namespace ethereum {
       public difficulty: BigInt,
       public totalDifficulty: BigInt,
       public size: BigInt | null,
+      public baseFeePerGas: BigInt | null,
     ) {}
   }
 
@@ -355,6 +356,7 @@ export namespace ethereum {
       public gasLimit: BigInt,
       public gasPrice: BigInt,
       public input: Bytes,
+      public nonce: Bytes,
     ) {}
   }
 

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

@@ -14,13 +14,13 @@ export declare namespace json {
 }
 
 export namespace json {
-  function fromString(data: string): JSONValue {
+  export function fromString(data: string): JSONValue {
     let bytes = Bytes.fromUTF8(data)
 
     return json.fromBytes(bytes)
   }
 
-  function try_fromString(data: string): Result<JSONValue, boolean> {
+  export function try_fromString(data: string): Result<JSONValue, boolean> {
     let bytes = Bytes.fromUTF8(data)
 
     return json.try_fromBytes(bytes)

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.23.1",
+  "version": "0.24.0",
   "module": "index.ts",
   "types": "index.ts",
   "main": "index.ts",
@@ -9,16 +9,11 @@
     "assemblyscript": "0.19.10"
   },
   "devDependencies": {
-    "glob": "^7.1.2",
     "prettier": "^2.4.1"
   },
   "scripts": {
     "lint": "prettier -c **/*.{js,ts}",
     "build": "asc --explicitStart --exportRuntime --runtime stub index.ts helper-functions.ts --lib graph-ts -b index.wasm",
-    "test": "node test/test.js",
-    "release:patch": "npm version patch && npm publish && git push origin master && git push --tags",
-    "release:minor": "npm version minor && npm publish && git push origin master && git push --tags",
-    "release:alpha:minor": "npm version preminor --preid alpha && npm publish --tag alpha && git push origin master && git push --tags",
-    "release:alpha:prerelease": "npm version prerelease --preid alpha && npm publish --tag alpha && git push origin master && git push --tags"
+    "test": "node test/test.js"
   }
 }

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.23.1",
+    "@graphprotocol/graph-ts": "0.24.1",
     "apollo-fetch": "^0.7.0"
   },
   "dependencies": {

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

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.23.1":
-  version "0.23.1"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.23.1.tgz#76e595d26ec5672f3778b1d3830e4640a57aec1b"
-  integrity sha512-pipofvN1LlwLOXrS7IWy8hSBFZzVyVHdLXDpQskl9nKqdbb3chelj4JoVEzCl7klvomDpP84ngLpW17fBh5vww==
+"@graphprotocol/graph-ts@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.24.1.tgz#50961b52b5383f9c5cf5e6e23fa039f24e729ddf"
+  integrity sha512-2vU4m5ZPQIqMlMce/z5vmOtGHRlRmcRhMfemS3NIwxCSxSBGVnX2zb7QBTzzdQKGwsAZdbz6V0okkOtvohELfQ==
   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.23.1"
+    "@graphprotocol/graph-ts": "0.24.1"
   },
   "resolutions": {
     "assemblyscript": "0.19.10"

package/examples/example-subgraph/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.23.1":
-  version "0.23.1"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.23.1.tgz#76e595d26ec5672f3778b1d3830e4640a57aec1b"
-  integrity sha512-pipofvN1LlwLOXrS7IWy8hSBFZzVyVHdLXDpQskl9nKqdbb3chelj4JoVEzCl7klvomDpP84ngLpW17fBh5vww==
+"@graphprotocol/graph-ts@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.24.1.tgz#50961b52b5383f9c5cf5e6e23fa039f24e729ddf"
+  integrity sha512-2vU4m5ZPQIqMlMce/z5vmOtGHRlRmcRhMfemS3NIwxCSxSBGVnX2zb7QBTzzdQKGwsAZdbz6V0okkOtvohELfQ==
   dependencies:
     assemblyscript "0.19.10"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.23.1",
+  "version": "0.24.1",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {
     "assemblyscript": "0.19.10",

package/src/commands/init.js

@@ -262,6 +262,7 @@ const getEtherscanLikeAPIUrl = (network) => {
     case "mainnet": return `https://api.etherscan.io/api`;
     case "bsc": return `https://api.bscscan.com/api`;
     case "matic": return `https://api.polygonscan.com/api`;
+    case "mumbai": return `https://api-testnet.polygonscan.com/api`;
     default: return `https://api-${network}.etherscan.io/api`;
   }
 } 

package/src/commands/test.js

@@ -11,6 +11,7 @@ ${chalk.dim('Options:')}
 
   -f  --force                   Overwrite folder + file when downloading
   -h, --help                    Show usage information
+  -l, --logs                    Logs to the console information about the OS, CPU model and download url (debugging purposes)
   -v, --version <tag>           Choose the version of the rust binary that you want to be downloaded/used
   `
 
@@ -21,12 +22,13 @@ module.exports = {
     let { print } = toolbox
 
     // Read CLI parameters
-    let { f, force, h, help, v, version } = toolbox.parameters.options
+    let { f, force, h, help, l, logs, v, version } = toolbox.parameters.options
     let datasource = toolbox.parameters.first
 
     // Support both long and short option variants
     force = force || f
     help = help || h
+    logs = logs || l
     version = version || v
 
     // Show help text if requested
@@ -35,48 +37,56 @@ module.exports = {
       return
     }
 
-    const platform = getPlatform();
+    const platform = getPlatform(logs)
     if (!version) {
-      let result = await fetch('https://api.github.com/repos/LimeChain/matchstick/releases/latest');
-      let json = await result.json();
-      version = json.tag_name;
+      let result = await fetch('https://api.github.com/repos/LimeChain/matchstick/releases/latest')
+      let json = await result.json()
+      version = json.tag_name
     }
 
-    const url = `https://github.com/LimeChain/matchstick/releases/download/${version}/${platform}`;
+    const url = `https://github.com/LimeChain/matchstick/releases/download/${version}/${platform}`
 
-    let binary = new Binary(platform, url, version);
-    await binary.install(force);
-    datasource ? binary.run(datasource) : binary.run();
+    if (logs) {
+      console.log(`Download link: ${url}`)
+    }
+
+    let binary = new Binary(platform, url, version)
+    await binary.install(force)
+    datasource ? binary.run(datasource) : binary.run()
   }
 }
 
-function getPlatform() {
-  const type = os.type();
-  const arch = os.arch();
-  const release = os.release();
-  const cpuCore = os.cpus()[0];
-  const majorVersion = semver.major(release);
-  const isM1 = cpuCore.model.includes("Apple M1");
+function getPlatform(logs) {
+  const type = os.type()
+  const arch = os.arch()
+  const release = os.release()
+  const cpuCore = os.cpus()[0]
+  const majorVersion = semver.major(release)
+  const isM1 = cpuCore.model.includes("Apple M1")
+
+  if (logs) {
+    console.log(`OS type: ${type}\nOS arch: ${arch}\nOS release: ${release}\nOS major version: ${majorVersion}\nCPU model: ${cpuCore.model}`)
+  }
 
   if (arch === 'x64' || (arch === 'arm64' && isM1)) {
     if (type === 'Darwin') {
-      if (majorVersion === '19') {
-        return 'binary-macos-10.15';
-      } else if (majorVersion === '18') {
-        return 'binary-macos-10.14';
+      if (majorVersion === 19) {
+        return 'binary-macos-10.15'
+      } else if (majorVersion === 18) {
+        return 'binary-macos-10.14'
       } else if (isM1) {
-        return 'binary-macos-11-m1';
+        return 'binary-macos-11-m1'
       }
-      return 'binary-macos-11';
+      return 'binary-macos-11'
     } else if (type === 'Linux') {
-      if (majorVersion === '18') {
-        return 'binary-linux-18';
+      if (majorVersion === 18) {
+        return 'binary-linux-18'
       }
-      return 'binary-linux-20';
+      return 'binary-linux-20'
     } else if (type === 'Windows_NT') {
-      return 'binary-windows';
+      return 'binary-windows'
     }
   }
 
-  throw new Error(`Unsupported platform: ${type} ${arch} ${majorVersion}`);
+  throw new Error(`Unsupported platform: ${type} ${arch} ${majorVersion}`)
 }

package/src/migrations/mapping_api_version_0_0_5.js

@@ -0,0 +1,74 @@
+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.5, replace them with 0.0.6
+module.exports = {
+  name: 'Bump mapping apiVersion from 0.0.5 to 0.0.6',
+  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.23.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.24.0') &&
+      // ...and we have a manifest with mapping > apiVersion = 0.0.5
+      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.5'),
+        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.5'),
+            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.5', 'g'),
+      'apiVersion: 0.0.6',
+    )
+    await toolbox.patching.replace(
+      manifestFile,
+      new RegExp("apiVersion: '0.0.5'", 'g'),
+      "apiVersion: '0.0.6'",
+    )
+    await toolbox.patching.replace(
+      manifestFile,
+      new RegExp('apiVersion: "0.0.5"', 'g'),
+      'apiVersion: "0.0.6"',
+    )
+  },
+}

package/src/scaffold.js

@@ -49,7 +49,7 @@ const generatePackageJson = ({ subgraphName, node }) =>
       },
       dependencies: {
         '@graphprotocol/graph-cli': graphCliVersion,
-        '@graphprotocol/graph-ts': `0.23.1`,
+        '@graphprotocol/graph-ts': `0.24.1`,
       },
     }),
     { parser: 'json' },