From 08550021bb06db4738a36d82d42a491ea407cc03 Mon Sep 17 00:00:00 2001
From: Nikolay Kurtov <nikolay.kurtov@near.org>
Date: Thu, 13 Apr 2023 15:12:39 +0200
Subject: [PATCH] Merge

---
 chain/client/src/client.rs       | 6 ++++--
 chain/client/src/client_actor.rs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/chain/client/src/client.rs b/chain/client/src/client.rs
index 38838c3dbfd..31996891d6a 100644
--- a/chain/client/src/client.rs
+++ b/chain/client/src/client.rs
@@ -32,6 +32,7 @@ use near_chunks::logic::{
 use near_chunks::ShardsManager;
 use near_client_primitives::debug::ChunkProduction;
 use near_client_primitives::types::{Error, ShardSyncDownload, ShardSyncStatus};
+use near_epoch_manager::shard_tracker::ShardTracker;
 use near_network::types::{AccountKeys, ChainInfo, PeerManagerMessageRequest, SetChainInfo};
 use near_network::types::{
     HighestHeightPeerInfo, NetworkRequests, PeerManagerAdapter, ReasonForBan,
@@ -359,7 +360,7 @@ impl Client {
                     block.header().prev_hash(),
                     shard_id,
                     false,
-                    self.runtime_adapter.as_ref(),
+                    &self.shard_tracker,
                 ) {
                     self.sharded_tx_pool.reintroduce_transactions(
                         shard_id,
@@ -1596,7 +1597,8 @@ impl Client {
             &encoded_chunk,
             merkle_paths.clone(),
             Some(&validator_id),
-            self.runtime_adapter.as_ref(),
+            self.runtime_adapter.epoch_manager_adapter(),
+            &self.shard_tracker,
         )?;
         persist_chunk(partial_chunk.clone(), Some(shard_chunk), self.chain.mut_store())?;
         self.on_chunk_header_ready_for_inclusion(encoded_chunk.cloned_header(), validator_id);
diff --git a/chain/client/src/client_actor.rs b/chain/client/src/client_actor.rs
index d7f3f7349a3..6240c621c6e 100644
--- a/chain/client/src/client_actor.rs
+++ b/chain/client/src/client_actor.rs
@@ -1657,7 +1657,7 @@ impl ClientActor {
                                     &prev_hash,
                                     *x,
                                     true,
-                                    self.client.runtime_adapter.as_ref(),
+                                    &self.client.shard_tracker,
                                 )
                             })
                             .collect();