diff --git a/third-party/patches/agave.patch b/third-party/patches/agave.patch index 583ee865..2d6b690c 100644 --- a/third-party/patches/agave.patch +++ b/third-party/patches/agave.patch @@ -64,7 +64,7 @@ index 4e764de..93cfd6c 100644 [dev-dependencies] assert_matches = { workspace = true } diff --git a/program-runtime/src/invoke_context.rs b/program-runtime/src/invoke_context.rs -index 1beda1c..b6bb470 100644 +index a54e083..4681ab6 100644 --- a/program-runtime/src/invoke_context.rs +++ b/program-runtime/src/invoke_context.rs @@ -121,4 +121,5 @@ impl fmt::Display for AllocErr { @@ -79,11 +79,11 @@ index 1beda1c..b6bb470 100644 +#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] pub struct EnvironmentConfig<'a> { pub blockhash: Hash, + pub blockhash_lamports_per_signature: u64, epoch_total_stake: Option, + #[serde(skip)] epoch_vote_accounts: Option<&'a VoteAccountsHashMap>, pub feature_set: Arc, - pub lamports_per_signature: u64, + #[serde( + serialize_with = "test_fuzz::serialize_ref", + deserialize_with = "test_fuzz::deserialize_ref" @@ -205,17 +205,17 @@ index 883f0d2..05c9344 100644 ) -> Result> { let log_collector = invoke_context.get_log_collector(); diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml -index cfef796..f3ae967 100644 +index 1b79c86..a02ef5d 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml -@@ -86,5 +86,5 @@ qualifier_attr = { workspace = true, optional = true } +@@ -90,5 +90,5 @@ qualifier_attr = { workspace = true, optional = true } rand = { workspace = true, optional = true } rand0-7 = { workspace = true, optional = true } -serde = { workspace = true } +serde = { workspace = true, features = ["rc"] } serde_bytes = { workspace = true } serde_derive = { workspace = true } -@@ -138,4 +138,6 @@ solana-transaction-error = { workspace = true, features = ["serde"], optional = +@@ -148,4 +148,6 @@ solana-transaction-error = { workspace = true, features = ["serde"], optional = thiserror = { workspace = true } +test-fuzz = { path = "../../../test-fuzz" } @@ -234,10 +234,10 @@ index 19b9075..ab7ed50 100644 [features] frozen-abi = [ diff --git a/sdk/feature-set/src/lib.rs b/sdk/feature-set/src/lib.rs -index 83b556f..b414464 100644 +index a66da8b..81bc72b 100644 --- a/sdk/feature-set/src/lib.rs +++ b/sdk/feature-set/src/lib.rs -@@ -1130,5 +1130,5 @@ lazy_static! { +@@ -1140,5 +1140,5 @@ lazy_static! { /// `FeatureSet` holds the set of currently active/inactive runtime features #[cfg_attr(feature = "frozen-abi", derive(solana_frozen_abi_macro::AbiExample))] -#[derive(Debug, Clone, Eq, PartialEq)] diff --git a/third-party/patches/substrate_client_transaction_pool.patch b/third-party/patches/substrate_client_transaction_pool.patch index dada106a..ea26ed1a 100644 --- a/third-party/patches/substrate_client_transaction_pool.patch +++ b/third-party/patches/substrate_client_transaction_pool.patch @@ -140,7 +140,7 @@ index 860bcff..85a3b95 100644 ready: &mut ReadyTransactions, tx: Transaction, diff --git a/substrate/client/transaction-pool/src/graph/tracked_map.rs b/substrate/client/transaction-pool/src/graph/tracked_map.rs -index 9e92dff..9c849f6 100644 +index 6c3bbbf..825f05c 100644 --- a/substrate/client/transaction-pool/src/graph/tracked_map.rs +++ b/substrate/client/transaction-pool/src/graph/tracked_map.rs @@ -34,6 +34,9 @@ pub trait Size { diff --git a/third-party/third_party.json b/third-party/third_party.json index 19e5092d..78f705b3 100644 --- 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": "2a618b5e01d898af63e0922454b6b0f0eed93528", + "rev": "938bd86722dc9dc8c6cb89e03df3445fc2cba170", "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": "0e09ad448bce27fcd255370cc2827ea5d2cf3892", + "rev": "ae4b68b36d6da1dd0d6a78643b634296b3fa8039", "patch": "substrate_client_transaction_pool.patch", "subdir": ".", "package": "sc-transaction-pool", @@ -38,7 +38,7 @@ { "flags": [], "url": "https://github.com/solana-labs/rbpf", - "rev": "73f0e76d3abb3b03a317e7f7094911e23f244b52", + "rev": "8d36530b7071060e2837ebb26f25590db6816048", "patch": "solana_rbpf.patch", "subdir": ".", "package": "solana_rbpf",