Skip to content

fix: configure DIP templates BlockNumber to u64 #599

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

Merged
ntn-x2 merged 5 commits into from
Dec 19, 2023
Merged

fix: configure DIP templates BlockNumber to u64 #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00e9f53
Change DIP provider template to have u64 as block number
ntn-x2 Dec 18, 2023
e58a6b8
Fix compilation errors
ntn-x2 Dec 18, 2023
48c2c61
More changes
ntn-x2 Dec 19, 2023
589a70c
Merge branch 'develop' into aa/consumer-template-fix
ntn-x2 Dec 19, 2023
d290a83
Merge branch 'aa/consumer-template-fix' of github.com:KILTprotocol/ki…
ntn-x2 Dec 19, 2023
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
14 changes: 7 additions & 7 deletions dip-template/runtimes/dip-consumer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ pub type AccountId = AccountId32;
pub type Address = MultiAddress<AccountId, ()>;
pub type Balance = u128;
pub type Block = generic::Block<Header, UncheckedExtrinsic>;
pub type BlockNumber = u32;
pub type BlockNumber = u64;
pub type DidIdentifier = AccountId;
pub type Hasher = BlakeTwo256;
pub type Hash = sp_core::H256;
pub type Header = generic::Header<BlockNumber, Hasher>;
pub type Nonce = u32;
pub type Nonce = u64;
pub type Signature = MultiSignature;

pub type SignedExtra = (
Expand Down Expand Up @@ -228,7 +228,7 @@ impl frame_system::Config for Runtime {
type AccountData = AccountData<Balance>;
type AccountId = AccountId;
type BaseCallFilter = Everything;
type BlockHashCount = ConstU32<256>;
type BlockHashCount = ConstU64<256>;
type BlockLength = RuntimeBlockLength;
type Block = Block;
type BlockWeights = RuntimeBlockWeights;
Expand All @@ -237,7 +237,7 @@ impl frame_system::Config for Runtime {
type Hashing = BlakeTwo256;
type Lookup = AccountIdLookup<AccountId, ()>;
type MaxConsumers = ConstU32<16>;
type Nonce = u32;
type Nonce = u64;
type OnKilledAccount = ();
type OnNewAccount = ();
type OnSetCode = ParachainSetCode<Self>;
Expand Down Expand Up @@ -323,7 +323,7 @@ parameter_types! {
impl pallet_collator_selection::Config for Runtime {
type Currency = Balances;
type PotId = PotId;
type KickThreshold = ConstU32<{ 6 * HOURS }>;
type KickThreshold = ConstU64<{ 6 * HOURS }>;
type MaxCandidates = ConstU32<1_000>;
type MaxInvulnerables = ConstU32<100>;
type MinEligibleCollators = ConstU32<5>;
Expand All @@ -343,11 +343,11 @@ impl_opaque_keys! {

impl pallet_session::Config for Runtime {
type Keys = SessionKeys;
type NextSessionRotation = PeriodicSessions<ConstU32<HOURS>, ConstU32<0>>;
type NextSessionRotation = PeriodicSessions<ConstU64<HOURS>, ConstU64<0>>;
type RuntimeEvent = RuntimeEvent;
type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
type SessionManager = CollatorSelection;
type ShouldEndSession = PeriodicSessions<ConstU32<HOURS>, ConstU32<0>>;
type ShouldEndSession = PeriodicSessions<ConstU64<HOURS>, ConstU64<0>>;
type ValidatorId = AccountId;
type ValidatorIdOf = IdentityCollator;
type WeightInfo = ();
Expand Down
16 changes: 8 additions & 8 deletions dip-template/runtimes/dip-provider/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ pub type AccountId = AccountId32;
pub type Address = MultiAddress<AccountId, ()>;
pub type Balance = u128;
pub type Block = generic::Block<Header, UncheckedExtrinsic>;
pub type BlockNumber = u32;
pub type BlockNumber = u64;
pub type DidIdentifier = AccountId;
pub type Hash = sp_core::H256;
pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
pub type Nonce = u32;
pub type Nonce = u64;
pub type Signature = MultiSignature;

pub type SignedExtra = (
Expand Down Expand Up @@ -229,7 +229,7 @@ impl frame_system::Config for Runtime {
type AccountData = AccountData<Balance>;
type AccountId = AccountId;
type BaseCallFilter = Everything;
type BlockHashCount = ConstU32<256>;
type BlockHashCount = ConstU64<256>;
type BlockLength = RuntimeBlockLength;
type Block = Block;
type BlockWeights = RuntimeBlockWeights;
Expand All @@ -238,7 +238,7 @@ impl frame_system::Config for Runtime {
type Hashing = BlakeTwo256;
type Lookup = AccountIdLookup<AccountId, ()>;
type MaxConsumers = ConstU32<16>;
type Nonce = u32;
type Nonce = u64;
type OnKilledAccount = ();
type OnNewAccount = ();
type OnSetCode = ParachainSetCode<Self>;
Expand Down Expand Up @@ -324,7 +324,7 @@ parameter_types! {
impl pallet_collator_selection::Config for Runtime {
type Currency = Balances;
type PotId = PotId;
type KickThreshold = ConstU32<{ 6 * HOURS }>;
type KickThreshold = ConstU64<{ 6 * HOURS }>;
type MaxCandidates = ConstU32<1_000>;
type MaxInvulnerables = ConstU32<100>;
type MinEligibleCollators = ConstU32<5>;
Expand All @@ -344,11 +344,11 @@ impl_opaque_keys! {

impl pallet_session::Config for Runtime {
type Keys = SessionKeys;
type NextSessionRotation = PeriodicSessions<ConstU32<HOURS>, ConstU32<0>>;
type NextSessionRotation = PeriodicSessions<ConstU64<HOURS>, ConstU64<0>>;
type RuntimeEvent = RuntimeEvent;
type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
type SessionManager = CollatorSelection;
type ShouldEndSession = PeriodicSessions<ConstU32<HOURS>, ConstU32<0>>;
type ShouldEndSession = PeriodicSessions<ConstU64<HOURS>, ConstU64<0>>;
type ValidatorId = AccountId;
type ValidatorIdOf = IdentityCollator;
type WeightInfo = ();
Expand Down Expand Up @@ -392,7 +392,7 @@ impl did::Config for Runtime {
type Fee = ConstU128<MILLIUNIT>;
type FeeCollector = ();
type KeyDeposit = ConstU128<UNIT>;
type MaxBlocksTxValidity = ConstU32<HOURS>;
type MaxBlocksTxValidity = ConstU64<HOURS>;
type MaxNewKeyAgreementKeys = MaxNewKeyAgreementKeys;
type MaxNumberOfServicesPerDid = ConstU32<1>;
type MaxNumberOfTypesPerService = ConstU32<1>;
Expand Down