o1js reflected changes. (#595)

Co-authored-by: Martin Minkov <[email protected]>

CHANGELOG.md

@@ -17,6 +17,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## Unreleased
 
+## [0.18.0](https://github.com/o1-labs/zkapp-cli/compare/v17.2...v18.0) - 2024-03-06
+
 ### Breaking changes
 
 - Lightnet error and edge cases handling. [#597](https://github.com/o1-labs/zkapp-cli/pull/597)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zkapp-cli",
-  "version": "0.17.2",
+  "version": "0.18.0",
   "description": "CLI to create zkApps (zero-knowledge apps) for Mina Protocol",
   "homepage": "https://github.com/o1-labs/zkapp-cli/",
   "keywords": [
@@ -65,7 +65,7 @@
     "fs-extra": "^11.2.0",
     "gittar": "^0.1.1",
     "mina-signer": "^3.0.4",
-    "o1js": "^0.16.*",
+    "o1js": "^0.17.*",
     "opener": "^1.5.2",
     "ora": "^8.0.1",
     "semver": "^7.6.0",
@@ -78,8 +78,8 @@
     "@shimkiv/cli-testing-library": "^0.1.7",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "cross-env": "^7.0.3",
     "eslint": "^8.57.0",
     "eslint-plugin-o1js": "^0.4.0",

src/bin/index.js

@@ -370,6 +370,9 @@ function getCustomizedStrings() {
       other: chalk.red('Unknown commands: %s'),
     },
     'Invalid values:': chalk.red('Invalid values:'),
+    'Argument: %s, Given: %s, Choices: %s': chalk.red(
+      'Argument: %s, Given: %s, Choices: %s'
+    ),
     'Argument check failed: %s': chalk.red('Argument check failed: %s'),
     'Implications failed:': chalk.red('Missing dependent arguments:'),
     'Not enough arguments following: %s': chalk.red(

templates/project-ts/package.json

@@ -36,6 +36,6 @@
     "typescript": "^4.7.2"
   },
   "peerDependencies": {
-    "o1js": "0.16.*"
+    "o1js": "0.17.*"
   }
 }

templates/project-ts/src/interact.ts

@@ -68,31 +68,31 @@ let feepayerAddress = feepayerKey.toPublicKey();
 let zkAppAddress = zkAppKey.toPublicKey();
 let zkApp = new Add(zkAppAddress);
 
-let sentTx;
 // compile the contract to create prover keys
 console.log('compile the contract...');
 await Add.compile();
+
 try {
   // call update() and send transaction
   console.log('build transaction and create proof...');
   let tx = await Mina.transaction({ sender: feepayerAddress, fee }, () => {
     zkApp.update();
   });
   await tx.prove();
+
   console.log('send transaction...');
-  sentTx = await tx.sign([feepayerKey]).send();
+  const sentTx = await tx.sign([feepayerKey]).send();
+  if (sentTx.status === 'pending') {
+    console.log(
+      '\nSuccess! Update transaction sent.\n' +
+        '\nYour smart contract state will be updated' +
+        '\nas soon as the transaction is included in a block:' +
+        `\n${getTxnUrl(config.url, sentTx.hash)}`
+    );
+  }
 } catch (err) {
   console.log(err);
 }
-if (sentTx?.hash() !== undefined) {
-  console.log(`
-Success! Update transaction sent.
-
-Your smart contract state will be updated
-as soon as the transaction is included in a block:
-${getTxnUrl(config.url, sentTx.hash())}
-`);
-}
 
 function getTxnUrl(graphQlUrl: string, txnHash: string | undefined) {
   const txnBroadcastServiceName = new URL(graphQlUrl).hostname

tests/cli/example.spec.ts

@@ -22,9 +22,9 @@ test.describe('zkApp-CLI', () => {
 
       expect(code).toBeGreaterThan(0);
       expect(stderr.at(-1)).toContain(
-        `name was "test". Must be one of: ${getArrayValuesAsString(
+        `Argument: name, Given: "test", Choices: ${getArrayValuesAsString(
           Constants.exampleTypes
-        )}.`
+        )}`
       );
     } finally {
       await cleanup();

tests/cli/project.spec.ts

@@ -24,9 +24,9 @@ test.describe('zkApp-CLI', () => {
 
       expect(code).toBeGreaterThan(0);
       expect(stderr.at(-1)).toContain(
-        `ui was "test". Must be one of: ${getArrayValuesAsString(
+        `Argument: ui, Given: "test", Choices: ${getArrayValuesAsString(
           Constants.uiTypes
-        )}.`
+        )}`
       );
     } finally {
       await cleanup();