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.

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

Sync up with latest master #14

Closed
wants to merge 12 commits into from
Closed

Sync up with latest master #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
532e02e
Bump version (#1071)
gavofyork May 6, 2020
019c665
fix migrations (also companion for #14421) (#7454)
liamaharon Jul 13, 2023
d7653c3
Moves `Block` to `frame_system` instead of `construct_runtime` and re…
gupnik Jul 13, 2023
fe51155
Replace Index for Nonce (#7374)
juangirini Jul 14, 2023
0fd3824
Put HRMP Channel Management on General Admin Track (#7477)
joepetrowski Jul 17, 2023
c4d0582
Moves `Block` to `frame_system` instead of `construct_runtime` and re…
gupnik Jul 13, 2023
0224f53
Replace Index for Nonce (#2740)
juangirini Jul 14, 2023
b207ed0
Bump clap from 4.3.11 to 4.3.12 (#2873)
dependabot[bot] Jul 14, 2023
f8575a3
Fix dependency revs
ggwpez Jul 17, 2023
2c09efd
Rebase merge upstream changes
ggwpez Jul 17, 2023
fafaa46
Pin upstream deps
ggwpez Jul 17, 2023
f84a4d7
Manual merge fixup
ggwpez Jul 17, 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
474 changes: 237 additions & 237 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion relay/kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "m
pallet-referenda = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["experimental"] }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion relay/kusama/src/governance/origins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub mod pallet_custom_origins {
Treasurer,
/// Origin for managing the composition of the fellowship.
FellowshipAdmin,
/// Origin for managing the registrar.
/// Origin for managing the registrar and permissioned HRMP channel operations.
GeneralAdmin,
/// Origin for starting auctions.
AuctionAdmin,
Expand Down
19 changes: 10 additions & 9 deletions relay/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,12 @@ impl frame_system::Config for Runtime {
type BlockLength = BlockLength;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type Index = Nonce;
type BlockNumber = BlockNumber;
type Nonce = Nonce;
type Hash = Hash;
type Hashing = BlakeTwo256;
type AccountId = AccountId;
type Lookup = AccountIdLookup<AccountId, ()>;
type Header = generic::Header<BlockNumber, BlakeTwo256>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
type BlockHashCount = BlockHashCount;
type DbWeight = RocksDbWeight;
Expand Down Expand Up @@ -734,7 +733,7 @@ where
call: RuntimeCall,
public: <Signature as Verify>::Signer,
account: AccountId,
nonce: <Runtime as frame_system::Config>::Index,
nonce: <Runtime as frame_system::Config>::Nonce,
) -> Option<(RuntimeCall, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
use sp_runtime::traits::StaticLookup;
// take the biggest period possible.
Expand Down Expand Up @@ -1156,6 +1155,7 @@ impl parachains_dmp::Config for Runtime {}
impl parachains_hrmp::Config for Runtime {
type RuntimeOrigin = RuntimeOrigin;
type RuntimeEvent = RuntimeEvent;
type ChannelManager = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
type Currency = Balances;
type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo<Runtime>;
}
Expand Down Expand Up @@ -1363,10 +1363,7 @@ impl pallet_state_trie_migration::Config for Runtime {
}

construct_runtime! {
pub enum Runtime where
Block = Block,
NodeBlock = primitives::Block,
UncheckedExtrinsic = UncheckedExtrinsic
pub enum Runtime
{
// Basic stuff; balances is uncallable initially.
System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
Expand Down Expand Up @@ -1560,7 +1557,11 @@ pub mod migrations {
/// Unreleased migrations. Add new ones here:
pub type Unreleased = (
init_state_migration::InitMigrate,
pallet_society::migrations::MigrateToV2<Runtime, (), past_payouts::PastPayouts>,
pallet_society::migrations::VersionCheckedMigrateToV2<
Runtime,
(),
past_payouts::PastPayouts,
>,
pallet_im_online::migration::v1::Migration<Runtime>,
parachains_configuration::migration::v7::MigrateToV7<Runtime>,
);
Expand Down
2 changes: 1 addition & 1 deletion relay/polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pallet-whitelist = { git = "https://github.com/paritytech/substrate", branch = "
pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-xcm = { default-features = false , git = "https://github.com/paritytech/polkadot.git", branch = "master" }
pallet-xcm = { default-features = false , features = ["experimental"], git = "https://github.com/paritytech/polkadot.git", branch = "master" }

frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion relay/polkadot/src/governance/origins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub mod pallet_custom_origins {
Treasurer,
/// Origin for managing the composition of the fellowship.
FellowshipAdmin,
/// Origin for managing the registrar.
/// Origin for managing the registrar and permissioned HRMP channel operations.
GeneralAdmin,
/// Origin for starting auctions.
AuctionAdmin,
Expand Down
15 changes: 6 additions & 9 deletions relay/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,12 @@ impl frame_system::Config for Runtime {
type BlockLength = BlockLength;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type Index = Nonce;
type BlockNumber = BlockNumber;
type Nonce = Nonce;
type Hash = Hash;
type Hashing = BlakeTwo256;
type AccountId = AccountId;
type Lookup = AccountIdLookup<AccountId, ()>;
type Header = generic::Header<BlockNumber, BlakeTwo256>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
type BlockHashCount = BlockHashCount;
type DbWeight = RocksDbWeight;
Expand Down Expand Up @@ -782,7 +781,7 @@ where
call: RuntimeCall,
public: <Signature as Verify>::Signer,
account: AccountId,
nonce: <Runtime as frame_system::Config>::Index,
nonce: <Runtime as frame_system::Config>::Nonce,
) -> Option<(RuntimeCall, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
use sp_runtime::traits::StaticLookup;
// take the biggest period possible.
Expand Down Expand Up @@ -1172,6 +1171,7 @@ impl parachains_dmp::Config for Runtime {}
impl parachains_hrmp::Config for Runtime {
type RuntimeOrigin = RuntimeOrigin;
type RuntimeEvent = RuntimeEvent;
type ChannelManager = EitherOf<EnsureRoot<Self::AccountId>, GeneralAdmin>;
type Currency = Balances;
type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo<Self>;
}
Expand Down Expand Up @@ -1340,10 +1340,7 @@ impl frame_support::traits::OnRuntimeUpgrade for InitiateNominationPools {
}

construct_runtime! {
pub enum Runtime where
Block = Block,
NodeBlock = primitives::Block,
UncheckedExtrinsic = UncheckedExtrinsic
pub enum Runtime
{
// Basic stuff; balances is uncallable initially.
System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
Expand Down Expand Up @@ -1499,7 +1496,7 @@ pub mod migrations {
use frame_support::traits::{GetStorageVersion, OnRuntimeUpgrade, StorageVersion};

pub type V0938 = (
pallet_xcm::migration::v1::MigrateToV1<Runtime>,
pallet_xcm::migration::v1::VersionCheckedMigrateToV1<Runtime>,
// The UMP pallet got deleted in <https://github.com/paritytech/polkadot/pull/6271>
// parachains_ump::migration::v1::MigrateToV1<Runtime>,
);
Expand Down
28 changes: 14 additions & 14 deletions system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

# Cumulus
cumulus-pallet-aura-ext = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-dmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-parachain-system = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-session-benchmarking = { default-features = false, version = "3.0.0", git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-xcm = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-xcmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-primitives-timestamp = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-primitives-utility = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
pallet-collator-selection = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
parachain-info = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
parachains-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
assets-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-aura-ext = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-dmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-parachain-system = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-session-benchmarking = { default-features = false, version = "3.0.0", git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-xcm = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-xcmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-primitives-timestamp = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-primitives-utility = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
pallet-collator-selection = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
parachain-info = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
parachains-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
assets-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }

[dev-dependencies]
asset-test-utils = { git = "https://github.com/paritytech/cumulus.git", branch = "master" }
asset-test-utils = { git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }

[build-dependencies]
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
Expand Down
18 changes: 7 additions & 11 deletions system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ use pallet_nfts::PalletFeatures;
pub use parachains_common as common;
use parachains_common::{
impls::{AssetsToBlockAuthor, DealWithFees},
opaque, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header,
Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Nonce,
Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};
use xcm_config::{
Expand Down Expand Up @@ -165,11 +165,10 @@ impl frame_system::Config for Runtime {
type AccountId = AccountId;
type RuntimeCall = RuntimeCall;
type Lookup = AccountIdLookup<AccountId, ()>;
type Index = Index;
type BlockNumber = BlockNumber;
type Nonce = Nonce;
type Hash = Hash;
type Hashing = BlakeTwo256;
type Header = Header;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
type RuntimeOrigin = RuntimeOrigin;
type BlockHashCount = BlockHashCount;
Expand Down Expand Up @@ -736,10 +735,7 @@ impl pallet_nfts::Config for Runtime {

// Create the runtime by composing the FRAME pallets that were previously configured.
construct_runtime!(
pub enum Runtime where
Block = Block,
NodeBlock = opaque::Block,
UncheckedExtrinsic = UncheckedExtrinsic,
pub enum Runtime
{
// System support stuff.
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
Expand Down Expand Up @@ -939,8 +935,8 @@ impl_runtime_apis! {
}
}

impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
fn account_nonce(account: AccountId) -> Index {
impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
fn account_nonce(account: AccountId) -> Nonce {
System::account_nonce(account)
}
}
Expand Down
28 changes: 14 additions & 14 deletions system-parachains/asset-hubs/asset-hub-polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,23 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }

# Cumulus
cumulus-pallet-aura-ext = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-dmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-parachain-system = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-session-benchmarking = { default-features = false, version = "3.0.0" , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-xcm = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-xcmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-primitives-timestamp = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-primitives-utility = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
pallet-collator-selection = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
parachain-info = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
parachains-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
assets-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", branch = "master" }
cumulus-pallet-aura-ext = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-dmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-parachain-system = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-session-benchmarking = { default-features = false, version = "3.0.0" , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-xcm = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-pallet-xcmp-queue = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-primitives-timestamp = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
cumulus-primitives-utility = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
pallet-collator-selection = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
parachain-info = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
parachains-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }
assets-common = { default-features = false , git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }

[dev-dependencies]
hex-literal = "0.4.1"
asset-test-utils = { git = "https://github.com/paritytech/cumulus.git", branch = "master" }
asset-test-utils = { git = "https://github.com/paritytech/cumulus.git", rev = "3b2e317f6bd7bee63083da99553ea4972b31a675" }

[build-dependencies]
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
Expand Down
20 changes: 8 additions & 12 deletions system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ use pallet_nfts::PalletFeatures;
pub use parachains_common as common;
use parachains_common::{
impls::{AssetsToBlockAuthor, DealWithFees},
opaque, AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance,
BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS,
MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, BlockNumber,
Hash, Header, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT,
NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};
use xcm_config::{
DotLocation, FellowshipLocation, ForeignAssetsConvertedConcreteId, GovernanceLocation,
Expand Down Expand Up @@ -183,11 +183,10 @@ impl frame_system::Config for Runtime {
type AccountId = AccountId;
type RuntimeCall = RuntimeCall;
type Lookup = AccountIdLookup<AccountId, ()>;
type Index = Index;
type BlockNumber = BlockNumber;
type Nonce = Nonce;
type Hash = Hash;
type Hashing = BlakeTwo256;
type Header = Header;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
type RuntimeOrigin = RuntimeOrigin;
type BlockHashCount = BlockHashCount;
Expand Down Expand Up @@ -723,10 +722,7 @@ impl pallet_nfts::Config for Runtime {

// Create the runtime by composing the FRAME pallets that were previously configured.
construct_runtime!(
pub enum Runtime where
Block = Block,
NodeBlock = opaque::Block,
UncheckedExtrinsic = UncheckedExtrinsic,
pub enum Runtime
{
// System support stuff.
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
Expand Down Expand Up @@ -921,8 +917,8 @@ impl_runtime_apis! {
}
}

impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
fn account_nonce(account: AccountId) -> Index {
impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
fn account_nonce(account: AccountId) -> Nonce {
System::account_nonce(account)
}
}
Expand Down
Loading