Release v2.3.0-testnet for hardfork.

Conflux-Chain · Jun 29, 2023 · ea8f4d5 · ea8f4d5
1 parent 566ec1a
commit ea8f4d5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "conflux"
-version = "2.2.5-2-testnet"
+version = "2.3.0-testnet"
 edition = "2018"
 build = "build.rs"
 

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "client"
-version = "2.2.5-2-testnet"
+version = "2.3.0-testnet"
 edition = "2018"
 
 [dependencies]

diff --git a/client/src/configuration.rs b/client/src/configuration.rs
@@ -156,8 +156,8 @@ build_config! {
         (cip90_transition_number,(Option<u64>), Some(77340000))
         (cip105_transition_number, (Option<u64>), Some(122700000))
         (sigma_fix_transition_number, (Option<u64>), Some(125360000))
-        (cip107_transition_number, (Option<u64>), None)
-        (cip112_transition_height, (Option<u64>), None)
+        (cip107_transition_number, (Option<u64>), Some(167000000))
+        (cip112_transition_height, (Option<u64>), Some(129100000))
         (referee_bound, (usize), REFEREE_DEFAULT_BOUND)
         (params_dao_vote_period, (u64), DAO_PARAMETER_VOTE_PERIOD)
         (timer_chain_beta, (u64), TIMER_CHAIN_DEFAULT_BETA)

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -3,7 +3,7 @@ description = "Conflux core library"
 homepage = "https://www.confluxnetwork.org"
 license = "GPL-3.0"
 name = "cfxcore"
-version = "2.2.5-2-testnet"
+version = "2.3.0-testnet"
 edition = "2018"
 
 [dependencies]

diff --git a/core/src/pos/config/src/config/consensus_config.rs b/core/src/pos/config/src/config/consensus_config.rs
@@ -58,7 +58,7 @@ impl Default for ConsensusConfig {
             // 60 epochs should have been generated in 4 minutes.
             round_initial_timeout_ms: 60_000,
             cip113_round_initial_timeout_ms: 30_000,
-            cip113_transition_epoch: u64::MAX,
+            cip113_transition_epoch: 12365,
             proposer_type: ConsensusProposerType::VrfProposer,
             safety_rules: SafetyRulesConfig::default(),
             sync_only: false,