merged with develop

Author: rdeioris

CHANGELOG.md

@@ -14,12 +14,17 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ### Changed
 
+- Implement faster cost tracker for default cost functions in Clarity
 - Miner will stop waiting for signatures on a block if the Stacks tip advances (causing the block it had proposed to be invalid).
+- By default, miners will wait for a new tenure to start for a configurable amount of time after receiving a burn block before 
+  submitting a block commit. This will reduce the amount of RBF transactions miners are expected to need.
 - Logging improvements:
   - P2P logs now includes a reason for dropping a peer or neighbor
   - Improvements to how a PeerAddress is logged (human readable format vs hex)
+  - Add weight threshold and percentages to `StackerDBListener` logs
 - Signer will not allow reorg if more than one block in the current tenure has already been globally approved
 
+
 ### Fixed
 
 - Error responses to /v2/transactions/fees are once again expressed as JSON ([#4145](https://github.com/stacks-network/stacks-core/issues/4145)).

clarity/src/vm/contexts.rs

@@ -715,6 +715,10 @@ impl<'a, 'hooks> OwnedEnvironment<'a, 'hooks> {
         })
     }
 
+    pub fn is_mainnet(&self) -> bool {
+        self.context.mainnet
+    }
+
     #[cfg(any(test, feature = "testing"))]
     pub fn stx_faucet(&mut self, recipient: &PrincipalData, amount: u128) {
         self.execute_in_env::<_, _, crate::vm::errors::Error>(