Skip to content

cluster: make example presets build-from-local, add gravity_cli Makefile target #682

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

Closed
Stumble wants to merge 1 commit into from
Closed

cluster: make example presets build-from-local, add gravity_cli Makefile target #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BINARY ?= gravity_node
FEATURE ?=
MODE ?= release

BIN_DIRS := gravity_node bench kvstore
BIN_DIRS := gravity_node gravity_cli bench kvstore
BIN_PATHS := $(addprefix bin/, $(BIN_DIRS))

ifeq ($(MODE),release)
Expand All @@ -15,13 +15,22 @@ endif

CARGO_FEATURES := $(if $(FEATURE),--features $(FEATURE),)

.PHONY: all $(BIN_DIRS) clean
.PHONY: all cluster $(BIN_DIRS) clean

all: $(BINARY)

# Convenience target: build everything the cluster/ scripts need.
# `make init`, `make genesis`, and `make deploy` all require gravity_cli in
# addition to gravity_node, so this target is the one-shot build for anyone
# following the cluster deployment or local-devnet docs.
cluster: gravity_node gravity_cli

gravity_node:
RUSTFLAGS="--cfg tokio_unstable" cargo build -p gravity_node $(CARGO_FLAGS) $(CARGO_FEATURES)

gravity_cli:
cargo build -p gravity_cli $(CARGO_FLAGS) $(CARGO_FEATURES)

bench:
cargo build -p bench $(CARGO_FLAGS) $(CARGO_FEATURES)

Expand Down
2 changes: 1 addition & 1 deletion cluster/example/1_node/cluster.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ waypoint_path = "./output/waypoint.txt"
[[nodes]]
id = "node1"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6180
vfn_port = 6190
Expand Down
2 changes: 1 addition & 1 deletion cluster/example/1_node_distinct_roles/cluster.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ waypoint_path = "./output/waypoint.txt"
[[nodes]]
id = "node1"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6180
vfn_port = 6190
Expand Down
6 changes: 3 additions & 3 deletions cluster/example/3_node/cluster.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ waypoint_path = "./output/waypoint.txt"
[[nodes]]
id = "node1"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6180
vfn_port = 6190
Expand All @@ -27,7 +27,7 @@ reth_p2p_port = 12024
[[nodes]]
id = "node2"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6181
vfn_port = 6191
Expand All @@ -41,7 +41,7 @@ reth_p2p_port = 12025
[[nodes]]
id = "node3"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6182
vfn_port = 6192
Expand Down
8 changes: 4 additions & 4 deletions cluster/example/3_node_1_vfn/cluster.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ waypoint_path = "./output/waypoint.txt"
[[nodes]]
id = "node1"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6180
vfn_port = 6190
Expand All @@ -27,7 +27,7 @@ reth_p2p_port = 12024
[[nodes]]
id = "node2"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6181
vfn_port = 6191
Expand All @@ -41,7 +41,7 @@ reth_p2p_port = 12025
[[nodes]]
id = "node3"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6182
vfn_port = 6192
Expand All @@ -55,7 +55,7 @@ reth_p2p_port = 12026
[[nodes]]
id = "vfn1"
role = "vfn"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
vfn_port = 6193
rpc_port = 8548
Expand Down
6 changes: 3 additions & 3 deletions cluster/example/3_node_distinct_roles/cluster.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ waypoint_path = "./output/waypoint.txt"
[[nodes]]
id = "node1"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6180
vfn_port = 6190
Expand All @@ -26,7 +26,7 @@ reth_p2p_port = 12024
[[nodes]]
id = "node2"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6181
vfn_port = 6191
Expand All @@ -40,7 +40,7 @@ reth_p2p_port = 12025
[[nodes]]
id = "node3"
role = "genesis"
source = { github = "Galxe/gravity-sdk", rev = "main" }
source = { project_path = "../" }
host = "127.0.0.1"
validator_port = 6182
vfn_port = 6192
Expand Down
Loading