Skip to content

Commit ea254b6

Browse files
jamie-osecjamie-osec
committed
chore: Move solana-* dependencies into workspace Cargo.toml 
1 parent e438593 commit ea254b6

File tree

6 files changed

+89
-51
lines changed

6 files changed

+89
-51
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
[workspace]
32
members = [
43
"avm",
@@ -13,6 +12,46 @@ members = [
1312
]
1413
exclude = ["tests/cfo/deps/openbook-dex", "tests/swap/deps/openbook-dex"]
1514
resolver = "2"
15+
16+
[workspace.dependencies]
17+
solana-account = "3.0.0"
18+
solana-account-decoder = "3.0.0"
19+
solana-account-info = "3.0.0"
20+
solana-cli-config = "3.0.0"
21+
solana-clock = "3.0.0"
22+
solana-commitment-config = "3.0.0"
23+
solana-compute-budget-interface = "3.0.0"
24+
solana-cpi = "3.0.0"
25+
solana-define-syscall = "3.0.0"
26+
solana-faucet = "3.0.0"
27+
solana-feature-gate-interface = "3.0.0"
28+
solana-instruction = "3.0.0"
29+
solana-instructions-sysvar = "3.0.0"
30+
solana-invoke = { git = "https://github.com/solana-foundation/solana-invoke", branch = "solana-3-0" }
31+
solana-keypair = "3.0.0"
32+
solana-loader-v3-interface = "6.0.0"
33+
solana-msg = "3.0.0"
34+
solana-program = "3.0.0"
35+
solana-program-entrypoint = "3.0.0"
36+
solana-program-error = "3.0.0"
37+
solana-program-memory = "3.0.0"
38+
solana-program-option = "3.0.0"
39+
solana-program-pack = "3.0.0"
40+
solana-pubkey = "4.0.0"
41+
solana-pubsub-client = "3.0.0"
42+
solana-rpc-client = "3.0.0"
43+
solana-rpc-client-api = "3.0.0"
44+
solana-sdk-ids = "3.0.0"
45+
solana-signature = "3.0.0"
46+
solana-signer = "3.0.0"
47+
solana-stake-interface = "2.0.0"
48+
solana-system-interface = "2.0.0"
49+
# FIXME: solana-sysvar 3.1.x contains UB and miscompiles:
50+
# https://github.com/anza-xyz/solana-sdk/pull/257#issuecomment-3566690576
51+
solana-sysvar = "~3.0.0"
52+
solana-sysvar-id = "3.0.0"
53+
solana-transaction = "3.0.0"
54+
1655
[profile.release]
1756
lto = true
1857

‎cli/Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ semver = "1.0.4"
3636
serde = { version = "1.0.130", features = ["derive"] }
3737
serde_json = "1.0"
3838
shellexpand = "2.1.0"
39-
solana-cli-config = "3.0.0"
40-
solana-clock = "3.0.0"
41-
solana-commitment-config = "3.0.0"
42-
solana-compute-budget-interface = "3.0.0"
43-
solana-faucet = { version = "3.0.0", features = ["agave-unstable-api"] }
44-
solana-instruction = "3.0.0"
45-
solana-keypair = "3.0.0"
46-
solana-pubkey = "3.0.0"
47-
solana-signature = "3.0.0"
48-
solana-signer = "3.0.0"
49-
solana-system-interface = "2.0.0"
50-
solana-transaction = "3.0.0"
51-
solana-rpc-client = "3.0.0"
39+
solana-cli-config.workspace = true
40+
solana-clock.workspace = true
41+
solana-commitment-config.workspace = true
42+
solana-compute-budget-interface.workspace = true
43+
solana-faucet = { workspace = true, features = ["agave-unstable-api"] }
44+
solana-instruction.workspace = true
45+
solana-keypair.workspace = true
46+
solana-pubkey.workspace = true
47+
solana-signature.workspace = true
48+
solana-signer.workspace = true
49+
solana-system-interface.workspace = true
50+
solana-transaction.workspace = true
51+
solana-rpc-client.workspace = true
5252
syn = { version = "1.0.60", features = ["full", "extra-traits"] }
5353
tar = "0.4.35"
5454
toml = "0.7.6"

‎client/Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ anyhow = "1"
2121
futures = "0.3"
2222
regex = "1"
2323
serde = { version = "1", features = ["derive"] }
24-
solana-account = "3.0.0"
25-
solana-account-decoder = "3.0.0"
26-
solana-commitment-config = "3.0.0"
27-
solana-instruction = "3.0.0"
28-
solana-program = "3.0.0"
29-
solana-pubsub-client = "3.0.0"
30-
solana-rpc-client = "3.0.0"
31-
solana-rpc-client-api = "3.0.0"
32-
solana-signature = "3.0.0"
33-
solana-signer = "3.0.0"
34-
solana-transaction = "3.0.0"
24+
solana-account.workspace = true
25+
solana-account-decoder.workspace = true
26+
solana-commitment-config.workspace = true
27+
solana-instruction.workspace = true
28+
solana-program.workspace = true
29+
solana-pubsub-client.workspace = true
30+
solana-rpc-client.workspace = true
31+
solana-rpc-client-api.workspace = true
32+
solana-signature.workspace = true
33+
solana-signer.workspace = true
34+
solana-transaction.workspace = true
3535
thiserror = "1"
3636
tokio = { version = "1", features = ["rt", "sync"] }
3737
url = "2"

‎lang/Cargo.toml‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,30 +63,29 @@ bincode = "1"
6363
borsh = "1.5.7"
6464
bytemuck = { version = "1", features = ["derive"] }
6565
const-crypto = "0.3.0"
66-
solana-account-info = "3.0.0"
67-
solana-clock = "3.0.0"
68-
solana-cpi = "3.0.0"
69-
solana-define-syscall = "3.0.0"
70-
solana-feature-gate-interface = "3.0.0"
71-
solana-instruction = "3.0.0"
72-
solana-instructions-sysvar = "3.0.0"
73-
## FIXME(jamie): When solana-invoke is released with 3.0 compatability, update this
74-
solana-invoke = { git = "https://github.com/solana-foundation/solana-invoke", branch = "solana-3-0" }
75-
solana-loader-v3-interface = { version = "6.0.0", features = ["bincode"] }
76-
solana-msg = "3.0.0"
77-
solana-program-entrypoint = "3.0.0"
78-
solana-program-error = { version = "3.0.0", features = ["borsh"] }
79-
solana-program-memory = "3.0.0"
80-
solana-program-option = "3.0.0"
81-
solana-program-pack = "3.0.0"
82-
solana-pubkey = { version = "4", features = ["borsh", "bytemuck", "serde"] }
83-
solana-sdk-ids = "3.0.0"
84-
solana-stake-interface = { version = "2.0.0", features = ["sysvar", "bincode"] }
85-
solana-system-interface = "2.0.0"
86-
# FIXME: solana-sysvar 3.1.x causes breakage:
87-
# https://github.com/anza-xyz/solana-sdk/pull/257#issuecomment-3566690576
88-
solana-sysvar = { version = "~3.0.0", features = ["bincode"] }
89-
solana-sysvar-id = "3.0.0"
66+
67+
solana-account-info.workspace = true
68+
solana-clock.workspace = true
69+
solana-cpi.workspace = true
70+
solana-define-syscall.workspace = true
71+
solana-feature-gate-interface.workspace = true
72+
solana-instruction.workspace = true
73+
solana-instructions-sysvar.workspace = true
74+
solana-invoke.workspace = true
75+
solana-loader-v3-interface = { workspace = true, features = ["bincode"] }
76+
solana-msg.workspace = true
77+
solana-program-entrypoint.workspace = true
78+
solana-program-error = { workspace = true, features = ["borsh"] }
79+
solana-program-memory.workspace = true
80+
solana-program-option.workspace = true
81+
solana-program-pack.workspace = true
82+
solana-pubkey = { workspace = true, features = ["borsh", "bytemuck", "serde"] }
83+
solana-sdk-ids.workspace = true
84+
solana-stake-interface = { workspace = true, features = ["sysvar", "bincode"] }
85+
solana-system-interface.workspace = true
86+
solana-sysvar = { workspace = true, features = ["bincode"] }
87+
solana-sysvar-id.workspace = true
88+
9089
thiserror = "1"
9190

9291
[lints.rust.unexpected_cfgs]

‎spl/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ anchor-lang = { path = "../lang", version = "0.32.1", features = ["derive"] }
3737
base64ct = { version = "<1.8.0", optional = true }
3838
borsh = { version = "1.5.7", optional = true }
3939
mpl-token-metadata = { version = "=5.1.2-alpha.1", optional = true }
40-
solana-stake-interface = { version = "2", features = ["borsh"], optional = true }
40+
solana-stake-interface = { workspace = true, features = ["borsh"], optional = true }
4141
solana-sysvar = { version = "3", optional = true }
4242
spl-associated-token-account-interface = { version = "2", optional = true }
4343
spl-memo-interface = { version = "2", optional = true }

0 commit comments

Comments
 (0)