Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade polkadot-sdk version to stable2409 also some relative crates #412

Merged
merged 1 commit into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21,937 changes: 13,991 additions & 7,946 deletions Cargo.lock

Large diffs are not rendered by default.

411 changes: 207 additions & 204 deletions Cargo.toml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/cestory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resolver = "2"
anyhow = { workspace = true }
async-trait = { workspace = true }
base64 = { workspace = true }
chrono = { workspace = true }
chrono = { workspace = true, features = ["now"] }
environmental = { workspace = true }
glob = { workspace = true }
hex = { workspace = true, features = ["alloc"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/cestory/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mod storage_ext {
}

pub fn timestamp_now(&self) -> chain::Moment {
self.execute_with(chain::Timestamp::now)
self.execute_with(|| chain::Timestamp::get())
}

/// Get the next mq sequnce number for given sender. Default to 0 if no message sent.
Expand Down
3 changes: 2 additions & 1 deletion crates/rrsc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
async-trait = { workspace = true }
scale-info = { workspace = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
codec = { workspace = true, default-features = true, features = ["derive"] }
futures = { workspace = true }
log = { workspace = true }
num-bigint = { workspace = true }
Expand All @@ -29,6 +29,7 @@ sc-client-api = { workspace = true }
sc-consensus = { workspace = true }
sc-consensus-epochs = { workspace = true }
sc-consensus-slots = { workspace = true }
sp-crypto-hashing = { workspace = true, default-features = true }
sc-keystore = { workspace = true }
sc-telemetry = { workspace = true }
sc-transaction-pool-api = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/rrsc/pallet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-rrsc"
version = "4.0.0-dev"
version = "38.0.0"
authors = ["CESS"]
edition = "2021"
license = "Apache-2.0"
Expand All @@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
codec = { workspace = true, default-features = false, features = ["derive"] }
log = { workspace = true }
scale-info = { workspace = true, features = ["derive", "serde"] }
frame-benchmarking = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/rrsc/pallet/src/benchmarking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ benchmarks! {
// NOTE: generated with the test below `test_generate_equivocation_report_blob`.
// the output is not deterministic since keys are generated randomly (and therefore
// signature content changes). it should not affect the benchmark.
// with the current benchmark setup it is not possible to generate this programatically
// with the current benchmark setup it is not possible to generate this programmatically
// from the benchmark setup.
const EQUIVOCATION_PROOF_BLOB: [u8; 416] = [
222, 241, 46, 66, 243, 228, 135, 233, 177, 64, 149, 170, 141, 92, 193, 106, 51, 73, 31,
Expand Down
4 changes: 2 additions & 2 deletions crates/rrsc/pallet/src/equivocation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
//! that the `ValidateUnsigned` for the RRSC pallet is used in the runtime
//! definition.

use alloc::{boxed::Box, vec, vec::Vec};
use frame_support::traits::{Get, KeyOwnerProofSystem};
use frame_system::pallet_prelude::HeaderFor;
use log::{error, info};
Expand All @@ -50,7 +51,6 @@ use sp_staking::{
offence::{Kind, Offence, OffenceReportSystem, ReportOffence},
SessionIndex,
};
use sp_std::prelude::*;

use crate::{Call, Config, Error, Pallet, LOG_TARGET};

Expand Down Expand Up @@ -104,7 +104,7 @@ impl<Offender: Clone> Offence<Offender> for EquivocationOffence<Offender> {
/// - On-chain validity checks and processing are mostly delegated to the user provided generic
/// types implementing `KeyOwnerProofSystem` and `ReportOffence` traits.
/// - Offence reporter for unsigned transactions is fetched via the the authorship pallet.
pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T, R, P, L)>);
pub struct EquivocationReportSystem<T, R, P, L>(core::marker::PhantomData<(T, R, P, L)>);

impl<T, R, P, L>
OffenceReportSystem<Option<T::AccountId>, (EquivocationProof<HeaderFor<T>>, T::KeyOwnerProof)>
Expand Down
Loading
Loading