Skip to content
Snippets Groups Projects
Commit 8a1e5855 authored by Hugo Trentesaux's avatar Hugo Trentesaux
Browse files

fix after rebase

parent 7c151fe0
No related branches found
No related tags found
No related merge requests found
......@@ -688,7 +688,7 @@ fn genesis_data_to_gdev_genesis_conf(
let super::gen_genesis_data::GenesisData {
accounts,
certs_by_receiver,
first_ud_value,
first_ud,
first_ud_reeval,
identities,
initial_authorities,
......@@ -764,7 +764,7 @@ fn genesis_data_to_gdev_genesis_conf(
},
universal_dividend: UniversalDividendConfig {
first_reeval: first_ud_reeval,
first_ud_value,
first_ud,
initial_monetary_mass,
ud,
},
......
......@@ -144,7 +144,7 @@ where
.map_err(|e| format!("Error parsing gen conf file: {}", e))?;
let GenesisConfig {
sudo_key,
first_ud_value,
first_ud,
first_ud_reeval,
genesis_parameters:
ParamsAppliedAtGenesis {
......@@ -378,7 +378,7 @@ where
let genesis_data = GenesisData {
accounts,
certs_by_receiver,
first_ud_value,
first_ud,
first_ud_reeval,
identities: identities_,
initial_authorities,
......
......@@ -395,8 +395,9 @@ fn generate_genesis(
certs_by_receiver: clique_wot(initial_smiths_len),
},
universal_dividend: UniversalDividendConfig {
first_reeval: 600_000,
first_ud: 6_000,
// TODO FIXME
first_reeval: Some(600_000),
first_ud: Some(6_000),
initial_monetary_mass: 0,
ud,
},
......
......@@ -47,10 +47,12 @@ pub struct GenesisJson {
/// smith-related data
// (smith memberships, smith certifications, session keys of bootstrapper)
smiths: HashMap<String, Smith>,
/// value of first universal dividend
first_ud_value: u64,
/// block number of the first ud reeval
first_ud_reeval: u32,
/// time of the first ud reeval
first_ud_reeval: u64,
/// time of the first ud
first_ud: u64,
/// value of the first ud
ud: u64,
/// initial monetary mass (must match what is available on accounts)
initial_monetary_mass: u64,
/// amount on the accounts (must be above existential deposit)
......@@ -491,8 +493,9 @@ pub fn build_genesis(
memberships: smith_memberships,
},
universal_dividend: UniversalDividendConfig {
first_reeval: genesis_data.first_ud_reeval,
first_ud_value: genesis_data.first_ud_value,
first_reeval: Some(genesis_data.first_ud_reeval),
first_ud: Some(genesis_data.first_ud),
ud: genesis_data.ud,
initial_monetary_mass: genesis_data.initial_monetary_mass,
},
treasury: Default::default(),
......
{
"first_ud_value": 10000,
"first_ud_reeval": 100800,
"ud": 1000,
"first_ud": 6000,
"first_ud_reeval": 600000,
"genesis_parameters": {
"genesis_certs_expire_on": 2102400,
"genesis_certs_min_received": 3,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment