diff --git a/Cargo.toml b/Cargo.toml index 9edf4aff..9b541d48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,14 @@ members = ["programs/*", "clients/rust/*", "tools/*"] exclude = ["observability/indexer"] +[workspace.dependencies] +solana-client = "=1.14.11" +solana-sdk = "=1.14.13" +solana-logger = "=1.14.13" +solana-program = "=1.14.13" +solana-program-test = "=1.14.13" +solana-account-decoder = "=1.14.12" + [profile.release] overflow-checks = true lto = "fat" diff --git a/clients/rust/marginfi-cli/Cargo.toml b/clients/rust/marginfi-cli/Cargo.toml index 9d546897..bd959182 100644 --- a/clients/rust/marginfi-cli/Cargo.toml +++ b/clients/rust/marginfi-cli/Cargo.toml @@ -20,8 +20,8 @@ clap = { version = "3.2.6", features = ["derive"] } anyhow = "1.0.58" log = "0.4.17" env_logger = "0.9.0" -solana-client = "1.14.11" -solana-sdk = "1.14.11" +solana-client = { workspace = true } +solana-sdk = { workspace = true } anchor-client = "0.26.0" anchor-spl = "0.26.0" dirs = "4.0.0" @@ -36,7 +36,7 @@ serde_json = "1.0.81" fixed = "1.12.0" fixed-macro = "1.2.0" bytemuck = "1.12.3" -solana-account-decoder = "1.14.12" +solana-account-decoder = { workspace = true } type-layout = "0.2.0" spl-token = "3.5.0" spl-associated-token-account = "1.1.2" diff --git a/observability/indexer/Cargo.toml b/observability/indexer/Cargo.toml index 5c355ec5..3bc36ae4 100644 --- a/observability/indexer/Cargo.toml +++ b/observability/indexer/Cargo.toml @@ -11,9 +11,9 @@ path = "src/bin/main.rs" solana-client = "=1.14.3" solana-measure = "=1.14.3" solana-metrics = "=1.14.3" -solana-sdk = "=1.14.3" +solana-sdk = { workspace = true } solana-transaction-status = "=1.14.3" -solana-account-decoder = "=1.14.3" +solana-account-decoder = { workspace = true } gcp-bigquery-client = "0.16.2" google-cloud-auth = "0.8.1" diff --git a/programs/liquidity-incentive-program/Cargo.toml b/programs/liquidity-incentive-program/Cargo.toml index f82caf6c..237686c8 100644 --- a/programs/liquidity-incentive-program/Cargo.toml +++ b/programs/liquidity-incentive-program/Cargo.toml @@ -35,8 +35,8 @@ assert_matches = "1.5.0" bincode = "1.3.3" futures = "0.3.25" pretty_assertions = "1.2.1" -solana-logger = "1.14.11" -solana-program = "1.14.11" -solana-program-test = "1.14.11" -solana-sdk = "1.14.11" +solana-logger = { workspace = true } +solana-program = { workspace = true } +solana-program-test = { workspace = true } +solana-sdk = { workspace = true } fixtures = { path = "../../test-utils", package = "test-utilities", features = [ "lip" ] } diff --git a/programs/marginfi/Cargo.toml b/programs/marginfi/Cargo.toml index ca8ce21f..b64af437 100644 --- a/programs/marginfi/Cargo.toml +++ b/programs/marginfi/Cargo.toml @@ -31,7 +31,7 @@ fixed = "1.12.0" fixed-macro = "1.2.0" lazy_static = "1.4.0" pyth-sdk-solana = "0.7.0" -solana-program = "1.14.13" +solana-program = { workspace = true } static_assertions = "1.1.0" switchboard-v2 = "=0.1.22" type-layout = "0.2.0" @@ -42,8 +42,8 @@ assert_matches = "1.5.0" bincode = "1.3.3" futures = "0.3.25" pretty_assertions = "1.2.1" -solana-logger = "1.14.13" -solana-program-test = "1.14.13" -solana-sdk = "1.14.13" +solana-logger = { workspace = true } +solana-program-test = { workspace = true } +solana-sdk = { workspace = true } rust_decimal = "*" fixtures = { path = "../../test-utils", package = "test-utilities" } diff --git a/programs/marginfi/fuzz/Cargo.toml b/programs/marginfi/fuzz/Cargo.toml index 859d334c..c21ef86c 100644 --- a/programs/marginfi/fuzz/Cargo.toml +++ b/programs/marginfi/fuzz/Cargo.toml @@ -15,8 +15,8 @@ bumpalo = "3.11.1" libfuzzer-sys = "0.4" safe-transmute = "0.11.2" rand = "0.8.5" -solana-sdk = "1.14.13" -solana-program = "1.14.13" +solana-sdk = { workspace = true } +solana-program = { workspace = true } spl-token = "3.5.0" bytemuck = "1.12.3" pyth-sdk-solana = "0.7.0" diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 7aae40c9..6977fd43 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -25,10 +25,10 @@ assert_matches = "1.5.0" bincode = "1.3.3" futures = "0.3.25" pretty_assertions = "1.2.1" -solana-program = "1.14.13" -solana-logger = "1.14.13" -solana-program-test = "1.14.13" -solana-sdk = "1.14.13" +solana-program = { workspace = true } +solana-logger = { workspace = true } +solana-program-test = { workspace = true } +solana-sdk = { workspace = true } switchboard-v2 = "0.1.22" [dependencies.marginfi] diff --git a/tools/llama-snapshot-tool/Cargo.toml b/tools/llama-snapshot-tool/Cargo.toml index 3ede5410..09ee1c44 100644 --- a/tools/llama-snapshot-tool/Cargo.toml +++ b/tools/llama-snapshot-tool/Cargo.toml @@ -19,14 +19,14 @@ marginfi = { path = "../../programs/marginfi", version = "0.1.0", features = [ log = "0.4.17" env_logger = "0.9.0" solana-client = "1.14.11" -solana-sdk = "1.14.11" +solana-sdk = { workspace = true } anchor-client = "0.26.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.81" fixed = "1.12.0" fixed-macro = "1.2.0" bytemuck = "1.12.3" -solana-account-decoder = "1.14.12" +solana-account-decoder = { workspace = true } reqwest = { version = "0.11", features = ["json"] } # reqwest with JSON parsing support futures = "0.3" # for our async / await blocks tokio = { version = "1.12.0", features = ["full"] } # for our async runtime