Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Yaml configuration #78

Merged
merged 14 commits into from
Oct 9, 2024
Merged

Yaml configuration #78

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
548dca7
feat(cli): bump dependencies
tuler Sep 18, 2024
0519ada
feat(cli): build based on configuration
tuler Sep 18, 2024
80f2883
fixup! feat(cli): build based on configuration
tuler Sep 26, 2024
5e51a86
fixup! feat(cli): build based on configuration
tuler Sep 26, 2024
f2c3330
fixup! feat(cli): build based on configuration
tuler Oct 4, 2024
f5ffc5e
fixup! feat(cli): build based on configuration
tuler Oct 4, 2024
c28d308
fixup! feat(cli): build based on configuration
tuler Oct 4, 2024
2ca70a3
fixup! feat(cli): build based on configuration
tuler Oct 7, 2024
0a86192
fixup! feat(cli): build based on configuration
tuler Oct 8, 2024
237299c
fixup! feat(cli): build based on configuration
tuler Oct 9, 2024
29c293c
fixup! feat(cli): build based on configuration
tuler Oct 9, 2024
06d61ce
fixup! feat(cli): build based on configuration
tuler Oct 9, 2024
39f4c1b
fixup! feat(cli): build based on configuration
tuler Oct 9, 2024
6d70730
fixup! feat(cli): build based on configuration
tuler Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion apps/cli/.eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ module.exports = {
],
parser: "@typescript-eslint/parser",
parserOptions: {
project: ["./tsconfig.eslint.json", "./tsconfig.json"],
project: [
"./tsconfig.eslint.json",
"./tsconfig.json",
"./test/tsconfig.json",
],
tsconfigRootDir: __dirname,
},
};
65 changes: 33 additions & 32 deletions apps/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,54 +18,55 @@
"/oclif.manifest.json"
],
"dependencies": {
"@inquirer/confirm": "^3.1.17",
"@inquirer/core": "^9.0.5",
"@inquirer/input": "^2.2.4",
"@inquirer/select": "^2.4.2",
"@inquirer/type": "^1.5.1",
"@oclif/core": "^4.0.14",
"@oclif/plugin-help": "^6.2.7",
"@oclif/plugin-plugins": "^5.3.9",
"bytes": "^3.1",
"@inquirer/confirm": "^4.0.1",
"@inquirer/core": "^9.2.1",
"@inquirer/input": "^3.0.1",
"@inquirer/select": "^3.0.1",
"@inquirer/type": "^1.5.5",
"@oclif/core": "^4.0.22",
"@oclif/plugin-help": "^6.2.11",
"@oclif/plugin-plugins": "^5.4.8",
"bytes": "^3.1.2",
"chalk": "^5.3.0",
"cli-table3": "^0.6.5",
"execa": "^9.3.0",
"fs-extra": "^11",
"execa": "^9.4.0",
"fs-extra": "^11.2.0",
"giget": "^1.2.3",
"lookpath": "^1.2.2",
"open": "^10.1.0",
"ora": "^8.0.1",
"progress-stream": "^2.0",
"ora": "^8.1.0",
"progress-stream": "^2.0.0",
"semver": "^7.6.3",
"smol-toml": "^1.3.0",
"tmp": "^0.2.3",
"viem": "^2.18.2"
"viem": "^2.21.9"
},
"devDependencies": {
"@cartesi/devnet": "workspace:*",
"@cartesi/eslint-config": "workspace:*",
"@sunodo/wagmi-plugin-hardhat-deploy": "^0.3.0",
"@types/bytes": "^3.1",
"@types/fs-extra": "^11",
"@types/inquirer": "^9",
"@types/node": "^20.14.12",
"@types/node-fetch": "^2.6",
"@types/progress-stream": "^2.0",
"@types/prompts": "^2.4",
"@types/bytes": "^3.1.4",
"@types/fs-extra": "^11.0.4",
"@types/inquirer": "^9.0.7",
"@types/node": "^22.5.5",
"@types/node-fetch": "^2.6.11",
"@types/progress-stream": "^2.0.5",
"@types/prompts": "^2.4.9",
"@types/semver": "^7.5.8",
"@types/tmp": "^0.2",
"@wagmi/cli": "^2.1.15",
"copyfiles": "^2",
"@types/tmp": "^0.2.6",
"@wagmi/cli": "^2.1.16",
"copyfiles": "^2.4.1",
"eslint": "^8.57.0",
"eslint-config-oclif": "^5.2.0",
"eslint-config-oclif-typescript": "^3.1.8",
"npm-run-all": "^4",
"oclif": "^4.14.9",
"eslint-config-oclif": "^5.2.1",
"eslint-config-oclif-typescript": "^3.1.11",
"npm-run-all": "^4.1.5",
"oclif": "^4.14.34",
"rimraf": "^6.0.1",
"ts-node": "^10",
"ts-node": "^10.9.2",
"tsconfig": "workspace:*",
"tslib": "^2.6.3",
"typescript": "^5.5.4",
"vitest": "^2.0.4"
"tslib": "^2.7.0",
"typescript": "^5.6.2",
"vitest": "^2.1.1"
},
"oclif": {
"bin": "cartesi",
Expand Down
7 changes: 7 additions & 0 deletions apps/cli/src/baseCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import fs from "fs";
import path from "path";
import { Address, Hash, getAddress, isHash } from "viem";

import { Config, parse } from "./config.js";
import {
authorityHistoryPairFactoryAddress,
cartesiDAppFactoryAddress,
Expand Down Expand Up @@ -54,6 +55,12 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
return path.join(".cartesi", ...paths);
}

protected getApplicationConfig(configPath: string): Config {
return fs.existsSync(configPath)
? parse(fs.readFileSync(configPath).toString())
: parse("");
}

protected getMachineHash(): Hash | undefined {
// read hash of the cartesi machine snapshot, if one exists
const hashPath = this.getContextPath("image", "hash");
Expand Down
Loading
Loading