mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 07:01:03 +00:00
Replace Index for Nonce (#7374)
* replace Index for Nonce
* remove extra Nonce
* update lockfile for {"substrate"}
---------
Co-authored-by: parity-processbot <>
This commit is contained in:
Generated
+183
-183
File diff suppressed because it is too large
Load Diff
@@ -593,8 +593,7 @@ mod tests {
|
||||
type BlockLength = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
|
||||
@@ -711,8 +711,7 @@ mod tests {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
|
||||
@@ -741,7 +741,7 @@ mod tests {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
|
||||
@@ -904,8 +904,7 @@ mod tests {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
|
||||
@@ -147,7 +147,7 @@ mod tests {
|
||||
impl frame_system::Config for Test {
|
||||
type BaseCallFilter = frame_support::traits::Everything;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
|
||||
@@ -116,8 +116,7 @@ impl frame_system::Config for Test {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
@@ -716,8 +716,7 @@ mod tests {
|
||||
type BaseCallFilter = frame_support::traits::Everything;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
|
||||
@@ -514,7 +514,7 @@ mod tests {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
@@ -532,8 +532,7 @@ mod tests {
|
||||
type BlockLength = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
|
||||
@@ -175,8 +175,7 @@ impl frame_system::Config for Runtime {
|
||||
type BlockLength = BlockLength;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = Nonce;
|
||||
|
||||
type Nonce = Nonce;
|
||||
type Hash = Hash;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
@@ -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.
|
||||
|
||||
@@ -96,8 +96,7 @@ impl frame_system::Config for Test {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
|
||||
@@ -160,8 +160,7 @@ impl frame_system::Config for Runtime {
|
||||
type BlockLength = BlockLength;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = Nonce;
|
||||
|
||||
type Nonce = Nonce;
|
||||
type Hash = Hash;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
@@ -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.
|
||||
|
||||
@@ -155,8 +155,7 @@ impl frame_system::Config for Runtime {
|
||||
type DbWeight = RocksDbWeight;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = Nonce;
|
||||
|
||||
type Nonce = Nonce;
|
||||
type Hash = Hash;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
@@ -676,7 +675,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.
|
||||
|
||||
@@ -140,8 +140,7 @@ impl frame_system::Config for Runtime {
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = Nonce;
|
||||
|
||||
type Nonce = Nonce;
|
||||
type Hash = HashT;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
@@ -385,7 +384,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)> {
|
||||
let period =
|
||||
BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64;
|
||||
|
||||
@@ -150,8 +150,7 @@ impl frame_system::Config for Runtime {
|
||||
type BlockLength = BlockLength;
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = Nonce;
|
||||
|
||||
type Nonce = Nonce;
|
||||
type Hash = Hash;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
@@ -610,7 +609,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.
|
||||
|
||||
@@ -83,7 +83,7 @@ macro_rules! construct_runtime_prelude {
|
||||
pub(crate) fn [<create_uxt_ $runtime>](
|
||||
raw_solution: EPM::RawSolution<EPM::SolutionOf<Runtime>>,
|
||||
signer: crate::signer::Signer,
|
||||
nonce: crate::prelude::Index,
|
||||
nonce: crate::prelude::Nonce,
|
||||
tip: crate::prelude::Balance,
|
||||
era: sp_runtime::generic::Era,
|
||||
) -> UncheckedExtrinsic {
|
||||
@@ -121,7 +121,7 @@ macro_rules! construct_runtime_prelude {
|
||||
|
||||
// NOTE: we might be able to use some code from the bridges repo here.
|
||||
fn signed_ext_builder_polkadot(
|
||||
nonce: Index,
|
||||
nonce: Nonce,
|
||||
tip: Balance,
|
||||
era: sp_runtime::generic::Era,
|
||||
) -> polkadot_runtime_exports::SignedExtra {
|
||||
@@ -140,7 +140,7 @@ fn signed_ext_builder_polkadot(
|
||||
}
|
||||
|
||||
fn signed_ext_builder_kusama(
|
||||
nonce: Index,
|
||||
nonce: Nonce,
|
||||
tip: Balance,
|
||||
era: sp_runtime::generic::Era,
|
||||
) -> kusama_runtime_exports::SignedExtra {
|
||||
@@ -158,7 +158,7 @@ fn signed_ext_builder_kusama(
|
||||
}
|
||||
|
||||
fn signed_ext_builder_westend(
|
||||
nonce: Index,
|
||||
nonce: Nonce,
|
||||
tip: Balance,
|
||||
era: sp_runtime::generic::Era,
|
||||
) -> westend_runtime_exports::SignedExtra {
|
||||
|
||||
@@ -26,8 +26,8 @@ pub type AccountId = core_primitives::AccountId;
|
||||
pub type BlockNumber = core_primitives::BlockNumber;
|
||||
/// The balance type.
|
||||
pub type Balance = core_primitives::Balance;
|
||||
/// The index of an account.
|
||||
pub type Index = core_primitives::AccountIndex;
|
||||
/// Index of a transaction in the chain.
|
||||
pub type Nonce = core_primitives::Nonce;
|
||||
/// The hash type. We re-export it here, but we can easily get it from block as well.
|
||||
pub type Hash = core_primitives::Hash;
|
||||
/// The header type. We re-export it here, but we can easily get it from block as well.
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
//! Wrappers around creating a signer account.
|
||||
|
||||
use crate::{prelude::*, rpc::SharedRpcClient, AccountId, Error, Index, Pair, LOG_TARGET};
|
||||
use crate::{prelude::*, rpc::SharedRpcClient, AccountId, Error, Nonce, Pair, LOG_TARGET};
|
||||
use frame_system::AccountInfo;
|
||||
use sp_core::{crypto::Pair as _, storage::StorageKey};
|
||||
|
||||
@@ -39,8 +39,8 @@ pub(crate) async fn get_account_info<T: frame_system::Config<Hash = Hash> + EPM:
|
||||
rpc: &SharedRpcClient,
|
||||
who: &T::AccountId,
|
||||
maybe_at: Option<T::Hash>,
|
||||
) -> Result<Option<AccountInfo<Index, T::AccountData>>, Error<T>> {
|
||||
rpc.get_storage_and_decode::<AccountInfo<Index, T::AccountData>>(
|
||||
) -> Result<Option<AccountInfo<Nonce, T::AccountData>>, Error<T>> {
|
||||
rpc.get_storage_and_decode::<AccountInfo<Nonce, T::AccountData>>(
|
||||
&StorageKey(<frame_system::Account<T>>::hashed_key_for(&who)),
|
||||
maybe_at,
|
||||
)
|
||||
@@ -52,7 +52,7 @@ pub(crate) async fn get_account_info<T: frame_system::Config<Hash = Hash> + EPM:
|
||||
pub(crate) async fn signer_uri_from_string<
|
||||
T: frame_system::Config<
|
||||
AccountId = AccountId,
|
||||
Index = Index,
|
||||
Nonce = Nonce,
|
||||
AccountData = pallet_balances::AccountData<Balance>,
|
||||
Hash = Hash,
|
||||
> + EPM::Config,
|
||||
|
||||
@@ -51,7 +51,7 @@ impl frame_system::Config for Test {
|
||||
type BlockLength = ();
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hashing = BlakeTwo256;
|
||||
|
||||
@@ -56,7 +56,7 @@ impl frame_system::Config for Test {
|
||||
type BlockLength = ();
|
||||
type DbWeight = ();
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hashing = BlakeTwo256;
|
||||
|
||||
@@ -200,7 +200,7 @@ parameter_types! {
|
||||
impl frame_system::Config for Test {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
@@ -77,7 +77,7 @@ parameter_types! {
|
||||
impl frame_system::Config for Runtime {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
@@ -66,7 +66,7 @@ parameter_types! {
|
||||
impl frame_system::Config for Runtime {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
@@ -52,7 +52,7 @@ parameter_types! {
|
||||
impl frame_system::Config for Runtime {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
@@ -55,7 +55,7 @@ parameter_types! {
|
||||
impl frame_system::Config for Runtime {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
@@ -51,7 +51,7 @@ parameter_types! {
|
||||
impl frame_system::Config for Runtime {
|
||||
type RuntimeOrigin = RuntimeOrigin;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Index = u64;
|
||||
type Nonce = u64;
|
||||
type Hash = H256;
|
||||
type Hashing = ::sp_runtime::traits::BlakeTwo256;
|
||||
type AccountId = AccountId;
|
||||
|
||||
Reference in New Issue
Block a user