From b03c5f6ad3fd0c5ab63c6c38ccd20efd5dc46eca Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Thu, 21 Nov 2024 19:02:06 +0000 Subject: [PATCH] Update patches --- third-party/patches/agave.patch | 6 +++--- third-party/third_party.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/third-party/patches/agave.patch b/third-party/patches/agave.patch index 1b32fb91..b05d459f 100644 --- a/third-party/patches/agave.patch +++ b/third-party/patches/agave.patch @@ -224,17 +224,17 @@ index 9f62c4f..ffbf6b8 100644 ) -> Result> { let log_collector = invoke_context.get_log_collector(); diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml -index 485a8d3..a15c3ff 100644 +index 1cc7507..0cf0eb6 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml -@@ -94,5 +94,5 @@ qualifier_attr = { workspace = true, optional = true } +@@ -101,5 +101,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 } -@@ -158,4 +158,6 @@ solana-transaction-error = { workspace = true, features = ["serde"], optional = +@@ -168,4 +168,6 @@ solana-transaction-error = { workspace = true, features = ["serde"], optional = thiserror = { workspace = true } +test-fuzz = { path = "../../../test-fuzz" } diff --git a/third-party/third_party.json b/third-party/third_party.json index 80638abd..db73be02 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": "86a70621aeabefdfdd574155e37520342d7e0680", + "rev": "f9f54bcba0b75b7566a948c3441bc5e1d03152fc", "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": "56d97c3ad8c86e602bc7ac368751210517c4309f", + "rev": "bf20a9ee18f7215210bbbabf79e955c8c35b3360", "patch": "substrate_client_transaction_pool.patch", "subdir": ".", "package": "sc-transaction-pool",