Skip to content

Bump to polkadot-stable2506-1 #295

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.

Sign up for GitHub

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Bump to polkadot-stable2506-1 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fbe2016
bump psdk to 2506-1
clangenb Aug 31, 2025
674a373
integrate upstream changes
clangenb Aug 31, 2025
8d9fc11
remove forgotten RuntimeEvent
clangenb Aug 31, 2025
df8ab7d
cargo zepter
clangenb Aug 31, 2025
69207fc
fix typo
clangenb Aug 31, 2025
801e0e7
taplo fmt
clangenb Sep 11, 2025
31fbdf0
Merge branch 'master' into cl/polkadot-stable2506-1
clangenb Sep 11, 2025
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
2,763 changes: 2,300 additions & 463 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,38 @@ webpki = { version = "=0.102.0-alpha.3", default-features = false, features = ["
x509-cert = { version = "0.1.0", default-features = false, features = ["alloc"] }

# polkadot-sdk and ecosystem crates [no_std]
cumulus-pallet-dmp-queue = { version = "0.20.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.20.0", default-features = false }
cumulus-primitives-core = { version = "0.18.1", default-features = false }
frame-benchmarking = { version = "40.2.0", default-features = false }
frame-support = { version = "40.1.0", default-features = false }
frame-system = { version = "40.1.0", default-features = false }
pallet-assets = { version = "42.0.0", default-features = false }
pallet-aura = { version = "39.0.0", default-features = false }
pallet-balances = { version = "41.1.0", default-features = false }
pallet-timestamp = { version = "39.0.0", default-features = false }
pallet-vesting = { version = "40.1.0", default-features = false }
pallet-xcm = { version = "19.1.2", default-features = false }
parachains-common = { version = "21.0.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.21.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.21.0", default-features = false }
cumulus-primitives-core = { version = "0.19.0", default-features = false }
frame-benchmarking = { version = "41.0.1", default-features = false }
frame-support = { version = "41.0.0", default-features = false }
frame-system = { version = "41.0.0", default-features = false }
pallet-assets = { version = "43.0.0", default-features = false }
pallet-aura = { version = "40.0.0", default-features = false }
pallet-balances = { version = "42.0.0", default-features = false }
pallet-timestamp = { version = "40.0.0", default-features = false }
pallet-vesting = { version = "41.0.0", default-features = false }
pallet-xcm = { version = "20.1.2", default-features = false }
parachains-common = { version = "22.0.0", default-features = false }
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive"] }
polkadot-core-primitives = { version = "17.1.0", default-features = false }
polkadot-parachain-primitives = { version = "16.1.0", default-features = false }
polkadot-core-primitives = { version = "18.0.0", default-features = false }
polkadot-parachain-primitives = { version = "17.0.0", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive", "serde"] }
sp-core = { version = "36.1.0", default-features = false }
sp-io = { version = "40.0.1", default-features = false }
sp-runtime = { version = "41.1.0", default-features = false }
sp-core = { version = "37.0.0", default-features = false }
sp-io = { version = "41.0.1", default-features = false }
sp-runtime = { version = "42.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
staging-parachain-info = { version = "0.20.0", default-features = false }
staging-xcm = { version = "16.2.0", default-features = false }
staging-xcm-builder = { version = "20.1.1", default-features = false }
staging-xcm-executor = { version = "19.1.2", default-features = false }
staging-parachain-info = { version = "0.21.0", default-features = false }
staging-xcm = { version = "17.0.0", default-features = false }
staging-xcm-builder = { version = "21.1.0", default-features = false }
staging-xcm-executor = { version = "20.0.1", default-features = false }
substrate-fixed = { version = "0.6.0", default-features = false }

# dev-deps [std]
sp-keyring = { version = "41.0.0", default-features = false }
sp-keyring = { version = "42.0.0", default-features = false }
sp-externalities = { version = "0.30.0", default-features = false }
sp-consensus-aura = { version = "0.42.0", default-features = false }
polkadot-runtime-parachains = { version = "19.1.0" }
sp-consensus-aura = { version = "0.43.0", default-features = false }
polkadot-runtime-parachains = { version = "20.0.1" }

[patch.crates-io]
ring = { git = "https://github.com/betrusted-io/ring-xous", branch = "0.16.20-cleanup" }
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# pallets

This repository contains all custom pallets used by the integritee netowork, a parachain to Polkadot and Kusama
This repository contains all custom pallets used by the integritee network, a parachain to Polkadot and Kusama

## Licensing

Please note that while all pallets utilized in the Integritee network are open-sourced,
it is important to be aware that certain pallets are licensed under MS-RSL (Microsoft Reference Source License)
solely for reference purposes.
If you are interested in using these pallets in chains other than the Integritee network,
Please note that while all pallets utilized in the Integritee network are open-sourced,
it is important to be aware that certain pallets are licensed under MS-RSL (Microsoft Reference Source License)
solely for reference purposes.
If you are interested in using these pallets in chains other than the Integritee network,
we kindly request you to [contact us]([email protected]) to inquire about the conditions for licensing.
1 change: 1 addition & 0 deletions asset-registry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,5 @@ try-runtime = [
"polkadot-runtime-parachains/try-runtime",
"sp-runtime/try-runtime",
"staging-parachain-info/try-runtime",
"parachains-common/try-runtime",
]
1 change: 0 additions & 1 deletion asset-registry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type ReserveAssetModifierOrigin: EnsureOrigin<Self::RuntimeOrigin>;
type Assets: Inspect<Self::AccountId>;
type WeightInfo: WeightInfo;
Expand Down
1 change: 0 additions & 1 deletion asset-registry/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ impl pallet_asset_registry::BenchmarkHelper<u32> for MockAssetRegistryBenchmarkH
}

impl pallet_asset_registry::Config for Test {
type RuntimeEvent = RuntimeEvent;
type ReserveAssetModifierOrigin = frame_system::EnsureRoot<Self::AccountId>;
type Assets = Assets;
type WeightInfo = pallet_asset_registry::weights::SubstrateWeight<Test>;
Expand Down
3 changes: 0 additions & 3 deletions claims/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ pub mod pallet {
/// Configuration trait.
#[pallet::config]
pub trait Config: frame_system::Config {
/// The overarching event type.
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type VestingSchedule: VestingSchedule<Self::AccountId, Moment = BlockNumberFor<Self>>;
#[pallet::constant]
type Prefix: Get<&'static [u8]>;
Expand Down Expand Up @@ -746,7 +744,6 @@ mod tests {
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type VestingSchedule = Vesting;
type Prefix = Prefix;
type MoveClaimOrigin = frame_system::EnsureSignedBy<Six, u64>;
Expand Down
3 changes: 1 addition & 2 deletions enclave-bridge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ pub mod pallet {
pub trait Config:
frame_system::Config + pallet_timestamp::Config + pallet_teerex::Config
{
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type Currency: Currency<<Self as frame_system::Config>::AccountId>;
type WeightInfo: WeightInfo;
}
Expand Down Expand Up @@ -504,7 +503,7 @@ impl<T: Config> Pallet<T> {
fn deposit_event_indexed(topics: &[T::Hash], event: Event<T>) {
<frame_system::Pallet<T>>::deposit_event_indexed(
topics,
<T as Config>::RuntimeEvent::from(event).into(),
<T as frame_system::Config>::RuntimeEvent::from(event).into(),
)
}
}
Expand Down
2 changes: 0 additions & 2 deletions enclave-bridge/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,12 @@ parameter_types! {
}

impl pallet_teerex::Config for Test {
type RuntimeEvent = RuntimeEvent;
type MomentsPerDay = MomentsPerDay;
type MaxAttestationRenewalPeriod = MaxAttestationRenewalPeriod;
type WeightInfo = ();
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type WeightInfo = ();
}
Expand Down
1 change: 0 additions & 1 deletion porteer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ pub mod pallet {
/// Configuration trait.
#[pallet::config]
pub trait Config: frame_system::Config + pallet_timestamp::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type WeightInfo: WeightInfo;

/// Can enable/disable the bridge, e.g. council/technical committee.
Expand Down
1 change: 0 additions & 1 deletion porteer/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ pub const WHITELISTED_LOCATION: TestLocation = 1;
pub const WHITELISTED_BUT_UNSUPPORTED_LOCATION: TestLocation = 2;

impl crate::Config for Test {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = ();
type PorteerAdmin =
EitherOfDiverse<EnsureSignedBy<Alice, AccountId32>, EnsureRoot<AccountId32>>;
Expand Down
10 changes: 8 additions & 2 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
[toolchain]
channel = "1.88.0"
targets = ["wasm32-unknown-unknown"]
channel = "1.88.0" # align with https://github.com/polkadot-fellows/runtimes/blob/main/.github/env#L1
profile = "default" # include rustfmt, clippy
components = [
"cargo",
"clippy",
"rust-src",
"rustfmt",
]
targets = ["wasm32-unknown-unknown"]
1 change: 0 additions & 1 deletion sidechain/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pub mod pallet {
pub trait Config:
frame_system::Config + pallet_teerex::Config + pallet_enclave_bridge::Config
{
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type WeightInfo: WeightInfo;
}

Expand Down
3 changes: 0 additions & 3 deletions sidechain/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,12 @@ parameter_types! {
}

impl pallet_teerex::Config for Test {
type RuntimeEvent = RuntimeEvent;
type MomentsPerDay = MomentsPerDay;
type WeightInfo = ();
type MaxAttestationRenewalPeriod = MaxAttestationRenewalPeriod;
}

impl pallet_enclave_bridge::Config for Test {
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type WeightInfo = ();
}
Expand All @@ -148,7 +146,6 @@ parameter_types! {
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = ();
}

Expand Down
2 changes: 0 additions & 2 deletions teeracle/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config + pallet_teerex::Config {
/// The overarching event type.
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type WeightInfo: WeightInfo;
/// Max number of whitelisted oracle's releases allowed
#[pallet::constant]
Expand Down
2 changes: 0 additions & 2 deletions teeracle/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,12 @@ parameter_types! {
}

impl pallet_teerex::Config for Test {
type RuntimeEvent = RuntimeEvent;
type MomentsPerDay = MomentsPerDay;
type WeightInfo = ();
type MaxAttestationRenewalPeriod = MaxAttestationRenewalPeriod;
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = ();
type MaxWhitelistedReleases = MaxWhitelistedReleases;
type MaxOracleBlobLen = MaxOracleBlobLen;
Expand Down
1 change: 0 additions & 1 deletion teerdays/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ pub mod pallet {
/// Configuration trait.
#[pallet::config]
pub trait Config: frame_system::Config + pallet_timestamp::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type WeightInfo: WeightInfo;

/// The bonding balance.
Expand Down
1 change: 0 additions & 1 deletion teerdays/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ parameter_types! {
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type UnlockPeriod = UnlockPeriod;
type WeightInfo = ();
type Currency = Balances;
Expand Down
2 changes: 0 additions & 2 deletions teerex/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config + pallet_timestamp::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

#[pallet::constant]
type MomentsPerDay: Get<Self::Moment>;

Expand Down
1 change: 0 additions & 1 deletion teerex/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ parameter_types! {
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type MomentsPerDay = MomentsPerDay;
type MaxAttestationRenewalPeriod = MaxAttestationRenewalPeriod;
type WeightInfo = ();
Expand Down
Loading