Skip to content

Commit

Permalink
chore: 📦 Big pkg refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
timbrinded committed Nov 12, 2024
1 parent c8dd382 commit 87bf403
Show file tree
Hide file tree
Showing 14 changed files with 7,621 additions and 4,910 deletions.
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"files": {
"include": ["*.js", "*.ts", "*.json", "*.yml", "*.md"],
"ignore": ["./dist/*", "./node_modules/*", "package.json"]
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/troubleshooting/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Make sure that you specify the correct version of Moonwall that you'd like to us
"@moonwall/util": "^4.7.5",
"ethers":"^6.10.0",
"@polkadot/api": "^10.11.2",
"typescript": "^5.3.3"
"typescript": "^5.6.3"
}
}
```
Expand Down
48 changes: 44 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,49 @@
"typecheck": "pnpm -r --filter='./packages/**' run typecheck"
},
"devDependencies": {
"@biomejs/biome": "1.9.2",
"@changesets/cli": "2.27.8",
"@types/node": "20.14.10",
"typescript": "5.5.3"
"@biomejs/biome": "1.9.4",
"@changesets/cli": "2.27.9",
"@types/node": "22.9.0",
"typescript": "5.6.3"
},
"dependencies": {
"@acala-network/chopsticks": "1.0.1",
"@moonbeam-network/api-augment": "0.3200.3",
"@polkadot/api": "14.3.1",
"@polkadot/api-base": "14.3.1",
"@polkadot/api-derive": "14.3.1",
"@polkadot/keyring": "13.2.3",
"@polkadot/rpc-provider": "*",
"@polkadot/types": "14.3.1",
"@polkadot/types-codec": "14.3.1",
"@polkadot/util": "13.2.3",
"@polkadot/util-crypto": "13.2.3",
"@types/debug": "*",
"@types/semver": "^7.5.8",
"@types/ws": "^8.5.10",
"@types/yargs": "*",
"@vitest/ui": "2.1.4",
"@zombienet/utils": "0.0.25",
"bottleneck": "2.19.5",
"chalk": "5.3.0",
"debug": "4.3.7",
"ethers": "6.13.4",
"inquirer": "9.3.3",
"inquirer-press-to-continue": "1.2.0",
"pnpm": "9.12.3",
"semver": "7.6.2",
"solc": "0.8.28",
"tsup": "8.3.5",
"tsx": "4.19.2",
"viem": "2.21.44",
"vitest": "2.1.4",
"web3": "4.15.0",
"ws": "8.18.0",
"yargs": "17.7.2"
},
"pnpm": {
"overrides": {
"inquirer": "9.3.3"
}
}
}
1 change: 0 additions & 1 deletion packages/cli/biome.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
"extends": ["../../biome.json"]
}
65 changes: 29 additions & 36 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,63 +58,56 @@
"prepublish": "pnpm run build && pnpm run generate-types"
},
"dependencies": {
"@acala-network/chopsticks": "0.16.1",
"@moonbeam-network/api-augment": "0.2902.0",
"@acala-network/chopsticks": "*",
"@moonbeam-network/api-augment": "*",
"@moonwall/types": "workspace:*",
"@moonwall/util": "workspace:*",
"@octokit/rest": "^21.0.0",
"@polkadot/api": "13.2.1",
"@polkadot/api-derive": "13.2.1",
"@polkadot/keyring": "13.1.1",
"@polkadot/types": "13.2.1",
"@polkadot/types-codec": "13.2.1",
"@polkadot/util": "13.1.1",
"@polkadot/util-crypto": "13.1.1",
"@vitest/ui": "2.1.1",
"@polkadot/api": "*",
"@polkadot/api-derive": "*",
"@polkadot/keyring": "*",
"@polkadot/types": "*",
"@polkadot/types-codec": "*",
"@polkadot/util": "*",
"@polkadot/util-crypto": "*",
"@vitest/ui": "*",
"@zombienet/orchestrator": "0.0.91",
"@zombienet/utils": "0.0.25",
"@zombienet/utils": "*",
"bottleneck": "2.19.5",
"cfonts": "^3.3.0",
"chalk": "5.3.0",
"chalk": "*",
"clear": "0.1.0",
"cli-progress": "3.12.0",
"colors": "1.4.0",
"debug": "4.3.7",
"dotenv": "16.4.5",
"ethers": "6.13.2",
"ethers": "*",
"get-port": "^7.1.0",
"inquirer": "9.3.3",
"inquirer-press-to-continue": "1.2.0",
"inquirer": "*",
"inquirer-press-to-continue": "*",
"jsonc-parser": "3.3.1",
"minimatch": "9.0.5",
"semver": "7.6.2",
"viem": "2.21.15",
"vitest": "2.1.1",
"web3": "4.13.0",
"semver": "*",
"viem": "*",
"vitest": "*",
"web3": "*",
"web3-providers-ws": "^4.0.7",
"ws": "8.18.0",
"ws": "*",
"yaml": "2.4.5",
"yargs": "17.7.2"
},
"peerDependencies": {
"@acala-network/chopsticks": "^0.16.1",
"@polkadot/api": "^10.11.2",
"@vitest/ui": "^1.2.2",
"vitest": "^2.1.1"
"yargs": "*"
},
"devDependencies": {
"@biomejs/biome": "1.9.2",
"@types/clear": "^0.1.4",
"@types/cli-progress": "3.11.6",
"@types/debug": "4.1.12",
"@types/inquirer": "^9.0.7",
"@types/node": "20.14.10",
"@types/semver": "^7.5.8",
"@types/ws": "^8.5.10",
"@types/yargs": "17.0.33",
"tsup": "8.3.0",
"tsx": "4.19.1",
"typescript": "5.5.3"
"@types/debug": "*",
"@types/node": "*",
"@types/semver": "*",
"@types/ws": "*",
"@types/yargs": "*",
"tsup": "*",
"tsx": "*",
"typescript": "*"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 0 additions & 12 deletions packages/cli/src/cmds/runNetwork.ts
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ const resolveTailChoice = async (env: Environment) => {
};

const handleInputData = async (key: any) => {
// @ts-expect-error - internal method
ui.rl.input.pause();
const char = key.toString().trim();

Expand All @@ -447,9 +446,7 @@ const resolveTailChoice = async (env: Environment) => {
}

if (char === "q") {
// @ts-expect-error - internal method
ui.rl.input.removeListener("data", handleInputData);
// @ts-expect-error - internal method
ui.rl.input.pause();
fs.unwatchFile(logFilePath);
resolve("");
Expand All @@ -461,9 +458,7 @@ const resolveTailChoice = async (env: Environment) => {
}

if (char === ",") {
// @ts-expect-error - internal method
ui.rl.input.removeListener("data", handleInputData);
// @ts-expect-error - internal method
ui.rl.input.pause();
fs.unwatchFile(logFilePath);
switchNode = true;
Expand All @@ -472,9 +467,7 @@ const resolveTailChoice = async (env: Environment) => {
}

if (char === ".") {
// @ts-expect-error - internal method
ui.rl.input.removeListener("data", handleInputData);
// @ts-expect-error - internal method
ui.rl.input.pause();
fs.unwatchFile(logFilePath);
switchNode = true;
Expand All @@ -483,19 +476,15 @@ const resolveTailChoice = async (env: Environment) => {
}

if (char === "g") {
// @ts-expect-error - internal method
ui.rl.input.pause();
tailing = false;
await resolveGrepChoice(env, true);
renderBottomBar(resumePauseProse[tailing ? 0 : 1]);
tailing = true;
// @ts-expect-error - internal method
ui.rl.input.resume();
}
// @ts-expect-error - internal method
ui.rl.input.resume();
};
// @ts-expect-error - internal method
ui.rl.input.on("data", handleInputData);

fs.watchFile(logFilePath, () => {
Expand All @@ -507,6 +496,5 @@ const resolveTailChoice = async (env: Environment) => {
break;
}
}
// @ts-expect-error - internal method
ui.close();
};
1 change: 0 additions & 1 deletion packages/types/biome.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
"extends": ["../../biome.json"]
}
37 changes: 17 additions & 20 deletions packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,28 @@
"schema": "typescript-json-schema --tsNodeRegister --esModuleInterop -o config_schema.json ./src/config.ts MoonwallConfig && pnpm biome format config_schema.json --write"
},
"dependencies": {
"@polkadot/api": "13.2.1",
"@polkadot/api-base": "13.2.1",
"@polkadot/keyring": "13.1.1",
"@polkadot/util-crypto": "13.1.1",
"@polkadot/types": "13.2.1",
"@polkadot/util": "13.1.1",
"@types/node": "20.14.10",
"@zombienet/utils": "0.0.25",
"bottleneck": "2.19.5",
"debug": "4.3.7",
"ethers": "6.13.2",
"viem": "2.21.15",
"web3": "4.13.0"
},
"peerDependencies": {
"@polkadot/api": "^10.12.6"
"@polkadot/api": "*",
"@polkadot/api-base": "*",
"@polkadot/keyring": "*",
"@polkadot/util-crypto": "*",
"@polkadot/types": "*",
"@polkadot/util": "*",
"@types/node": "*",
"@zombienet/utils": "*",
"bottleneck": "*",
"debug": "*",
"ethers": "*",
"viem": "*",
"web3": "*"
},
"publishConfig": {
"access": "public"
},
"devDependencies": {
"@biomejs/biome": "1.9.2",
"@types/debug": "4.1.12",
"tsup": "8.3.0",
"typescript": "5.5.3",
"@biomejs/biome": "*",
"@types/debug":"*",
"tsup": "*",
"typescript": "*",
"typescript-json-schema": "0.64.0"
}
}
1 change: 0 additions & 1 deletion packages/util/biome.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
"extends": ["../../biome.json"]
}
54 changes: 25 additions & 29 deletions packages/util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,46 +53,42 @@
"prepublish": "pnpm run build && pnpm run generate-types"
},
"dependencies": {
"@moonbeam-network/api-augment": "0.2902.0",
"@moonbeam-network/api-augment": "*",
"@moonwall/types": "workspace:*",
"@polkadot/api": "13.2.1",
"@polkadot/api-derive": "13.2.1",
"@polkadot/keyring": "13.1.1",
"@polkadot/util-crypto": "13.1.1",
"@polkadot/rpc-provider": "13.2.1",
"@polkadot/types": "13.2.1",
"@polkadot/types-codec": "13.2.1",
"@polkadot/util": "13.1.1",
"@polkadot/api": "*",
"@polkadot/api-derive": "*",
"@polkadot/keyring": "*",
"@polkadot/util-crypto": "*",
"@polkadot/rpc-provider": "*",
"@polkadot/types": "*",
"@polkadot/types-codec": "*",
"@polkadot/util": "*",
"bottleneck": "2.19.5",
"chalk": "5.3.0",
"chalk": "*",
"clear": "0.1.0",
"cli-progress": "3.12.0",
"colors": "1.4.0",
"debug": "4.3.7",
"dotenv": "16.4.5",
"ethers": "6.13.2",
"inquirer": "9.3.3",
"ethers": "*",
"inquirer": "*",
"inquirer-press-to-continue": "1.2.0",
"rlp": "3.0.0",
"semver": "7.6.2",
"viem": "2.21.15",
"vitest": "2.1.1",
"web3": "4.13.0",
"ws": "8.18.0",
"yargs": "17.7.2"
},
"peerDependencies": {
"@polkadot/api": "^10.11.2",
"vitest": "^2.1.1"
"semver": "*",
"viem": "*",
"vitest": "*",
"web3": "*",
"ws": "*",
"yargs": "*"
},
"devDependencies": {
"@biomejs/biome": "1.9.2",
"@types/debug": "4.1.12",
"@types/node": "20.14.10",
"@types/ws": "^8.5.10",
"@types/yargs": "17.0.33",
"tsup": "8.3.0",
"typescript": "5.5.3"
"@biomejs/biome": "*",
"@types/debug": "*",
"@types/node": "*",
"@types/ws": "*",
"@types/yargs": "*",
"tsup": "*",
"typescript": "*"
},
"publishConfig": {
"access": "public"
Expand Down
1 change: 1 addition & 0 deletions packages/util/src/functions/block.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import "@moonbeam-network/api-augment";
import type { ApiPromise } from "@polkadot/api";
import type { TxWithEvent } from "@polkadot/api-derive/types";
import type { Option, u32, u64 } from "@polkadot/types";
Expand Down
Loading

0 comments on commit 87bf403

Please sign in to comment.