Skip to content
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

Moving relevant dependencies to global #136

Merged
merged 7 commits into from
Nov 20, 2023
Merged
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
340 changes: 98 additions & 242 deletions Cargo.lock

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
members = ["programs/*", "clients/rust/*", "tools/*"]
exclude = ["observability/indexer"]

[workspace.dependencies]
solana-client = "1.14.13"
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.13"
anchor-lang = "0.26.0"
anchor-spl = "0.26.0"
anchor-client = "0.26.0"

[profile.release]
overflow-checks = true
lto = "fat"
Expand Down
12 changes: 7 additions & 5 deletions clients/rust/marginfi-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cargo-features = ["workspace-inheritance"]

[package]
name = "marginfi-v2-cli"
version = "0.1.0"
Expand All @@ -20,10 +22,10 @@ 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"
anchor-client = "0.26.0"
anchor-spl = "0.26.0"
solana-client = { workspace = true }
solana-sdk = { workspace = true }
anchor-client = { workspace = true }
anchor-spl = { workspace = true }
dirs = "4.0.0"
shellexpand = "2.1.0"
marginfi = { path = "../../../programs/marginfi", version = "0.1.0", features = [
Expand All @@ -36,7 +38,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
14 changes: 8 additions & 6 deletions programs/liquidity-incentive-program/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cargo-features = ["workspace-inheritance"]

[package]
name = "liquidity-incentive-program"
version = "0.1.0"
Expand All @@ -20,8 +22,8 @@ test = []
test-bpf = []

[dependencies]
anchor-lang = "0.26.0"
anchor-spl = "0.26.0"
anchor-lang = { workspace = true }
anchor-spl = { workspace = true }
cfg-if = "1.0.0"
fixed = "1.12.0"

Expand All @@ -35,8 +37,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" ] }
14 changes: 8 additions & 6 deletions programs/marginfi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cargo-features = ["workspace-inheritance"]

[package]
name = "marginfi"
version = "0.1.0"
Expand All @@ -22,16 +24,16 @@ mainnet-beta = []
debug = []

[dependencies]
anchor-lang = "0.26.0"
anchor-spl = "0.26.0"
anchor-lang = { workspace = true }
anchor-spl = { workspace = true }
bytemuck = "1.9.1"
cfg-if = "1.0.0"
enum_dispatch = "0.3.11"
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 +44,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" }
8 changes: 5 additions & 3 deletions programs/marginfi/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cargo-features = ["workspace-inheritance"]

[package]
name = "marginfi-fuzz"
version = "0.0.0"
Expand All @@ -8,15 +10,15 @@ edition = "2021"
cargo-fuzz = true

[dependencies]
anchor-lang = "0.26.0"
anchor-lang = { workspace = true }
anyhow = "1.0.68"
arbitrary = { version = "1.2.2", features = ["derive"] }
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
15 changes: 8 additions & 7 deletions test-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cargo-features = ["workspace-inheritance"]

[package]
name = "test-utilities"
version = "0.1.0"
Expand All @@ -10,9 +12,8 @@ lip = ["liquidity-incentive-program"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anchor-lang = "0.26.0"
anchor-lang-27 = { version = "0.27.0", package = "anchor-lang" }
anchor-spl = "0.26.0"
anchor-lang = { workspace = true }
anchor-spl = { workspace = true }
bytemuck = "1.9.1"
fixed = "1.12.0"
fixed-macro = "1.2.0"
Expand All @@ -25,10 +26,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
6 changes: 4 additions & 2 deletions tools/llama-snapshot-tool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cargo-features = ["workspace-inheritance"]

[package]
name = "llama-snapshot-tool"
version = "0.1.0"
Expand All @@ -19,14 +21,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
Loading