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 patches #364

Merged
merged 2 commits into from
Feb 26, 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
4 changes: 2 additions & 2 deletions cargo-test-fuzz/patches/solana.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions cargo-test-fuzz/third_party.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test-fuzz/tests/supply_chain.json
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
"id": 1613,
"kind": "user",
"login": "withoutboats",
"name": "Saoirse Shipwreckt"
"name": "srrrse"
},
{
"avatar": "https://avatars.githubusercontent.com/u/951129?v=4",
Expand Down