Update patches

trailofbits · Mar 12, 2024 · 871c0f1 · 871c0f1
1 parent 8ddb576
commit 871c0f1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/cargo-test-fuzz/patches/cw-plus.patch b/cargo-test-fuzz/patches/cw-plus.patch
@@ -1,16 +1,16 @@
 diff --git a/contracts/cw20-base/Cargo.toml b/contracts/cw20-base/Cargo.toml
-index e35a05d..d687203 100644
+index e3cffc3..77ad75e 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"] }
- thiserror = { version = "1.0.49" }
+@@ -28,4 +28,6 @@ serde = { workspace = true }
+ thiserror = { workspace = true }
 
 +test-fuzz = { path = "../../../../test-fuzz" }
 +
  [dev-dependencies]
- cw-multi-test = "0.16.5"
+ cw-multi-test = { workspace = true }
 diff --git a/contracts/cw20-base/src/contract.rs b/contracts/cw20-base/src/contract.rs
-index 6f92ac2..2df8ffe 100644
+index 4fd8a99..2aca2ac 100644
 --- a/contracts/cw20-base/src/contract.rs
 +++ b/contracts/cw20-base/src/contract.rs
 @@ -91,7 +91,33 @@ fn verify_logo(logo: &Logo) -> Result<(), ContractError> {
@@ -92,7 +92,7 @@ index 6f92ac2..2df8ffe 100644
 +#[test_fuzz::test_fuzz(convert = "Deps<'a>, MockDeps")]
 +pub fn query<'a>(deps: Deps<'a>, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
      match msg {
-         QueryMsg::Balance { address } => to_binary(&query_balance(deps, address)?),
+         QueryMsg::Balance { address } => to_json_binary(&query_balance(deps, address)?),
 @@ -587,5 +640,10 @@ pub fn query_download_logo(deps: Deps) -> StdResult<DownloadLogoResponse> {
 
  #[cfg_attr(not(feature = "library"), entry_point)]

diff --git a/cargo-test-fuzz/patches/solana.patch b/cargo-test-fuzz/patches/solana.patch
@@ -1,5 +1,5 @@
 diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
-index ed4b2a6..670e9e1 100644
+index afec735..6896c4d 100644
 --- a/program-runtime/Cargo.toml
 +++ b/program-runtime/Cargo.toml
 @@ -31,4 +31,6 @@ solana_rbpf = { workspace = true }
@@ -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 5ba8b26..469c09e 100644
+index a9c34fb..d730e44 100644
 --- a/programs/bpf_loader/src/lib.rs
 +++ b/programs/bpf_loader/src/lib.rs
-@@ -366,6 +366,7 @@ declare_builtin_function!(
+@@ -367,6 +367,7 @@ declare_builtin_function!(
  );
 
 -pub fn process_instruction_inner(
@@ -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 abecf4f..43b536e 100644
+index 98dc5a4..45bdbc7 100644
 --- a/sdk/src/feature_set.rs
 +++ b/sdk/src/feature_set.rs
-@@ -1014,5 +1014,5 @@ lazy_static! {
+@@ -1004,5 +1004,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
@@ -198,10 +198,10 @@ index 47ad226..41b184e 100644
  	/// Clone the inner map.
  	pub fn clone_map(&self) -> HashMap<K, V> {
 diff --git a/substrate/primitives/runtime/src/transaction_validity.rs b/substrate/primitives/runtime/src/transaction_validity.rs
-index 8369484..ef3bdb4 100644
+index 2412412..2872ab2 100644
 --- a/substrate/primitives/runtime/src/transaction_validity.rs
 +++ b/substrate/primitives/runtime/src/transaction_validity.rs
-@@ -228,4 +228,5 @@ impl From<UnknownTransaction> for TransactionValidity {
+@@ -232,4 +232,5 @@ impl From<UnknownTransaction> for TransactionValidity {
  /// by our local node (for instance off-chain workers).
  #[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)]
 +#[cfg_attr(feature = "std", derive(serde::Deserialize, serde::Serialize))]

diff --git a/cargo-test-fuzz/third_party.json b/cargo-test-fuzz/third_party.json
@@ -2,7 +2,7 @@
   {
     "flags": ["SKIP_NIGHTLY"],
     "url": "https://github.com/CosmWasm/cw-plus",
-    "rev": "f40c2c07465e309a01d2d881e5c0346ac4825ca2",
+    "rev": "df67017591c38dd50850a538cebe746c98c59e48",
     "patch": "cw-plus.patch",
     "subdir": ".",
     "package": "cw20-base",
@@ -11,7 +11,7 @@
   {
     "flags": ["EXPENSIVE", "SKIP_NIGHTLY"],
     "url": "https://github.com/paritytech/polkadot-sdk",
-    "rev": "de6d02591b57d03f70ed8db0c674f045ad2ea029",
+    "rev": "7a644fa082f09b557a8a198ed56412f02062bbcf",
     "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": "e74d5ccca32086b8ab5b7ba1e0584a1292a550f2",
+    "rev": "e0203f22dc83cb792fa97f91dbe6e924cbd08af1",
     "patch": "solana.patch",
     "subdir": ".",
     "package": "solana-bpf-loader-program",