Feat/nakamoto coordinator

.github/workflows/bitcoin-tests.yml

@@ -142,6 +142,7 @@ jobs:
           - tests::epoch_24::verify_auto_unlock_behavior
           - tests::stackerdb::test_stackerdb_load_store
           - tests::stackerdb::test_stackerdb_event_observer
+          - tests::signer::test_stackerdb_dkg
     steps:
       - name: Checkout the latest code
         id: git_checkout

clarity/src/vm/analysis/mod.rs

@@ -141,6 +141,7 @@ pub fn run_analysis(
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
             | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
             | StacksEpochId::Epoch30 => {
                 TypeChecker2_1::run_pass(&epoch, &mut contract_analysis, db)
             }

clarity/src/vm/analysis/type_checker/mod.rs

@@ -53,6 +53,7 @@ impl FunctionType {
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
             | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
             | StacksEpochId::Epoch30 => self.check_args_2_1(accounting, args, clarity_version),
             StacksEpochId::Epoch10 => unreachable!("Epoch10 is not supported"),
         }
@@ -73,6 +74,7 @@ impl FunctionType {
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
             | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
             | StacksEpochId::Epoch30 => {
                 self.check_args_by_allowing_trait_cast_2_1(db, clarity_version, func_args)
             }

clarity/src/vm/costs/mod.rs

@@ -724,6 +724,7 @@ impl LimitedCostTracker {
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
             | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
             | StacksEpochId::Epoch30 => COSTS_3_NAME.to_string(),
         }
     }

clarity/src/vm/database/clarity_db.rs

@@ -112,7 +112,9 @@ pub trait HeadersDB {
 pub trait BurnStateDB {
     fn get_v1_unlock_height(&self) -> u32;
     fn get_v2_unlock_height(&self) -> u32;
+    fn get_v3_unlock_height(&self) -> u32;
     fn get_pox_3_activation_height(&self) -> u32;
+    fn get_pox_4_activation_height(&self) -> u32;
 
     /// Returns the *burnchain block height* for the `sortition_id` is associated with.
     fn get_burn_block_height(&self, sortition_id: &SortitionId) -> Option<u32>;
@@ -201,10 +203,18 @@ impl BurnStateDB for &dyn BurnStateDB {
         (*self).get_v2_unlock_height()
     }
 
+    fn get_v3_unlock_height(&self) -> u32 {
+        (*self).get_v3_unlock_height()
+    }
+
     fn get_pox_3_activation_height(&self) -> u32 {
         (*self).get_pox_3_activation_height()
     }
 
+    fn get_pox_4_activation_height(&self) -> u32 {
+        (*self).get_pox_4_activation_height()
+    }
+
     fn get_burn_block_height(&self, sortition_id: &SortitionId) -> Option<u32> {
         (*self).get_burn_block_height(sortition_id)
     }
@@ -379,10 +389,18 @@ impl BurnStateDB for NullBurnStateDB {
         u32::MAX
     }
 
+    fn get_v3_unlock_height(&self) -> u32 {
+        u32::MAX
+    }
+
     fn get_pox_3_activation_height(&self) -> u32 {
         u32::MAX
     }
 
+    fn get_pox_4_activation_height(&self) -> u32 {
+        u32::MAX
+    }
+
     fn get_pox_prepare_length(&self) -> u32 {
         panic!("NullBurnStateDB should not return PoX info");
     }
@@ -820,6 +838,11 @@ impl<'a> ClarityDatabase<'a> {
         self.burn_state_db.get_pox_3_activation_height()
     }
 
+    /// Return the height for PoX 4 activation from the burn state db
+    pub fn get_pox_4_activation_height(&self) -> u32 {
+        self.burn_state_db.get_pox_4_activation_height()
+    }
+
     /// Return the height for PoX v2 -> v3 auto unlocks
     ///   from the burn state db
     pub fn get_v2_unlock_height(&mut self) -> u32 {
@@ -830,6 +853,16 @@ impl<'a> ClarityDatabase<'a> {
         }
     }
 
+    /// Return the height for PoX v3 -> v4 auto unlocks
+    ///   from the burn state db
+    pub fn get_v3_unlock_height(&mut self) -> u32 {
+        if self.get_clarity_epoch_version() >= StacksEpochId::Epoch24 {
+            self.burn_state_db.get_v3_unlock_height()
+        } else {
+            u32::MAX
+        }
+    }
+
     /// Get the last-known burnchain block height.
     /// Note that this is _not_ the burnchain height in which this block was mined!
     /// This is the burnchain block height of the parent of the Stacks block at the current Stacks
@@ -1906,8 +1939,8 @@ impl<'a> ClarityDatabase<'a> {
             stx_balance.amount_locked(),
             stx_balance.unlock_height(),
             cur_burn_height,
-            stx_balance.get_available_balance_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height()),
-            stx_balance.has_unlockable_tokens_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height()));
+            stx_balance.get_available_balance_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height(), self.get_v3_unlock_height()),
+            stx_balance.has_unlockable_tokens_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height(), self.get_v3_unlock_height()));
 
         STXBalanceSnapshot::new(principal, stx_balance, cur_burn_height, self)
     }
@@ -1925,8 +1958,8 @@ impl<'a> ClarityDatabase<'a> {
             stx_balance.amount_locked(),
             stx_balance.unlock_height(),
             cur_burn_height,
-            stx_balance.get_available_balance_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height()),
-            stx_balance.has_unlockable_tokens_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height()));
+            stx_balance.get_available_balance_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height(), self.get_v3_unlock_height()),
+            stx_balance.has_unlockable_tokens_at_burn_block(cur_burn_height, self.get_v1_unlock_height(), self.get_v2_unlock_height(), self.get_v3_unlock_height()));
 
         STXBalanceSnapshot::new(principal, stx_balance, cur_burn_height, self)
     }