Update patches

trailofbits · Oct 2, 2023 · 68a49fe · 68a49fe
1 parent bc8a336
commit 68a49fe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 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 0a15c6d..8a619ee 100644
+index d9b40fd..676ff40 100644
 --- a/contracts/cw20-base/Cargo.toml
 +++ b/contracts/cw20-base/Cargo.toml
-@@ -30,4 +30,6 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] }
- thiserror = { version = "1.0.23" }
+@@ -30,4 +30,6 @@ serde = { version = "1.0.188", default-features = false, features = ["derive"] }
+ thiserror = { version = "1.0.49" }
 
 +test-fuzz = { path = "../../../../test-fuzz" }
 +
  [dev-dependencies]
- cw-multi-test = "0.16.1"
+ cw-multi-test = "0.16.5"
 diff --git a/contracts/cw20-base/src/contract.rs b/contracts/cw20-base/src/contract.rs
-index 02608ad..2317522 100644
+index 30335e4..4c854af 100644
 --- a/contracts/cw20-base/src/contract.rs
 +++ b/contracts/cw20-base/src/contract.rs
 @@ -92,7 +92,33 @@ fn verify_logo(logo: &Logo) -> Result<(), ContractError> {

diff --git a/cargo-test-fuzz/patches/solana.patch b/cargo-test-fuzz/patches/solana.patch
@@ -10,10 +10,10 @@ index 3e0553d..5136a8b 100644
  pub struct AccountsDataMeter {
      /// The initial amount of accounts data space used (in bytes)
 diff --git a/program-runtime/src/compute_budget.rs b/program-runtime/src/compute_budget.rs
-index 44fb070..547d338 100644
+index f923922..0054d03 100644
 --- a/program-runtime/src/compute_budget.rs
 +++ b/program-runtime/src/compute_budget.rs
-@@ -33,5 +33,5 @@ impl ::solana_frozen_abi::abi_example::AbiExample for ComputeBudget {
+@@ -32,5 +32,5 @@ impl ::solana_frozen_abi::abi_example::AbiExample for ComputeBudget {
  }
 
 -#[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -188,10 +188,10 @@ index 16a52c0..e2683ac 100644
  [dev-dependencies]
  assert_matches = { workspace = true }
 diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
-index 9a91286..c68abaf 100644
+index 82c6237..6abf051 100644
 --- a/programs/bpf_loader/src/lib.rs
 +++ b/programs/bpf_loader/src/lib.rs
-@@ -371,6 +371,7 @@ pub fn process_instruction(
+@@ -388,6 +388,7 @@ pub fn process_instruction(
  }
 
 -fn process_instruction_inner(
@@ -220,10 +220,10 @@ index 061b16c..3d02d73 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 418d328..345ffc9 100644
+index b414a5f..47ad755 100644
 --- a/sdk/src/feature_set.rs
 +++ b/sdk/src/feature_set.rs
-@@ -900,5 +900,5 @@ lazy_static! {
+@@ -909,5 +909,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/third_party.json b/cargo-test-fuzz/third_party.json
@@ -2,7 +2,7 @@
   {
     "flags": [],
     "url": "https://github.com/CosmWasm/cw-plus",
-    "rev": "362423321cfd16ba51590a90413a048e47e1063a",
+    "rev": "49a2ed0a4df46a7100e4f5d65bd8cfd4cd90db5f",
     "patch": "cw-plus.patch",
     "subdir": ".",
     "package": "cw20-base",
@@ -29,7 +29,7 @@
   {
     "flags": ["EXPENSIVE", "SKIP"],
     "url": "https://github.com/solana-labs/solana",
-    "rev": "1e1e29641499e08ea1516ba2d81344e7875abc52",
+    "rev": "3508b7d84ee3d05107c908ff2bb4772f3524e22e",
     "patch": "solana.patch",
     "subdir": ".",
     "package": "solana-bpf-loader-program",