chore: upgrade clarity-vm including epoch 3.0

components/clarinet-cli/Cargo.toml

@@ -27,12 +27,12 @@ serde_derive = "1"
 log = { version = "=0.4.17", features = ["serde"] }
 signal-hook-registry = "1.4.0"
 secure_tempfile = { version = "3.8.0", package = "tempfile" }
-tokio-util = { version = "0.7.1", features = ["io"], optional = true }
 libsecp256k1 = "0.7.0"
 hmac = "0.12.0"
 pbkdf2 = { version = "0.12.2", features = ["simple"], default-features = false }
 futures = "0.3.12"
-tokio = { version = "1.24", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
+tokio-util = { version = "0.7.10", features = ["io"], optional = true }
 lazy_static = "1.4.0"
 atty = "0.2.14"
 termcolor = "1.1.2"
@@ -47,7 +47,8 @@ reqwest = { version = "0.11", default-features = false, features = [
     "json",
     "rustls-tls",
 ] }
-crossterm = "0.22.1"
+crossterm = "0.27.0"
+ratatui = { version = "0.25.0", default-features = false, features = ["crossterm"] }
 base58 = "0.2.0"
 ctrlc = "3.1.9"
 strum = { version = "0.23.0", features = ["derive"] }
@@ -75,11 +76,6 @@ hiro-system-kit = { path = "../hiro-system-kit" }
 clarinet-utils = { path = "../clarinet-utils" }
 stacks-network = { path = "../stacks-network" }
 
-[dependencies.tui]
-version = "0.18.0"
-default-features = false
-features = ["crossterm"]
-
 [target.'cfg(unix)'.dependencies]
 nix = "=0.24.2"
 

components/clarinet-cli/examples/swappool/settings/Devnet.toml

@@ -121,7 +121,6 @@ disable_stacks_api = false
 # epoch_2_0 = 100
 # epoch_2_05 = 102
 # epoch_2_1 = 106
-# pox_2_activation = 109
 
 
 # Send some stacking orders

components/clarinet-cli/src/deployments/ui/app.rs

@@ -1,5 +1,5 @@
 use clarinet_deployments::onchain::TransactionTracker;
-use tui::widgets::ListState;
+use ratatui::widgets::ListState;
 
 pub struct StatefulList<T> {
     pub state: ListState,

components/clarinet-cli/src/deployments/ui/mod.rs

@@ -10,9 +10,9 @@ use crossterm::{
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
+use ratatui::{backend::CrosstermBackend, Terminal};
 use std::io::stdout;
 use std::sync::mpsc::Receiver;
-use tui::{backend::CrosstermBackend, Terminal};
 
 pub fn start_ui(
     node_url: &str,

components/clarinet-cli/src/deployments/ui/ui.rs

@@ -1,22 +1,18 @@
 use clarinet_deployments::onchain::TransactionStatus;
 
 use super::App;
-use tui::{
-    backend::Backend,
+use ratatui::{
     layout::{Constraint, Rect},
     style::{Color, Style},
     widgets::{Block, Cell, Row, Table},
     Frame,
 };
 
-pub fn draw<B: Backend>(f: &mut Frame<B>, app: &mut App) {
+pub fn draw(f: &mut Frame, app: &mut App) {
     draw_contracts_status(f, app, f.size());
 }
 
-fn draw_contracts_status<B>(f: &mut Frame<B>, app: &mut App, area: Rect)
-where
-    B: Backend,
-{
+fn draw_contracts_status(f: &mut Frame, app: &mut App, area: Rect) {
     let rows = app.transactions.items.iter().map(|tx| {
         let (status, default_comment) = match &tx.status {
             TransactionStatus::Queued => ("🟪", "Transaction indexed".to_string()),
@@ -39,10 +35,10 @@ where
         .bottom_margin(0)
     });
 
-    let t = Table::new(rows)
+    let t = Table::new(rows, vec![] as Vec<&Constraint>)
         .block(Block::default().title(format!("Broadcasting transactions to {}", app.node_url)))
         .style(Style::default().fg(Color::White))
-        .widths(&[
+        .widths([
             Constraint::Length(3),
             Constraint::Length(90),
             Constraint::Length(110),

components/clarinet-cli/src/frontend/cli.rs

@@ -1081,12 +1081,13 @@ pub fn main() {
                 }
             };
             let contract_id = QualifiedContractIdentifier::transient();
+            let epoch = DEFAULT_EPOCH;
             let contract = ClarityContract {
                 code_source: ClarityCodeSource::ContractInMemory(code_source),
                 deployer: ContractDeployer::Transient,
                 name: "transient".to_string(),
-                clarity_version: ClarityVersion::Clarity1,
-                epoch: DEFAULT_EPOCH,
+                clarity_version: ClarityVersion::default_for_epoch(epoch),
+                epoch,
             };
             let (ast, mut diagnostics, mut success) = session.interpreter.build_ast(&contract);
             let (annotations, mut annotation_diagnostics) = session

components/clarinet-cli/src/generate/mod.rs

@@ -4,7 +4,7 @@ mod contract;
 mod project;
 
 use chainhook::GetChangesForNewChainhook;
-pub use changes::{Changes, DirectoryCreation, FileCreation, TOMLEdition};
+pub use changes::Changes;
 use clarinet_files::chainhook_types::Chain;
 use clarinet_files::FileLocation;
 use contract::GetChangesForNewContract;

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_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,
+    DEFAULT_EPOCH_2_4, DEFAULT_EPOCH_2_5, DEFAULT_EPOCH_3_0, DEFAULT_FAUCET_MNEMONIC,
+    DEFAULT_POSTGRES_IMAGE, 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,32 +403,33 @@ disable_stacks_api = false
 # subnet_api_postgres_database = "subnet_api"
 
 # For testing in epoch 2.1 / using Clarity2
-# epoch_2_0 = {default_epoch_2_0}
-# 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}
+# epoch_2_0 = {DEFAULT_EPOCH_2_0}
+# epoch_2_05 = {DEFAULT_EPOCH_2_05}
+# epoch_2_1 = {DEFAULT_EPOCH_2_1}
+# epoch_2_2 = {DEFAULT_EPOCH_2_2}
+# epoch_2_3 = {DEFAULT_EPOCH_2_3}
+# epoch_2_4 = {DEFAULT_EPOCH_2_4}
+# epoch_2_5 = {DEFAULT_EPOCH_2_5}
+# epoch_3_0 = {DEFAULT_EPOCH_3_0}
 
 
 # Send some stacking orders
 [[devnet.pox_stacking_orders]]
-start_at_cycle = 3
+start_at_cycle = 0
 duration = 12
 wallet = "wallet_1"
 slots = 2
 btc_address = "mr1iPkD9N3RJZZxXRk7xF9d36gffa6exNC"
 
 [[devnet.pox_stacking_orders]]
-start_at_cycle = 3
+start_at_cycle = 1
 duration = 12
 wallet = "wallet_2"
 slots = 1
 btc_address = "muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG"
 
 [[devnet.pox_stacking_orders]]
-start_at_cycle = 3
+start_at_cycle = 2
 duration = 12
 wallet = "wallet_3"
 slots = 1
@@ -447,13 +448,6 @@ btc_address = "mvZtbibDAAA3WLpY7zXXFqRa3T4XSknBX7"
             default_subnet_api_image = DEFAULT_SUBNET_API_IMAGE,
             default_stacks_miner_mnemonic = DEFAULT_STACKS_MINER_MNEMONIC,
             default_stacks_faucet_mnemonic = DEFAULT_FAUCET_MNEMONIC,
-            default_epoch_2_0 = DEFAULT_EPOCH_2_0,
-            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 = "Devnet.toml".into();
         let path = format!(

components/clarinet-deployments/src/lib.rs

@@ -1,4 +1,4 @@
-use clarity_repl::clarity::stacks_common::types::StacksEpochId;
+use clarity_repl::clarity::StacksEpochId;
 use clarity_repl::repl::{ClarityCodeSource, ClarityContract, ContractDeployer};
 use clarity_repl::repl::{DEFAULT_CLARITY_VERSION, DEFAULT_EPOCH};
 
@@ -119,10 +119,10 @@ pub fn update_session_with_contracts_executions(
 ) -> BTreeMap<QualifiedContractIdentifier, Result<ExecutionResult, Vec<Diagnostic>>> {
     let boot_contracts_data = BOOT_CONTRACTS_DATA.clone();
 
-    for (_, (boot_contract, mut ast)) in boot_contracts_data {
+    for (_, (boot_contract, ast)) in boot_contracts_data {
         session
             .interpreter
-            .run_ast(&boot_contract, &mut ast, &mut vec![], true, false, None)
+            .run(&boot_contract, &mut Some(ast), false, None)
             .expect("failed to interprete boot contract");
     }
 

components/clarinet-deployments/src/onchain/mod.rs

@@ -2,8 +2,8 @@ use bitcoincore_rpc::{Auth, Client};
 use clarinet_files::chainhook_types::StacksNetwork;
 use clarinet_files::{AccountConfig, NetworkManifest};
 use clarinet_utils::get_bip39_seed_from_mnemonic;
+use clarity_repl::clarity::chainstate::StacksAddress;
 use clarity_repl::clarity::codec::StacksMessageCodec;
-use clarity_repl::clarity::stacks_common::types::chainstate::StacksAddress;
 use clarity_repl::clarity::util::secp256k1::{
     MessageSignature, Secp256k1PrivateKey, Secp256k1PublicKey,
 };
@@ -537,9 +537,7 @@ pub fn apply_on_chain_deployment(
                             let _ =
                                 deployment_event_tx.send(DeploymentEvent::Interrupted(format!(
                                     "unable to encode contract_call {}::{} ({})",
-                                    tx.contract_id.to_string(),
-                                    tx.method,
-                                    e
+                                    tx.contract_id, tx.method, e
                                 )));
                             return;
                         }
@@ -548,7 +546,7 @@ pub fn apply_on_chain_deployment(
                     accounts_cached_nonces.insert(issuer_address.clone(), nonce + 1);
                     let name = format!(
                         "Call ({} {} {})",
-                        tx.contract_id.to_string(),
+                        tx.contract_id,
                         tx.method,
                         tx.parameters.join(" ")
                     );
@@ -758,6 +756,8 @@ pub fn apply_on_chain_deployment(
                 EpochSpec::Epoch2_2 => network_manifest.devnet.as_ref().unwrap().epoch_2_2,
                 EpochSpec::Epoch2_3 => network_manifest.devnet.as_ref().unwrap().epoch_2_3,
                 EpochSpec::Epoch2_4 => network_manifest.devnet.as_ref().unwrap().epoch_2_4,
+                EpochSpec::Epoch2_5 => network_manifest.devnet.as_ref().unwrap().epoch_2_5,
+                EpochSpec::Epoch3_0 => network_manifest.devnet.as_ref().unwrap().epoch_3_0,
             };
             let mut epoch_transition_successful =
                 current_bitcoin_block_height > after_bitcoin_block;

components/clarinet-deployments/src/requirements.rs

@@ -1,6 +1,8 @@
 use clarinet_files::{FileAccessor, FileLocation};
-use clarity_repl::clarity::stacks_common::types::StacksEpochId;
-use clarity_repl::clarity::{vm::types::QualifiedContractIdentifier, ClarityVersion};
+use clarity_repl::{
+    clarity::{vm::types::QualifiedContractIdentifier, ClarityVersion, StacksEpochId},
+    repl::{DEFAULT_CLARITY_VERSION, DEFAULT_EPOCH},
+};
 use reqwest;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -12,8 +14,8 @@ pub struct ContractMetadata {
 impl Default for ContractMetadata {
     fn default() -> Self {
         ContractMetadata {
-            epoch: StacksEpochId::latest(),
-            clarity_version: ClarityVersion::latest(),
+            epoch: DEFAULT_EPOCH,
+            clarity_version: DEFAULT_CLARITY_VERSION,
         }
     }
 }
@@ -119,13 +121,19 @@ pub const MAINNET_21_START_HEIGHT: u32 = 99_113;
 pub const MAINNET_22_START_HEIGHT: u32 = 103_900;
 pub const MAINNET_23_START_HEIGHT: u32 = 104_359;
 pub const MAINNET_24_START_HEIGHT: u32 = 107_055;
+// @TODO: set right heights once epochs are live on mainnet
+pub const MAINNET_25_START_HEIGHT: u32 = 200_000;
+pub const MAINNET_30_START_HEIGHT: u32 = 300_000;
 
 pub const TESTNET_20_START_HEIGHT: u32 = 1;
 pub const TESTNET_2_05_START_HEIGHT: u32 = 20_216;
 pub const TESTNET_21_START_HEIGHT: u32 = 99_113;
 pub const TESTNET_22_START_HEIGHT: u32 = 105_923;
 pub const TESTNET_23_START_HEIGHT: u32 = 106_196;
 pub const TESTNET_24_START_HEIGHT: u32 = 106_979;
+// @TODO: set right heights once epochs are live on testnet
+pub const TESTNET_25_START_HEIGHT: u32 = 200_000;
+pub const TESTNET_30_START_HEIGHT: u32 = 300_000;
 
 fn epoch_for_height(is_mainnet: bool, height: u32) -> StacksEpochId {
     if is_mainnet {
@@ -146,8 +154,12 @@ fn epoch_for_mainnet_height(height: u32) -> StacksEpochId {
         StacksEpochId::Epoch22
     } else if height < MAINNET_24_START_HEIGHT {
         StacksEpochId::Epoch23
-    } else {
+    } else if height < MAINNET_25_START_HEIGHT {
         StacksEpochId::Epoch24
+    } else if height < MAINNET_30_START_HEIGHT {
+        StacksEpochId::Epoch25
+    } else {
+        StacksEpochId::Epoch30
     }
 }
 
@@ -162,8 +174,12 @@ fn epoch_for_testnet_height(height: u32) -> StacksEpochId {
         StacksEpochId::Epoch22
     } else if height < TESTNET_24_START_HEIGHT {
         StacksEpochId::Epoch23
-    } else {
+    } else if height < TESTNET_25_START_HEIGHT {
         StacksEpochId::Epoch24
+    } else if height < TESTNET_30_START_HEIGHT {
+        StacksEpochId::Epoch25
+    } else {
+        StacksEpochId::Epoch30
     }
 }
 

components/clarinet-deployments/src/types.rs

@@ -1,5 +1,5 @@
+use clarinet_files::chainhook_types::StacksNetwork;
 use clarinet_files::FileLocation;
-use clarity_repl::clarity::stacks_common::types::StacksEpochId;
 use clarity_repl::clarity::util::hash::{hex_bytes, to_hex};
 use clarity_repl::clarity::vm::analysis::ContractAnalysis;
 use clarity_repl::clarity::vm::ast::ContractAST;
@@ -8,9 +8,8 @@ use clarity_repl::clarity::vm::types::{
     PrincipalData, QualifiedContractIdentifier, StandardPrincipalData,
 };
 
-use clarinet_files::chainhook_types::StacksNetwork;
 use clarity_repl::analysis::ast_dependency_detector::DependencySet;
-use clarity_repl::clarity::{ClarityName, ClarityVersion, ContractName};
+use clarity_repl::clarity::{ClarityName, ClarityVersion, ContractName, StacksEpochId};
 use clarity_repl::repl::{Session, DEFAULT_CLARITY_VERSION};
 use serde::{Deserialize, Serialize};
 use serde_yaml;
@@ -31,6 +30,10 @@ pub enum EpochSpec {
     Epoch2_3,
     #[serde(rename = "2.4")]
     Epoch2_4,
+    #[serde(rename = "2.5")]
+    Epoch2_5,
+    #[serde(rename = "3.0")]
+    Epoch3_0,
 }
 
 impl From<StacksEpochId> for EpochSpec {
@@ -42,6 +45,8 @@ impl From<StacksEpochId> for EpochSpec {
             StacksEpochId::Epoch22 => EpochSpec::Epoch2_2,
             StacksEpochId::Epoch23 => EpochSpec::Epoch2_3,
             StacksEpochId::Epoch24 => EpochSpec::Epoch2_4,
+            StacksEpochId::Epoch25 => EpochSpec::Epoch2_5,
+            StacksEpochId::Epoch30 => EpochSpec::Epoch3_0,
             StacksEpochId::Epoch10 => unreachable!("epoch 1.0 is not supported"),
         }
     }
@@ -56,6 +61,8 @@ impl From<EpochSpec> for StacksEpochId {
             EpochSpec::Epoch2_2 => StacksEpochId::Epoch22,
             EpochSpec::Epoch2_3 => StacksEpochId::Epoch23,
             EpochSpec::Epoch2_4 => StacksEpochId::Epoch24,
+            EpochSpec::Epoch2_5 => StacksEpochId::Epoch25,
+            EpochSpec::Epoch3_0 => StacksEpochId::Epoch30,
         }
     }
 }

components/clarinet-files/Cargo.toml

@@ -8,8 +8,8 @@ edition = "2021"
 [dependencies]
 serde = "1"
 serde_derive = "1"
-chainhook-types = "1.2"
-# chainhook-types = { version = "=1.2", path = "../../../chainhook/components/chainhook-types-rs" }
+# chainhook-types = "1.2"
+chainhook-types = { version = "1.2",  git = "https://github.com/hirosystems/chainhook.git", rev="a938e61846a430750ad31d84b2032efabf6d039f" }
 bip39 = { version = "1.0.1", default-features = false }
 libsecp256k1 = "0.7.0"
 toml = { version = "0.5.6", features = ["preserve_order"] }

components/clarinet-files/src/lib.rs

@@ -22,9 +22,10 @@ pub use network_manifest::{
     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_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_EPOCH_2_4, DEFAULT_EPOCH_2_5, DEFAULT_EPOCH_3_0, DEFAULT_FAUCET_MNEMONIC,
+    DEFAULT_POSTGRES_IMAGE, DEFAULT_STACKS_API_IMAGE, DEFAULT_STACKS_API_IMAGE_NAKA,
+    DEFAULT_STACKS_EXPLORER_IMAGE, DEFAULT_STACKS_MINER_MNEMONIC, DEFAULT_STACKS_NODE_IMAGE,
+    DEFAULT_STACKS_NODE_IMAGE_NAKA, DEFAULT_SUBNET_API_IMAGE, DEFAULT_SUBNET_CONTRACT_ID,
     DEFAULT_SUBNET_MNEMONIC, DEFAULT_SUBNET_NODE_IMAGE,
 };
 pub use project_manifest::{