Update patches

trailofbits · Sep 10, 2023 · e0c83c4 · e0c83c4
1 parent 2ddd7ee
commit e0c83c4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/cargo-test-fuzz/patches/cw-plus.patch b/cargo-test-fuzz/patches/cw-plus.patch
@@ -10,7 +10,7 @@ index 0a15c6d..8a619ee 100644
  [dev-dependencies]
  cw-multi-test = "0.16.1"
 diff --git a/contracts/cw20-base/src/contract.rs b/contracts/cw20-base/src/contract.rs
-index 7e3547b..a32746e 100644
+index 02608ad..2317522 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
@@ -21,7 +21,7 @@ index 02983f9..da311b8 100644
  pub struct ComputeBudget {
      /// Number of compute units that a transaction or individual instruction is
 diff --git a/program-runtime/src/invoke_context.rs b/program-runtime/src/invoke_context.rs
-index a105048..d04ae6a 100644
+index 12f8230..c3ff480 100644
 --- a/program-runtime/src/invoke_context.rs
 +++ b/program-runtime/src/invoke_context.rs
 @@ -117,4 +117,5 @@ impl fmt::Display for AllocErr {
@@ -176,10 +176,10 @@ index 0e2e495..a380f89 100644
  pub struct ExecuteDetailsTimings {
      pub serialize_us: u64,
 diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
-index f979b73..fc996b0 100644
+index 16a52c0..e2683ac 100644
 --- a/programs/bpf_loader/Cargo.toml
 +++ b/programs/bpf_loader/Cargo.toml
-@@ -24,4 +24,7 @@ solana_rbpf = { workspace = true }
+@@ -23,4 +23,7 @@ solana_rbpf = { workspace = true }
  thiserror = { workspace = true }
 
 +serde = "1.0"
@@ -188,10 +188,10 @@ index f979b73..fc996b0 100644
  [dev-dependencies]
  assert_matches = { workspace = true }
 diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
-index 45430a3..68d1d49 100644
+index 342d383..d48c3bc 100644
 --- a/programs/bpf_loader/src/lib.rs
 +++ b/programs/bpf_loader/src/lib.rs
-@@ -357,6 +357,7 @@ pub fn process_instruction(
+@@ -353,6 +353,7 @@ pub fn process_instruction(
  }
 
 -fn process_instruction_inner(
@@ -202,28 +202,28 @@ index 45430a3..68d1d49 100644
  ) -> Result<u64, Box<dyn std::error::Error>> {
      let log_collector = invoke_context.get_log_collector();
 diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
-index 629fbe5..3f5ab42 100644
+index 061b16c..3d02d73 100644
 --- a/sdk/Cargo.toml
 +++ b/sdk/Cargo.toml
-@@ -68,5 +68,5 @@ rand = { workspace = true, optional = true }
+@@ -69,5 +69,5 @@ rand = { workspace = true, optional = true }
  rand0-7 = { package = "rand", version = "0.7", optional = true }
  rustversion = { workspace = true }
 -serde = { workspace = true }
 +serde = { version = "1.0.152", features = ["rc"] }
  serde_bytes = { workspace = true }
  serde_derive = { workspace = true }
-@@ -84,4 +84,6 @@ uriparse = { workspace = true }
+@@ -85,4 +85,6 @@ uriparse = { workspace = true }
  wasm-bindgen = { workspace = true }
 
 +test-fuzz = { path = "../../../test-fuzz" }
 +
  [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 52db257..174775a 100644
+index 386a696..8f73f70 100644
 --- a/sdk/src/feature_set.rs
 +++ b/sdk/src/feature_set.rs
-@@ -900,5 +900,5 @@ lazy_static! {
+@@ -890,5 +890,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": "dd2ca3dd5558b4a65ca112b2f655ae043d956c20",
+    "rev": "362423321cfd16ba51590a90413a048e47e1063a",
     "patch": "cw-plus.patch",
     "subdir": ".",
     "package": "cw20-base",
@@ -29,7 +29,7 @@
   {
     "flags": ["EXPENSIVE", "SKIP"],
     "url": "https://github.com/solana-labs/solana",
-    "rev": "92a0b310c1619f1951d18b49e41417699f37bc49",
+    "rev": "a145ade564c5181b264247adb4a3347eb883aed6",
     "patch": "solana.patch",
     "subdir": ".",
     "package": "solana-bpf-loader-program",
@@ -38,7 +38,7 @@
   {
     "flags": [],
     "url": "https://github.com/substrate-developer-hub/substrate-node-template",
-    "rev": "f3083ac2c10994bfbc32135c17ed11f56c5a9874",
+    "rev": "41ad4a6c9d712ac4b6e16e79a8b3837af8234f46",
     "patch": "substrate_node_template.patch",
     "subdir": ".",
     "package": "pallet-template",