From a936c8a8c51457f112b108bc89451bd9ff20bf07 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Thu, 26 Dec 2024 14:06:17 +0000 Subject: [PATCH] Update patches --- .../substrate_client_transaction_pool.patch | 18 +++++++++++------- third-party/third_party.json | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/third-party/patches/substrate_client_transaction_pool.patch b/third-party/patches/substrate_client_transaction_pool.patch index 3888533c..50853185 100644 --- a/third-party/patches/substrate_client_transaction_pool.patch +++ b/third-party/patches/substrate_client_transaction_pool.patch @@ -1,18 +1,22 @@ diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml -index d346add..d270d0f 100644 +index 72586b9..8d94fbd 100644 --- a/substrate/client/transaction-pool/Cargo.toml +++ b/substrate/client/transaction-pool/Cargo.toml -@@ -25,6 +25,6 @@ itertools = { workspace = true } +@@ -25,10 +25,10 @@ itertools = { workspace = true } linked-hash-map = { workspace = true } log = { workspace = true, default-features = true } -parking_lot = { workspace = true, default-features = true } --serde = { features = ["derive"], workspace = true, default-features = true } +parking_lot = { workspace = true, features = ["serde"] } -+serde = { features = ["derive", "rc"], workspace = true, default-features = true } - thiserror = { workspace = true } prometheus-endpoint = { workspace = true, default-features = true } -@@ -42,4 +42,6 @@ tokio-stream = { workspace = true } - tokio = { workspace = true, default-features = true, features = ["macros", "time"] } + sc-client-api = { workspace = true, default-features = true } + sc-transaction-pool-api = { workspace = true, default-features = true } + sc-utils = { workspace = true, default-features = true } +-serde = { features = ["derive"], workspace = true, default-features = true } ++serde = { features = ["derive", "rc"], workspace = true, default-features = true } + sp-api = { workspace = true, default-features = true } + sp-blockchain = { workspace = true, default-features = true } +@@ -42,4 +42,6 @@ tokio = { workspace = true, default-features = true, features = ["macros", "time + tokio-stream = { workspace = true } +test-fuzz = { path = "../../../../../test-fuzz" } + diff --git a/third-party/third_party.json b/third-party/third_party.json index 21050239..f75bcf1f 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": "ee31e3137d017c581d0bc13c24cedf050bb0f3e4", + "rev": "e063c19025d65870a513fcc010c47685dc989d52", "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": "4e805ca05067f6ed970f33f9be51483185b0cc0b", + "rev": "ca7817922148c1e6f6856138998f7135f42f3f4f", "patch": "substrate_client_transaction_pool.patch", "subdir": ".", "package": "sc-transaction-pool",