Merge pull request #6673 from brice-stacks/3.3.0.0.1-to-develop

3.3.0.0.1 to develop

Author: brice-stacks

CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Added `result_hex` and `post_condition_aborted` to the block replay RPC endpoint
 - Added `--epoch <epoch_number>` flag to `clarity-cli` commands to specify the epoch context for evaluation.
 
+## [3.3.0.0.1]
+
+- Add indexes to `nakamoto_block_headers` to fix a performance regression. Node may take a few minutes to restart during the upgrade while the new indexes are created.
+
 ## [3.3.0.0.0]
 
 ### Added

stackslib/src/chainstate/nakamoto/mod.rs

@@ -289,14 +289,18 @@ pub static NAKAMOTO_CHAINSTATE_SCHEMA_6: &[&str] = &[
 ];
 
 pub static NAKAMOTO_CHAINSTATE_SCHEMA_7: &[&str] = &[
-    r#"
-    UPDATE db_config SET version = "12";
-    "#,
+    // schema change is JUST a new index, but the index is on a table
+    //  created by a migration, so don't add the index to the CHAINSTATE_INDEXES
+    r#"UPDATE db_config SET version = "12";"#,
+    "CREATE INDEX IF NOT EXISTS naka_block_headers_by_burn_hash ON nakamoto_block_headers(burn_header_hash);",
+    "CREATE INDEX IF NOT EXISTS naka_block_headers_by_burn_ht ON nakamoto_block_headers(burn_header_height);"
+];
+
+pub static NAKAMOTO_CHAINSTATE_SCHEMA_8: &[&str] = &[
+    r#"UPDATE db_config SET version = "13";"#,
     // Add a `total_tenure_size` field to the block header row, so we can keep track
     // of the whole tenure size (and eventually limit it)
     //
-    //
-    //
     // Default to 0.
     r#"
     -- total_tenure_size cannot be consensus critical as existing nodes which migrate will report a 0 size while

stackslib/src/chainstate/stacks/db/mod.rs

@@ -50,7 +50,7 @@ use crate::chainstate::nakamoto::{
     HeaderTypeNames, NakamotoBlockHeader, NakamotoChainState, NakamotoStagingBlocksConn,
     NAKAMOTO_CHAINSTATE_SCHEMA_1, NAKAMOTO_CHAINSTATE_SCHEMA_2, NAKAMOTO_CHAINSTATE_SCHEMA_3,
     NAKAMOTO_CHAINSTATE_SCHEMA_4, NAKAMOTO_CHAINSTATE_SCHEMA_5, NAKAMOTO_CHAINSTATE_SCHEMA_6,
-    NAKAMOTO_CHAINSTATE_SCHEMA_7,
+    NAKAMOTO_CHAINSTATE_SCHEMA_7, NAKAMOTO_CHAINSTATE_SCHEMA_8,
 };
 use crate::chainstate::stacks::address::StacksAddressExtensions;
 use crate::chainstate::stacks::boot::*;
@@ -665,8 +665,8 @@ impl<'a> DerefMut for ChainstateTx<'a> {
     }
 }
 
-pub const CHAINSTATE_VERSION: &str = "12";
-pub const CHAINSTATE_VERSION_NUMBER: u32 = 12;
+pub const CHAINSTATE_VERSION: &str = "13";
+pub const CHAINSTATE_VERSION_NUMBER: u32 = 13;
 
 const CHAINSTATE_INITIAL_SCHEMA: &[&str] = &[
     "PRAGMA foreign_keys = ON;",
@@ -1161,12 +1161,20 @@ impl StacksChainState {
                 }
                 "11" => {
                     info!(
-                        "Migrating chainstate schema from version 11 to 12: add total_tenure_size field"
+                        "Migrating chainstate schema from version 11 to 12: add index for nakamoto_block_headers"
                     );
                     for cmd in NAKAMOTO_CHAINSTATE_SCHEMA_7.iter() {
                         tx.execute_batch(cmd)?;
                     }
                 }
+                "12" => {
+                    info!(
+                        "Migrating chainstate schema from version 12 to 13: add total_tenure_size field"
+                    );
+                    for cmd in NAKAMOTO_CHAINSTATE_SCHEMA_8.iter() {
+                        tx.execute_batch(cmd)?;
+                    }
+                }
                 _ => {
                     error!(
                         "Invalid chain state database: expected version = {}, got {}",

stackslib/src/chainstate/stacks/db/transactions.rs

@@ -1558,13 +1558,14 @@ impl StacksChainState {
 
         // what version of Clarity did the transaction caller want? And, is it valid now?
         let clarity_version = StacksChainState::get_tx_clarity_version(clarity_block, tx)?;
-        if clarity_version == ClarityVersion::Clarity2 {
-            // requires 2.1 and higher
-            if clarity_block.get_epoch() < StacksEpochId::Epoch21 {
-                let msg = format!("Invalid transaction {}: asks for Clarity2, but not in Stacks epoch 2.1 or later", tx.txid());
-                info!("{}", &msg);
-                return Err(Error::InvalidStacksTransaction(msg, false));
-            }
+        if clarity_version > ClarityVersion::default_for_epoch(epoch) {
+            let msg = format!(
+                "Invalid transaction {}: asks for {clarity_version}, but current epoch {epoch} only supports up to {}",
+                tx.txid(),
+                ClarityVersion::default_for_epoch(epoch)
+            );
+            info!("{msg}");
+            return Err(Error::InvalidStacksTransaction(msg, false));
         }
 
         let mut transaction = clarity_block.connection().start_transaction_processing();
@@ -8666,7 +8667,9 @@ pub mod test {
         if let Err(Error::InvalidStacksTransaction(msg, ..)) =
             StacksChainState::process_transaction(&mut conn, &smart_contract_v2, false, None)
         {
-            assert!(msg.find("not in Stacks epoch 2.1 or later").is_some());
+            assert!(msg
+                .find("asks for Clarity 2, but current epoch 2.05 only supports up to Clarity 1")
+                .is_some());
         } else {
             panic!("FATAL: did not recieve the appropriate error in processing a clarity2 tx in pre-2.1 epoch");
         }

versions.toml

@@ -1,4 +1,4 @@
 # Update these values when a new release is created.
 # `stacks-common/build.rs` will automatically update `versions.rs` with these values.
-stacks_node_version = "3.3.0.0.0"
-stacks_signer_version = "3.3.0.0.0.0"
+stacks_node_version = "3.3.0.0.1"
+stacks_signer_version = "3.3.0.0.1.0"