diff --git a/cargo-test-fuzz/patches/solana.patch b/cargo-test-fuzz/patches/solana.patch index ad81415a..b95cf4d0 100644 --- a/cargo-test-fuzz/patches/solana.patch +++ b/cargo-test-fuzz/patches/solana.patch @@ -188,10 +188,10 @@ index 57bf073..f28e99f 100644 [target.'cfg(target_arch = "wasm32")'.dependencies] js-sys = { workspace = true } diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs -index 2201ed5..ad9d31a 100644 +index abecf4f..43b536e 100644 --- a/sdk/src/feature_set.rs +++ b/sdk/src/feature_set.rs -@@ -1009,5 +1009,5 @@ lazy_static! { +@@ -1014,5 +1014,5 @@ lazy_static! { /// `FeatureSet` holds the set of currently active/inactive runtime features -#[derive(AbiExample, Debug, Clone, Eq, PartialEq)] diff --git a/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch b/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch index d9206721..e2f152ec 100644 --- a/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch +++ b/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch @@ -1,15 +1,15 @@ diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml -index c7a2540..b0e4581 100644 +index 2ca37af..1d910fe 100644 --- a/substrate/client/transaction-pool/Cargo.toml +++ b/substrate/client/transaction-pool/Cargo.toml @@ -23,6 +23,6 @@ futures-timer = "3.0.2" linked-hash-map = "0.5.4" log = { workspace = true, default-features = true } -parking_lot = "0.12.1" --serde = { version = "1.0.196", features = ["derive"] } +-serde = { features = ["derive"], workspace = true, default-features = true } +parking_lot = { version = "0.12.1", features = ["serde"] } -+serde = { version = "1.0.196", features = ["derive", "rc"] } - thiserror = "1.0.48" ++serde = { features = ["derive", "rc"], workspace = true, default-features = true } + thiserror = { workspace = true } prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" } @@ -37,4 +37,5 @@ sp-runtime = { path = "../../primitives/runtime" } sp-tracing = { path = "../../primitives/tracing" } diff --git a/cargo-test-fuzz/third_party.json b/cargo-test-fuzz/third_party.json index ce1a5c86..6e9c348c 100644 --- a/cargo-test-fuzz/third_party.json +++ b/cargo-test-fuzz/third_party.json @@ -11,7 +11,7 @@ { "flags": ["EXPENSIVE", "SKIP_NIGHTLY"], "url": "https://github.com/paritytech/polkadot-sdk", - "rev": "6185b002dfb54c73881257913a830416f2e17a15", + "rev": "de6d02591b57d03f70ed8db0c674f045ad2ea029", "patch": "substrate_client_transaction_pool.patch", "subdir": ".", "package": "sc-transaction-pool", @@ -38,7 +38,7 @@ { "flags": ["EXPENSIVE", "SKIP_NIGHTLY"], "url": "https://github.com/solana-labs/solana", - "rev": "69345899f3b7449daac57ec1a28142bb410d7f06", + "rev": "e74d5ccca32086b8ab5b7ba1e0584a1292a550f2", "patch": "solana.patch", "subdir": ".", "package": "solana-bpf-loader-program",