Skip to content

Commit b611cfc

Browse files
authored
Merge branch 'develop' into feat/block-commit-checks
2 parents e078628 + 3fa16aa commit b611cfc

File tree

14 files changed

+3719
-108
lines changed

14 files changed

+3719
-108
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
1414

1515
### Changed
1616

17+
- Implement faster cost tracker for default cost functions in Clarity
1718
- Miner will stop waiting for signatures on a block if the Stacks tip advances (causing the block it had proposed to be invalid).
1819
- By default, miners will wait for a new tenure to start for a configurable amount of time after receiving a burn block before
1920
submitting a block commit. This will reduce the amount of RBF transactions miners are expected to need.

clarity/src/vm/contexts.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,10 @@ impl<'a, 'hooks> OwnedEnvironment<'a, 'hooks> {
715715
})
716716
}
717717

718+
pub fn is_mainnet(&self) -> bool {
719+
self.context.mainnet
720+
}
721+
718722
#[cfg(any(test, feature = "testing"))]
719723
pub fn stx_faucet(&mut self, recipient: &PrincipalData, amount: u128) {
720724
self.execute_in_env::<_, _, crate::vm::errors::Error>(

clarity/src/vm/costs/cost_functions.rs

Lines changed: 326 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)