pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 13:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FRAME: Create TransactionExtension as a replacement for SignedExtension (#2280)" (#3665)

Browse Source 
This PR reverts #2280 which introduced `TransactionExtension` to replace
`SignedExtension`.

As a result of the discussion
[here](https://github.com/paritytech/polkadot-sdk/pull/3623#issuecomment-1986789700),
the changes will be reverted for now with plans to reintroduce the
concept in the future.

---------

Signed-off-by: georgepisaltu <george.pisaltu@parity.io>
This commit is contained in:
georgepisaltu
2024-03-13 16:10:59 +02:00
committed by GitHub
parent 60ac5a723c
commit bbd51ce867
350 changed files with 15826 additions and 24304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/bin/node/testing/src/bench.rs
+8 -18
View File
@@ -51,7 +51,6 @@ use sp_core::{ed25519, sr25519, traits::SpawnNamed, Pair, Public};
use sp_crypto_hashing::blake2_256;
use sp_inherents::InherentData;
use sp_runtime::{
generic::{ExtrinsicFormat, Preamble},
traits::{Block as BlockT, IdentifyAccount, Verify},
OpaqueExtrinsic,
};
@@ -296,10 +295,10 @@ impl<'a> Iterator for BlockContentIterator<'a> {
let signed = self.keyring.sign(
CheckedExtrinsic {
format: ExtrinsicFormat::Signed(
signed: Some((
sender,
tx_ext(0, kitchensink_runtime::ExistentialDeposit::get() + 1),
),
signed_extra(0, kitchensink_runtime::ExistentialDeposit::get() + 1),
)),
function: match self.content.block_type {
BlockType::RandomTransfersKeepAlive =>
RuntimeCall::Balances(BalancesCall::transfer_keep_alive {
@@ -563,11 +562,11 @@ impl BenchKeyring {
tx_version: u32,
genesis_hash: [u8; 32],
) -> UncheckedExtrinsic {
match xt.format {
ExtrinsicFormat::Signed(signed, tx_ext) => {
match xt.signed {
Some((signed, extra)) => {
let payload = (
xt.function,
tx_ext.clone(),
extra.clone(),
spec_version,
tx_version,
genesis_hash,
@@ -582,20 +581,11 @@ impl BenchKeyring {
}
});
UncheckedExtrinsic {
preamble: Preamble::Signed(
sp_runtime::MultiAddress::Id(signed),
signature,
tx_ext,
),
signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
function: payload.0,
}
},
ExtrinsicFormat::Bare =>
UncheckedExtrinsic { preamble: Preamble::Bare, function: xt.function },
ExtrinsicFormat::General(tx_ext) => UncheckedExtrinsic {
preamble: sp_runtime::generic::Preamble::General(tx_ext),
function: xt.function,
},
None => UncheckedExtrinsic { signature: None, function: xt.function },
}
}
substrate/bin/node/testing/src/keyring.rs
+15 -29
View File
@@ -19,13 +19,13 @@
//! Test accounts.
use codec::Encode;
use kitchensink_runtime::{CheckedExtrinsic, SessionKeys, TxExtension, UncheckedExtrinsic};
use kitchensink_runtime::{CheckedExtrinsic, SessionKeys, SignedExtra, UncheckedExtrinsic};
use node_cli::chain_spec::get_from_seed;
use node_primitives::{AccountId, Balance, Nonce};
use sp_core::{ecdsa, ed25519, sr25519};
use sp_crypto_hashing::blake2_256;
use sp_keyring::AccountKeyring;
use sp_runtime::generic::{Era, ExtrinsicFormat};
use sp_runtime::generic::Era;
/// Alice's account id.
pub fn alice() -> AccountId {
@@ -70,18 +70,15 @@ pub fn session_keys_from_seed(seed: &str) -> SessionKeys {
}
/// Returns transaction extra.
pub fn tx_ext(nonce: Nonce, extra_fee: Balance) -> TxExtension {
pub fn signed_extra(nonce: Nonce, extra_fee: Balance) -> SignedExtra {
(
(
frame_system::CheckNonZeroSender::new(),
frame_system::CheckSpecVersion::new(),
frame_system::CheckTxVersion::new(),
frame_system::CheckGenesis::new(),
frame_system::CheckEra::from(Era::mortal(256, 0)),
frame_system::CheckNonce::from(nonce),
frame_system::CheckWeight::new(),
)
.into(),
frame_system::CheckNonZeroSender::new(),
frame_system::CheckSpecVersion::new(),
frame_system::CheckTxVersion::new(),
frame_system::CheckGenesis::new(),
frame_system::CheckEra::from(Era::mortal(256, 0)),
frame_system::CheckNonce::from(nonce),
frame_system::CheckWeight::new(),
pallet_skip_feeless_payment::SkipCheckIfFeeless::from(
pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::from(extra_fee, None),
),
@@ -95,10 +92,10 @@ pub fn sign(
tx_version: u32,
genesis_hash: [u8; 32],
) -> UncheckedExtrinsic {
match xt.format {
ExtrinsicFormat::Signed(signed, tx_ext) => {
match xt.signed {
Some((signed, extra)) => {
let payload =
(xt.function, tx_ext.clone(), spec_version, tx_version, genesis_hash, genesis_hash);
(xt.function, extra.clone(), spec_version, tx_version, genesis_hash, genesis_hash);
let key = AccountKeyring::from_account_id(&signed).unwrap();
let signature =
payload
@@ -111,21 +108,10 @@ pub fn sign(
})
.into();
UncheckedExtrinsic {
preamble: sp_runtime::generic::Preamble::Signed(
sp_runtime::MultiAddress::Id(signed),
signature,
tx_ext,
),
signature: Some((sp_runtime::MultiAddress::Id(signed), signature, extra)),
function: payload.0,
}
},
ExtrinsicFormat::Bare => UncheckedExtrinsic {
preamble: sp_runtime::generic::Preamble::Bare,
function: xt.function,
},
ExtrinsicFormat::General(tx_ext) => UncheckedExtrinsic {
preamble: sp_runtime::generic::Preamble::General(tx_ext),
function: xt.function,
},
None => UncheckedExtrinsic { signature: None, function: xt.function },
}
}