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

Update cargo_metadata requirement from 0.18 to 0.19 #487

Merged
merged 3 commits into from
Nov 21, 2024
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ afl = { version = "0.15" }
anyhow = { version = "1.0", features = ["backtrace"] }
assert_cmd = "2.0"
bitflags = "2.6"
cargo_metadata = "0.18"
cargo_metadata = "0.19"
cast_checks = { version = "0.1" }
clap = { version = "4.5", features = ["cargo", "derive", "wrap_help"] }
ctor = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions third-party/patches/agave.patch
Original file line number Diff line number Diff line change
Expand Up @@ -224,17 +224,17 @@ index 9f62c4f..ffbf6b8 100644
) -> Result<u64, Box<dyn std::error::Error>> {
let log_collector = invoke_context.get_log_collector();
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index 485a8d3..a15c3ff 100644
index 1cc7507..0cf0eb6 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -94,5 +94,5 @@ qualifier_attr = { workspace = true, optional = true }
@@ -101,5 +101,5 @@ qualifier_attr = { workspace = true, optional = true }
rand = { workspace = true, optional = true }
rand0-7 = { workspace = true, optional = true }
-serde = { workspace = true }
+serde = { workspace = true, features = ["rc"] }
serde_bytes = { workspace = true }
serde_derive = { workspace = true }
@@ -158,4 +158,6 @@ solana-transaction-error = { workspace = true, features = ["serde"], optional =
@@ -168,4 +168,6 @@ solana-transaction-error = { workspace = true, features = ["serde"], optional =
thiserror = { workspace = true }

+test-fuzz = { path = "../../../test-fuzz" }
Expand Down
4 changes: 4 additions & 0 deletions third-party/tests/third_party.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,15 @@ fn run_test(test: &Test, no_run: bool) {
// However, rather than try to upgrade everything and then downgrade just `x25519-dalek`
// (similar to how I did for `libp2p-swarm-derive`), I am instead trying to upgrade just the
// packages that need it.
// smoelius: `cw20-base` relies on `serde_json` 1.0.114, which is before `serde_json::Value`
// started deriving `Hash`:
// https://github.com/serde-rs/json/blob/e1b3a6d8a161ff5ec4865b487d148c17d0188e3e/src/value/mod.rs#L115
for package in [
"ahash@0.7.6",
"ahash@0.7.7",
"libc",
"num-bigint@0.4.0",
"serde_json",
"tempfile",
] {
#[allow(clippy::let_unit_value)]
Expand Down
4 changes: 2 additions & 2 deletions third-party/third_party.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"flags": ["EXPENSIVE", "SKIP_NIGHTLY"],
"url": "https://github.com/anza-xyz/agave",
"rev": "86a70621aeabefdfdd574155e37520342d7e0680",
"rev": "f9f54bcba0b75b7566a948c3441bc5e1d03152fc",
"patch": "agave.patch",
"subdir": ".",
"package": "solana-bpf-loader-program",
Expand All @@ -20,7 +20,7 @@
{
"flags": ["EXPENSIVE", "SKIP_NIGHTLY"],
"url": "https://github.com/paritytech/polkadot-sdk",
"rev": "56d97c3ad8c86e602bc7ac368751210517c4309f",
"rev": "bf20a9ee18f7215210bbbabf79e955c8c35b3360",
"patch": "substrate_client_transaction_pool.patch",
"subdir": ".",
"package": "sc-transaction-pool",
Expand Down