Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2024-11-17 01:17:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update tendermint/node to latest substrate

Browse source
This commit is contained in:
Luke Parker 2023-03-06 08:20:01 -05:00
parent 4a81640ab8
commit db1fefe7c1
No known key found for this signature in database
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
substrate/node/src/service.rs
View file

@ -202,7 +202,7 @@ pub async fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceE
spawn_handle: task_manager.spawn_handle(),
import_queue,
block_announce_validator_builder: None,
warp_sync: None,
warp_sync_params: None,
})?;
if config.offchain_worker.enabled {

4
substrate/tendermint/client/src/tendermint.rs
View file

@ -14,7 +14,7 @@ use sp_runtime::{
};
use sp_inherents::{InherentData, InherentDataProvider, CreateInherentDataProviders};
use sp_blockchain::HeaderBackend;
use sp_api::{BlockId, ProvideRuntimeApi};
use sp_api::ProvideRuntimeApi;
use sp_consensus::Error;
use sc_consensus::{ForkChoiceStrategy, BlockImportParams};
@ -121,7 +121,7 @@ impl<T: TendermintValidator> TendermintImport<T> {
let err = self
.client
.runtime_api()
.check_inherents(&BlockId::Hash(self.client.info().finalized_hash), block, inherent_data)
.check_inherents(self.client.info().finalized_hash, block, inherent_data)
.map_err(|_| Error::Other(BlockError::Fatal.into()))?;
if err.ok() {

9
substrate/tendermint/client/src/validators.rs
View file

@ -11,7 +11,7 @@ use sp_application_crypto::{
use sp_keystore::CryptoStore;
use sp_staking::SessionIndex;
use sp_api::{BlockId, ProvideRuntimeApi};
use sp_api::ProvideRuntimeApi;
use sc_client_api::HeaderBackend;
@ -34,8 +34,8 @@ impl TendermintValidatorsStruct {
fn from_module<T: TendermintClient>(client: &Arc<T::Client>) -> Self {
let last = client.info().finalized_hash;
let api = client.runtime_api();
let session = api.current_session(&BlockId::Hash(last)).unwrap();
let validators = api.validators(&BlockId::Hash(last)).unwrap();
let session = api.current_session(last).unwrap();
let validators = api.validators(last).unwrap();
Self {
session,
@ -59,8 +59,7 @@ impl<T: TendermintClient> Refresh<T> {
// If the session has changed, re-create the struct with the data on it
fn refresh(&self) {
let session = self._refresh.read().unwrap().session;
let current_block = BlockId::Hash(self.client.info().finalized_hash);
if session != self.client.runtime_api().current_session(&current_block).unwrap() {
if session != self.client.runtime_api().current_session(self.client.info().finalized_hash).unwrap() {
*self._refresh.write().unwrap() = TendermintValidatorsStruct::from_module::<T>(&self.client);
}
}