Skip to content

imp(admin): refactor scattered dev-utils to simple admin-cli #529

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.

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
99 changes: 82 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = [
"crates/validator",
"crates/shared",
"crates/orchestrator",
"crates/dev-utils",
"crates/admin-cli",
]
resolver = "2"

Expand Down
30 changes: 15 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,43 @@ ENV_FILE ?= .env

mint-ai-tokens-to-provider:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example mint_ai_token -- --address $${PROVIDER_ADDRESS} --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- token mint --address $${PROVIDER_ADDRESS} --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL}

test-concurrent-calls:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example test_concurrent_calls -- --address $${PROVIDER_ADDRESS} --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- test concurrent-calls --address $${PROVIDER_ADDRESS} --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL}

mint-ai-tokens-to-federator:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example mint_ai_token -- --address $${FEDERATOR_ADDRESS} --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL} --amount 1000000000000000000
cargo run -p admin-cli -- token mint --address $${FEDERATOR_ADDRESS} --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL} --amount 1000000000000000000

transfer-eth-to-provider:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example transfer_eth -- --address $${PROVIDER_ADDRESS} --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL} --amount 100000000000000000
cargo run -p admin-cli -- token transfer-eth --address $${PROVIDER_ADDRESS} --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL} --amount 0.1

transfer-eth-to-pool-owner:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example transfer_eth -- --address $${POOL_OWNER_ADDRESS} --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL} --amount 1000000000000000000
cargo run -p admin-cli -- token transfer-eth --address $${POOL_OWNER_ADDRESS} --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL} --amount 1

create-domain:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example create_domain -- --domain-name "$${DOMAIN_NAME:-default_domain}" --domain-uri "$${DOMAIN_URI:-http://default.uri}" --key $${PRIVATE_KEY_FEDERATOR} --validation-logic $${WORK_VALIDATION_CONTRACT} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- domain create --domain-name "$${DOMAIN_NAME:-default_domain}" --domain-uri "$${DOMAIN_URI:-http://default.uri}" --key env:PRIVATE_KEY_FEDERATOR --validation-logic $${WORK_VALIDATION_CONTRACT} --rpc-url $${RPC_URL}

create-training-domain:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example create_domain -- --domain-name "$${DOMAIN_NAME:-training}" --domain-uri "$${DOMAIN_URI:-http://default.uri}" --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL} --validation-logic $${WORK_VALIDATION_CONTRACT}
cargo run -p admin-cli -- domain create-training --domain-name "$${DOMAIN_NAME:-training}" --domain-uri "$${DOMAIN_URI:-http://default.uri}" --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL}

create-synth-data-domain:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example create_domain -- --domain-name "$${DOMAIN_NAME:-synth_data}" --domain-uri "$${DOMAIN_URI:-http://default.uri}" --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL} --validation-logic $${WORK_VALIDATION_CONTRACT}
cargo run -p admin-cli -- domain create-synth-data --domain-name "$${DOMAIN_NAME:-synth_data}" --domain-uri "$${DOMAIN_URI:-http://default.uri}" --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL}

create-compute-pool:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example compute_pool -- --domain-id "$${DOMAIN_ID:-0}" --compute-manager-key "$${POOL_OWNER_ADDRESS}" --pool-name "$${POOL_NAME:-default_pool}" --pool-data-uri "$${POOL_DATA_URI:-http://default.pool.data}" --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- pool create --domain-id "$${DOMAIN_ID:-0}" --compute-manager-key "$${POOL_OWNER_ADDRESS}" --pool-name "$${POOL_NAME:-default_pool}" --pool-data-uri "$${POOL_DATA_URI:-http://default.pool.data}" --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL}

start-compute-pool:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example start_compute_pool -- --key $${POOL_OWNER_PRIVATE_KEY} --rpc-url $${RPC_URL} --pool-id="$${POOL_ID:-0}"
cargo run -p admin-cli -- pool start --key env:POOL_OWNER_PRIVATE_KEY --rpc-url $${RPC_URL} --pool-id="$${POOL_ID:-0}"

setup:
make mint-ai-tokens-to-provider
Expand Down Expand Up @@ -71,7 +71,7 @@ down:

whitelist-provider:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example whitelist_provider -- --provider-address $${PROVIDER_ADDRESS} --key $${PRIVATE_KEY_VALIDATOR} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- provider whitelist --provider-address $${PROVIDER_ADDRESS} --key env:PRIVATE_KEY_VALIDATOR --rpc-url $${RPC_URL}

watch-discovery:
set -a; source .env; set +a; \
Expand Down Expand Up @@ -200,7 +200,7 @@ remote-worker-two:
# testing:
eject-node:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example eject_node -- --pool-id $${WORKER_COMPUTE_POOL_ID} --node $${NODE_ADDRESS} --provider-address $${PROVIDER_ADDRESS} --key $${POOL_OWNER_PRIVATE_KEY} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- node eject --pool-id $${WORKER_COMPUTE_POOL_ID} --node $${NODE_ADDRESS} --provider-address $${PROVIDER_ADDRESS} --key env:POOL_OWNER_PRIVATE_KEY --rpc-url $${RPC_URL}

sign-message:
set -a; source ${ENV_FILE}; set +a; \
Expand All @@ -212,15 +212,15 @@ balance:

get-node-info:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example get_node_info -- --provider-address $${PROVIDER_ADDRESS} --node-address $${NODE_ADDRESS} --key $${PRIVATE_KEY_FEDERATOR} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- node info --provider-address $${PROVIDER_ADDRESS} --node-address $${NODE_ADDRESS} --key env:PRIVATE_KEY_FEDERATOR --rpc-url $${RPC_URL}

submit-work:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example submit_work -- --pool-id $${POOL_ID:-0} --node $${NODE_ADDRESS} --work-key $${WORK_KEY} --key $${PRIVATE_KEY_PROVIDER} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- work submit --pool-id $${POOL_ID:-0} --node $${NODE_ADDRESS} --work-key $${WORK_KEY} --key env:PRIVATE_KEY_PROVIDER --rpc-url $${RPC_URL}

invalidate-work:
set -a; source ${ENV_FILE}; set +a; \
cargo run -p dev-utils --example invalidate_work -- --pool-id $${POOL_ID:-0} --penalty $${PENALTY} --work-key $${WORK_KEY} --key $${PRIVATE_KEY_VALIDATOR} --rpc-url $${RPC_URL}
cargo run -p admin-cli -- work invalidate --pool-id $${POOL_ID:-0} --penalty $${PENALTY} --work-key $${WORK_KEY} --key env:PRIVATE_KEY_VALIDATOR --rpc-url $${RPC_URL}

deregister-worker:
set -a; source ${ENV_FILE}; set +a; \
Expand Down
25 changes: 25 additions & 0 deletions crates/admin-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[package]
name = "admin-cli"
version = "0.1.0"
edition = "2021"

[[bin]]
name = "admin-cli"
path = "src/main.rs"

[dependencies]
shared = { workspace = true }
tokio = { workspace = true }
eyre = "0.6"
clap = { workspace = true }
url = { workspace = true }
alloy = { workspace = true }
tokio-util = { workspace = true }
hex = "0.4.3"
rand = "0.9.1"
serde = { workspace = true }
serde_json = { workspace = true }
dirs = "5.0"
rpassword = "7.0"
dotenv = "0.15"
toml = { workspace = true }
Loading