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 #362

Merged
merged 1 commit into from
Feb 18, 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-test-fuzz/patches/cw-plus.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/contracts/cw20-base/Cargo.toml b/contracts/cw20-base/Cargo.toml
index 2f49e44..40409d0 100644
index e35a05d..d687203 100644
--- a/contracts/cw20-base/Cargo.toml
+++ b/contracts/cw20-base/Cargo.toml
@@ -29,4 +29,6 @@ serde = { version = "1.0.188", default-features = false, features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions cargo-test-fuzz/patches/solana.patch
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ index 48d771b..1d1d527 100644
[dev-dependencies]
assert_matches = { workspace = true }
diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index 21a7b5f..ad85633 100644
index 5ba8b26..469c09e 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -368,6 +368,7 @@ declare_builtin_function!(
@@ -366,6 +366,7 @@ declare_builtin_function!(
);

-pub fn process_instruction_inner(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml
index b491f7b..480184a 100644
index c7a2540..b0e4581 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 = "0.4.17"
log = { workspace = true, default-features = true }
-parking_lot = "0.12.1"
-serde = { version = "1.0.195", features = ["derive"] }
-serde = { version = "1.0.196", features = ["derive"] }
+parking_lot = { version = "0.12.1", features = ["serde"] }
+serde = { version = "1.0.195", features = ["derive", "rc"] }
+serde = { version = "1.0.196", features = ["derive", "rc"] }
thiserror = "1.0.48"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus" }
@@ -37,4 +37,5 @@ sp-runtime = { path = "../../primitives/runtime" }
Expand Down
8 changes: 4 additions & 4 deletions cargo-test-fuzz/third_party.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"flags": [],
"url": "https://github.com/CosmWasm/cw-plus",
"rev": "1a598fd99f788e1f0a2d735ff7d19571ca70205c",
"rev": "f40c2c07465e309a01d2d881e5c0346ac4825ca2",
"patch": "cw-plus.patch",
"subdir": ".",
"package": "cw20-base",
Expand All @@ -11,7 +11,7 @@
{
"flags": ["EXPENSIVE"],
"url": "https://github.com/paritytech/polkadot-sdk",
"rev": "2556e33fb4c52ea8192de68df33c151768edc2a9",
"rev": "6185b002dfb54c73881257913a830416f2e17a15",
"patch": "substrate_client_transaction_pool.patch",
"subdir": ".",
"package": "sc-transaction-pool",
Expand All @@ -38,7 +38,7 @@
{
"flags": ["EXPENSIVE"],
"url": "https://github.com/solana-labs/solana",
"rev": "28a320d81571f776c439a4090aedcceffaf5fbbb",
"rev": "69345899f3b7449daac57ec1a28142bb410d7f06",
"patch": "solana.patch",
"subdir": ".",
"package": "solana-bpf-loader-program",
Expand All @@ -47,7 +47,7 @@
{
"flags": [],
"url": "https://github.com/substrate-developer-hub/substrate-node-template",
"rev": "41ad4a6c9d712ac4b6e16e79a8b3837af8234f46",
"rev": "2ad9b78c7b56434c8036d1447120f4566583e54e",
"patch": "substrate_node_template.patch",
"subdir": ".",
"package": "pallet-template",
Expand Down