mirror of
https://github.com/pezkuwichain/pezkuwi-runtime-templates.git
synced 2026-04-25 14:37:54 +00:00
merge changes/fixes from v2 back into main (#333)
* update version for antora * improving zombienet guide (#280) * update docs version to 2.0.1 (#315) * Change all references from rococo to paseo (#330) * remove rococo-native featire from cargo.toml and other doc changes * use evm compatible accounts, and fix properties for chain spec (#326) * doc changes * bump node and docs versions * impl_runtime_apis need to be in the same file with construct runtime for the moment * account type fix * zombienet script update * slot duration fix --------- Co-authored-by: Nikita Khateev <nikita.khateev@gmail.com> Co-authored-by: Özgün Özerk <ozgunozerk.elo@gmail.com> Co-authored-by: Gustavo Gonzalez <gustavo.gonzalez@openzeppelin.com> ---------
This commit is contained in:
Özgün Özerk
@@ -77,13 +77,14 @@ pub fn development_config(contracts_path: ContractsPath) -> ChainSpec {
|
||||
properties.insert("tokenSymbol".into(), "UNIT".into());
|
||||
properties.insert("tokenDecimals".into(), 12.into());
|
||||
properties.insert("ss58Format".into(), 42.into());
|
||||
properties.insert("isEthereum".into(), true.into());
|
||||
// This is very important for us, it lets us track the usage of our templates, and have no downside for the node/runtime. Please do not remove :)
|
||||
properties.insert("basedOn".into(), "OpenZeppelin EVM Template".into());
|
||||
|
||||
ChainSpec::builder(
|
||||
evm_runtime_template::WASM_BINARY.expect("WASM binary was not built, please build it!"),
|
||||
Extensions {
|
||||
relay_chain: "rococo-local".into(),
|
||||
relay_chain: "paseo-local".into(),
|
||||
// You MUST set this to the correct network!
|
||||
para_id: 1000,
|
||||
},
|
||||
@@ -101,25 +102,19 @@ pub fn development_config(contracts_path: ContractsPath) -> ChainSpec {
|
||||
(get_account_id_from_seed::<ecdsa::Public>("Bob"), get_collator_keys_from_seed("Bob")),
|
||||
],
|
||||
vec![
|
||||
get_account_id_from_seed::<ecdsa::Public>("Alice"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Bob"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Charlie"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Dave"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Eve"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Ferdie"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Alice//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Bob//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Charlie//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Dave//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Eve//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Ferdie//stash"),
|
||||
AccountId::from(hex!("33c7c88f2B2Fcb83975fCDB08d2B5bf7eA29FDCE")),
|
||||
AccountId::from(hex!("c02db867898f227416BCB6d97190126A6b04988A")),
|
||||
// Alith, Baltathar, Charleth and Dorothy, Ethan
|
||||
AccountId::from(hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac")),
|
||||
AccountId::from(hex!("3Cd0A705a2DC65e5b1E1205896BaA2be8A07c6e0")),
|
||||
AccountId::from(hex!("798d4Ba9baf0064Ec19eB4F0a1a45785ae9D6DFc")),
|
||||
AccountId::from(hex!("773539d4Ac0e786233D90A233654ccEE26a613D9")),
|
||||
AccountId::from(hex!("Ff64d3F6efE2317EE2807d223a0Bdc4c0c49dfDB")),
|
||||
],
|
||||
get_account_id_from_seed::<ecdsa::Public>("Alice"),
|
||||
// Alith
|
||||
AccountId::from(hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac")),
|
||||
1000.into(),
|
||||
contracts_path,
|
||||
))
|
||||
.with_properties(properties)
|
||||
.build()
|
||||
}
|
||||
|
||||
@@ -129,12 +124,13 @@ pub fn local_testnet_config(contracts_path: ContractsPath) -> ChainSpec {
|
||||
properties.insert("tokenSymbol".into(), "UNIT".into());
|
||||
properties.insert("tokenDecimals".into(), 12.into());
|
||||
properties.insert("ss58Format".into(), 42.into());
|
||||
properties.insert("isEthereum".into(), true.into());
|
||||
|
||||
#[allow(deprecated)]
|
||||
ChainSpec::builder(
|
||||
evm_runtime_template::WASM_BINARY.expect("WASM binary was not built, please build it!"),
|
||||
Extensions {
|
||||
relay_chain: "rococo-local".into(),
|
||||
relay_chain: "paseo-local".into(),
|
||||
// You MUST set this to the correct network!
|
||||
para_id: 1000,
|
||||
},
|
||||
@@ -152,20 +148,15 @@ pub fn local_testnet_config(contracts_path: ContractsPath) -> ChainSpec {
|
||||
(get_account_id_from_seed::<ecdsa::Public>("Bob"), get_collator_keys_from_seed("Bob")),
|
||||
],
|
||||
vec![
|
||||
get_account_id_from_seed::<ecdsa::Public>("Alice"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Bob"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Charlie"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Dave"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Eve"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Ferdie"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Alice//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Bob//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Charlie//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Dave//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Eve//stash"),
|
||||
get_account_id_from_seed::<ecdsa::Public>("Ferdie//stash"),
|
||||
// Alith, Baltathar, Charleth and Dorothy, Ethan
|
||||
AccountId::from(hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac")),
|
||||
AccountId::from(hex!("3Cd0A705a2DC65e5b1E1205896BaA2be8A07c6e0")),
|
||||
AccountId::from(hex!("798d4Ba9baf0064Ec19eB4F0a1a45785ae9D6DFc")),
|
||||
AccountId::from(hex!("773539d4Ac0e786233D90A233654ccEE26a613D9")),
|
||||
AccountId::from(hex!("Ff64d3F6efE2317EE2807d223a0Bdc4c0c49dfDB")),
|
||||
],
|
||||
get_account_id_from_seed::<ecdsa::Public>("Alice"),
|
||||
// Alith
|
||||
AccountId::from(hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac")),
|
||||
1000.into(),
|
||||
contracts_path,
|
||||
))
|
||||
|
||||
@@ -96,12 +96,12 @@ const AFTER_HELP_EXAMPLE: &str = color_print::cstr!(
|
||||
r#"<bold><underline>Examples:</></>
|
||||
<bold>parachain-template-node build-spec --disable-default-bootnode > plain-parachain-chainspec.json</>
|
||||
Export a chainspec for a local testnet in json format.
|
||||
<bold>parachain-template-node --chain plain-parachain-chainspec.json --tmp -- --chain rococo-local</>
|
||||
<bold>parachain-template-node --chain plain-parachain-chainspec.json --tmp -- --chain paseo-local</>
|
||||
Launch a full node with chain specification loaded from plain-parachain-chainspec.json.
|
||||
<bold>parachain-template-node</>
|
||||
Launch a full node with default parachain <italic>local-testnet</> and relay chain <italic>rococo-local</>.
|
||||
Launch a full node with default parachain <italic>local-testnet</> and relay chain <italic>paseo-local</>.
|
||||
<bold>parachain-template-node --collator</>
|
||||
Launch a collator with default parachain <italic>local-testnet</> and relay chain <italic>rococo-local</>.
|
||||
Launch a collator with default parachain <italic>local-testnet</> and relay chain <italic>paseo-local</>.
|
||||
"#
|
||||
);
|
||||
#[derive(Debug, clap::Parser)]
|
||||
|
||||
@@ -25,7 +25,7 @@ fn load_spec(
|
||||
) -> std::result::Result<Box<dyn ChainSpec>, String> {
|
||||
Ok(match id {
|
||||
"dev" => Box::new(chain_spec::development_config(contracts_path)),
|
||||
"template-rococo" => Box::new(chain_spec::local_testnet_config(contracts_path)),
|
||||
"template-paseo" => Box::new(chain_spec::local_testnet_config(contracts_path)),
|
||||
"" | "local" => Box::new(chain_spec::local_testnet_config(contracts_path)),
|
||||
path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
|
||||
})
|
||||
|
||||
@@ -19,9 +19,9 @@ use cumulus_primitives_core::{relay_chain::CollatorPair, ParaId};
|
||||
use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
|
||||
// Local Runtime Types
|
||||
use evm_runtime_template::{
|
||||
apis::RuntimeApi,
|
||||
configs::TransactionConverter,
|
||||
opaque::{Block, Hash},
|
||||
RuntimeApi,
|
||||
};
|
||||
// Substrate Imports
|
||||
use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
|
||||
|
||||
Reference in New Issue
Block a user