From d89a2ce94cac3dd7fa4ce54b0fcdecddf72dcd9c Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Mon, 4 Sep 2023 15:10:45 +0200
Subject: [PATCH] fix after rebase
---
node/src/chain_spec/gdev.rs | 4 ++--
node/src/chain_spec/gen_genesis_data.rs | 4 ++--
node/src/chain_spec/gtest.rs | 5 +++--
node/src/chain_spec/gtest_genesis.rs | 15 +++++++++------
resources/gdev.json | 5 +++--
5 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs
index 6d601d9a2..a4b16ad9d 100644
--- a/node/src/chain_spec/gdev.rs
+++ b/node/src/chain_spec/gdev.rs
@@ -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,
},
diff --git a/node/src/chain_spec/gen_genesis_data.rs b/node/src/chain_spec/gen_genesis_data.rs
index b8bfe2512..2fdd6cef0 100644
--- a/node/src/chain_spec/gen_genesis_data.rs
+++ b/node/src/chain_spec/gen_genesis_data.rs
@@ -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,
diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs
index 0eb25e3db..e1aaf3877 100644
--- a/node/src/chain_spec/gtest.rs
+++ b/node/src/chain_spec/gtest.rs
@@ -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,
},
diff --git a/node/src/chain_spec/gtest_genesis.rs b/node/src/chain_spec/gtest_genesis.rs
index f7a341ed0..2f50ae481 100644
--- a/node/src/chain_spec/gtest_genesis.rs
+++ b/node/src/chain_spec/gtest_genesis.rs
@@ -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(),
diff --git a/resources/gdev.json b/resources/gdev.json
index 4182910b8..b23b840d1 100644
--- a/resources/gdev.json
+++ b/resources/gdev.json
@@ -1,6 +1,7 @@
{
- "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,
--
GitLab