Feat/check pox 2 params

.github/workflows/bitcoin-tests.yml

@@ -75,6 +75,7 @@ jobs:
           - tests::neon_integrations::test_problematic_blocks_are_not_relayed_or_stored
           - tests::neon_integrations::test_problematic_microblocks_are_not_mined
           - tests::neon_integrations::test_problematic_microblocks_are_not_relayed_or_stored
+          - tests::neon_integrations::push_boot_receipts
           - tests::epoch_205::test_dynamic_db_method_costs
           - tests::epoch_205::transition_empty_blocks
           - tests::epoch_205::test_cost_limit_switch_version205

clarity/src/vm/errors.rs

@@ -99,6 +99,7 @@ pub enum RuntimeErrorType {
     BadBlockHash(Vec<u8>),
     UnwrapFailure,
     DefunctPoxContract,
+    PoxAlreadyLocked,
 }
 
 #[derive(Debug, PartialEq)]

src/burnchains/db.rs

@@ -1063,6 +1063,16 @@ impl BurnchainDB {
         opt.ok_or(BurnchainError::MissingParentBlock)
     }
 
+    pub fn has_burnchain_block_at_height(
+        conn: &DBConn,
+        height: u64,
+    ) -> Result<bool, BurnchainError> {
+        let qry = "SELECT 1 FROM burnchain_db_block_headers WHERE block_height = ?1";
+        let args = &[&u64_to_sql(height)?];
+        let res: Option<i64> = query_row(conn, qry, args)?;
+        Ok(res.is_some())
+    }
+
     pub fn get_burnchain_block(
         conn: &DBConn,
         block: &BurnchainHeaderHash,
@@ -1524,12 +1534,20 @@ impl BurnchainDB {
         );
         for rc in start_rc..last_reward_cycle {
             if let Some((commit, metadata)) = BurnchainDB::get_anchor_block_commit(conn, rc)? {
+                let bhh = commit.block_header_hash.clone();
+                let txid = metadata.txid.clone();
                 let present = unconfirmed_oracle(commit, metadata);
                 if present {
-                    debug!("Assume present anchor block at reward cycle {}", rc);
+                    debug!(
+                        "Assume present anchor block {} txid {} at reward cycle {}",
+                        &bhh, &txid, rc
+                    );
                     heaviest_am.push(AffirmationMapEntry::PoxAnchorBlockPresent);
                 } else {
-                    debug!("Assume absent anchor block at reward cycle {}", rc);
+                    debug!(
+                        "Assume absent anchor block {} txid {} at reward cycle {}",
+                        &bhh, &txid, rc
+                    );
                     heaviest_am.push(AffirmationMapEntry::PoxAnchorBlockAbsent);
                 }
             } else {

src/chainstate/burn/db/sortdb.rs

@@ -66,7 +66,7 @@ use crate::chainstate::ChainstateDB;
 use crate::core::AST_RULES_PRECHECK_SIZE;
 use crate::core::FIRST_BURNCHAIN_CONSENSUS_HASH;
 use crate::core::FIRST_STACKS_BLOCK_HASH;
-use crate::core::{StacksEpoch, StacksEpochId, STACKS_EPOCH_MAX};
+use crate::core::{StacksEpoch, StacksEpochExtension, StacksEpochId, STACKS_EPOCH_MAX};
 use crate::net::neighbors::MAX_NEIGHBOR_BLOCK_DELAY;
 use crate::net::{Error as NetError, Error};
 use crate::util_lib::db::tx_begin_immediate;
@@ -2555,44 +2555,6 @@ impl SortitionDB {
         Ok(db)
     }
 
-    /// Validate all Stacks Epochs. Since this is data that always comes from a static variable,
-    /// any invalid StacksEpoch structuring should result in a runtime panic.
-    fn validate_epochs(epochs_ref: &[StacksEpoch]) -> Vec<StacksEpoch> {
-        // sanity check -- epochs must all be contiguous, each epoch must be unique,
-        // and the range of epochs should span the whole non-negative i64 space.
-        let mut epochs = epochs_ref.to_vec();
-        let mut seen_epochs = HashSet::new();
-        epochs.sort();
-
-        let mut epoch_end_height = 0;
-        for epoch in epochs.iter() {
-            assert!(
-                epoch.start_height <= epoch.end_height,
-                "{} > {} for {:?}",
-                epoch.start_height,
-                epoch.end_height,
-                &epoch.epoch_id
-            );
-
-            if epoch_end_height == 0 {
-                // first ever epoch must be defined for all of the prior chain history
-                assert_eq!(epoch.start_height, 0);
-                epoch_end_height = epoch.end_height;
-            } else {
-                assert_eq!(epoch_end_height, epoch.start_height);
-                epoch_end_height = epoch.end_height;
-            }
-            if seen_epochs.contains(&epoch.epoch_id) {
-                panic!("BUG: duplicate epoch");
-            }
-
-            seen_epochs.insert(epoch.epoch_id);
-        }
-
-        assert_eq!(epoch_end_height, STACKS_EPOCH_MAX);
-        epochs
-    }
-
     fn instantiate(
         &mut self,
         first_block_height: u64,
@@ -2657,7 +2619,7 @@ impl SortitionDB {
         db_tx: &Transaction,
         epochs: &[StacksEpoch],
     ) -> Result<(), db_error> {
-        let epochs = SortitionDB::validate_epochs(epochs);
+        let epochs = StacksEpoch::validate_epochs(epochs);
         for epoch in epochs.into_iter() {
             let args: &[&dyn ToSql] = &[
                 &(epoch.epoch_id as u32),
@@ -2815,7 +2777,9 @@ impl SortitionDB {
     pub fn is_db_version_supported_in_epoch(epoch: StacksEpochId, version: &str) -> bool {
         match epoch {
             StacksEpochId::Epoch10 => true,
-            StacksEpochId::Epoch20 => version == "1" || version == "2" || version == "3",
+            StacksEpochId::Epoch20 => {
+                version == "1" || version == "2" || version == "3" || version == "4"
+            }
             StacksEpochId::Epoch2_05 => version == "2" || version == "3" || version == "4",
             StacksEpochId::Epoch21 => version == "3" || version == "4",
         }