From 09ca30cc4ec0eb83a0231b4dba5e53e8045ff328 Mon Sep 17 00:00:00 2001 From: Serhii Shymkiv Date: Tue, 7 May 2024 13:59:02 +0300 Subject: [PATCH 1/2] Search for class names that extend any other classes (hotfix). --- src/lib/deploy.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/deploy.js b/src/lib/deploy.js index 60ae8f17..21aa6e5c 100644 --- a/src/lib/deploy.js +++ b/src/lib/deploy.js @@ -674,9 +674,11 @@ export async function findSmartContracts(path) { for (const file of files) { const str = fs.readFileSync(file, 'utf-8'); - let results = str.matchAll(/class (\w*) extends SmartContract/gi); + // TODO: Implement better SmartContract classes lookup. + // https://github.com/o1-labs/zkapp-cli/issues/636 + let results = str.matchAll(/class (\w+) (extends|implements) (\w+)/gi); results = Array.from(results) ?? []; // prevent error if no results - results = results.map((result) => result[1]); // only keep capture groups + results = results.map((result) => result[1]); // only keep first capture group, the class name smartContracts.push(...results); } return smartContracts; From adabce75fc1e4d0a9bdc0c5f20c76f9cbefbd40f Mon Sep 17 00:00:00 2001 From: Serhii Shymkiv Date: Tue, 7 May 2024 15:39:56 +0300 Subject: [PATCH 2/2] Changelog and version bump. --- CHANGELOG.md | 6 ++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdbf1b1c..96c9d28e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## Unreleased +## [0.20.2](https://github.com/o1-labs/zkapp-cli/compare/0.20.1...0.20.2) - 2024-05-07 + +### Fixed + +- [Hotfix] SmartContract classes lookup for deployment. [#637](https://github.com/o1-labs/zkapp-cli/pull/637) + ## [0.20.1](https://github.com/o1-labs/zkapp-cli/compare/0.20.0...0.20.1) - 2024-04-30 ### Added diff --git a/package-lock.json b/package-lock.json index 61cea071..06800a0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "zkapp-cli", - "version": "0.20.1", + "version": "0.20.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "zkapp-cli", - "version": "0.20.1", + "version": "0.20.2", "license": "Apache-2.0", "dependencies": { "chalk": "^5.3.0", diff --git a/package.json b/package.json index 08d9d519..b28214d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zkapp-cli", - "version": "0.20.1", + "version": "0.20.2", "description": "CLI to create zkApps (zero-knowledge apps) for Mina Protocol", "homepage": "https://github.com/o1-labs/zkapp-cli/", "keywords": [