rename fee_upgrade to fee

EspressoSystems · Aug 14, 2024 · 2a0f407 · 2a0f407
1 parent 849d54c
commit 2a0f407
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/data/genesis/demo.toml b/data/genesis/demo.toml
@@ -16,9 +16,9 @@ version = "0.2"
 start_proposing_view = 5
 stop_proposing_view = 15
 
-[upgrade.fee_upgrade]
+[upgrade.fee]
 
-[upgrade.fee_upgrade.chain_config]
+[upgrade.fee.chain_config]
 chain_id = 999999999
 base_fee = '1 wei'
 max_block_size = '1mb'

diff --git a/doc/upgrades.md b/doc/upgrades.md
@@ -88,9 +88,9 @@ version = "0.2"
 start_proposing_view = 5
 stop_proposing_view = 15
 
-[upgrade.fee_upgrade]
+[upgrade.fee]
 
-[upgrade.fee_upgrade.chain_config]
+[upgrade.fee.chain_config]
 chain_id = 999999999
 base_fee = '1 wei'
 max_block_size = '1mb'
@@ -106,13 +106,13 @@ stop_proposing_view = 15
 ```
 
 In the TOML configuration example above, the `upgrade` section defines an array of tables, each specifying upgrade
-parameters:
+parameters
 
 - **Version:** the new version after an upgrade is successful.
 - **start_proposing_view:** Represents the `start_proposing_view` value at which the upgrade is proposed.
-- **stop_proposing_view:** Refers to the view at which the proposing an upgrade has stopped.
+- **stop_proposing_view:** Refers to the view view after which the node stops proposing an upgrade.
 
-The `upgrade.fee_upgrade.chain_config` table contains the complete set of chain config parameters, which can be used, for example,
+The `upgrade.fee.chain_config` table contains the complete set of chain config parameters, which can be used, for example,
 to enable protocol fees or modify other parameters.
 
 ## Fee upgrade

diff --git a/sequencer/src/api.rs b/sequencer/src/api.rs
@@ -1497,7 +1497,7 @@ mod test {
             <SeqTypes as NodeType>::Upgrade::VERSION,
             Upgrade {
                 mode,
-                upgrade_type: UpgradeType::FeeUpgrade {
+                upgrade_type: UpgradeType::Fee {
                     chain_config: chain_config_upgrade,
                 },
             },

diff --git a/sequencer/src/genesis.rs b/sequencer/src/genesis.rs
@@ -56,7 +56,7 @@ impl Genesis {
         let upgrades: Vec<&Upgrade> = self.upgrades.values().collect();
 
         for upgrade in upgrades {
-            if let UpgradeType::FeeUpgrade { chain_config } = upgrade.upgrade_type {
+            if let UpgradeType::Fee { chain_config } = upgrade.upgrade_type {
                 base_fee = std::cmp::max(chain_config.base_fee, base_fee);
             }
         }
@@ -430,9 +430,9 @@ mod test {
             start_proposing_view = 1
             stop_proposing_view = 15
 
-            [upgrade.fee_upgrade]
+            [upgrade.fee]
 
-            [upgrade.fee_upgrade.chain_config]
+            [upgrade.fee.chain_config]
             chain_id = 12345
             max_block_size = 30000
             base_fee = 1
@@ -454,7 +454,7 @@ mod test {
                 start_proposing_view: 1,
                 stop_proposing_view: 15,
             }),
-            upgrade_type: UpgradeType::FeeUpgrade {
+            upgrade_type: UpgradeType::Fee {
                 chain_config: genesis.chain_config,
             },
         };
@@ -494,9 +494,9 @@ mod test {
             start_proposing_time = "2024-01-01T00:00:00Z"
             stop_proposing_time = "2024-01-02T00:00:00Z"
 
-            [upgrade.fee_upgrade]
+            [upgrade.fee]
 
-            [upgrade.fee_upgrade.chain_config]
+            [upgrade.fee.chain_config]
             chain_id = 12345
             max_block_size = 30000
             base_fee = 1
@@ -520,7 +520,7 @@ mod test {
                 stop_proposing_time: Timestamp::from_string("2024-01-02T00:00:00Z".to_string())
                     .unwrap(),
             }),
-            upgrade_type: UpgradeType::FeeUpgrade {
+            upgrade_type: UpgradeType::Fee {
                 chain_config: genesis.chain_config,
             },
         };
@@ -562,9 +562,9 @@ mod test {
             start_proposing_time = 1
             stop_proposing_time = 10
 
-            [upgrade.fee_upgrade]
+            [upgrade.fee]
 
-            [upgrade.fee_upgrade.chain_config]
+            [upgrade.fee.chain_config]
             chain_id = 12345
             max_block_size = 30000
             base_fee = 1
@@ -651,9 +651,9 @@ mod test {
             start_proposing_view = 1
             stop_proposing_view = 15
 
-            [upgrade.fee_upgrade]
+            [upgrade.fee]
 
-            [upgrade.fee_upgrade.chain_config]
+            [upgrade.fee.chain_config]
             chain_id = 12345
             max_block_size = 30000
             base_fee = 1

diff --git a/types/src/v0/impls/header.rs b/types/src/v0/impls/header.rs
@@ -750,7 +750,7 @@ impl BlockHeader<SeqTypes> for Header {
         let chain_config = if version > instance_state.current_version {
             match instance_state.upgrades.get(&version) {
                 Some(upgrade) => match upgrade.upgrade_type {
-                    UpgradeType::FeeUpgrade { chain_config } => chain_config,
+                    UpgradeType::Fee { chain_config } => chain_config,
                     _ => Header::get_chain_config(&validated_state, instance_state).await,
                 },
                 None => Header::get_chain_config(&validated_state, instance_state).await,
@@ -867,7 +867,7 @@ impl BlockHeader<SeqTypes> for Header {
         let chain_config = if version > instance_state.current_version {
             match instance_state.upgrades.get(&version) {
                 Some(upgrade) => match upgrade.upgrade_type {
-                    UpgradeType::FeeUpgrade { chain_config } => chain_config,
+                    UpgradeType::Fee { chain_config } => chain_config,
                     _ => Header::get_chain_config(&validated_state, instance_state).await,
                 },
                 None => Header::get_chain_config(&validated_state, instance_state).await,

diff --git a/types/src/v0/impls/state.rs b/types/src/v0/impls/state.rs
@@ -510,7 +510,7 @@ impl ValidatedState {
             return;
         };
 
-        if let UpgradeType::FeeUpgrade { chain_config } = upgrade.upgrade_type {
+        if let UpgradeType::Fee { chain_config } = upgrade.upgrade_type {
             self.chain_config = chain_config.into();
         }
     }

diff --git a/types/src/v0/v0_1/instance_state.rs b/types/src/v0/v0_1/instance_state.rs
@@ -9,7 +9,7 @@ use crate::{v0_3::ChainConfig, Timestamp};
 pub enum UpgradeType {
     // Note: Wrapping this in a tuple variant causes deserialization to fail because
     // the 'chain_config' name is also provided in the TOML input.
-    FeeUpgrade { chain_config: ChainConfig },
+    Fee { chain_config: ChainConfig },
     Marketplace {},
 }