chore: shorten the default epoch timing

Since most users will want to be testing on the latest, this proposes getting to epoch 2.4 faster. It's in this subnet branch because the subnet contract launches in 2.4 and the previous default takes far too long to reach.
hirosystems · Jun 22, 2023 · 9885888 · 9885888
1 parent 64d6d90
commit 9885888
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/components/clarinet-cli/src/generate/project.rs b/components/clarinet-cli/src/generate/project.rs
@@ -1,10 +1,10 @@
 use clarinet_files::{
     DEFAULT_BITCOIN_EXPLORER_IMAGE, DEFAULT_BITCOIN_NODE_IMAGE, DEFAULT_DERIVATION_PATH,
-    DEFAULT_EPOCH_2_0, DEFAULT_EPOCH_2_05, DEFAULT_EPOCH_2_1, DEFAULT_FAUCET_MNEMONIC,
-    DEFAULT_POSTGRES_IMAGE, DEFAULT_POX2_ACTIVATION, DEFAULT_STACKS_API_IMAGE,
-    DEFAULT_STACKS_EXPLORER_IMAGE, DEFAULT_STACKS_MINER_MNEMONIC, DEFAULT_STACKS_NODE_IMAGE,
-    DEFAULT_SUBNET_API_IMAGE, DEFAULT_SUBNET_CONTRACT_ID, DEFAULT_SUBNET_MNEMONIC,
-    DEFAULT_SUBNET_NODE_IMAGE,
+    DEFAULT_EPOCH_2_0, DEFAULT_EPOCH_2_05, DEFAULT_EPOCH_2_1, DEFAULT_EPOCH_2_2, DEFAULT_EPOCH_2_3,
+    DEFAULT_EPOCH_2_4, DEFAULT_FAUCET_MNEMONIC, DEFAULT_POSTGRES_IMAGE, DEFAULT_POX2_ACTIVATION,
+    DEFAULT_STACKS_API_IMAGE, DEFAULT_STACKS_EXPLORER_IMAGE, DEFAULT_STACKS_MINER_MNEMONIC,
+    DEFAULT_STACKS_NODE_IMAGE, DEFAULT_SUBNET_API_IMAGE, DEFAULT_SUBNET_CONTRACT_ID,
+    DEFAULT_SUBNET_MNEMONIC, DEFAULT_SUBNET_NODE_IMAGE,
 };
 
 use super::changes::{Changes, DirectoryCreation, FileCreation};
@@ -403,6 +403,9 @@ disable_stacks_api = false
 # epoch_2_05 = {default_epoch_2_05}
 # epoch_2_1 = {default_epoch_2_1}
 # pox_2_activation = {default_pox2_activation}
+# epoch_2_2 = {default_epoch_2_2}
+# epoch_2_3 = {default_epoch_2_3}
+# epoch_2_4 = {default_epoch_2_4}
 
 
 # Send some stacking orders
@@ -444,6 +447,9 @@ btc_address = "mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7"
             default_epoch_2_05 = DEFAULT_EPOCH_2_05,
             default_epoch_2_1 = DEFAULT_EPOCH_2_1,
             default_pox2_activation = DEFAULT_POX2_ACTIVATION,
+            default_epoch_2_2 = DEFAULT_EPOCH_2_2,
+            default_epoch_2_3 = DEFAULT_EPOCH_2_3,
+            default_epoch_2_4 = DEFAULT_EPOCH_2_4,
         );
         let name = format!("Devnet.toml");
         let path = format!(

diff --git a/components/clarinet-files/src/lib.rs b/components/clarinet-files/src/lib.rs
@@ -21,11 +21,11 @@ pub use network_manifest::{
     compute_addresses, AccountConfig, DevnetConfig, DevnetConfigFile, NetworkManifest,
     NetworkManifestFile, PoxStackingOrder, DEFAULT_BITCOIN_EXPLORER_IMAGE,
     DEFAULT_BITCOIN_NODE_IMAGE, DEFAULT_DERIVATION_PATH, DEFAULT_DOCKER_PLATFORM,
-    DEFAULT_EPOCH_2_0, DEFAULT_EPOCH_2_05, DEFAULT_EPOCH_2_1, DEFAULT_FAUCET_MNEMONIC,
-    DEFAULT_POSTGRES_IMAGE, DEFAULT_POX2_ACTIVATION, DEFAULT_STACKS_API_IMAGE,
-    DEFAULT_STACKS_EXPLORER_IMAGE, DEFAULT_STACKS_MINER_MNEMONIC, DEFAULT_STACKS_NODE_IMAGE,
-    DEFAULT_SUBNET_API_IMAGE, DEFAULT_SUBNET_CONTRACT_ID, DEFAULT_SUBNET_MNEMONIC,
-    DEFAULT_SUBNET_NODE_IMAGE,
+    DEFAULT_EPOCH_2_0, DEFAULT_EPOCH_2_05, DEFAULT_EPOCH_2_1, DEFAULT_EPOCH_2_2, DEFAULT_EPOCH_2_3,
+    DEFAULT_EPOCH_2_4, DEFAULT_FAUCET_MNEMONIC, DEFAULT_POSTGRES_IMAGE, DEFAULT_POX2_ACTIVATION,
+    DEFAULT_STACKS_API_IMAGE, DEFAULT_STACKS_EXPLORER_IMAGE, DEFAULT_STACKS_MINER_MNEMONIC,
+    DEFAULT_STACKS_NODE_IMAGE, DEFAULT_SUBNET_API_IMAGE, DEFAULT_SUBNET_CONTRACT_ID,
+    DEFAULT_SUBNET_MNEMONIC, DEFAULT_SUBNET_NODE_IMAGE,
 };
 pub use project_manifest::{ProjectManifest, ProjectManifestFile, RequirementConfig};
 use serde::ser::{Serialize, SerializeMap, Serializer};

diff --git a/components/clarinet-files/src/network_manifest.rs b/components/clarinet-files/src/network_manifest.rs
@@ -36,12 +36,12 @@ pub const DEFAULT_DOCKER_SOCKET: &str = "/var/run/docker.sock";
 pub const DEFAULT_DOCKER_PLATFORM: &str = "linux/amd64";
 
 pub const DEFAULT_EPOCH_2_0: u64 = 100;
-pub const DEFAULT_EPOCH_2_05: u64 = 102;
-pub const DEFAULT_EPOCH_2_1: u64 = 106;
-pub const DEFAULT_POX2_ACTIVATION: u64 = 109;
-pub const DEFAULT_EPOCH_2_2: u64 = 122;
-pub const DEFAULT_EPOCH_2_3: u64 = 128;
-pub const DEFAULT_EPOCH_2_4: u64 = 134;
+pub const DEFAULT_EPOCH_2_05: u64 = 100;
+pub const DEFAULT_EPOCH_2_1: u64 = 101;
+pub const DEFAULT_POX2_ACTIVATION: u64 = 102;
+pub const DEFAULT_EPOCH_2_2: u64 = 103;
+pub const DEFAULT_EPOCH_2_3: u64 = 104;
+pub const DEFAULT_EPOCH_2_4: u64 = 105;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct NetworkManifestFile {