Add era to CommonParams

core/src/consensus/stake/actions.rs

@@ -105,15 +105,7 @@ impl Action {
                 params,
                 signatures,
             } => {
-                let current_network_id = current_params.network_id();
-                let transaction_network_id = params.network_id();
-                if current_network_id != transaction_network_id {
-                    return Err(SyntaxError::InvalidCustomAction(format!(
-                        "The current network id is {} but the transaction tries to change the network id to {}",
-                        current_network_id, transaction_network_id
-                    )))
-                }
-                params.verify().map_err(SyntaxError::InvalidCustomAction)?;
+                params.verify_change(current_params).map_err(SyntaxError::InvalidCustomAction)?;
                 let action = Action::ChangeParams {
                     metadata_seq: *metadata_seq,
                     params: params.clone(),

json/src/scheme/params.rs

@@ -66,6 +66,10 @@ pub struct Params {
     pub delegation_threshold: Option<Uint>,
     pub min_deposit: Option<Uint>,
     pub max_candidate_metadata_size: Option<Uint>,
+
+    /// A monotonically increasing number to denote the consensus version.
+    /// It is increased when we fork.
+    pub era: Option<Uint>,
 }
 
 #[cfg(test)]
@@ -277,4 +281,79 @@ mod tests {
         assert_eq!(deserialized.min_deposit, Some(32.into()));
         assert_eq!(deserialized.max_candidate_metadata_size, Some(33.into()));
     }
+
+    #[test]
+    #[allow(clippy::cognitive_complexity)]
+    fn params_deserialization_with_era() {
+        let s = r#"{
+            "maxExtraDataSize": "0x20",
+            "maxAssetSchemeMetadataSize": "0x0400",
+            "maxTransferMetadataSize": "0x0100",
+            "maxTextContentSize": "0x0200",
+            "networkID" : "tc",
+            "minPayCost" : 10,
+            "minSetRegularKeyCost" : 11,
+            "minCreateShardCost" : 12,
+            "minSetShardOwnersCost" : 13,
+            "minSetShardUsersCost" : 14,
+            "minWrapCccCost" : 15,
+            "minCustomCost" : 16,
+            "minStoreCost" : 17,
+            "minRemoveCost" : 18,
+            "minMintAssetCost" : 19,
+            "minTransferAssetCost" : 20,
+            "minChangeAssetSchemeCost" : 21,
+            "minComposeAssetCost" : 22,
+            "minDecomposeAssetCost" : 23,
+            "minUnwrapCccCost" : 24,
+            "minIncreaseAssetSupplyCost": 25,
+            "maxBodySize" : 4194304,
+            "snapshotPeriod": 16384,
+            "termSeconds": 3600,
+            "nominationExpiration": 26,
+            "custodyPeriod": 27,
+            "releasePeriod": 28,
+            "maxNumOfValidators": 29,
+            "minNumOfValidators": 30,
+            "delegationThreshold": 31,
+            "minDeposit": 32,
+            "maxCandidateMetadataSize": 33,
+            "era": 34
+        }"#;
+
+        let deserialized: Params = serde_json::from_str(s).unwrap();
+        assert_eq!(deserialized.max_extra_data_size, 0x20.into());
+        assert_eq!(deserialized.max_asset_scheme_metadata_size, 0x0400.into());
+        assert_eq!(deserialized.max_transfer_metadata_size, 0x0100.into());
+        assert_eq!(deserialized.max_text_content_size, 0x0200.into());
+        assert_eq!(deserialized.network_id, "tc".into());
+        assert_eq!(deserialized.min_pay_cost, 10.into());
+        assert_eq!(deserialized.min_set_regular_key_cost, 11.into());
+        assert_eq!(deserialized.min_create_shard_cost, 12.into());
+        assert_eq!(deserialized.min_set_shard_owners_cost, 13.into());
+        assert_eq!(deserialized.min_set_shard_users_cost, 14.into());
+        assert_eq!(deserialized.min_wrap_ccc_cost, 15.into());
+        assert_eq!(deserialized.min_custom_cost, 16.into());
+        assert_eq!(deserialized.min_store_cost, 17.into());
+        assert_eq!(deserialized.min_remove_cost, 18.into());
+        assert_eq!(deserialized.min_mint_asset_cost, 19.into());
+        assert_eq!(deserialized.min_transfer_asset_cost, 20.into());
+        assert_eq!(deserialized.min_change_asset_scheme_cost, 21.into());
+        assert_eq!(deserialized.min_compose_asset_cost, 22.into());
+        assert_eq!(deserialized.min_decompose_asset_cost, 23.into());
+        assert_eq!(deserialized.min_unwrap_ccc_cost, 24.into());
+        assert_eq!(deserialized.min_increase_asset_supply_cost, 25.into());
+        assert_eq!(deserialized.max_body_size, 4_194_304.into());
+        assert_eq!(deserialized.snapshot_period, 16_384.into());
+        assert_eq!(deserialized.term_seconds, Some(3600.into()));
+        assert_eq!(deserialized.nomination_expiration, Some(26.into()));
+        assert_eq!(deserialized.custody_period, Some(27.into()));
+        assert_eq!(deserialized.release_period, Some(28.into()));
+        assert_eq!(deserialized.max_num_of_validators, Some(29.into()));
+        assert_eq!(deserialized.min_num_of_validators, Some(30.into()));
+        assert_eq!(deserialized.delegation_threshold, Some(31.into()));
+        assert_eq!(deserialized.min_deposit, Some(32.into()));
+        assert_eq!(deserialized.max_candidate_metadata_size, Some(33.into()));
+        assert_eq!(deserialized.era, Some(34.into()));
+    }
 }