diff --git a/end2end-tests/cucumber-genesis/default.json b/end2end-tests/cucumber-genesis/default.json index 7e1c8ffda3e8c11ccd06de484ccc982bf41f49a7..fab39aad614d7f3f631cae19d24dfd757cc567d0 100644 --- a/end2end-tests/cucumber-genesis/default.json +++ b/end2end-tests/cucumber-genesis/default.json @@ -81,5 +81,9 @@ ], "treasury_funder_pubkey": "FHNpKmJrUtusuvKPGomAygQqeiks98bdV6yD61Stb6vg", "ud": 1000, - "initial_monetary_mass": 3000 + "initial_monetary_mass": 3000, + "current_block": { + "number": 0, + "medianTime": 1700000000 + } } \ No newline at end of file diff --git a/end2end-tests/cucumber-genesis/wot.json b/end2end-tests/cucumber-genesis/wot.json index 948b34aaa99e7ac2a747efa31b1ec68ba0af55aa..4c7183b2a37cd3b82fd4c95ba360cf0025c91ae8 100644 --- a/end2end-tests/cucumber-genesis/wot.json +++ b/end2end-tests/cucumber-genesis/wot.json @@ -90,5 +90,9 @@ ], "treasury_funder_pubkey": "FHNpKmJrUtusuvKPGomAygQqeiks98bdV6yD61Stb6vg", "ud": 1000, - "initial_monetary_mass": 4000 + "initial_monetary_mass": 4000, + "current_block": { + "number": 0, + "medianTime": 1700000000 + } } \ No newline at end of file diff --git a/node/src/chain_spec/gen_genesis_data.rs b/node/src/chain_spec/gen_genesis_data.rs index 7fd06a7769c3d7d20993426344a42aaf3688f260..85499d9f2e739571ef6c93e2a90daaf0357f472c 100644 --- a/node/src/chain_spec/gen_genesis_data.rs +++ b/node/src/chain_spec/gen_genesis_data.rs @@ -1729,8 +1729,13 @@ fn get_genesis_input<P: Default + DeserializeOwned>( memmap2::Mmap::map(&file) .map_err(|e| format!("Error mmaping gen conf file `{}`: {}", config_file_path, e))? }; - serde_yaml::from_slice::<GenesisInput<P>>(&bytes) - .map_err(|e| format!("Error parsing gen conf file: {}", e)) + if config_file_path.ends_with(".json") { + serde_json::from_slice::<GenesisInput<P>>(&bytes) + .map_err(|e| format!("Error parsing JSON gen conf file: {}", e)) + } else { + serde_yaml::from_slice::<GenesisInput<P>>(&bytes) + .map_err(|e| format!("Error parsing YAML gen conf file: {}", e)) + } } fn get_genesis_migration_data() -> Result<GenesisMigrationData, String> {