Update patches

trailofbits · Sep 20, 2024 · d556314 · d556314
1 parent b18354d
commit d556314
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/third-party/patches/agave.patch b/third-party/patches/agave.patch
@@ -1,16 +1,16 @@
 diff --git a/compute-budget/Cargo.toml b/compute-budget/Cargo.toml
-index bbcaa27..a34b9bf 100644
+index 07ba01c..c68aab1 100644
 --- a/compute-budget/Cargo.toml
 +++ b/compute-budget/Cargo.toml
-@@ -14,4 +14,6 @@ solana-frozen-abi = { workspace = true, optional = true }
+@@ -16,4 +16,6 @@ solana-frozen-abi = { workspace = true, optional = true, features = [
  solana-sdk = { workspace = true }
 
 +serde = { workspace = true }
 +
- [build-dependencies]
- rustc_version = { workspace = true, optional = true }
+ [features]
+ frozen-abi = [
 diff --git a/compute-budget/src/compute_budget.rs b/compute-budget/src/compute_budget.rs
-index 5539e81..931a38b 100644
+index 577a000..255809a 100644
 --- a/compute-budget/src/compute_budget.rs
 +++ b/compute-budget/src/compute_budget.rs
 @@ -19,5 +19,5 @@ pub const MAX_CALL_DEPTH: usize = 64;
@@ -53,10 +53,10 @@ index 190abb3..c157072 100644
  pub struct Measure {
      name: &'static str,
 diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
-index af276bc..f402996 100644
+index 4e764de..93cfd6c 100644
 --- a/program-runtime/Cargo.toml
 +++ b/program-runtime/Cargo.toml
-@@ -36,4 +36,6 @@ solana_rbpf = { workspace = true }
+@@ -40,4 +40,6 @@ solana_rbpf = { workspace = true }
  thiserror = { workspace = true }
 
 +test-fuzz = { path = "../../../test-fuzz" }
@@ -168,7 +168,7 @@ index c96da3e..3abc16c 100644
  impl<'a> InvokeContext<'a> {
      #[allow(clippy::too_many_arguments)]
 diff --git a/program-runtime/src/sysvar_cache.rs b/program-runtime/src/sysvar_cache.rs
-index 79124bd..acdaa87 100644
+index 8b4bc61..d8c791c 100644
 --- a/program-runtime/src/sysvar_cache.rs
 +++ b/program-runtime/src/sysvar_cache.rs
 @@ -25,5 +25,5 @@ impl ::solana_frozen_abi::abi_example::AbiExample for SysvarCache {
@@ -205,36 +205,36 @@ index 5e81062..821afe7 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 a14c58d..8dc16f9 100644
+index 8793f1e..a9dc134 100644
 --- a/sdk/Cargo.toml
 +++ b/sdk/Cargo.toml
-@@ -77,5 +77,5 @@ qualifier_attr = { workspace = true, optional = true }
+@@ -76,5 +76,5 @@ qualifier_attr = { workspace = true, optional = true }
  rand = { workspace = true, optional = true }
  rand0-7 = { package = "rand", version = "0.7", optional = true }
 -serde = { workspace = true }
 +serde = { workspace = true, features = ["rc"] }
  serde_bytes = { workspace = true }
  serde_derive = { workspace = true }
-@@ -101,4 +101,6 @@ solana-signature = { workspace = true, features = ["rand", "serde", "verify"], o
+@@ -109,4 +109,6 @@ solana-signature = { workspace = true, features = [
  thiserror = { workspace = true }
 
 +test-fuzz = { path = "../../../test-fuzz" }
 +
  [target.'cfg(target_arch = "wasm32")'.dependencies]
  getrandom = { version = "0.1", features = ["wasm-bindgen"] }
 diff --git a/sdk/feature-set/Cargo.toml b/sdk/feature-set/Cargo.toml
-index 02da9d0..a6a1cda 100644
+index d6f2824..cd164aa 100644
 --- a/sdk/feature-set/Cargo.toml
 +++ b/sdk/feature-set/Cargo.toml
-@@ -16,4 +16,6 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
+@@ -20,4 +20,6 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [
  solana-program = { workspace = true }
 
 +serde = { workspace = true }
 +
- [build-dependencies]
- rustc_version = { workspace = true, optional = true }
+ [features]
+ frozen-abi = [
 diff --git a/sdk/feature-set/src/lib.rs b/sdk/feature-set/src/lib.rs
-index f2b094e..689477b 100644
+index 6567404..e35c427 100644
 --- a/sdk/feature-set/src/lib.rs
 +++ b/sdk/feature-set/src/lib.rs
 @@ -1123,5 +1123,5 @@ lazy_static! {

diff --git a/third-party/patches/solana_rbpf.patch b/third-party/patches/solana_rbpf.patch
@@ -520,7 +520,7 @@ index 969a339..a5e1a2c 100644
  pub struct TestContextObject {
      /// Contains the register state at every instruction in order of execution
 diff --git a/tests/execution.rs b/tests/execution.rs
-index e7f77ce..f6c1a93 100644
+index fae306d..07a48ff 100644
 --- a/tests/execution.rs
 +++ b/tests/execution.rs
 @@ -2534,5 +2534,5 @@ declare_builtin_function!(

diff --git a/third-party/third_party.json b/third-party/third_party.json
@@ -2,7 +2,7 @@
   {
     "flags": ["EXPENSIVE", "SKIP_NIGHTLY"],
     "url": "https://github.com/anza-xyz/agave",
-    "rev": "fc4069a8ae55e2d3ba7b345c53f15279e7ba5923",
+    "rev": "037838a156b433c53d28be8fd5405f520b23a8cd",
     "patch": "agave.patch",
     "subdir": ".",
     "package": "solana-bpf-loader-program",
@@ -20,7 +20,7 @@
   {
     "flags": ["EXPENSIVE", "SKIP_NIGHTLY"],
     "url": "https://github.com/paritytech/polkadot-sdk",
-    "rev": "a34cc8dff09dc3840a304befc2415343244b5fd0",
+    "rev": "5a431470d2a4155a4bb00ea6ac07d7f9707f8e82",
     "patch": "substrate_client_transaction_pool.patch",
     "subdir": ".",
     "package": "sc-transaction-pool",
@@ -38,7 +38,7 @@
   {
     "flags": [],
     "url": "https://github.com/solana-labs/rbpf",
-    "rev": "9f8d7cb694c8afd28f6e42d38826036c77ea7b52",
+    "rev": "57139e9e1fca4f01155f7d99bc55cdcc25b0bc04",
     "patch": "solana_rbpf.patch",
     "subdir": ".",
     "package": "solana_rbpf",