Compare commits

..

No commits in common. "d5ffe99c55ed3892036af9c4f3f8677b1b86a169" and "d9db917f512d819dc2e435ad96acf657b8943846" have entirely different histories.

2 changed files with 14 additions and 3 deletions

View File

@ -28,6 +28,7 @@ use frame_support::{
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
use runtime_common::benchmarking::BenchmarkTreasuryHelper; use runtime_common::benchmarking::BenchmarkTreasuryHelper;
// #[cfg(not(feature = "runtime-benchmarks"))]
use frame_support::traits::tokens::pay::PayFromAccount; use frame_support::traits::tokens::pay::PayFromAccount;
use pallet_transaction_payment::FungibleAdapter; use pallet_transaction_payment::FungibleAdapter;

View File

@ -61,6 +61,19 @@ pub fn casper_config() -> Result<CasperChainSpec, String> {
CasperChainSpec::from_json_bytes(&include_bytes!("../chain-specs/casper.json")[..]) CasperChainSpec::from_json_bytes(&include_bytes!("../chain-specs/casper.json")[..])
} }
// #[derive(Encode, Clone)]
// struct PreparedNetworkData {
// chain_name: Vec<u8>,
// default_endpoint: Vec<u8>,
// finality_delay: Option<u64>,
// release_delay: Option<u64>,
// network_type: u8,
// gatekeeper: Vec<u8>,
// topic_name: Vec<u8>,
// incoming_fee: u32,
// outgoing_fee: u32,
// }
#[cfg(feature = "casper-native")] #[cfg(feature = "casper-native")]
fn casper_session_keys( fn casper_session_keys(
babe: BabeId, babe: BabeId,
@ -464,7 +477,6 @@ pub fn casper_development_config() -> Result<CasperChainSpec, String> {
.with_chain_type(ChainType::Development) .with_chain_type(ChainType::Development)
.with_genesis_config_patch(casper_development_config_genesis()) .with_genesis_config_patch(casper_development_config_genesis())
.with_protocol_id(DEFAULT_PROTOCOL_ID) .with_protocol_id(DEFAULT_PROTOCOL_ID)
.with_properties(casper_chain_spec_properties())
.build()) .build())
} }
@ -479,7 +491,6 @@ pub fn casper_local_testnet_config() -> Result<CasperChainSpec, String> {
.with_chain_type(ChainType::Local) .with_chain_type(ChainType::Local)
.with_genesis_config_patch(casper_local_config_genesis()) .with_genesis_config_patch(casper_local_config_genesis())
.with_protocol_id(DEFAULT_PROTOCOL_ID) .with_protocol_id(DEFAULT_PROTOCOL_ID)
.with_properties(casper_chain_spec_properties())
.build()) .build())
} }
@ -498,6 +509,5 @@ pub fn casper_staging_testnet_config() -> Result<CasperChainSpec, String> {
.expect("Casper Staging telemetry url is valid; qed"), .expect("Casper Staging telemetry url is valid; qed"),
) )
.with_protocol_id(DEFAULT_PROTOCOL_ID) .with_protocol_id(DEFAULT_PROTOCOL_ID)
.with_properties(casper_chain_spec_properties())
.build()) .build())
} }