Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2024-12-22 19:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cargo update

Browse source
This commit is contained in:
Luke Parker 2023-01-04 03:17:36 -05:00
parent eeca440fa7
commit bf09b5cc7e
No known key found for this signature in database
7 changed files with 344 additions and 427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

743
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

5
substrate/node/Cargo.toml
View file

@ -16,8 +16,11 @@ async-trait = "0.1"
log = "0.4"
futures = { version = "0.3" }
clap = { version = "4", features = ["derive"] }
jsonrpsee = { version = "0.15", features = ["server"] }
jsonrpsee = { version = "0.16", features = ["server"] }
sp-core = { git = "https://github.com/serai-dex/substrate" }
sp-application-crypto = { git = "https://github.com/serai-dex/substrate" }

8
substrate/node/src/command_helper.rs
View file

@ -88,8 +88,10 @@ pub fn create_benchmark_extrinsic(
pub fn inherent_benchmark_data() -> Result<InherentData> {
let mut inherent_data = InherentData::new();
sp_timestamp::InherentDataProvider::new(Duration::from_millis(0).into())
.provide_inherent_data(&mut inherent_data)
.map_err(|e| format!("creating inherent data: {e:?}"))?;
futures::executor::block_on(
sp_timestamp::InherentDataProvider::new(Duration::from_millis(0).into())
.provide_inherent_data(&mut inherent_data),
)
.map_err(|e| format!("creating inherent data: {e:?}"))?;
Ok(inherent_data)
}

9
substrate/runtime/src/lib.rs
View file

@ -18,9 +18,9 @@ use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
use frame_support::{
traits::{ConstU8, ConstU32, ConstU64},
traits::{ConstBool, ConstU8, ConstU32, ConstU64},
weights::{
constants::{RocksDbWeight, WEIGHT_PER_SECOND},
constants::{RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND},
IdentityFee, Weight,
},
dispatch::DispatchClass,
@ -117,7 +117,7 @@ parameter_types! {
frame_system::limits::BlockLength::max_with_normal_ratio(BLOCK_SIZE, NORMAL_DISPATCH_RATIO);
pub BlockWeights: frame_system::limits::BlockWeights =
frame_system::limits::BlockWeights::with_sensible_defaults(
(2u64 * WEIGHT_PER_SECOND).set_proof_size(u64::MAX),
Weight::from_ref_time(2u64 * WEIGHT_REF_TIME_PER_SECOND).set_proof_size(u64::MAX),
NORMAL_DISPATCH_RATIO,
);
@ -214,6 +214,9 @@ impl pallet_contracts::Config for Runtime {
type MaxCodeLen = ConstU32<{ 128 * 1024 }>;
type MaxStorageKeyLen = ConstU32<128>;
type UnsafeUnstableInterface = ConstBool<false>;
type MaxDebugBufferLen = ConstU32<255>;
}
impl pallet_tendermint::Config for Runtime {}

2
substrate/tendermint/client/src/authority/mod.rs
View file

@ -405,7 +405,7 @@ impl<T: TendermintValidator> Network for TendermintAuthority<T> {
let mut queue_write = self.import.queue.write().await;
*self.import.importing_block.write().unwrap() = Some(hash);
queue_write.as_mut().unwrap().import_blocks(
queue_write.as_mut().unwrap().service_ref().import_blocks(
BlockOrigin::ConsensusBroadcast, // TODO: Use BlockOrigin::Own when it's our block
vec![IncomingBlock {
hash,

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

@ -97,7 +97,7 @@ impl<T: TendermintValidator> TendermintImport<T> {
.create_inherent_data_providers(parent, ())
.await
{
Ok(providers) => match providers.create_inherent_data() {
Ok(providers) => match providers.create_inherent_data().await {
Ok(data) => Some(data),
Err(err) => {
warn!(target: "tendermint", "Failed to create inherent data: {}", err);

2
substrate/tendermint/machine/Cargo.toml
View file

@ -18,7 +18,7 @@ parity-scale-codec = { version = "3.2", features = ["derive"] }
futures = "0.3"
tokio = { version = "1", features = ["macros", "sync", "time", "rt"] }
sp-runtime = { git = "https://github.com/serai-dex/substrate", version = "6.0.0", optional = true }
sp-runtime = { git = "https://github.com/serai-dex/substrate", version = "7.0.0", optional = true }
[features]
substrate = ["sp-runtime"]