pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 10:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Extensible Multiaddress in all Polkadot Runtimes (#2126)

Browse Source 
* Use extensible multiaddress

* copy pasta
This commit is contained in:
Shawn Tabrizi
2021-01-27 04:00:33 -04:00
committed by GitHub
parent ca2fedc395
commit 884167a5e7
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/kusama/src/lib.rs
+6 -4
View File
@@ -43,7 +43,7 @@ use sp_runtime::{
transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority}, transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority},
curve::PiecewiseLinear, curve::PiecewiseLinear,
traits::{ traits::{
BlakeTwo256, Block as BlockT, OpaqueKeys, ConvertInto, IdentityLookup, BlakeTwo256, Block as BlockT, OpaqueKeys, ConvertInto, AccountIdLookup,
Extrinsic as ExtrinsicT, SaturatedConversion, Verify, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
}, },
}; };
@@ -138,7 +138,7 @@ impl frame_system::Config for Runtime {
type Hash = Hash; type Hash = Hash;
type Hashing = BlakeTwo256; type Hashing = BlakeTwo256;
type AccountId = AccountId; type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>; type Lookup = AccountIdLookup<AccountId, ()>;
type Header = generic::Header<BlockNumber, BlakeTwo256>; type Header = generic::Header<BlockNumber, BlakeTwo256>;
type Event = Event; type Event = Event;
type BlockHashCount = BlockHashCount; type BlockHashCount = BlockHashCount;
@@ -662,6 +662,7 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
account: AccountId, account: AccountId,
nonce: <Runtime as frame_system::Config>::Index, nonce: <Runtime as frame_system::Config>::Index,
) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> { ) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
use sp_runtime::traits::StaticLookup;
// take the biggest period possible. // take the biggest period possible.
let period = BlockHashCount::get() let period = BlockHashCount::get()
.checked_next_power_of_two() .checked_next_power_of_two()
@@ -690,7 +691,8 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
C::sign(payload, public) C::sign(payload, public)
})?; })?;
let (call, extra, _) = raw_payload.deconstruct(); let (call, extra, _) = raw_payload.deconstruct();
Some((call, (account, signature, extra))) let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
Some((call, (address, signature, extra)))
} }
} }
@@ -1031,7 +1033,7 @@ construct_runtime! {
} }
/// The address format for describing accounts. /// The address format for describing accounts.
pub type Address = AccountId; pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
/// Block header type as expected by this runtime. /// Block header type as expected by this runtime.
pub type Header = generic::Header<BlockNumber, BlakeTwo256>; pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
/// Block type as expected by this runtime. /// Block type as expected by this runtime.
polkadot/runtime/polkadot/src/lib.rs
+6 -4
View File
@@ -43,7 +43,7 @@ use sp_runtime::{
KeyTypeId, Percent, Permill, Perbill, curve::PiecewiseLinear, KeyTypeId, Percent, Permill, Perbill, curve::PiecewiseLinear,
transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority}, transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority},
traits::{ traits::{
BlakeTwo256, Block as BlockT, OpaqueKeys, ConvertInto, IdentityLookup, BlakeTwo256, Block as BlockT, OpaqueKeys, ConvertInto, AccountIdLookup,
Extrinsic as ExtrinsicT, SaturatedConversion, Verify, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
}, },
}; };
@@ -152,7 +152,7 @@ impl frame_system::Config for Runtime {
type Hash = Hash; type Hash = Hash;
type Hashing = BlakeTwo256; type Hashing = BlakeTwo256;
type AccountId = AccountId; type AccountId = AccountId;
type Lookup = IdentityLookup<AccountId>; type Lookup = AccountIdLookup<AccountId, ()>;
type Header = generic::Header<BlockNumber, BlakeTwo256>; type Header = generic::Header<BlockNumber, BlakeTwo256>;
type Event = Event; type Event = Event;
type BlockHashCount = BlockHashCount; type BlockHashCount = BlockHashCount;
@@ -707,6 +707,7 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
account: AccountId, account: AccountId,
nonce: <Runtime as frame_system::Config>::Index, nonce: <Runtime as frame_system::Config>::Index,
) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> { ) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
use sp_runtime::traits::StaticLookup;
// take the biggest period possible. // take the biggest period possible.
let period = BlockHashCount::get() let period = BlockHashCount::get()
.checked_next_power_of_two() .checked_next_power_of_two()
@@ -736,7 +737,8 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
C::sign(payload, public) C::sign(payload, public)
})?; })?;
let (call, extra, _) = raw_payload.deconstruct(); let (call, extra, _) = raw_payload.deconstruct();
Some((call, (account, signature, extra))) let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
Some((call, (address, signature, extra)))
} }
} }
@@ -1026,7 +1028,7 @@ construct_runtime! {
} }
/// The address format for describing accounts. /// The address format for describing accounts.
pub type Address = AccountId; pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
/// Block header type as expected by this runtime. /// Block header type as expected by this runtime.
pub type Header = generic::Header<BlockNumber, BlakeTwo256>; pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
/// Block type as expected by this runtime. /// Block type as expected by this runtime.
polkadot/runtime/rococo/src/lib.rs
+6 -4
View File
@@ -46,7 +46,7 @@ use sp_runtime::{
ApplyExtrinsicResult, KeyTypeId, Perbill, ApplyExtrinsicResult, KeyTypeId, Perbill,
transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority}, transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority},
traits::{ traits::{
BlakeTwo256, Block as BlockT, OpaqueKeys, IdentityLookup, BlakeTwo256, Block as BlockT, OpaqueKeys, AccountIdLookup,
Extrinsic as ExtrinsicT, SaturatedConversion, Verify, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
}, },
}; };
@@ -119,7 +119,7 @@ pub fn native_version() -> NativeVersion {
} }
/// The address format for describing accounts. /// The address format for describing accounts.
pub type Address = AccountId; pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
/// Block header type as expected by this runtime. /// Block header type as expected by this runtime.
pub type Header = generic::Header<BlockNumber, BlakeTwo256>; pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
/// Block type as expected by this runtime. /// Block type as expected by this runtime.
@@ -232,7 +232,7 @@ impl frame_system::Config for Runtime {
type Hash = Hash; type Hash = Hash;
type Hashing = BlakeTwo256; type Hashing = BlakeTwo256;
type AccountId = AccountId; type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>; type Lookup = AccountIdLookup<AccountId, ()>;
type Header = generic::Header<BlockNumber, BlakeTwo256>; type Header = generic::Header<BlockNumber, BlakeTwo256>;
type Event = Event; type Event = Event;
type BlockHashCount = BlockHashCount; type BlockHashCount = BlockHashCount;
@@ -264,6 +264,7 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
account: AccountId, account: AccountId,
nonce: <Runtime as frame_system::Config>::Index, nonce: <Runtime as frame_system::Config>::Index,
) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> { ) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
use sp_runtime::traits::StaticLookup;
// take the biggest period possible. // take the biggest period possible.
let period = BlockHashCount::get() let period = BlockHashCount::get()
.checked_next_power_of_two() .checked_next_power_of_two()
@@ -292,7 +293,8 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
C::sign(payload, public) C::sign(payload, public)
})?; })?;
let (call, extra, _) = raw_payload.deconstruct(); let (call, extra, _) = raw_payload.deconstruct();
Some((call, (account, signature, extra))) let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
Some((call, (address, signature, extra)))
} }
} }
polkadot/runtime/test-runtime/src/lib.rs
+1 -1
View File
@@ -528,7 +528,7 @@ construct_runtime! {
} }
/// The address format for describing accounts. /// The address format for describing accounts.
pub type Address = <Indices as StaticLookup>::Source; pub type Address = sp_runtime::MultiAddress<AccountId, AccountIndex>;
/// Block header type as expected by this runtime. /// Block header type as expected by this runtime.
pub type Header = generic::Header<BlockNumber, BlakeTwo256>; pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
/// Block type as expected by this runtime. /// Block type as expected by this runtime.
polkadot/runtime/westend/src/lib.rs
+6 -4
View File
@@ -41,7 +41,7 @@ use sp_runtime::{
ApplyExtrinsicResult, KeyTypeId, Perbill, curve::PiecewiseLinear, ApplyExtrinsicResult, KeyTypeId, Perbill, curve::PiecewiseLinear,
transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority}, transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority},
traits::{ traits::{
BlakeTwo256, Block as BlockT, OpaqueKeys, ConvertInto, IdentityLookup, BlakeTwo256, Block as BlockT, OpaqueKeys, ConvertInto, AccountIdLookup,
Extrinsic as ExtrinsicT, SaturatedConversion, Verify, Extrinsic as ExtrinsicT, SaturatedConversion, Verify,
}, },
}; };
@@ -129,7 +129,7 @@ impl frame_system::Config for Runtime {
type Hash = Hash; type Hash = Hash;
type Hashing = BlakeTwo256; type Hashing = BlakeTwo256;
type AccountId = AccountId; type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>; type Lookup = AccountIdLookup<AccountId, ()>;
type Header = generic::Header<BlockNumber, BlakeTwo256>; type Header = generic::Header<BlockNumber, BlakeTwo256>;
type Event = Event; type Event = Event;
type BlockHashCount = BlockHashCount; type BlockHashCount = BlockHashCount;
@@ -442,6 +442,7 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
account: AccountId, account: AccountId,
nonce: <Runtime as frame_system::Config>::Index, nonce: <Runtime as frame_system::Config>::Index,
) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> { ) -> Option<(Call, <UncheckedExtrinsic as ExtrinsicT>::SignaturePayload)> {
use sp_runtime::traits::StaticLookup;
// take the biggest period possible. // take the biggest period possible.
let period = BlockHashCount::get() let period = BlockHashCount::get()
.checked_next_power_of_two() .checked_next_power_of_two()
@@ -470,7 +471,8 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
C::sign(payload, public) C::sign(payload, public)
})?; })?;
let (call, extra, _) = raw_payload.deconstruct(); let (call, extra, _) = raw_payload.deconstruct();
Some((call, (account, signature, extra))) let address = <Runtime as frame_system::Config>::Lookup::unlookup(account);
Some((call, (address, signature, extra)))
} }
} }
@@ -724,7 +726,7 @@ construct_runtime! {
} }
/// The address format for describing accounts. /// The address format for describing accounts.
pub type Address = AccountId; pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
/// Block header type as expected by this runtime. /// Block header type as expected by this runtime.
pub type Header = generic::Header<BlockNumber, BlakeTwo256>; pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
/// Block type as expected by this runtime. /// Block type as expected by this runtime.