Skip to content

Commit ebdfa8d

Browse files
chore: update dependencies to use workspace for better management (#1559)
1 parent b96ba7d commit ebdfa8d

File tree

9 files changed

+37
-46
lines changed

9 files changed

+37
-46
lines changed

Cargo.lock

Lines changed: 15 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ solana-transaction-status = "=1.18.22"
5959
solana-account-decoder = "=1.18.22"
6060
solana-rpc = "=1.18.22"
6161
solana-rpc-client-api = "=1.18.22"
62+
solana-security-txt = "1.1.1"
6263
spl-token = "=4.0.0"
6364
spl-token-2022 = {version="3.0.5", no-default-features = true, features = ["no-entrypoint"]}
6465

@@ -84,7 +85,7 @@ log = "0.4"
8485
env_logger = "0.11"
8586

8687
# Error handling
87-
thiserror = "1.0"
88+
thiserror = "2.0"
8889
anyhow = "1.0"
8990

9091
# Arkworks
@@ -125,7 +126,10 @@ light-bounded-vec = { version = "1.1.0" }
125126
light-poseidon = { version = "0.3.0" }
126127
light-test-utils = { path = "program-tests/utils", version = "1.2.1" }
127128
create-address-program-test = { path = "program-tests/create-address-test-program", version = "1.0.0" }
128-
bytemuck = { version = "1.21" }
129+
groth16-solana = { version = "0.0.3" }
130+
# anchor 0.29 requires 1.19
131+
bytemuck = { version = "1.19.0" }
132+
129133
# Math and crypto
130134
num-bigint = "0.4.6"
131135
num-traits = "0.2.19"

program-libs/batched-merkle-tree/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ anchor = ["anchor-lang", "solana"]
1212
solana = []
1313

1414
[dependencies]
15-
aligned-sized = { workspace=true}
15+
aligned-sized = { workspace = true}
1616
solana-program = { workspace = true }
1717
light-zero-copy = { workspace=true, features = ["solana", "std"] }
18-
light-hasher = { workspace=true, features = ["solana"] }
19-
light-utils = { workspace=true, features = ["bytemuck-des"] }
20-
light-bloom-filter = { workspace=true, features = ["solana"] }
21-
light-verifier = { workspace=true, features = ["solana"] }
18+
light-hasher = { workspace= true, features = ["solana"] }
19+
light-utils = { workspace= true, features = ["bytemuck-des"] }
20+
light-bloom-filter = { workspace = true, features = ["solana"] }
21+
light-verifier = { workspace = true, features = ["solana"] }
2222
thiserror = { workspace = true }
2323
light-merkle-tree-metadata = { workspace = true }
2424
borsh = { workspace = true }
@@ -30,8 +30,8 @@ zerocopy = { workspace = true }
3030
rand = { workspace = true }
3131
light-prover-client = { workspace = true }
3232
light-merkle-tree-reference = { workspace = true }
33-
tokio = {workspace = true}
34-
serial_test = {workspace = true}
33+
tokio = { workspace = true }
34+
serial_test = { workspace = true}
3535

3636
[lints.rust.unexpected_cfgs]
3737
level = "allow"

program-libs/hasher/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010
solana = []
1111

1212
[dependencies]
13-
light-poseidon = "0.3.0"
13+
light-poseidon = { workspace = true }
1414
solana-program = { workspace = true }
1515
thiserror = { workspace = true }
1616

program-libs/merkle-tree-metadata/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ solana = []
1414
[dependencies]
1515
thiserror = { workspace = true}
1616
borsh = { workspace = true }
17-
bytemuck = "1.21"
17+
bytemuck = { workspace = true }
1818
solana-program = { workspace = true }
1919
anchor-lang = { workspace = true , optional = true }
2020
zerocopy = {workspace = true, features = ["derive"]}

program-libs/utils/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ zerocopy = { workspace = true, features = ["derive"] }
2525
borsh = { workspace = true }
2626
bytemuck = { workspace = true, optional = true }
2727
anchor-lang = { workspace = true, optional = true }
28-
light-bounded-vec = { workspace = true }
2928
light-zero-copy = { workspace = true }
3029

3130
[dev-dependencies]
3231
light-poseidon = { workspace = true }
3332
borsh = { workspace = true }
34-
memoffset = "0.9"

program-libs/verifier/Cargo.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@ edition = "2021"
1010
solana = ["solana-program"]
1111

1212
[dependencies]
13-
groth16-solana = "0.0.3"
13+
groth16-solana = { workspace = true }
1414
thiserror = { workspace = true }
15-
borsh = { workspace = true }
1615
solana-program = { workspace = true, optional = true }
17-
zerocopy = { workspace = true }
18-
light-zero-copy = { workspace = true }
1916
light-utils = { workspace = true }
2017

2118
[dev-dependencies]
2219
tokio = { workspace = true }
23-
reqwest = { version = "0.11.24", features = ["json", "rustls-tls"] }
20+
reqwest = { workspace = true, features = ["json", "rustls-tls"] }
2421
light-prover-client = { workspace = true }
2522
serial_test = { workspace = true }
2623

program-libs/zero-copy/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ std = []
1313

1414
[dependencies]
1515
solana-program = { workspace = true, optional = true }
16-
thiserror = {version="2.0", default-features = false}
17-
num-traits = { workspace = true }
16+
thiserror = { workspace = true, default-features = false}
1817
zerocopy = { workspace = true}
1918

2019
[dev-dependencies]
21-
rand = "0.8"
22-
num-traits.workspace = true
20+
rand = { workspace = true }
2321
zerocopy = {workspace = true, features=["derive"]}

programs/account-compression/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ test = []
2626
[dependencies]
2727
aligned-sized = { workspace = true }
2828
anchor-lang = { workspace = true }
29-
bytemuck = { version = "1.21", features = ["min_const_generics"] }
29+
bytemuck = { workspace = true, features = ["min_const_generics"] }
3030
light-bounded-vec = { workspace = true, features = ["solana"] }
3131
light-hash-set = { workspace = true, features = ["solana"] }
3232
light-hasher = { workspace = true, features = ["solana"] }
3333
light-heap = { workspace = true, optional = true }
3434
light-concurrent-merkle-tree = { workspace = true, features = ["solana"] }
3535
light-indexed-merkle-tree = { workspace = true, features = ["solana"] }
3636
light-utils = { workspace = true, features = ["anchor"] }
37-
num-bigint = "0.4"
38-
solana-security-txt = "1.1.0"
37+
num-bigint = { workspace = true }
38+
solana-security-txt = { workspace = true }
3939
light-batched-merkle-tree = {workspace = true, features = ["solana"] }
4040
light-merkle-tree-metadata = {workspace = true, features = ["anchor"] }
4141
light-zero-copy = {workspace = true, features = ["solana"] }

0 commit comments

Comments
 (0)