Merge pull request #256 from aeternity/feature/update-sdk

Release v6.0.1 with [email protected]

Author: davidyuk

.github/workflows/main.yml

@@ -8,8 +8,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - run: |
-          wget -q https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_25.0.4-1~ubuntu~jammy_amd64.deb
-          sudo apt install --allow-downgrades ./esl-erlang_25.0.4-1~ubuntu~jammy_amd64.deb
+          wget -q https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_25.2.3-1~ubuntu~jammy_amd64.deb
+          sudo apt install ./esl-erlang_25.2.3-1~ubuntu~jammy_amd64.deb
       - uses: actions/checkout@v4
         with:
           fetch-depth: 100

.mocharc.cjs

@@ -1,6 +1,3 @@
-process.env._EXPECTED_MINE_RATE = 1000
-process.env._MICRO_BLOCK_CYCLE = 300
-
 module.exports = {
   recursive: true,
   timeout: '4s',

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [6.0.1](https://github.com/aeternity/aepp-cli-js/compare/v6.0.0...v6.0.1) (2024-04-22)
+
+
+### Bug Fixes
+
+* don't show stacktrace for ACI-not-match error ([b1b53b5](https://github.com/aeternity/aepp-cli-js/commit/b1b53b5f135f63f6bac36a0f738581c9e2c616cc))
+* update sdk to 13.3.2 ([2b63f5f](https://github.com/aeternity/aepp-cli-js/commit/2b63f5f0c8a8ae4d29a313fd441da0d09486b183))
+
 ## [6.0.0](https://github.com/aeternity/aepp-cli-js/compare/v5.0.0...v6.0.0) (2024-04-16)
 
 *Check out the new documentation at [docs.aeternity.com/aepp-cli-js](https://docs.aeternity.com/aepp-cli-js/)*

package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "@aeternity/aepp-cli",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Aeternity command line interface",
   "bin": {
     "aecli": "src/aecli.js"
   },
   "type": "module",
   "dependencies": {
-    "@aeternity/aepp-sdk": "^13.3.0",
+    "@aeternity/aepp-sdk": "^13.3.2",
     "@azure/core-rest-pipeline": "^1.15.2",
     "bignumber.js": "^9.1.2",
     "commander": "^12.0.0",

package.json

@@ -1,5 +1,23 @@
 #!/usr/bin/env node
+import { RestError } from '@azure/core-rest-pipeline';
+import { InvalidPasswordError, NodeInvocationError, ContractError } from '@aeternity/aepp-sdk';
+import { setCommandOptions } from './utils/config.js';
+import { prepareOptions } from './utils/default-option-description.js';
+import CliError from './utils/CliError.js';
 import program from './commands/main.js';
-import { runProgram } from './utils/CliError.js';
 
-await runProgram(program);
+try {
+  prepareOptions(program);
+  await setCommandOptions(program);
+  await program.parseAsync();
+} catch (error) {
+  if (
+    error instanceof CliError
+    || error instanceof RestError
+    || error instanceof InvalidPasswordError
+    || error instanceof NodeInvocationError
+    || (error instanceof ContractError && error.message.includes('ACI doesn\'t match called contract'))
+    || error.code === 'ENOENT'
+  ) program.error(error.message);
+  else throw error;
+}

src/aecli.js

@@ -1,31 +1,6 @@
-import { RestError } from '@azure/core-rest-pipeline';
-import { InvalidPasswordError, NodeInvocationError } from '@aeternity/aepp-sdk';
-import { setCommandOptions } from './config.js';
-import { prepareOptions } from './default-option-description.js';
-
 export default class CliError extends Error {
   constructor(message) {
     super(message);
     this.name = 'CliError';
   }
 }
-
-export async function runProgram(program) {
-  try {
-    prepareOptions(program);
-    await setCommandOptions(program);
-    await program.parseAsync();
-  } catch (error) {
-    if (
-      error instanceof CliError
-      || error instanceof RestError
-      || error instanceof InvalidPasswordError
-      || error instanceof NodeInvocationError
-      || error.code === 'ENOENT'
-    ) {
-      program.error(error.message);
-      return;
-    }
-    throw error;
-  }
-}

src/utils/CliError.js

@@ -16,10 +16,6 @@ export function initSdk({
   url, keypair, compilerUrl, force: ignoreVersion, networkId, accounts = [],
 } = {}) {
   return new AeSdk({
-    /* eslint-disable no-underscore-dangle */
-    _expectedMineRate: process.env._EXPECTED_MINE_RATE,
-    _microBlockCycle: process.env._MICRO_BLOCK_CYCLE,
-    /* eslint-enable no-underscore-dangle */
     nodes: url ? [{ name: 'test-node', instance: new Node(url, { ignoreVersion }) }] : [],
     ...compilerUrl && { onCompiler: getCompilerByUrl(compilerUrl) },
     networkId,

src/utils/cli.js

@@ -31,10 +31,6 @@ export const WALLET_NAME = 'test-artifacts/wallet.json';
 const Sdk = (params = {}) => {
   params.accounts ??= [new MemoryAccount(secretKey)];
   return new AeSdk({
-    /* eslint-disable no-underscore-dangle */
-    _expectedMineRate: process.env._EXPECTED_MINE_RATE,
-    _microBlockCycle: process.env._MICRO_BLOCK_CYCLE,
-    /* eslint-enable no-underscore-dangle */
     onCompiler: new CompilerHttpNode(compilerUrl),
     nodes: [{ name: 'test', instance: new Node(url) }],
     ...params,