Skip to content

Commit 5a8eaa7

Browse files
Remove Meta Tx from Westend RC (#11668)
Removal of the Meta Transaction from the Westend Relay Chain. With this removal, pallet Verify Signature is removed as well. --------- Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 89ad96e commit 5a8eaa7

File tree

8 files changed

+15
-240
lines changed

8 files changed

+15
-240
lines changed

Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 66 deletions
Large diffs are not rendered by default.

polkadot/runtime/westend/Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ pallet-grandpa = { workspace = true }
6868
pallet-identity = { workspace = true }
6969
pallet-indices = { workspace = true }
7070
pallet-message-queue = { workspace = true }
71-
pallet-meta-tx = { workspace = true }
7271
pallet-migrations = { workspace = true }
7372
pallet-mmr = { workspace = true }
7473
pallet-multisig = { workspace = true }
@@ -94,7 +93,6 @@ pallet-transaction-payment = { workspace = true }
9493
pallet-transaction-payment-rpc-runtime-api = { workspace = true }
9594
pallet-treasury = { workspace = true }
9695
pallet-utility = { workspace = true }
97-
pallet-verify-signature = { workspace = true }
9896
pallet-vesting = { workspace = true }
9997
pallet-whitelist = { workspace = true }
10098
pallet-xcm = { workspace = true }
@@ -166,7 +164,6 @@ std = [
166164
"pallet-identity/std",
167165
"pallet-indices/std",
168166
"pallet-message-queue/std",
169-
"pallet-meta-tx/std",
170167
"pallet-migrations/std",
171168
"pallet-mmr/std",
172169
"pallet-multisig/std",
@@ -195,7 +192,6 @@ std = [
195192
"pallet-transaction-payment/std",
196193
"pallet-treasury/std",
197194
"pallet-utility/std",
198-
"pallet-verify-signature/std",
199195
"pallet-vesting/std",
200196
"pallet-whitelist/std",
201197
"pallet-xcm-benchmarks?/std",
@@ -257,7 +253,6 @@ runtime-benchmarks = [
257253
"pallet-identity/runtime-benchmarks",
258254
"pallet-indices/runtime-benchmarks",
259255
"pallet-message-queue/runtime-benchmarks",
260-
"pallet-meta-tx/runtime-benchmarks",
261256
"pallet-migrations/runtime-benchmarks",
262257
"pallet-mmr/runtime-benchmarks",
263258
"pallet-multisig/runtime-benchmarks",
@@ -282,7 +277,6 @@ runtime-benchmarks = [
282277
"pallet-transaction-payment/runtime-benchmarks",
283278
"pallet-treasury/runtime-benchmarks",
284279
"pallet-utility/runtime-benchmarks",
285-
"pallet-verify-signature/runtime-benchmarks",
286280
"pallet-vesting/runtime-benchmarks",
287281
"pallet-whitelist/runtime-benchmarks",
288282
"pallet-xcm-benchmarks/runtime-benchmarks",
@@ -323,7 +317,6 @@ try-runtime = [
323317
"pallet-identity/try-runtime",
324318
"pallet-indices/try-runtime",
325319
"pallet-message-queue/try-runtime",
326-
"pallet-meta-tx/try-runtime",
327320
"pallet-migrations/try-runtime",
328321
"pallet-mmr/try-runtime",
329322
"pallet-multisig/try-runtime",
@@ -346,7 +339,6 @@ try-runtime = [
346339
"pallet-transaction-payment/try-runtime",
347340
"pallet-treasury/try-runtime",
348341
"pallet-utility/try-runtime",
349-
"pallet-verify-signature/try-runtime",
350342
"pallet-vesting/try-runtime",
351343
"pallet-whitelist/try-runtime",
352344
"pallet-xcm/try-runtime",

polkadot/runtime/westend/src/lib.rs

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ use sp_runtime::{
107107
Keccak256, OpaqueKeys, SaturatedConversion, Verify,
108108
},
109109
transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
110-
ApplyExtrinsicResult, FixedU128, KeyTypeId, MultiSignature, MultiSigner, Percent,
110+
ApplyExtrinsicResult, FixedU128, KeyTypeId, Percent,
111111
};
112112
use sp_staking::{EraIndex, SessionIndex};
113113
#[cfg(any(feature = "std", test))]
@@ -1803,35 +1803,6 @@ impl OnSwap for SwapLeases {
18031803
}
18041804
}
18051805

1806-
pub type MetaTxExtension = (
1807-
pallet_verify_signature::VerifySignature<Runtime>,
1808-
pallet_meta_tx::MetaTxMarker<Runtime>,
1809-
frame_system::CheckNonZeroSender<Runtime>,
1810-
frame_system::CheckSpecVersion<Runtime>,
1811-
frame_system::CheckTxVersion<Runtime>,
1812-
frame_system::CheckGenesis<Runtime>,
1813-
frame_system::CheckMortality<Runtime>,
1814-
frame_system::CheckNonce<Runtime>,
1815-
frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
1816-
);
1817-
1818-
impl pallet_meta_tx::Config for Runtime {
1819-
type WeightInfo = weights::pallet_meta_tx::WeightInfo<Runtime>;
1820-
type RuntimeEvent = RuntimeEvent;
1821-
#[cfg(not(feature = "runtime-benchmarks"))]
1822-
type Extension = MetaTxExtension;
1823-
#[cfg(feature = "runtime-benchmarks")]
1824-
type Extension = pallet_meta_tx::WeightlessExtension<Runtime>;
1825-
}
1826-
1827-
impl pallet_verify_signature::Config for Runtime {
1828-
type Signature = MultiSignature;
1829-
type AccountIdentifier = MultiSigner;
1830-
type WeightInfo = weights::pallet_verify_signature::WeightInfo<Runtime>;
1831-
#[cfg(feature = "runtime-benchmarks")]
1832-
type BenchmarkHelper = ();
1833-
}
1834-
18351806
#[frame_support::runtime(legacy_ordering)]
18361807
mod runtime {
18371808
#[runtime::runtime]
@@ -2030,12 +2001,6 @@ mod runtime {
20302001
#[runtime::pallet_index(102)]
20312002
pub type RootTesting = pallet_root_testing;
20322003

2033-
#[runtime::pallet_index(103)]
2034-
pub type MetaTx = pallet_meta_tx::Pallet<Runtime>;
2035-
2036-
#[runtime::pallet_index(104)]
2037-
pub type VerifySignature = pallet_verify_signature::Pallet<Runtime>;
2038-
20392004
// Root offences pallet
20402005
#[runtime::pallet_index(105)]
20412006
pub type RootOffences = pallet_root_offences;
@@ -2192,8 +2157,6 @@ mod benches {
21922157
[pallet_vesting, Vesting]
21932158
[pallet_whitelist, Whitelist]
21942159
[pallet_asset_rate, AssetRate]
2195-
[pallet_meta_tx, MetaTx]
2196-
[pallet_verify_signature, VerifySignature]
21972160
// XCM
21982161
[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
21992162
// NOTE: Make sure you point to the individual modules below.

polkadot/runtime/westend/src/weights/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ pub mod pallet_fast_unstake;
2828
pub mod pallet_identity;
2929
pub mod pallet_indices;
3030
pub mod pallet_message_queue;
31-
pub mod pallet_meta_tx;
3231
pub mod pallet_migrations;
3332
pub mod pallet_mmr;
3433
pub mod pallet_multisig;
@@ -45,7 +44,6 @@ pub mod pallet_timestamp;
4544
pub mod pallet_transaction_payment;
4645
pub mod pallet_treasury;
4746
pub mod pallet_utility;
48-
pub mod pallet_verify_signature;
4947
pub mod pallet_vesting;
5048
pub mod pallet_whitelist;
5149
pub mod pallet_xcm;

polkadot/runtime/westend/src/weights/pallet_meta_tx.rs

Lines changed: 0 additions & 65 deletions
This file was deleted.

polkadot/runtime/westend/src/weights/pallet_verify_signature.rs

Lines changed: 0 additions & 59 deletions
This file was deleted.

prdoc/pr_11668.prdoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
title: Remove Meta Tx from Westend RC
2+
doc:
3+
- audience: Runtime User
4+
description: |-
5+
Removal of the Meta Transaction from the Westend Relay Chain.
6+
With this removal, pallet Verify Signature is removed as well.
7+
crates:
8+
- name: westend-runtime
9+
bump: major

0 commit comments

Comments
 (0)