diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index bdbe508a44..2e1976f8ed 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -8,32 +8,32 @@ license = "Apache-2.0" homepage = "https://solana.com/" [dependencies] +bincode = "1.1.4" bs58 = "0.2.0" clap = "2.32.0" -bincode = "1.1.4" env_logger = "0.6.0" itertools = "0.8.0" log = "0.4.6" -num-traits = "0.2" num-derive = "0.2" +num-traits = "0.2" rand = "0.6.5" rayon = "1.0.3" serde = "1.0.91" serde_derive = "1.0.91" serde_json = "1.0.38" # solana-runtime = { path = "../solana/runtime"} -solana = { path = "../core", version = "0.16.0" } -solana-client = { path = "../client", version = "0.16.0" } -solana-drone = { path = "../drone", version = "0.16.0" } -solana-exchange-api = { path = "../programs/exchange_api", version = "0.16.0" } -solana-exchange-program = { path = "../programs/exchange_program", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-metrics = { path = "../metrics", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-runtime = { path = "../runtime", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -ws = "0.8.1" +solana = { path = "../core", version = "0.16.0" } +solana-client = { path = "../client", version = "0.16.0" } +solana-drone = { path = "../drone", version = "0.16.0" } +solana-exchange-api = { path = "../programs/exchange_api", version = "0.16.0" } +solana-exchange-program = { path = "../programs/exchange_program", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-runtime = { path = "../runtime", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } untrusted = "0.6.2" +ws = "0.8.1" [features] cuda = ["solana/cuda"] diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml index ba49e58f6a..84b873f0f6 100644 --- a/bench-streamer/Cargo.toml +++ b/bench-streamer/Cargo.toml @@ -9,9 +9,9 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" -solana = { path = "../core", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } [features] cuda = ["solana/cuda"] diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index 7b7aacb6f3..27fef50cf4 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -12,14 +12,14 @@ clap = "2.33.0" log = "0.4.6" rayon = "1.0.3" serde_json = "1.0.39" -solana = { path = "../core", version = "0.16.0" } -solana-client = { path = "../client", version = "0.16.0" } -solana-drone = { path = "../drone", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-metrics = { path = "../metrics", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-runtime = { path = "../runtime", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-client = { path = "../client", version = "0.16.0" } +solana-drone = { path = "../drone", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-runtime = { path = "../runtime", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } [features] cuda = ["solana/cuda"] diff --git a/client/Cargo.toml b/client/Cargo.toml index 835148c3a8..7aad885f80 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -11,18 +11,18 @@ edition = "2018" [dependencies] bincode = "1.1.4" bs58 = "0.2.0" -log = "0.4.2" jsonrpc-core = "10.1.0" -reqwest = "0.9.17" +log = "0.4.2" rand = "0.6.5" rayon = "1.0.0" +reqwest = "0.9.17" serde = "1.0.89" serde_derive = "1.0.91" serde_json = "1.0.39" -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } [dev-dependencies] jsonrpc-core = "10.1.0" jsonrpc-http-server = "10.1.0" -solana-logger = { path = "../logger", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } diff --git a/core/Cargo.toml b/core/Cargo.toml index f356a752bb..ca62ae852b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -24,8 +24,8 @@ bincode = "1.1.4" bs58 = "0.2.0" byteorder = "1.3.1" chrono = { version = "0.4.0", features = ["serde"] } -crc = { version = "1.8.1", optional = true } core_affinity = "0.5.9" +crc = { version = "1.8.1", optional = true } hashbrown = "0.2.0" indexmap = "1.0" itertools = "0.8.0" @@ -47,26 +47,26 @@ rocksdb = "0.11.0" serde = "1.0.89" serde_derive = "1.0.91" serde_json = "1.0.39" -solana-budget-api = { path = "../programs/budget_api", version = "0.16.0" } -solana-budget-program = { path = "../programs/budget_program", version = "0.16.0" } -solana-client = { path = "../client", version = "0.16.0" } -solana-drone = { path = "../drone", version = "0.16.0" } +solana-budget-api = { path = "../programs/budget_api", version = "0.16.0" } +solana-budget-program = { path = "../programs/budget_program", version = "0.16.0" } +solana-client = { path = "../client", version = "0.16.0" } +solana-config-program = { path = "../programs/config_program", version = "0.16.0" } +solana-drone = { path = "../drone", version = "0.16.0" } solana-ed25519-dalek = "0.2.0" -solana-kvstore = { path = "../kvstore", version = "0.16.0" , optional = true } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-metrics = { path = "../metrics", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-runtime = { path = "../runtime", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } -solana-stake-program = { path = "../programs/stake_program", version = "0.16.0" } -solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } -solana-storage-program = { path = "../programs/storage_program", version = "0.16.0" } -solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } -solana-vote-program = { path = "../programs/vote_program", version = "0.16.0" } -solana-exchange-program = { path = "../programs/exchange_program", version = "0.16.0" } -solana-config-program = { path = "../programs/config_program", version = "0.16.0" } -solana-vote-signer = { path = "../vote-signer", version = "0.16.0" } +solana-exchange-program = { path = "../programs/exchange_program", version = "0.16.0" } +solana-kvstore = { path = "../kvstore", version = "0.16.0", optional = true } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-runtime = { path = "../runtime", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } +solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } +solana-stake-program = { path = "../programs/stake_program", version = "0.16.0" } +solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } +solana-storage-program = { path = "../programs/storage_program", version = "0.16.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } +solana-vote-program = { path = "../programs/vote_program", version = "0.16.0" } +solana-vote-signer = { path = "../vote-signer", version = "0.16.0" } sys-info = "0.5.7" tokio = "0.1" tokio-codec = "0.1" @@ -99,5 +99,5 @@ name = "sigverify_stage" name = "poh" [[bench]] -required-features = ["chacha"] name = "chacha" +required-features = ["chacha"] diff --git a/drone/Cargo.toml b/drone/Cargo.toml index 8629b594c5..f0cec12545 100644 --- a/drone/Cargo.toml +++ b/drone/Cargo.toml @@ -14,21 +14,21 @@ erasure = [] [dependencies] bincode = "1.1.4" -bytes = "0.4" byteorder = "1.3.1" +bytes = "0.4" clap = "2.33" log = "0.4.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-logger = { path = "../logger", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } tokio = "0.1" tokio-codec = "0.1" [lib] -name = "solana_drone" crate-type = ["lib"] +name = "solana_drone" [[bin]] name = "solana-drone" diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml index 86d06635aa..3f7520df28 100644 --- a/genesis/Cargo.toml +++ b/genesis/Cargo.toml @@ -11,22 +11,22 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" serde_json = "1.0.39" -solana = { path = "../core", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-budget-api = { path = "../programs/budget_api", version = "0.16.0" } -solana-budget-program = { path = "../programs/budget_program", version = "0.16.0" } -solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } -solana-vote-program = { path = "../programs/vote_program", version = "0.16.0" } -solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } -solana-stake-program = { path = "../programs/stake_program", version = "0.16.0" } -solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } -solana-storage-program = { path = "../programs/storage_program", version = "0.16.0" } -solana-token-api = { path = "../programs/token_api", version = "0.16.0" } -solana-token-program = { path = "../programs/token_program", version = "0.16.0" } -solana-config-api = { path = "../programs/config_api", version = "0.16.0" } -solana-config-program = { path = "../programs/config_program", version = "0.16.0" } -solana-exchange-api = { path = "../programs/exchange_api", version = "0.16.0" } -solana-exchange-program = { path = "../programs/exchange_program", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-budget-api = { path = "../programs/budget_api", version = "0.16.0" } +solana-budget-program = { path = "../programs/budget_program", version = "0.16.0" } +solana-config-api = { path = "../programs/config_api", version = "0.16.0" } +solana-config-program = { path = "../programs/config_program", version = "0.16.0" } +solana-exchange-api = { path = "../programs/exchange_api", version = "0.16.0" } +solana-exchange-program = { path = "../programs/exchange_program", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } +solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } +solana-stake-program = { path = "../programs/stake_program", version = "0.16.0" } +solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } +solana-storage-program = { path = "../programs/storage_program", version = "0.16.0" } +solana-token-api = { path = "../programs/token_api", version = "0.16.0" } +solana-token-program = { path = "../programs/token_program", version = "0.16.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } +solana-vote-program = { path = "../programs/vote_program", version = "0.16.0" } [dev-dependencies] hashbrown = "0.3.0" diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index 55e32354e4..7f6e7529d9 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -11,10 +11,10 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" env_logger = "0.6.1" -solana = { path = "../core", version = "0.16.0" } -solana-client = { path = "../client", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-client = { path = "../client", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } [features] chacha = [] diff --git a/install/Cargo.toml b/install/Cargo.toml index 28ec065b4e..1a34adfac6 100644 --- a/install/Cargo.toml +++ b/install/Cargo.toml @@ -16,9 +16,9 @@ erasure = [] bincode = "1.1.4" bs58 = "0.2.0" bzip2 = "0.3.3" -console = "0.7.5" chrono = { version = "0.4.0", features = ["serde"] } -clap = { version = "2.33.0"} +clap = { version = "2.33.0" } +console = "0.7.5" dirs = "1.0.5" indicatif = "0.11.0" lazy_static = "1.3.0" @@ -28,10 +28,10 @@ ring = "0.13.2" serde = "1.0.91" serde_derive = "1.0.91" serde_yaml = "0.8.9" -solana-client = { path = "../client", version = "0.16.0" } -solana-config-api = { path = "../programs/config_api", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } +solana-client = { path = "../client", version = "0.16.0" } +solana-config-api = { path = "../programs/config_api", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } tar = "0.4.26" tempdir = "0.3.7" url = "1.7.2" diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml index f5fb7e7e98..313c9936d0 100644 --- a/keygen/Cargo.toml +++ b/keygen/Cargo.toml @@ -13,9 +13,9 @@ cuda = [] erasure = [] [dependencies] -dirs = "1.0.5" clap = "2.33" -solana-sdk = { path = "../sdk", version = "0.16.0" } +dirs = "1.0.5" +solana-sdk = { path = "../sdk", version = "0.16.0" } [[bin]] name = "solana-keygen" diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index ef7edc7957..4f4a428514 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -11,10 +11,10 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" serde_json = "1.0.39" -solana = { path = "../core", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-runtime = { path = "../runtime", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-runtime = { path = "../runtime", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } [dev-dependencies] assert_cmd = "0.11" diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 940f4c8765..bb562877ac 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -11,11 +11,11 @@ edition = "2018" [dependencies] env_logger = "0.6.1" influx_db_client = "0.3.6" +lazy_static = "1.3.0" log = "0.4.2" reqwest = "0.9.17" -lazy_static = "1.3.0" +solana-sdk = { path = "../sdk", version = "0.16.0" } sys-info = "0.5.7" -solana-sdk = { path = "../sdk", version = "0.16.0" } [dev-dependencies] rand = "0.6.5" diff --git a/netutil/Cargo.toml b/netutil/Cargo.toml index 0fa85349ba..893d1f900f 100644 --- a/netutil/Cargo.toml +++ b/netutil/Cargo.toml @@ -15,7 +15,7 @@ log = "0.4.2" nix = "0.14.0" rand = "0.6.1" socket2 = "0.3.9" -solana-logger = { path = "../logger", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } tokio = "0.1" [lib] diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml index 22330091bb..c6a7dc2681 100644 --- a/programs/bpf/Cargo.toml +++ b/programs/bpf/Cargo.toml @@ -21,11 +21,11 @@ walkdir = "2" bincode = "1.1.4" byteorder = "1.3.1" elf = "0.0.10" +solana-bpfloader = { path = "../bpf_loader", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-runtime = { path = "../../runtime", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } solana_rbpf = "=0.1.12" -solana-bpfloader = { path = "../bpf_loader", version = "0.16.0" } -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-runtime = { path = "../../runtime", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } [[bench]] name = "bpf_loader" diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml index f242a496bc..d9878eac10 100644 --- a/programs/bpf/rust/alloc/Cargo.toml +++ b/programs/bpf/rust/alloc/Cargo.toml @@ -12,11 +12,11 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.16.0" } +solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.16.0" } [workspace] members = [] [lib] -name = "solana_bpf_rust_alloc" crate-type = ["cdylib"] +name = "solana_bpf_rust_alloc" diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml index 69258272dd..3eea502104 100644 --- a/programs/bpf/rust/iter/Cargo.toml +++ b/programs/bpf/rust/iter/Cargo.toml @@ -12,11 +12,11 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.16.0" } +solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.16.0" } [workspace] members = [] [lib] -name = "solana_bpf_rust_iter" crate-type = ["cdylib"] +name = "solana_bpf_rust_iter" diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml index 7aa2d355da..24be29a25c 100644 --- a/programs/bpf/rust/noop/Cargo.toml +++ b/programs/bpf/rust/noop/Cargo.toml @@ -12,11 +12,11 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.16.0" } +solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust-utils", version = "0.16.0" } [workspace] members = [] [lib] -name = "solana_bpf_rust_noop" crate-type = ["cdylib"] +name = "solana_bpf_rust_noop" diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml index a23565a7d2..6a17d3baef 100644 --- a/programs/bpf_loader/Cargo.toml +++ b/programs/bpf_loader/Cargo.toml @@ -13,11 +13,11 @@ bincode = "1.1.4" byteorder = "1.3.1" libc = "0.2.55" log = "0.4.2" -solana_rbpf = "=0.1.12" serde = "1.0.91" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana_rbpf = "=0.1.12" [lib] -name = "solana_bpf_loader" crate-type = ["lib", "cdylib"] +name = "solana_bpf_loader" diff --git a/programs/budget_api/Cargo.toml b/programs/budget_api/Cargo.toml index 4202ccfd37..921d07319f 100644 --- a/programs/budget_api/Cargo.toml +++ b/programs/budget_api/Cargo.toml @@ -16,11 +16,11 @@ num-derive = "0.2" num-traits = "0.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [dev-dependencies] -solana-runtime = { path = "../../runtime", version = "0.16.0" } +solana-runtime = { path = "../../runtime", version = "0.16.0" } [lib] -name = "solana_budget_api" crate-type = ["lib"] +name = "solana_budget_api" diff --git a/programs/budget_program/Cargo.toml b/programs/budget_program/Cargo.toml index dcde19113d..40cb580e90 100644 --- a/programs/budget_program/Cargo.toml +++ b/programs/budget_program/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" [dependencies] log = "0.4.2" -solana-budget-api = { path = "../budget_api", version = "0.16.0" } -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-budget-api = { path = "../budget_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [lib] +crate-type = ["lib", "cdylib"] name = "solana_budget_program" -crate-type = ["lib","cdylib"] diff --git a/programs/config_api/Cargo.toml b/programs/config_api/Cargo.toml index 99bef898fd..829c5ea8ff 100644 --- a/programs/config_api/Cargo.toml +++ b/programs/config_api/Cargo.toml @@ -13,13 +13,13 @@ bincode = "1.1.4" log = "0.4.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [dev-dependencies] -solana-runtime = { path = "../../runtime", version = "0.16.0" } +solana-runtime = { path = "../../runtime", version = "0.16.0" } [lib] -name = "solana_config_api" crate-type = ["lib"] +name = "solana_config_api" diff --git a/programs/config_program/Cargo.toml b/programs/config_program/Cargo.toml index a30450426e..50ccc549e1 100644 --- a/programs/config_program/Cargo.toml +++ b/programs/config_program/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" [dependencies] log = "0.4.2" -solana-config-api = { path = "../config_api", version = "0.16.0" } -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-config-api = { path = "../config_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [lib] +crate-type = ["lib", "cdylib"] name = "solana_config_program" -crate-type = ["lib","cdylib"] diff --git a/programs/exchange_api/Cargo.toml b/programs/exchange_api/Cargo.toml index 2be97cea0c..61cdea37af 100644 --- a/programs/exchange_api/Cargo.toml +++ b/programs/exchange_api/Cargo.toml @@ -9,17 +9,17 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -log = "0.4.2" bincode = "1.1.4" +log = "0.4.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } -solana-metrics = { path = "../../metrics", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-metrics = { path = "../../metrics", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [dev-dependencies] -solana-runtime = { path = "../../runtime", version = "0.16.0" } +solana-runtime = { path = "../../runtime", version = "0.16.0" } [lib] -name = "solana_exchange_api" crate-type = ["lib"] +name = "solana_exchange_api" diff --git a/programs/exchange_program/Cargo.toml b/programs/exchange_program/Cargo.toml index 0e662a0f8f..a4f4806187 100644 --- a/programs/exchange_program/Cargo.toml +++ b/programs/exchange_program/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" [dependencies] log = "0.4.2" -solana-exchange-api = { path = "../exchange_api", version = "0.16.0" } -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-exchange-api = { path = "../exchange_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [lib] +crate-type = ["lib", "cdylib"] name = "solana_exchange_program" -crate-type = ["lib","cdylib"] diff --git a/programs/failure_program/Cargo.toml b/programs/failure_program/Cargo.toml index 870849ba7d..d5cba080d6 100644 --- a/programs/failure_program/Cargo.toml +++ b/programs/failure_program/Cargo.toml @@ -9,13 +9,13 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -solana-sdk = { path = "../../sdk", version = "0.16.0" } log = "0.4.2" +solana-sdk = { path = "../../sdk", version = "0.16.0" } [dev-dependencies] -solana-runtime = { path = "../../runtime", version = "0.16.0" } +solana-runtime = { path = "../../runtime", version = "0.16.0" } [lib] -name = "solana_failure_program" crate-type = ["cdylib"] +name = "solana_failure_program" diff --git a/programs/noop_program/Cargo.toml b/programs/noop_program/Cargo.toml index 6c1fddbbff..add9d12b2f 100644 --- a/programs/noop_program/Cargo.toml +++ b/programs/noop_program/Cargo.toml @@ -9,14 +9,14 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -solana-sdk = { path = "../../sdk", version = "0.16.0" } -solana-logger = { path = "../../logger", version = "0.16.0" } log = "0.4.2" +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [dev-dependencies] -solana-runtime = { path = "../../runtime", version = "0.16.0" } +solana-runtime = { path = "../../runtime", version = "0.16.0" } [lib] -name = "solana_noop_program" crate-type = ["cdylib"] +name = "solana_noop_program" diff --git a/programs/stake_api/Cargo.toml b/programs/stake_api/Cargo.toml index 3345d16f13..bbca6f3884 100644 --- a/programs/stake_api/Cargo.toml +++ b/programs/stake_api/Cargo.toml @@ -13,11 +13,11 @@ bincode = "1.1.4" log = "0.4.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-metrics = { path = "../../metrics", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } -solana-vote-api = { path = "../vote_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-metrics = { path = "../../metrics", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-vote-api = { path = "../vote_api", version = "0.16.0" } [lib] -name = "solana_stake_api" crate-type = ["lib"] +name = "solana_stake_api" diff --git a/programs/stake_program/Cargo.toml b/programs/stake_program/Cargo.toml index 98712fbf09..3924ca9899 100644 --- a/programs/stake_program/Cargo.toml +++ b/programs/stake_program/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" [dependencies] log = "0.4.2" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } -solana-stake-api = { path = "../stake_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-stake-api = { path = "../stake_api", version = "0.16.0" } [lib] -name = "solana_stake_program" crate-type = ["lib", "cdylib"] +name = "solana_stake_program" diff --git a/programs/storage_api/Cargo.toml b/programs/storage_api/Cargo.toml index cd1ffaa62e..df6684ea92 100644 --- a/programs/storage_api/Cargo.toml +++ b/programs/storage_api/Cargo.toml @@ -9,17 +9,17 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] +assert_matches = "1.3.0" bincode = "1.1.4" log = "0.4.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } -assert_matches = "1.3.0" +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [dev-dependencies] -solana-runtime = { path = "../../runtime", version = "0.16.0" } +solana-runtime = { path = "../../runtime", version = "0.16.0" } [lib] -name = "solana_storage_api" crate-type = ["lib"] +name = "solana_storage_api" diff --git a/programs/storage_program/Cargo.toml b/programs/storage_program/Cargo.toml index 529a15de4a..40e0f14814 100644 --- a/programs/storage_program/Cargo.toml +++ b/programs/storage_program/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" [dependencies] log = "0.4.2" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } -solana-storage-api = { path = "../storage_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-storage-api = { path = "../storage_api", version = "0.16.0" } [lib] -name = "solana_storage_program" crate-type = ["lib", "cdylib"] +name = "solana_storage_program" diff --git a/programs/token_api/Cargo.toml b/programs/token_api/Cargo.toml index 1e4f7b72e5..f573ad9d99 100644 --- a/programs/token_api/Cargo.toml +++ b/programs/token_api/Cargo.toml @@ -15,9 +15,9 @@ num-derive = "0.2" num-traits = "0.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [lib] -name = "solana_token_api" crate-type = ["lib"] +name = "solana_token_api" diff --git a/programs/token_program/Cargo.toml b/programs/token_program/Cargo.toml index f49e4ad20a..fa69d70b85 100644 --- a/programs/token_program/Cargo.toml +++ b/programs/token_program/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" [dependencies] log = "0.4.2" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } -solana-token-api = { path = "../token_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-token-api = { path = "../token_api", version = "0.16.0" } [lib] +crate-type = ["lib", "cdylib"] name = "solana_token_program" -crate-type = ["lib","cdylib"] diff --git a/programs/vote_api/Cargo.toml b/programs/vote_api/Cargo.toml index 42cb15a611..254bf47d52 100644 --- a/programs/vote_api/Cargo.toml +++ b/programs/vote_api/Cargo.toml @@ -13,10 +13,10 @@ bincode = "1.1.4" log = "0.4.2" serde = "1.0.91" serde_derive = "1.0.91" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-metrics = { path = "../../metrics", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-metrics = { path = "../../metrics", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } [lib] -name = "solana_vote_api" crate-type = ["lib"] +name = "solana_vote_api" diff --git a/programs/vote_program/Cargo.toml b/programs/vote_program/Cargo.toml index 244bf08543..f294841f65 100644 --- a/programs/vote_program/Cargo.toml +++ b/programs/vote_program/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" [dependencies] log = "0.4.2" -solana-logger = { path = "../../logger", version = "0.16.0" } -solana-sdk = { path = "../../sdk", version = "0.16.0" } -solana-vote-api = { path = "../vote_api", version = "0.16.0" } +solana-logger = { path = "../../logger", version = "0.16.0" } +solana-sdk = { path = "../../sdk", version = "0.16.0" } +solana-vote-api = { path = "../vote_api", version = "0.16.0" } [lib] +crate-type = ["lib", "cdylib"] name = "solana_vote_program" -crate-type = ["lib","cdylib"] diff --git a/replicator/Cargo.toml b/replicator/Cargo.toml index edcec8b95d..5214462e64 100644 --- a/replicator/Cargo.toml +++ b/replicator/Cargo.toml @@ -9,10 +9,10 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" -solana = { path = "../core", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } [features] chacha = ["solana/chacha"] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 8b409e3aba..fc73345f25 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -23,18 +23,18 @@ rayon = "1.0.0" serde = "1.0.88" serde_derive = "1.0.91" serde_json = "1.0.38" -solana-logger = { path = "../logger", version = "0.16.0" } -solana-metrics = { path = "../metrics", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } -solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } -solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } -solana-vote-program = { path = "../programs/vote_program", version = "0.16.0" } -solana-stake-program = { path = "../programs/stake_program", version = "0.16.0" } -solana-storage-program = { path = "../programs/storage_program", version = "0.16.0" } -solana-noop-program = { path = "../programs/noop_program", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-noop-program = { path = "../programs/noop_program", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } +solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } +solana-stake-program = { path = "../programs/stake_program", version = "0.16.0" } +solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } +solana-storage-program = { path = "../programs/storage_program", version = "0.16.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } +solana-vote-program = { path = "../programs/vote_program", version = "0.16.0" } sys-info = "0.5.7" [lib] -name = "solana_runtime" crate-type = ["lib"] +name = "solana_runtime" diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh index 79a29e7479..0ac376b951 100755 --- a/scripts/increment-cargo-version.sh +++ b/scripts/increment-cargo-version.sh @@ -89,7 +89,7 @@ for Cargo_toml in "${Cargo_tomls[@]}"; do ( set -x sed -i "$Cargo_toml" -e " - s/^$crate = { *path *= *\"\([^\"]*\)\" *, *version *= *\"[^\"]*\"\(.*\)} *\$/$crate = \{ path = \"\1\", version = \"$newVersion\"\2 \}/ + s/^$crate = { *path *= *\"\([^\"]*\)\" *, *version *= *\"[^\"]*\"\(.*\)} *\$/$crate = \{ path = \"\1\", version = \"$newVersion\"\2\}/ " ) done diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 33efaf1027..a777410487 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -11,19 +11,19 @@ edition = "2018" [dependencies] bincode = "1.1.4" bs58 = "0.2.0" -hex = "0.3.2" byteorder = "1.2.1" chrono = { version = "0.4.0", features = ["serde"] } generic-array = { version = "0.13.0", default-features = false, features = ["serde"] } +hex = "0.3.2" itertools = "0.8.0" log = "0.4.2" num-derive = "0.2" num-traits = "0.2" rand = "0.6.5" rayon = "1.0.0" -sha2 = "0.8.0" serde = "1.0.91" serde_derive = "1.0.91" serde_json = "1.0.39" +sha2 = "0.8.0" solana-ed25519-dalek = "0.2.0" untrusted = "0.6.2" diff --git a/upload-perf/Cargo.toml b/upload-perf/Cargo.toml index 82a2bcafcc..5795ab095d 100644 --- a/upload-perf/Cargo.toml +++ b/upload-perf/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" [dependencies] log = "0.4.2" serde_json = "1.0.39" -solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } [[bin]] name = "solana-upload-perf" diff --git a/validator/Cargo.toml b/validator/Cargo.toml index d6b255da6f..0448bb74a5 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -12,15 +12,15 @@ homepage = "https://solana.com/" clap = "2.33.0" log = "0.4.2" serde_json = "1.0.39" -solana = { path = "../core", version = "0.16.0" } -solana-drone = { path = "../drone", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-metrics = { path = "../metrics", version = "0.16.0" } -solana-runtime = { path = "../runtime", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } -solana-vote-signer = { path = "../vote-signer", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-drone = { path = "../drone", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-runtime = { path = "../runtime", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } +solana-vote-signer = { path = "../vote-signer", version = "0.16.0" } [features] chacha = ["solana/chacha"] diff --git a/vote-signer/Cargo.toml b/vote-signer/Cargo.toml index bfe53f005c..e1a8739243 100644 --- a/vote-signer/Cargo.toml +++ b/vote-signer/Cargo.toml @@ -11,18 +11,18 @@ homepage = "https://solana.com/" [dependencies] bs58 = "0.2.0" clap = "2.33" -log = "0.4.2" jsonrpc-core = "11.0.0" jsonrpc-derive = "11.0.0" jsonrpc-http-server = "11.0.0" +log = "0.4.2" serde = "1.0.91" serde_json = "1.0.39" -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-metrics = { path = "../metrics", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } [lib] -name = "solana_vote_signer" crate-type = ["lib"] +name = "solana_vote_signer" [[bin]] name = "solana-vote-signer" diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index 6035c3e650..a89b8e94fc 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -11,27 +11,27 @@ homepage = "https://solana.com/" [dependencies] bincode = "1.1.4" bs58 = "0.2.0" -clap = "2.33.0" chrono = { version = "0.4.0", features = ["serde"] } +clap = "2.33.0" dirs = "1.0.5" log = "0.4.2" num-traits = "0.2" serde_json = "1.0.39" -solana-budget-api = { path = "../programs/budget_api", version = "0.16.0" } -solana-client = { path = "../client", version = "0.16.0" } -solana-drone = { path = "../drone", version = "0.16.0" } -solana-logger = { path = "../logger", version = "0.16.0" } -solana-netutil = { path = "../netutil", version = "0.16.0" } -solana-sdk = { path = "../sdk", version = "0.16.0" } -solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } -solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } -solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } -solana-vote-signer = { path = "../vote-signer", version = "0.16.0" } +solana-budget-api = { path = "../programs/budget_api", version = "0.16.0" } +solana-client = { path = "../client", version = "0.16.0" } +solana-drone = { path = "../drone", version = "0.16.0" } +solana-logger = { path = "../logger", version = "0.16.0" } +solana-netutil = { path = "../netutil", version = "0.16.0" } +solana-sdk = { path = "../sdk", version = "0.16.0" } +solana-stake-api = { path = "../programs/stake_api", version = "0.16.0" } +solana-storage-api = { path = "../programs/storage_api", version = "0.16.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.16.0" } +solana-vote-signer = { path = "../vote-signer", version = "0.16.0" } url = "1.7.2" [dev-dependencies] -solana-budget-program = { path = "../programs/budget_program", version = "0.16.0" } -solana = { path = "../core", version = "0.16.0" } +solana = { path = "../core", version = "0.16.0" } +solana-budget-program = { path = "../programs/budget_program", version = "0.16.0" } [features] cuda = []