@graphprotocol/graph-cli 0.59.0-alpha-20230928143131-f349bfd → 0.59.0

package/CHANGELOG.md

@@ -1,19 +1,29 @@
 # @graphprotocol/graph-cli
 
-## 0.59.0-alpha-20230928143131-f349bfd
+## 0.59.0
 
 ### Minor Changes
 
 - [#1457](https://github.com/graphprotocol/graph-tooling/pull/1457)
-  [`f349bfd`](https://github.com/graphprotocol/graph-tooling/commit/f349bfd12da3feecc5227020d39eb5802a5d4e1c)
+  [`b7dc8a5`](https://github.com/graphprotocol/graph-tooling/commit/b7dc8a5fe32d0241f2bef5f118a9e1de819b61a9)
   Thanks [@saihaj](https://github.com/saihaj)! - do not generate loader for interfaces
 
 ### Patch Changes
 
+- [#1470](https://github.com/graphprotocol/graph-tooling/pull/1470)
+  [`4c1ca35`](https://github.com/graphprotocol/graph-tooling/commit/4c1ca35d7c5cf6ee3aae119d578978e55074f5e9)
+  Thanks [@axiomatic-aardvark](https://github.com/axiomatic-aardvark)! - Update 'test' command to
+  reflect new matchstick version
+
 - [#1458](https://github.com/graphprotocol/graph-tooling/pull/1458)
   [`05e61d2`](https://github.com/graphprotocol/graph-tooling/commit/05e61d212caf8bdb735e8527dbbab6a0beca516d)
   Thanks [@saihaj](https://github.com/saihaj)! - do not init a git repo if a repo already exists
 
+- [#1462](https://github.com/graphprotocol/graph-tooling/pull/1462)
+  [`b5f28bc`](https://github.com/graphprotocol/graph-tooling/commit/b5f28bc33a43b84ce4b6fe004c553e4de5e896a6)
+  Thanks [@omahs](https://github.com/omahs)! - deprecate `--skip-wait-for-etherium` for
+  `graph local`
+
 - [#1459](https://github.com/graphprotocol/graph-tooling/pull/1459)
   [`129d003`](https://github.com/graphprotocol/graph-tooling/commit/129d003838b9b138391835f5a03b21aa05c34e15)
   Thanks [@pustovalov](https://github.com/pustovalov)! - fix ABI api endpoint aurora networks

package/dist/commands/local.d.ts

@@ -13,6 +13,7 @@ export default class LocalCommand extends Command {
         'standalone-node': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'standalone-node-args': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'skip-wait-for-ipfs': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'skip-wait-for-ethereum': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'skip-wait-for-etherium': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'skip-wait-for-postgres': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

package/dist/commands/local.js

@@ -17,7 +17,8 @@ const spinner_1 = require("../command-helpers/spinner");
 tmp_promise_1.default.setGracefulCleanup();
 class LocalCommand extends core_1.Command {
     async run() {
-        const { args: { 'local-command': testCommand }, flags: { 'compose-file': composeFileFlag, 'ethereum-logs': ethereumLogsFlag, 'node-image': nodeImage, 'node-logs': nodeLogsFlag, 'skip-wait-for-etherium': skipWaitForEthereum, 'skip-wait-for-ipfs': skipWaitForIpfs, 'skip-wait-for-postgres': skipWaitForPostgres, 'standalone-node': standaloneNode, 'standalone-node-args': standaloneNodeArgs, timeout, }, } = await this.parse(LocalCommand);
+        const { args: { 'local-command': testCommand }, flags: { 'compose-file': composeFileFlag, 'ethereum-logs': ethereumLogsFlag, 'node-image': nodeImage, 'node-logs': nodeLogsFlag, 'skip-wait-for-etherium': skipWaitForEthereumTypo, 'skip-wait-for-ethereum': skipWaitForEthereumGood, 'skip-wait-for-ipfs': skipWaitForIpfs, 'skip-wait-for-postgres': skipWaitForPostgres, 'standalone-node': standaloneNode, 'standalone-node-args': standaloneNodeArgs, timeout, }, } = await this.parse(LocalCommand);
+        const skipWaitForEthereum = skipWaitForEthereumTypo || skipWaitForEthereumGood;
         // Obtain the Docker Compose file for services that the tests run against
         const composeFile = composeFileFlag ||
             path_1.default.join(__dirname, '..', '..', 'resources', 'test', standaloneNode ? 'docker-compose-standalone-node.yml' : 'docker-compose.yml');
@@ -25,7 +26,10 @@ class LocalCommand extends core_1.Command {
             this.error(`Docker Compose file "${composeFile}" not found`, { exit: 1 });
         }
         // Create temporary directory to operate in
-        const { path: tempdir } = await tmp_promise_1.default.dir({ prefix: 'graph-test', unsafeCleanup: true });
+        const { path: tempdir } = await tmp_promise_1.default.dir({
+            prefix: 'graph-test',
+            unsafeCleanup: true,
+        });
         try {
             await configureTestEnvironment(tempdir, composeFile, nodeImage);
         }
@@ -170,8 +174,15 @@ LocalCommand.flags = {
     'skip-wait-for-ipfs': core_1.Flags.boolean({
         summary: "Don't wait for IPFS to be up at localhost:15001",
     }),
+    'skip-wait-for-ethereum': core_1.Flags.boolean({
+        summary: "Don't wait for Ethereum to be up at localhost:18545",
+    }),
+    // TODO: Remove in next major release
     'skip-wait-for-etherium': core_1.Flags.boolean({
         summary: "Don't wait for Ethereum to be up at localhost:18545",
+        deprecated: {
+            message: 'Use --skip-wait-for-ethereum instead',
+        },
     }),
     'skip-wait-for-postgres': core_1.Flags.boolean({
         summary: "Don't wait for Postgres to be up at localhost:15432",

package/dist/commands/test.js

@@ -123,7 +123,7 @@ async function runBinary(datasource, opts) {
     const versionOpt = opts.version;
     const latestVersion = opts.latestVersion;
     const recompileOpt = opts.recompile;
-    const platform = await getPlatform.bind(this)(logsOpt);
+    const platform = await getPlatform.bind(this)(versionOpt || latestVersion, logsOpt);
     const url = `https://github.com/LimeChain/matchstick/releases/download/${versionOpt || latestVersion}/${platform}`;
     if (logsOpt) {
         this.log(`Download link: ${url}`);
@@ -141,7 +141,7 @@ async function runBinary(datasource, opts) {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     args.length > 0 ? binary.run(...args) : binary.run();
 }
-async function getPlatform(logsOpt) {
+async function getPlatform(matchstickVersion, logsOpt) {
     const type = os_1.default.type();
     const arch = os_1.default.arch();
     const cpuCore = os_1.default.cpus()[0];
@@ -154,23 +154,34 @@ async function getPlatform(logsOpt) {
         this.log(`OS type: ${linuxDistro || type}\nOS arch: ${arch}\nOS release: ${release}\nOS major version: ${majorVersion}\nCPU model: ${cpuCore.model}`);
     }
     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
+        if (semver_1.default.gt(matchstickVersion, '0.5.4')) {
+            if (type === 'Darwin') {
+                if (isAppleSilicon) {
+                    return 'binary-macos-12-m1';
+                }
+                return 'binary-macos-12';
             }
-            if (isAppleSilicon) {
-                return 'binary-macos-11-m1';
+            if (type === 'Linux' && majorVersion === 22) {
+                return 'binary-linux-22';
             }
-            return 'binary-macos-11';
         }
-        if (type === 'Linux') {
-            if (majorVersion === 18) {
-                return 'binary-linux-18';
+        else {
+            if (type === 'Darwin') {
+                if (majorVersion === 18 || majorVersion === 19) {
+                    return 'binary-macos-10.15';
+                }
+                if (isAppleSilicon) {
+                    return 'binary-macos-11-m1';
+                }
+                return 'binary-macos-11';
             }
-            if (majorVersion === 22) {
-                return 'binary-linux-22';
+            if (type === 'Linux') {
+                return majorVersion === 18
+                    ? 'binary-linux-18'
+                    : majorVersion === 22
+                        ? 'binary-linux-22'
+                        : 'binary-linux-20';
             }
-            return 'binary-linux-20';
         }
     }
     throw new Error(`Unsupported platform: ${type} ${arch} ${majorVersion}`);

package/dist/protocols/ethereum/subgraph.js

@@ -43,7 +43,7 @@ class EthereumSubgraph {
         return dataSourcesAndTemplates.reduce((errors, dataSourceOrTemplate) => errors.concat(this.validateDataSourceAbis(dataSourceOrTemplate.get('dataSource'), dataSourceOrTemplate.get('path'))), immutable_1.default.List());
     }
     validateDataSourceAbis(dataSource, path) {
-        // Validate that the the "source > abi" reference of all data sources
+        // Validate that the "source > abi" reference of all data sources
         // points to an existing ABI in the data source ABIs
         const abiName = dataSource.getIn(['source', 'abi']);
         const abiNames = dataSource.getIn(['mapping', 'abis']).map((abi) => abi.get('name'));

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.59.0-alpha-20230928143131-f349bfd",
+  "version": "0.59.0",
   "commands": {
     "add": {
       "id": "add",
@@ -724,11 +724,20 @@
           "summary": "Don't wait for IPFS to be up at localhost:15001",
           "allowNo": false
         },
+        "skip-wait-for-ethereum": {
+          "name": "skip-wait-for-ethereum",
+          "type": "boolean",
+          "summary": "Don't wait for Ethereum to be up at localhost:18545",
+          "allowNo": false
+        },
         "skip-wait-for-etherium": {
           "name": "skip-wait-for-etherium",
           "type": "boolean",
           "summary": "Don't wait for Ethereum to be up at localhost:18545",
-          "allowNo": false
+          "allowNo": false,
+          "deprecated": {
+            "message": "Use --skip-wait-for-ethereum instead"
+          }
         },
         "skip-wait-for-postgres": {
           "name": "skip-wait-for-postgres",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.59.0-alpha-20230928143131-f349bfd",
+  "version": "0.59.0",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {