From 1b8890e15d0ef5807b7d857b6da209e74c383878 Mon Sep 17 00:00:00 2001
From: smoelius <35515885+smoelius@users.noreply.github.com>
Date: Sun, 18 Feb 2024 12:56:32 +0000
Subject: [PATCH] Update patches

---
 cargo-test-fuzz/patches/cw-plus.patch                     | 2 +-
 cargo-test-fuzz/patches/solana.patch                      | 4 ++--
 .../patches/substrate_client_transaction_pool.patch       | 8 ++++----
 cargo-test-fuzz/third_party.json                          | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cargo-test-fuzz/patches/cw-plus.patch b/cargo-test-fuzz/patches/cw-plus.patch
index 23dc93cf..f250dd54 100644
--- a/cargo-test-fuzz/patches/cw-plus.patch
+++ b/cargo-test-fuzz/patches/cw-plus.patch
@@ -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"] }
diff --git a/cargo-test-fuzz/patches/solana.patch b/cargo-test-fuzz/patches/solana.patch
index 5d050c2f..ad81415a 100644
--- a/cargo-test-fuzz/patches/solana.patch
+++ b/cargo-test-fuzz/patches/solana.patch
@@ -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(
diff --git a/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch b/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch
index 4b32d735..d9206721 100644
--- a/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch
+++ b/cargo-test-fuzz/patches/substrate_client_transaction_pool.patch
@@ -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" }
diff --git a/cargo-test-fuzz/third_party.json b/cargo-test-fuzz/third_party.json
index 40f059c8..8f2d8b5d 100644
--- a/cargo-test-fuzz/third_party.json
+++ b/cargo-test-fuzz/third_party.json
@@ -2,7 +2,7 @@
   {
     "flags": [],
     "url": "https://github.com/CosmWasm/cw-plus",
-    "rev": "1a598fd99f788e1f0a2d735ff7d19571ca70205c",
+    "rev": "f40c2c07465e309a01d2d881e5c0346ac4825ca2",
     "patch": "cw-plus.patch",
     "subdir": ".",
     "package": "cw20-base",
@@ -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",
@@ -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",
@@ -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",