From 24d7848e5bd76e04fc49a5b5091bf085ebe76561 Mon Sep 17 00:00:00 2001
From: mariari <mariari@protonmail.com>
Date: Wed, 18 Jan 2023 13:21:19 +0800
Subject: [PATCH] Fix dev.toml having inconsistent token values and
 inconsistent dot

This addresses #1048 that creates two different dot toekns, along with
fixing dev's parameters to be consistent with dev's toml file and not
the e2e toml file
---
 genesis/dev.toml                   | 15 ++++++++++-----
 genesis/e2e-tests-single-node.toml |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/genesis/dev.toml b/genesis/dev.toml
index ccf3a5cd04..755b39163e 100644
--- a/genesis/dev.toml
+++ b/genesis/dev.toml
@@ -83,7 +83,7 @@ atest1v4ehgw368ycryv2z8qcnxv3cxgmrgvjpxs6yg333gym5vv2zxepnj334g4rryvj9xucrgve4x3
 atest1v4ehgw36x3qng3jzggu5yvpsxgcngv2xgguy2dpkgvu5x33kx3pr2w2zgep5xwfkxscrxs2pj8075p = 1000000
 atest1v4ehgw36xvcyyvejgvenxs34g3zygv3jxqunjd6rxyeyys3sxy6rwvfkx4qnj33hg9qnvse4lsfctw = 1000000
 a1qyqzsqqqqqcyvvf5xcu5vd6rg4z5233hg9pn23pjgdryzdjy8pz52wzxxscnvvjxx3rryvzz8y5p6mtz = 1000000
-[token.Dot.parameters]
+[token.DOT.parameters]
 max_reward_rate = 0.1
 kd_gain_nom = 0.1
 kp_gain_nom = 0.1
@@ -97,7 +97,7 @@ atest1v4ehgw368ycryv2z8qcnxv3cxgmrgvjpxs6yg333gym5vv2zxepnj334g4rryvj9xucrgve4x3
 atest1v4ehgw36x3qng3jzggu5yvpsxgcngv2xgguy2dpkgvu5x33kx3pr2w2zgep5xwfkxscrxs2pj8075p = 1000000
 atest1v4ehgw36xvcyyvejgvenxs34g3zygv3jxqunjd6rxyeyys3sxy6rwvfkx4qnj33hg9qnvse4lsfctw = 1000000
 a1qyqzsqqqqqcyvvf5xcu5vd6rg4z5233hg9pn23pjgdryzdjy8pz52wzxxscnvvjxx3rryvzz8y5p6mtz = 1000000
-[token.Schnitzel.parameters]
+[token.schnitzel.parameters]
 max_reward_rate = 0.1
 kd_gain_nom = 0.1
 kp_gain_nom = 0.1
@@ -111,7 +111,7 @@ atest1v4ehgw368ycryv2z8qcnxv3cxgmrgvjpxs6yg333gym5vv2zxepnj334g4rryvj9xucrgve4x3
 atest1v4ehgw36x3qng3jzggu5yvpsxgcngv2xgguy2dpkgvu5x33kx3pr2w2zgep5xwfkxscrxs2pj8075p = 1000000
 atest1v4ehgw36xvcyyvejgvenxs34g3zygv3jxqunjd6rxyeyys3sxy6rwvfkx4qnj33hg9qnvse4lsfctw = 1000000
 a1qyqzsqqqqqcyvvf5xcu5vd6rg4z5233hg9pn23pjgdryzdjy8pz52wzxxscnvvjxx3rryvzz8y5p6mtz = 1000000
-[token.Apfel.parameters]
+[token.apfel.parameters]
 max_reward_rate = 0.1
 kd_gain_nom = 0.1
 kp_gain_nom = 0.1
@@ -126,7 +126,7 @@ atest1v4ehgw368ycryv2z8qcnxv3cxgmrgvjpxs6yg333gym5vv2zxepnj334g4rryvj9xucrgve4x3
 atest1v4ehgw36x3qng3jzggu5yvpsxgcngv2xgguy2dpkgvu5x33kx3pr2w2zgep5xwfkxscrxs2pj8075p = 1000000
 atest1v4ehgw36xvcyyvejgvenxs34g3zygv3jxqunjd6rxyeyys3sxy6rwvfkx4qnj33hg9qnvse4lsfctw = 1000000
 a1qyqzsqqqqqcyvvf5xcu5vd6rg4z5233hg9pn23pjgdryzdjy8pz52wzxxscnvvjxx3rryvzz8y5p6mtz = 1000000
-[token.Kartoffel.parameters]
+[token.kartoffel.parameters]
 max_reward_rate = 0.1
 kd_gain_nom = 0.1
 kp_gain_nom = 0.1
@@ -183,7 +183,12 @@ max_expected_time_per_block = 30
 epochs_per_year = 525_600
 # Max payload size, in bytes, for a tx batch proposal.
 max_proposal_bytes = 22020096
-
+implicit_vp = "vp_implicit"
+# Expected number of epochs per year (also sets the min duration of an epoch in seconds)
+# The P gain factor in the Proof of Stake rewards controller
+pos_gain_p = 0.1
+# The D gain factor in the Proof of Stake rewards controller
+pos_gain_d = 0.1
 # Proof of stake parameters.
 [pos_params]
 # Maximum number of consensus validators.
diff --git a/genesis/e2e-tests-single-node.toml b/genesis/e2e-tests-single-node.toml
index f7d78e3477..0abc4e32fc 100644
--- a/genesis/e2e-tests-single-node.toml
+++ b/genesis/e2e-tests-single-node.toml
@@ -78,13 +78,13 @@ locked_ratio_target_key = 0.6667
 [token.DOT]
 address = "atest1v4ehgw36gg6nvs2zgfpyxsfjgc65yv6pxy6nwwfsxgungdzrggeyzv35gveyxsjyxymyz335hur2jn"
 vp = "vp_token"
-[token.Dot.balances]
+[token.DOT.balances]
 Albert = 1000000
 Bertha = 1000000
 Christel = 1000000
 Daewon = 1000000
 faucet = 9223372036854
-[token.Dot.parameters]
+[token.DOT.parameters]
 max_reward_rate = 0.1
 kd_gain_nom = 0.1
 kp_gain_nom = 0.1