Skip to content
Snippets Groups Projects
Commit 783c7a1b authored by Cédric Moreau's avatar Cédric Moreau
Browse files

fix(#150): show more parameters on genesis

parent 97dee2f6
No related branches found
No related tags found
1 merge request!209Resolve "Show more parameters in Genesis job"
Pipeline #34647 passed
...@@ -2026,6 +2026,7 @@ dependencies = [ ...@@ -2026,6 +2026,7 @@ dependencies = [
"pallet-transaction-payment", "pallet-transaction-payment",
"pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc",
"pallet-transaction-payment-rpc-runtime-api", "pallet-transaction-payment-rpc-runtime-api",
"pallet-treasury",
"rusty-hook", "rusty-hook",
"sc-basic-authorship", "sc-basic-authorship",
"sc-chain-spec", "sc-chain-spec",
......
...@@ -95,6 +95,7 @@ pallet-im-online = { git = "https://github.com/duniter/substrate", branch = "dun ...@@ -95,6 +95,7 @@ pallet-im-online = { git = "https://github.com/duniter/substrate", branch = "dun
pallet-transaction-payment = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } pallet-transaction-payment = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
pallet-transaction-payment-rpc = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } pallet-transaction-payment-rpc = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
pallet-treasury = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
sc-basic-authorship = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } sc-basic-authorship = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
sc-chain-spec = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } sc-chain-spec = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
......
...@@ -22,17 +22,18 @@ use common_runtime::constants::*; ...@@ -22,17 +22,18 @@ use common_runtime::constants::*;
use common_runtime::entities::IdtyData; use common_runtime::entities::IdtyData;
use common_runtime::*; use common_runtime::*;
use gdev_runtime::{ use gdev_runtime::{
opaque::SessionKeys, parameters, AccountConfig, AuthorityMembersConfig, BabeConfig, opaque::SessionKeys, pallet_universal_dividend, parameters, AccountConfig,
BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, MembershipConfig, ParametersConfig, AuthorityMembersConfig, BabeConfig, BalancesConfig, CertConfig, GenesisConfig, IdentityConfig,
QuotaConfig, SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig, SystemConfig, MembershipConfig, ParametersConfig, QuotaConfig, Runtime, SessionConfig, SmithCertConfig,
TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY, SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
UniversalDividendConfig, WASM_BINARY,
}; };
use jsonrpsee::core::JsonValue; use jsonrpsee::core::JsonValue;
use sc_network::config::MultiaddrWithPeerId; use sc_network::config::MultiaddrWithPeerId;
use sc_service::ChainType; use sc_service::ChainType;
use sc_telemetry::TelemetryEndpoints; use sc_telemetry::TelemetryEndpoints;
use serde::Deserialize; use serde::Deserialize;
use sp_core::sr25519; use sp_core::{sr25519, Get};
use sp_runtime::Perbill; use sp_runtime::Perbill;
use std::{env, fs}; use std::{env, fs};
...@@ -65,20 +66,47 @@ fn get_parameters(parameters_from_file: &Option<GenesisParameters>) -> CommonPar ...@@ -65,20 +66,47 @@ fn get_parameters(parameters_from_file: &Option<GenesisParameters>) -> CommonPar
CommonParameters { CommonParameters {
currency_name: TOKEN_SYMBOL.to_string(), currency_name: TOKEN_SYMBOL.to_string(),
decimals: TOKEN_DECIMALS, decimals: TOKEN_DECIMALS,
existential_deposit: EXISTENTIAL_DEPOSIT, babe_epoch_duration: parameters_from_file.babe_epoch_duration,
membership_period: parameters_from_file.membership_period, babe_expected_block_time: parameters::ExpectedBlockTime::get(),
cert_period: parameters_from_file.cert_period, babe_max_authorities: parameters::MaxAuthorities::get(),
smith_membership_period: parameters_from_file.smith_membership_period, timestamp_minimum_period: parameters::MinimumPeriod::get(),
smith_certs_validity_period: parameters_from_file.smith_cert_validity_period, balances_existential_deposit: EXISTENTIAL_DEPOSIT,
min_cert: parameters_from_file.wot_min_cert_for_membership, authority_members_max_authorities: parameters::MaxAuthorities::get(),
smith_min_cert: parameters_from_file.smith_wot_min_cert_for_membership, grandpa_max_authorities: parameters::MaxAuthorities::get(),
universal_dividend_max_past_reevals:
<Runtime as pallet_universal_dividend::Config>::MaxPastReeval::get(),
universal_dividend_square_money_growth_rate: parameters::SquareMoneyGrowthRate::get(),
universal_dividend_ud_creation_period: parameters_from_file.ud_creation_period,
universal_dividend_ud_reeval_period: parameters_from_file.ud_reeval_period,
universal_dividend_units_per_ud:
<Runtime as pallet_universal_dividend::Config>::UnitsPerUd::get(),
wot_first_issuable_on: parameters_from_file.wot_first_cert_issuable_on,
wot_min_cert_for_membership: parameters_from_file.wot_min_cert_for_membership,
wot_min_cert_for_create_idty_right: parameters_from_file.wot_min_cert_for_create_idty_right,
identity_confirm_period: parameters_from_file.idty_confirm_period,
identity_change_owner_key_period: parameters::ChangeOwnerKeyPeriod::get(),
identity_idty_creation_period: parameters_from_file.idty_creation_period,
membership_membership_period: parameters_from_file.membership_period,
membership_pending_membership_period: parameters_from_file.pending_membership_period,
cert_max_by_issuer: parameters_from_file.cert_max_by_issuer, cert_max_by_issuer: parameters_from_file.cert_max_by_issuer,
cert_min_received_cert_to_be_able_to_issue_cert: parameters_from_file
.cert_min_received_cert_to_issue_cert,
cert_validity_period: parameters_from_file.cert_validity_period, cert_validity_period: parameters_from_file.cert_validity_period,
c2: parameters::SquareMoneyGrowthRate::get(), distance_min_accessible_referees: Perbill::from_percent(80), // TODO: generalize
ud_creation_period: parameters_from_file.ud_creation_period, distance_max_depth: 5, // TODO: generalize
distance_min_accessible_referees: Perbill::from_percent(80), smith_sub_wot_first_issuable_on: parameters_from_file.smith_wot_first_cert_issuable_on,
max_depth: 5, // TODO: generalize smith_sub_wot_min_cert_for_membership: parameters_from_file
ud_reeval_period: parameters_from_file.ud_reeval_period, .smith_wot_min_cert_for_membership,
smith_membership_membership_period: parameters_from_file.smith_membership_period,
smith_membership_pending_membership_period: parameters_from_file
.smith_pending_membership_period,
smith_cert_cert_period: parameters_from_file.smith_cert_period,
smith_cert_max_by_issuer: parameters_from_file.smith_cert_max_by_issuer,
smith_cert_min_received_cert_to_be_able_to_issue_cert: parameters_from_file
.smith_cert_min_received_cert_to_issue_cert,
smith_cert_validity_period: parameters_from_file.smith_cert_validity_period,
cert_cert_period: parameters_from_file.cert_period,
treasury_spend_period: <Runtime as pallet_treasury::Config>::SpendPeriod::get(),
} }
} }
......
This diff is collapsed.
...@@ -19,11 +19,13 @@ use crate::chain_spec::gen_genesis_data::{CommonParameters, GenesisIdentity, Ses ...@@ -19,11 +19,13 @@ use crate::chain_spec::gen_genesis_data::{CommonParameters, GenesisIdentity, Ses
use common_runtime::constants::*; use common_runtime::constants::*;
use common_runtime::entities::IdtyData; use common_runtime::entities::IdtyData;
use common_runtime::*; use common_runtime::*;
use frame_benchmarking::frame_support::traits::Get;
use gtest_runtime::{ use gtest_runtime::{
opaque::SessionKeys, parameters, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, opaque::SessionKeys, pallet_universal_dividend, parameters, AccountConfig, AccountId,
BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, AuthorityMembersConfig, BabeConfig, BalancesConfig, CertConfig, GenesisConfig, IdentityConfig,
Perbill, QuotaConfig, SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig, ImOnlineId, MembershipConfig, Perbill, QuotaConfig, Runtime, SessionConfig, SmithCertConfig,
SystemConfig, TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY, SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
UniversalDividendConfig, WASM_BINARY,
}; };
use jsonrpsee::core::JsonValue; use jsonrpsee::core::JsonValue;
use sc_consensus_grandpa::AuthorityId as GrandpaId; use sc_consensus_grandpa::AuthorityId as GrandpaId;
...@@ -68,20 +70,45 @@ fn get_parameters(_: &Option<GenesisParameters>) -> CommonParameters { ...@@ -68,20 +70,45 @@ fn get_parameters(_: &Option<GenesisParameters>) -> CommonParameters {
CommonParameters { CommonParameters {
currency_name: TOKEN_SYMBOL.to_string(), currency_name: TOKEN_SYMBOL.to_string(),
decimals: TOKEN_DECIMALS, decimals: TOKEN_DECIMALS,
existential_deposit: parameters::ExistentialDeposit::get(), babe_epoch_duration: parameters::EpochDuration::get(),
membership_period: parameters::MembershipPeriod::get(), babe_expected_block_time: parameters::ExpectedBlockTime::get(),
cert_period: parameters::CertPeriod::get(), babe_max_authorities: parameters::MaxAuthorities::get(),
smith_membership_period: parameters::SmithMembershipPeriod::get(), timestamp_minimum_period: parameters::MinimumPeriod::get(),
smith_certs_validity_period: parameters::SmithValidityPeriod::get(), balances_existential_deposit: parameters::ExistentialDeposit::get(),
min_cert: parameters::WotMinCertForMembership::get(), authority_members_max_authorities: parameters::MaxAuthorities::get(),
smith_min_cert: parameters::SmithWotMinCertForMembership::get(), grandpa_max_authorities: parameters::MaxAuthorities::get(),
universal_dividend_max_past_reevals:
<Runtime as pallet_universal_dividend::Config>::MaxPastReeval::get(),
universal_dividend_square_money_growth_rate: parameters::SquareMoneyGrowthRate::get(),
universal_dividend_ud_creation_period: parameters::UdCreationPeriod::get() as u64,
universal_dividend_ud_reeval_period: parameters::UdReevalPeriod::get() as u64,
universal_dividend_units_per_ud:
<Runtime as pallet_universal_dividend::Config>::UnitsPerUd::get(),
wot_first_issuable_on: parameters::WotFirstCertIssuableOn::get(),
wot_min_cert_for_membership: parameters::WotMinCertForMembership::get(),
wot_min_cert_for_create_idty_right: parameters::WotMinCertForCreateIdtyRight::get(),
identity_confirm_period: parameters::ConfirmPeriod::get(),
identity_change_owner_key_period: parameters::ChangeOwnerKeyPeriod::get(),
identity_idty_creation_period: parameters::IdtyCreationPeriod::get(),
membership_membership_period: parameters::MembershipPeriod::get(),
membership_pending_membership_period: parameters::PendingMembershipPeriod::get(),
cert_max_by_issuer: parameters::MaxByIssuer::get(), cert_max_by_issuer: parameters::MaxByIssuer::get(),
cert_min_received_cert_to_be_able_to_issue_cert:
parameters::MinReceivedCertToBeAbleToIssueCert::get(),
cert_validity_period: parameters::ValidityPeriod::get(), cert_validity_period: parameters::ValidityPeriod::get(),
c2: parameters::SquareMoneyGrowthRate::get(), distance_min_accessible_referees: Perbill::from_percent(80), // TODO: generalize
ud_creation_period: parameters::UdCreationPeriod::get() as u64, // TODO: cast? distance_max_depth: 5, // TODO: generalize
distance_min_accessible_referees: Perbill::from_percent(80), // TODO: generalize smith_sub_wot_first_issuable_on: parameters::SmithWotFirstCertIssuableOn::get(),
max_depth: 5, // TODO: generalize value smith_sub_wot_min_cert_for_membership: parameters::SmithWotMinCertForMembership::get(),
ud_reeval_period: parameters::UdReevalPeriod::get() as u64, // TODO: cast? smith_membership_membership_period: parameters::SmithMembershipPeriod::get(),
smith_membership_pending_membership_period: parameters::SmithPendingMembershipPeriod::get(),
smith_cert_cert_period: parameters::SmithCertPeriod::get(),
smith_cert_max_by_issuer: parameters::SmithMaxByIssuer::get(),
smith_cert_min_received_cert_to_be_able_to_issue_cert:
parameters::SmithMinReceivedCertToBeAbleToIssueCert::get(),
smith_cert_validity_period: parameters::SmithValidityPeriod::get(),
cert_cert_period: parameters::CertPeriod::get(),
treasury_spend_period: <Runtime as pallet_treasury::Config>::SpendPeriod::get(),
} }
} }
......
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment