Skip to content

Commit

Permalink
fr
Browse files Browse the repository at this point in the history
  • Loading branch information
edgarpavlovsky committed Nov 20, 2023
1 parent 8e12ff6 commit 08c933d
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 21 deletions.
8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions clients/rust/marginfi-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions observability/indexer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions programs/liquidity-incentive-program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] }
8 changes: 4 additions & 4 deletions programs/marginfi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" }
4 changes: 2 additions & 2 deletions programs/marginfi/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions tools/llama-snapshot-tool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 08c933d

Please sign in to comment.