@cartesi/cli 2.0.0-alpha.6 → 2.0.0-alpha.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/rollups/start.js +14 -14
- package/dist/compose/rollups/docker-compose-bundler.yaml +1 -4
- package/dist/compose/rollups/docker-compose-espresso.yaml +0 -9
- package/dist/compose/rollups/docker-compose-explorer.yaml +0 -5
- package/dist/compose/rollups/docker-compose-graphql.yaml +0 -3
- package/dist/compose/rollups/docker-compose-node.yaml +0 -3
- package/dist/compose/rollups/docker-compose-paymaster.yaml +0 -3
- package/dist/compose/rollups/docker-compose-proxy.yaml +2 -0
- package/dist/compose/rollups/proxy/espresso.yaml +8 -47
- package/package.json +2 -2
- package/dist/compose/rollups/proxy/espresso-reader.yaml +0 -17
|
@@ -29,7 +29,7 @@ const baseServices = [
|
|
|
29
29
|
{
|
|
30
30
|
name: "rpc",
|
|
31
31
|
file: "docker-compose-node.yaml",
|
|
32
|
-
healthySemaphore: "
|
|
32
|
+
healthySemaphore: "rollups-node",
|
|
33
33
|
healthyTitle: (port) => `${chalk.cyan("rpc")} service ready at ${chalk.cyan(`${host}:${port}/rpc`)}`,
|
|
34
34
|
waitTitle: `${chalk.cyan("rpc")} service starting...`,
|
|
35
35
|
errorTitle: `${chalk.red("rpc")} service failed`,
|
|
@@ -37,7 +37,7 @@ const baseServices = [
|
|
|
37
37
|
{
|
|
38
38
|
name: "inspect",
|
|
39
39
|
file: "docker-compose-node.yaml",
|
|
40
|
-
healthySemaphore: "
|
|
40
|
+
healthySemaphore: "rollups-node",
|
|
41
41
|
healthyTitle: (port) => `${chalk.cyan("inspect")} service ready at ${chalk.cyan(`${host}:${port}/inspect/<application_address>`)}`,
|
|
42
42
|
waitTitle: `${chalk.cyan("inspect")} service starting...`,
|
|
43
43
|
errorTitle: `${chalk.red("inspect")} service failed`,
|
|
@@ -47,42 +47,42 @@ const availableServices = [
|
|
|
47
47
|
{
|
|
48
48
|
name: "bundler",
|
|
49
49
|
file: "docker-compose-bundler.yaml",
|
|
50
|
-
healthySemaphore: "
|
|
51
|
-
healthyTitle: (port) =>
|
|
50
|
+
healthySemaphore: "bundler",
|
|
51
|
+
healthyTitle: (port) => `${chalk.cyan("bundler")} service ready at ${chalk.cyan(`${host}:${port}/bundler/rpc`)}`,
|
|
52
52
|
waitTitle: `${chalk.cyan("bundler")} service starting...`,
|
|
53
53
|
errorTitle: `${chalk.red("bundler")} service failed`,
|
|
54
54
|
},
|
|
55
55
|
{
|
|
56
56
|
name: "espresso",
|
|
57
57
|
file: "docker-compose-espresso.yaml",
|
|
58
|
-
healthySemaphore: "
|
|
59
|
-
healthyTitle: (port) =>
|
|
58
|
+
healthySemaphore: "espresso",
|
|
59
|
+
healthyTitle: (port) => `${chalk.cyan("espresso")} service ready at ${chalk.cyan(`${host}:${port}/transaction`)}`,
|
|
60
60
|
waitTitle: `${chalk.cyan("espresso")} service starting...`,
|
|
61
61
|
errorTitle: `${chalk.red("espresso")} service failed`,
|
|
62
62
|
},
|
|
63
63
|
{
|
|
64
64
|
name: "explorer",
|
|
65
65
|
file: "docker-compose-explorer.yaml",
|
|
66
|
-
healthySemaphore: "
|
|
67
|
-
healthyTitle: (port) =>
|
|
66
|
+
healthySemaphore: "explorer_api",
|
|
67
|
+
healthyTitle: (port) => `${chalk.cyan("explorer")} service ready at ${chalk.cyan(`${host}:${port}/explorer`)}`,
|
|
68
68
|
waitTitle: `${chalk.cyan("explorer")} service starting...`,
|
|
69
69
|
errorTitle: `${chalk.red("explorer")} service failed`,
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
72
|
name: "graphql",
|
|
73
73
|
file: "docker-compose-graphql.yaml",
|
|
74
|
-
healthySemaphore: "
|
|
75
|
-
healthyTitle: (port) =>
|
|
74
|
+
healthySemaphore: "graphql",
|
|
75
|
+
healthyTitle: (port) => `${chalk.cyan("graphql")} service ready at ${chalk.cyan(`${host}:${port}/graphql`)}`,
|
|
76
76
|
waitTitle: `${chalk.cyan("graphql")} service starting...`,
|
|
77
77
|
errorTitle: `${chalk.red("graphql")} service failed`,
|
|
78
78
|
},
|
|
79
79
|
{
|
|
80
80
|
name: "paymaster",
|
|
81
81
|
file: "docker-compose-paymaster.yaml",
|
|
82
|
-
healthySemaphore: "
|
|
83
|
-
healthyTitle: (port) =>
|
|
84
|
-
waitTitle:
|
|
85
|
-
errorTitle:
|
|
82
|
+
healthySemaphore: "paymaster",
|
|
83
|
+
healthyTitle: (port) => `${chalk.cyan("paymaster")} service ready at ${chalk.cyan(`${host}:${port}/paymaster`)}`,
|
|
84
|
+
waitTitle: `${chalk.cyan("paymaster")} service starting...`,
|
|
85
|
+
errorTitle: `${chalk.red("paymaster")} service failed`,
|
|
86
86
|
},
|
|
87
87
|
];
|
|
88
88
|
const serviceMonitorTask = (options) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
services:
|
|
2
|
-
|
|
2
|
+
bundler:
|
|
3
3
|
image: ${CARTESI_SDK_IMAGE}
|
|
4
4
|
command:
|
|
5
5
|
- "alto"
|
|
@@ -39,8 +39,5 @@ services:
|
|
|
39
39
|
retries: 5
|
|
40
40
|
|
|
41
41
|
proxy:
|
|
42
|
-
depends_on:
|
|
43
|
-
bundler:
|
|
44
|
-
condition: service_healthy
|
|
45
42
|
volumes:
|
|
46
43
|
- ./proxy/bundler.yaml:/etc/traefik/conf.d/bundler.yaml
|
|
@@ -20,11 +20,6 @@ services:
|
|
|
20
20
|
limits:
|
|
21
21
|
cpus: "4"
|
|
22
22
|
memory: "1G"
|
|
23
|
-
ports:
|
|
24
|
-
- 8770:8770
|
|
25
|
-
- 8771:8771
|
|
26
|
-
- 8772:8772
|
|
27
|
-
- 20000:20000
|
|
28
23
|
depends_on:
|
|
29
24
|
espresso_database_creator:
|
|
30
25
|
condition: service_completed_successfully
|
|
@@ -95,9 +90,5 @@ services:
|
|
|
95
90
|
ESPRESSO_STARTING_BLOCK: 101
|
|
96
91
|
|
|
97
92
|
proxy:
|
|
98
|
-
depends_on:
|
|
99
|
-
espresso:
|
|
100
|
-
condition: service_healthy
|
|
101
93
|
volumes:
|
|
102
94
|
- ./proxy/espresso.yaml:/etc/traefik/conf.d/espresso.yaml
|
|
103
|
-
- ./proxy/espresso-reader.yaml:/etc/traefik/conf.d/espresso-reader.yaml
|
|
@@ -64,11 +64,6 @@ services:
|
|
|
64
64
|
condition: service_completed_successfully
|
|
65
65
|
|
|
66
66
|
proxy:
|
|
67
|
-
depends_on:
|
|
68
|
-
explorer_api:
|
|
69
|
-
condition: service_healthy
|
|
70
|
-
explorer:
|
|
71
|
-
condition: service_healthy
|
|
72
67
|
volumes:
|
|
73
68
|
- ./proxy/explorer.yaml:/etc/traefik/conf.d/explorer.yaml
|
|
74
69
|
- ./proxy/explorer-api.yaml:/etc/traefik/conf.d/explorer-api.yaml
|
|
@@ -1,56 +1,17 @@
|
|
|
1
1
|
http:
|
|
2
2
|
routers:
|
|
3
|
-
espresso-
|
|
4
|
-
rule: "PathPrefix(`/
|
|
3
|
+
espresso-reader:
|
|
4
|
+
rule: "PathPrefix(`/transaction`)"
|
|
5
5
|
middlewares:
|
|
6
|
-
- "remove-espresso-
|
|
7
|
-
service: espresso-
|
|
8
|
-
espresso-dev:
|
|
9
|
-
rule: "PathPrefix(`/espresso/dev`)"
|
|
10
|
-
middlewares:
|
|
11
|
-
- "remove-espresso-dev-prefix"
|
|
12
|
-
service: espresso-dev
|
|
13
|
-
espresso-prover:
|
|
14
|
-
rule: "PathPrefix(`/espresso/prover`)"
|
|
15
|
-
middlewares:
|
|
16
|
-
- "remove-espresso-prover-prefix"
|
|
17
|
-
service: espresso-prover
|
|
18
|
-
espresso-sequencer:
|
|
19
|
-
rule: "PathPrefix(`/espresso/sequencer`)"
|
|
20
|
-
middlewares:
|
|
21
|
-
- "remove-espresso-sequencer-prefix"
|
|
22
|
-
service: espresso-sequencer
|
|
6
|
+
- "remove-espresso-reader-prefix"
|
|
7
|
+
service: espresso-reader
|
|
23
8
|
middlewares:
|
|
24
|
-
remove-espresso-
|
|
25
|
-
replacePathRegex:
|
|
26
|
-
regex: "^/espresso/builder/(.*)"
|
|
27
|
-
replacement: "/$1"
|
|
28
|
-
remove-espresso-dev-prefix:
|
|
29
|
-
replacePathRegex:
|
|
30
|
-
regex: "^/espresso/dev/(.*)"
|
|
31
|
-
replacement: "/$1"
|
|
32
|
-
remove-espresso-prover-prefix:
|
|
9
|
+
remove-espresso-reader-prefix:
|
|
33
10
|
replacePathRegex:
|
|
34
|
-
regex: "^/
|
|
35
|
-
replacement: "/$1"
|
|
36
|
-
remove-espresso-sequencer-prefix:
|
|
37
|
-
replacePathRegex:
|
|
38
|
-
regex: "^/espresso/sequencer/(.*)"
|
|
11
|
+
regex: "^/transaction/(.*)"
|
|
39
12
|
replacement: "/$1"
|
|
40
13
|
services:
|
|
41
|
-
espresso-
|
|
42
|
-
loadBalancer:
|
|
43
|
-
servers:
|
|
44
|
-
- url: "http://espresso:8771"
|
|
45
|
-
espresso-dev:
|
|
46
|
-
loadBalancer:
|
|
47
|
-
servers:
|
|
48
|
-
- url: "http://espresso:20000"
|
|
49
|
-
espresso-prover:
|
|
50
|
-
loadBalancer:
|
|
51
|
-
servers:
|
|
52
|
-
- url: "http://espresso:8772"
|
|
53
|
-
espresso-sequencer:
|
|
14
|
+
espresso-reader:
|
|
54
15
|
loadBalancer:
|
|
55
16
|
servers:
|
|
56
|
-
- url: "http://
|
|
17
|
+
- url: "http://espresso_reader:8081"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cartesi/cli",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.7",
|
|
4
4
|
"description": "Cartesi CLI",
|
|
5
5
|
"author": "Danilo Tuler <tuler@pobox.com>",
|
|
6
6
|
"bin": {
|
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
"viem": "^2.23.6"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
+
"@cartesi/devnet": "2.0.0-alpha.3",
|
|
45
46
|
"@sunodo/wagmi-plugin-hardhat-deploy": "^0.3.0",
|
|
46
47
|
"@types/bytes": "^3.1.5",
|
|
47
48
|
"@types/fs-extra": "^11.0.4",
|
|
@@ -62,7 +63,6 @@
|
|
|
62
63
|
"tslib": "^2.8.1",
|
|
63
64
|
"typescript": "^5.8.2",
|
|
64
65
|
"vitest": "^2.1.3",
|
|
65
|
-
"@cartesi/devnet": "2.0.0-alpha.3",
|
|
66
66
|
"@cartesi/eslint-config": "0.0.0",
|
|
67
67
|
"tsconfig": "0.0.0"
|
|
68
68
|
},
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
http:
|
|
2
|
-
routers:
|
|
3
|
-
espresso-reader:
|
|
4
|
-
rule: "PathPrefix(`/espresso/reader`)"
|
|
5
|
-
middlewares:
|
|
6
|
-
- "remove-espresso-reader-prefix"
|
|
7
|
-
service: espresso-reader
|
|
8
|
-
middlewares:
|
|
9
|
-
remove-espresso-reader-prefix:
|
|
10
|
-
replacePathRegex:
|
|
11
|
-
regex: "^/espresso/reader/(.*)"
|
|
12
|
-
replacement: "/$1"
|
|
13
|
-
services:
|
|
14
|
-
espresso-reader:
|
|
15
|
-
loadBalancer:
|
|
16
|
-
servers:
|
|
17
|
-
- url: "http://espresso_reader:8081"
|