From ab61f19fe08a65c7ce61e74ecd5e0e9d53deb704 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 03:46:59 +0000 Subject: [PATCH 1/3] Update cargo_metadata requirement from 0.18 to 0.19 Updates the requirements on [cargo_metadata](https://github.com/oli-obk/cargo_metadata) to permit the latest version. - [Release notes](https://github.com/oli-obk/cargo_metadata/releases) - [Changelog](https://github.com/oli-obk/cargo_metadata/blob/main/CHANGELOG.md) - [Commits](https://github.com/oli-obk/cargo_metadata/compare/0.18.0...0.18.1) --- updated-dependencies: - dependency-name: cargo_metadata dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a26d61b0..a81da188 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" From a14da73e3614f88c43b122db39b96cdae273c508 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Thu, 21 Nov 2024 17:53:25 +0000 Subject: [PATCH 2/3] Update `serde_json` in `third_party` test --- third-party/tests/third_party.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/third-party/tests/third_party.rs b/third-party/tests/third_party.rs index 718574c9..3008d1ea 100644 --- a/third-party/tests/third_party.rs +++ b/third-party/tests/third_party.rs @@ -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)] From ecca79c1ecc63764158b0993a385945c0262741c Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Thu, 21 Nov 2024 19:02:06 +0000 Subject: [PATCH 3/3] Update patches --- third-party/patches/agave.patch | 6 +++--- third-party/third_party.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/third-party/patches/agave.patch b/third-party/patches/agave.patch index 1b32fb91..b05d459f 100644 --- a/third-party/patches/agave.patch +++ b/third-party/patches/agave.patch @@ -224,17 +224,17 @@ index 9f62c4f..ffbf6b8 100644 ) -> Result> { 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" } diff --git a/third-party/third_party.json b/third-party/third_party.json index 80638abd..db73be02 100644 --- a/third-party/third_party.json +++ b/third-party/third_party.json @@ -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", @@ -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",