Companion for substrate#14188 (Add genesis config to Glutton pallet) (#2612)

* sudo + genesis for glutton

* ".git/.scripts/commands/fmt/fmt.sh"

* add AdminOrigin to glutton

* ".git/.scripts/commands/fmt/fmt.sh"

* update Cargo.lock

---------

Co-authored-by: command-bot <>
This commit is contained in:
Ignacio Palaciosandcommand-bot authored and GitHub committed 2023-05-23 16:55:28 +02:00
1 parent 80ca5eec92
commit e19df87f5f
6 files changed
+238 -238

No files matched your search

Generated
+203 -193
View File
File diff suppressed because it is too large. Load diff
@@ -1,35 +0,0 @@
{
"name": "Glutton 1300",
"id": "glutton_kusama_1300",
"chainType": "Live",
"bootNodes": [],
"telemetryEndpoints": null,
"protocolId": "glutton_kusama_1300",
"properties": {
"ss58Format": 2
},
"relay_chain": "kusama",
"para_id": 1300,
"codeSubstitutes": {},
"genesis": {
"raw": {
"top": {
"0x0d715f2646c8f85767b5d2764bb2782604a74d81251e398fd8a0a4d55023bb3f": "0x14050000",
"0x0d715f2646c8f85767b5d2764bb278264e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
"0x26aa394eea5630e07c48ae0c9558cef74e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
"0x26aa394eea5630e07c48ae0c9558cef75684a022a34dd8bfa2baaf44f172b710": "0x01",
"0x26aa394eea5630e07c48ae0c9558cef78a42f33323cb5ced3b44dd825fda9fcc": "0x4545454545454545454545454545454545454545454545454545454545454545",
"0x26aa394eea5630e07c48ae0c9558cef7a44704b568d21667356a5a050c118746b4def25cfda6ef3a00000000": "0x4545454545454545454545454545454545454545454545454545454545454545",
"0x26aa394eea5630e07c48ae0c9558cef7a7fd6c28836b9a28522dc924110cf439": "0x01",
"0x26aa394eea5630e07c48ae0c9558cef7f9cce9c888469bb1a0dceaa129672ef8": "0x041c676c7574746f6e",
"0x3a63": "0x",
"0x3a636f6465": "0x52bc537646db8e0528b52ffd0058b4cc04deb74577114e107877930e70565839d8f5c5fa791f7f0f5c593af01ed6cb7ac383ca0b0d8c5e36d281f7f762a3b9c9ec446be48a97b7d91b85fd0c036a24e77aab729d618f216e1c6d13b2b7245b6e29654a29059c127a108f103fedce21f4c8277e98923a2473bf33b2c9b973494a00509377ca01a9dca4c8a77676e7aa2e19f3718b1121f44edb57ac3320954f7ca926350099fbeb2549f9c4179f9e7328bf9a927d76f6d69c2be603b456bc3e6bade93f0d73d7d3340585cc2b9fd8f97ae4d3fe3a633e7bbd6241dcec19591372bb48907a33c598d6e1d326c4b7b7107c72def1bba70873c359347df34ed638eaf8f4c3eed8b4be4ec327f676e51d6d9c8633caa68b4debce954deb5b5cbfd69577b44753528479f5c5d8150bc2ee7c08bb9b8e35c55990ca525d6fb61d7ad68522d3540ad0f81d7a75c93baafd643fedfadb0efdf69a4a0199df5f5fac8885e2756e3be45c3526eed59d4684f4eaada902d99cd70c11bd9b40a457d7335ee7372df35b3bebab26dda5daa2205bdf572e80fa62400e947dcf129bd677889b20158767fe04bae5393afcc9c89d07c0dd9fe8e0ed4ac5fa931c3ee33fe898a81a3eb3c39fb85ffe249b281dde337ec39f90bc9ff044714fd47bce13c56eb5a37aa2dea4621df53c07cffcc98d89c281c3754cd40d9fd11cc78de370940ec77cc64bfe444e9474e7fcc23151d3ad1dbc873bcb7138ca398e898ad179a2a4b3a370f8e54f2adf315134345e63a2da45132572ed7294e6d744753beaf21ab7c1ecd844c5e872a27aa278b8746e674761ce13156d382a3a8ef3e028761e268a86c66f4cd40db72ccf61a26872f01bd60de7c15196f3305139883a0747896e2615261b1365c36fdcf01a1b376e4cdf414acf8187949714693770e8c89a2d27923afa5d37e28c1631f7706433ee6916374bebc615311d38743c6d268b5224ea8bad1b19c63a44188ecc72cfc9192ddee8780347bf1e3df0e566b4cb7dc878903d7ad8c071b50807c751ce7170443a744c37f17313d6430f8e92de430f9a65cdf8741c4c3a4e34991ca5b9a987e9cddc609fde038ecc7b701f1ca5c37dc0c171d4e5383ce0b80f8e12c51e3d2ecda79be20d37b91e3d7af4e028cb7b98a81e3db2761f78e08187a330e721f2e93839388f1d74f8e0388ec2e1382613009c878932f90e3c388ea3a4efe0289e376ec386c3e1d37bf0e0e13be49083d7388f1d9c87a332e7f1bc87fb70d48cfb581d1bf7c15133eec3def80e3eb80f47e9f01d1cf51cc7646333dd06c76d1ca5b9cd3aea721be7a1a6c677c861a2784c140fdfc16b72f01a47615eb38e8ace839b1cc56e5a00f47094e53d260a003d7c4e14003c871cdce4a8f6e92891fb98a81e7af09b89aa99a81ab761c36d266ac70eaf99281bb761c36b1c75c36b266a478def70d48d639367874985ce44d5a8e13c266ac744ed701e8e613e1d3527aac60e3e1d55c3afe984fbe028399f509c751f26aa8749c5e25ccec34449e9341345e3170f7e394a348fb8264a5e6e3351d23191638eb2716d1a71630ea138eba689ea71c301305173a2a6f3a0f9cd44eda083cf8992411a5800a5479b5478cf13cd791a471da54d948ea93eb571d47598de38ea38660e3c74b8cd44d5e4f01d13a56352e13d3a1ca563a26666569ab171d4734c6d9c1fe6667af56c961cd57309c559c73151372615dbf364c669262a731b930a9d9e27ed35266a66e4d944f5a4c27b9eb4678eca26ca9a3aa4596a1cf5d1d4c609c0dc7ebc3acf1fd8445d930a53cf13e872a244930aef79c26e39ca9aa8385d71d651d5cc1a471d4e6d9c9cb9e9bcfa9b26c55977d388e2acab0b75131cce29232bd7de79a26270d2062d655cc0061640e979e2057429628f17cfd5bd779e2814a6b0e2096e3003164fa0d063b9baa9779e08c5200a2bac808c2ab4a18b163dd1d5757ae7890e63ac21086258410a378ca147bafa8fde79a2571003041bac200663c868438fc8d563ef08810184316ce982031d38018c1ef5ac778418421865e8411a5210b3831ef552ef08dd800b38707183316990e10c3dea3cbda33dea526aaa38ed222d2a4ebbdc4b8a2a5fccc7b91469daa35811d93b6969aa38eb518b8ab38e730400bca6a498a2f39a7a12e6a56620d3d4932e9ff39a72c2e5e5bb2c4d1b873d6ab1717856fe301f764bd39eaa678b5f79d4b4c7614564cfde1891ec9d3346247bf6c588688a88a6fe554d9cd07287e1040b3b33333be9e299995948ea053276e7537bbb129fda6fa209c8ac7ff76fd76ff1dbdb1d9f6e1a25f566d34922d35414555e53510c3d015e53506879c57c8ac8b68c87b38c4fcfdbe5d3f45bdb971a806c1ff6f534e88bf93474c588107a28171bf21cceedf973c9d890ec9f2be6d8e45cbaabb57dd917d49e2fa66cda687e5d4ac5e0dc841e7a6b5b7cdead6deea1f3b06c6d5bc0b74bc5aab93df195b7b669eadb9fb6299b9e70620923477cfba66cda8cf8f6edb9b2691be2db79fa69fa9506d465ca9419f3cf5bdb8478e772afd69c3f4d5fb122aa871a50f56f6efb3d81b64c9932657e13fa76a74536ed05d739917a812e3090690a8a30dec4a7ed723e6da66767f7913114593cdf3cff66b3002cba688e3e0f5f7c5267d7d9224805c005324d0d6df9589af2ea199f343594e5d56d685e5d6f5475b27575b5a4543ee9be24393eb1abcb957ba9ce2c00064ed8a4dfcedbd919f3e1a93bb30018446193fe7a6b92175b57cc4d27dfa57cd2dfe2abcbbe58db676c7db1c8a676c586d05fe761cc879d87b70b529fd997790aed0e91ebab15916deed9e37a8cda3bca385bf6eb5bf68e4fecbb49f4f6723b0f6f7777af772fb3c7e7594384dd39ef90759e1b7bf3ae19526f36d71f32a901c8d4db15f3515f2cc81343434350bc4e65d3169f5df2e5f8c4a75536b1f3706b8e4dec3999f3129ff4333e299b36f7eaec347c6a672ff1697dda694c74f82542f1d7e3efac21b2ee7cddcda0fd9e8af9ecdcf6d76f78fef8eb0e42bddb04a9af375bf6ec32f269db4102235bdfaee71eb2f57675c58a58ffe9a96c52e761b95a3ff6e5995c23b9d76aee2f310f543d931a1893ebd7d9470a44c90e3d50029e09fc7576920251b2430f94805f67576c881b1afa751e967ca90259dfda1d9bd4239fb6fd7675d95a64933a4ed6aeae981065937acfc826751e967cadc67f2910259b7a26f0d7d93105a264871e2801bfcebe5811d9d0af5f7cd267576cc80efd3a0ff3300ff3b06aca2675bde1f993bdee20c4cb5a90ca520590adabab45ba820253ca20227541ca62f486511a233224138cd0189161c486511b468085017bc3c808a3314648180d615e303123178c88306ac18805a31f8cae18bd6034054b0336068c0c181a232c46658ca2c0cc8091198981b501830336064303b606ec0c58194657462bc0d8806101cb0276054c0b98184642c0ba807dc1b6300aLine truncated
"0x3a65787472696e7369635f696e646578": "0x00000000",
"0x45323df7cc47150b3930e2666b0aa3134e7b9012096b41c4eb3aaf947f6ea429": "0x0200",
"0x79e2fe5d327165001f8232643023ed8b4e7b9012096b41c4eb3aaf947f6ea429": "0x0000",
"0xc2eac8c3d5c3234dc0a1a2cbcf2683444e7b9012096b41c4eb3aaf947f6ea429": "0x0000"
},
"childrenDefault": {}
}
}
}
@@ -16,6 +16,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", default-featur
frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, default-features = false, branch = "master" }
frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "master" }
pallet-glutton = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "master" }
pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -59,6 +60,7 @@ std = [
"frame-support/std",
"frame-system/std",
"pallet-glutton/std",
"pallet-sudo/std",
"sp-api/std",
"sp-block-builder/std",
"sp-core/std",
@@ -82,4 +84,5 @@ try-runtime = [
"frame-executive/try-runtime",
"frame-try-runtime/try-runtime",
"pallet-glutton/try-runtime",
"pallet-sudo/try-runtime",
]
@@ -76,7 +76,10 @@ pub use frame_support::{
},
StorageValue,
};
use frame_system::limits::{BlockLength, BlockWeights};
use frame_system::{
limits::{BlockLength, BlockWeights},
EnsureRoot,
};
use parachains_common::{AccountId, Signature};
#[cfg(any(feature = "std", test))]
pub use sp_runtime::BuildStorage;
@@ -187,6 +190,13 @@ impl parachain_info::Config for Runtime {}
impl pallet_glutton::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = weights::pallet_glutton::WeightInfo<Runtime>;
type AdminOrigin = EnsureRoot<AccountId>;
}
impl pallet_sudo::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type RuntimeCall = RuntimeCall;
type WeightInfo = ();
}
construct_runtime! {
@@ -205,7 +215,10 @@ construct_runtime! {
CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 10,
// The main stage.
Glutton: pallet_glutton::{Pallet, Call, Storage, Event} = 20,
Glutton: pallet_glutton::{Pallet, Call, Storage, Event, Config} = 20,
// Sudo.
Sudo: pallet_sudo::{Pallet, Call, Storage, Event<T>, Config<T>} = 255,
}
}
+10 -1
View File
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
use crate::chain_spec::Extensions;
use crate::chain_spec::{get_account_id_from_seed, Extensions};
use cumulus_primitives_core::ParaId;
use sc_service::ChainType;
use sp_core::sr25519;
/// Specialized `ChainSpec` for the Glutton parachain runtime.
pub type GluttonChainSpec =
@@ -86,5 +87,13 @@ fn glutton_genesis(parachain_id: ParaId) -> glutton_runtime::GenesisConfig {
},
parachain_info: glutton_runtime::ParachainInfoConfig { parachain_id },
parachain_system: Default::default(),
glutton: glutton_runtime::GluttonConfig {
compute: Default::default(),
storage: Default::default(),
trash_data_count: Default::default(),
},
sudo: glutton_runtime::SudoConfig {
key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
},
}
}
+7 -7
View File
@@ -27,7 +27,7 @@ pub use pallet_balances::AccountData;
pub use paste;
pub use sp_arithmetic::traits::Bounded;
pub use sp_core::storage::Storage;
pub use sp_io::TestExternalities;
pub use sp_io;
pub use sp_std::{cell::RefCell, collections::vec_deque::VecDeque, marker::PhantomData};
pub use sp_trie::StorageProof;
@@ -296,12 +296,12 @@ macro_rules! __impl_test_ext_for_relay_chain {
// impl
(@impl $name:ident, $genesis:expr, $on_init:expr, $ext_name:ident) => {
thread_local! {
pub static $ext_name: $crate::RefCell<$crate::TestExternalities>
pub static $ext_name: $crate::RefCell<$crate::sp_io::TestExternalities>
= $crate::RefCell::new(<$name>::build_new_ext($genesis));
}
impl TestExt for $name {
fn build_new_ext(storage: $crate::Storage) -> $crate::TestExternalities {
fn build_new_ext(storage: $crate::Storage) -> $crate::sp_io::TestExternalities {
let mut ext = sp_io::TestExternalities::new(storage);
ext.execute_with(|| {
#[allow(clippy::no_effect)]
@@ -312,7 +312,7 @@ macro_rules! __impl_test_ext_for_relay_chain {
ext
}
fn new_ext() -> $crate::TestExternalities {
fn new_ext() -> $crate::sp_io::TestExternalities {
<$name>::build_new_ext($genesis)
}
@@ -523,12 +523,12 @@ macro_rules! __impl_test_ext_for_parachain {
// impl
(@impl $name:ident, $genesis:expr, $on_init:expr, $ext_name:ident) => {
thread_local! {
pub static $ext_name: $crate::RefCell<$crate::TestExternalities>
pub static $ext_name: $crate::RefCell<$crate::sp_io::TestExternalities>
= $crate::RefCell::new(<$name>::build_new_ext($genesis));
}
impl TestExt for $name {
fn build_new_ext(storage: $crate::Storage) -> $crate::TestExternalities {
fn build_new_ext(storage: $crate::Storage) -> $crate::sp_io::TestExternalities {
let mut ext = sp_io::TestExternalities::new(storage);
ext.execute_with(|| {
#[allow(clippy::no_effect)]
@@ -539,7 +539,7 @@ macro_rules! __impl_test_ext_for_parachain {
ext
}
fn new_ext() -> $crate::TestExternalities {
fn new_ext() -> $crate::sp_io::TestExternalities {
<$name>::build_new_ext($genesis)
}