diff --git a/Cargo.lock b/Cargo.lock index a96780a4f9..2377baf38a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1778,6 +1778,27 @@ dependencies = [ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "solana-bench-streamer" +version = "0.11.0" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "solana 0.11.0", +] + +[[package]] +name = "solana-bench-tps" +version = "0.11.0" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "solana 0.11.0", + "solana-drone 0.11.0", + "solana-metrics 0.11.0", + "solana-sdk 0.11.0", +] + [[package]] name = "solana-bpf-noop" version = "0.11.0" @@ -1845,7 +1866,7 @@ dependencies = [ [[package]] name = "solana-fullnode" -version = "0.1.0" +version = "0.11.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1857,6 +1878,28 @@ dependencies = [ "solana-sdk 0.11.0", ] +[[package]] +name = "solana-fullnode-config" +version = "0.11.0" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "solana 0.11.0", + "solana-sdk 0.11.0", +] + +[[package]] +name = "solana-genesis" +version = "0.11.0" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "solana 0.11.0", + "solana-sdk 0.11.0", +] + [[package]] name = "solana-jsonrpc-core" version = "0.3.0" @@ -2002,6 +2045,15 @@ dependencies = [ "solana-sdk 0.11.0", ] +[[package]] +name = "solana-ledger-tool" +version = "0.11.0" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "solana 0.11.0", +] + [[package]] name = "solana-lualoader" version = "0.11.0" @@ -2045,6 +2097,17 @@ dependencies = [ "solana-sdk 0.11.0", ] +[[package]] +name = "solana-replicator" +version = "0.11.0" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "solana 0.11.0", + "solana-sdk 0.11.0", +] + [[package]] name = "solana-sdk" version = "0.11.0" @@ -2124,6 +2187,17 @@ dependencies = [ "solana-sdk 0.11.0", ] +[[package]] +name = "solana-wallet" +version = "0.11.0" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "solana 0.11.0", + "solana-sdk 0.11.0", +] + [[package]] name = "solana-ws" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index d43ec15d27..2b7b83bd43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,36 +10,6 @@ authors = ["Solana Maintainers "] license = "Apache-2.0" edition = "2018" -[[bin]] -required-features = ["bench_streamer"] -name = "solana-bench-streamer" -path = "src/bin/bench-streamer.rs" - -[[bin]] -name = "solana-bench-tps" -path = "src/bin/bench-tps.rs" - -[[bin]] -required-features = ["chacha"] -name = "solana-replicator" -path = "src/bin/replicator.rs" - -[[bin]] -name = "solana-fullnode-config" -path = "src/bin/fullnode-config.rs" - -[[bin]] -name = "solana-genesis" -path = "src/bin/genesis.rs" - -[[bin]] -name = "solana-ledger-tool" -path = "src/bin/ledger-tool.rs" - -[[bin]] -name = "solana-wallet" -path = "src/bin/wallet.rs" - [badges] codecov = { repository = "solana-labs/solana", branch = "master", service = "github" } @@ -133,10 +103,15 @@ name = "chacha" [workspace] members = [ ".", + "bench-streamer", + "bench-tps", "drone", - "keygen", - "metrics", "fullnode", + "fullnode-config", + "genesis", + "keygen", + "ledger-tool", + "metrics", "programs/bpf/rust/noop", "programs/native/bpf_loader", "programs/native/budget", @@ -145,7 +120,9 @@ members = [ "programs/native/native_loader", "programs/native/noop", "programs/native/vote", + "replicator", "sdk", "upload-perf", "vote-signer", + "wallet", ] diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml new file mode 100644 index 0000000000..6b6c41f974 --- /dev/null +++ b/bench-streamer/Cargo.toml @@ -0,0 +1,15 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-bench-streamer" +version = "0.11.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.32.0" +solana = { path = "..", version = "0.11.0" } + +[features] +cuda = [] diff --git a/src/bin/bench-streamer.rs b/bench-streamer/src/main.rs similarity index 100% rename from src/bin/bench-streamer.rs rename to bench-streamer/src/main.rs diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml new file mode 100644 index 0000000000..413da3b766 --- /dev/null +++ b/bench-tps/Cargo.toml @@ -0,0 +1,20 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-bench-tps" +version = "0.11.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.32.0" +rayon = "1.0.3" +serde_json = "1.0.10" +solana = { path = "..", version = "0.11.0" } +solana-drone = { path = "../drone", version = "0.11.0" } +solana-metrics = { path = "../metrics", version = "0.11.0" } +solana-sdk = { path = "../sdk", version = "0.11.0" } + +[features] +cuda = [] diff --git a/src/bin/bench-tps.rs b/bench-tps/src/main.rs similarity index 100% rename from src/bin/bench-tps.rs rename to bench-tps/src/main.rs diff --git a/ci/publish-crate.sh b/ci/publish-crate.sh index a55fc62e65..046f87edec 100755 --- a/ci/publish-crate.sh +++ b/ci/publish-crate.sh @@ -18,6 +18,9 @@ CRATES=( programs/native/{budget,bpf_loader,lua_loader,native_loader,noop,system,vote} . fullnode + genesis + ledger-tool + wallet ) diff --git a/fullnode-config/Cargo.toml b/fullnode-config/Cargo.toml new file mode 100644 index 0000000000..58fa467f40 --- /dev/null +++ b/fullnode-config/Cargo.toml @@ -0,0 +1,19 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-fullnode-config" +version = "0.11.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.32.0" +dirs = "1.0.2" +log = "0.4.2" +serde_json = "1.0.10" +solana = { path = "..", version = "0.11.0" } +solana-sdk = { path = "../sdk", version = "0.11.0" } + +[features] +cuda = [] diff --git a/src/bin/fullnode-config.rs b/fullnode-config/src/main.rs similarity index 100% rename from src/bin/fullnode-config.rs rename to fullnode-config/src/main.rs diff --git a/fullnode/Cargo.toml b/fullnode/Cargo.toml index 687a842c8e..e0693fad54 100644 --- a/fullnode/Cargo.toml +++ b/fullnode/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Solana Maintainers "] edition = "2018" name = "solana-fullnode" -version = "0.1.0" +version = "0.11.0" repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" homepage = "https://solana.com/" @@ -19,7 +19,7 @@ solana-sdk = { path = "../sdk", version = "0.11.0" } [features] chacha = [] -cuda = [] +cuda = ["solana/cuda"] erasure = [] ipv6 = [] unstable = [] diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml new file mode 100644 index 0000000000..c3454539d2 --- /dev/null +++ b/genesis/Cargo.toml @@ -0,0 +1,17 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-genesis" +version = "0.11.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.32.0" +serde_json = "1.0.10" +solana = { path = "..", version = "0.11.0" } +solana-sdk = { path = "../sdk", version = "0.11.0" } + +[features] +cuda = [] diff --git a/src/bin/genesis.rs b/genesis/src/main.rs similarity index 100% rename from src/bin/genesis.rs rename to genesis/src/main.rs diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml new file mode 100644 index 0000000000..dd9615753d --- /dev/null +++ b/ledger-tool/Cargo.toml @@ -0,0 +1,16 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-ledger-tool" +version = "0.11.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.32.0" +serde_json = "1.0.10" +solana = { path = "..", version = "0.11.0" } + +[features] +cuda = [] diff --git a/src/bin/ledger-tool.rs b/ledger-tool/src/main.rs similarity index 100% rename from src/bin/ledger-tool.rs rename to ledger-tool/src/main.rs diff --git a/replicator/Cargo.toml b/replicator/Cargo.toml new file mode 100644 index 0000000000..3fcf7c3285 --- /dev/null +++ b/replicator/Cargo.toml @@ -0,0 +1,19 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-replicator" +version = "0.11.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.32.0" +dirs = "1.0.2" +serde_json = "1.0.10" +solana = { path = "..", version = "0.11.0" } +solana-sdk = { path = "../sdk", version = "0.11.0" } + +[features] +chacha = ["solana/chacha"] +cuda = ["solana/cuda"] diff --git a/src/bin/replicator.rs b/replicator/src/main.rs similarity index 100% rename from src/bin/replicator.rs rename to replicator/src/main.rs diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh index 31f887f948..b30900bbb9 100755 --- a/scripts/cargo-install-all.sh +++ b/scripts/cargo-install-all.sh @@ -5,8 +5,24 @@ set -e cd "$(dirname "$0")/.." -set -x -cargo install --path drone "$@" -cargo install --path keygen "$@" -cargo install --path . "$@" -cargo install --path fullnode "$@" +SECONDS=0 + +CRATES=( + drone + keygen + fullnode + bench-streamer + bench-tps + fullnode-config + genesis + ledger-tool + wallet +) +for crate in "${CRATES[@]}"; do + ( + set -x + cargo install --path "$crate" "$@" + ) +done + +echo "Done after $SECONDS seconds" diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml new file mode 100644 index 0000000000..2f3ff335cc --- /dev/null +++ b/wallet/Cargo.toml @@ -0,0 +1,18 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-wallet" +version = "0.11.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.32.0" +dirs = "1.0.2" +serde_json = "1.0.10" +solana = { path = "..", version = "0.11.0" } +solana-sdk = { path = "../sdk", version = "0.11.0" } + +[features] +cuda = [] diff --git a/src/bin/wallet.rs b/wallet/src/main.rs similarity index 100% rename from src/bin/wallet.rs rename to wallet/src/main.rs