Skip to content

Commit 881e215

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feat/hot-reload-miner-spend
2 parents 785f1fa + bd45dd7 commit 881e215

File tree

24 files changed

+4518
-531
lines changed

24 files changed

+4518
-531
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
1515

1616
### Changed
1717

18+
- Implement faster cost tracker for default cost functions in Clarity
1819
- Miner will stop waiting for signatures on a block if the Stacks tip advances (causing the block it had proposed to be invalid).
20+
- By default, miners will wait for a new tenure to start for a configurable amount of time after receiving a burn block before
21+
submitting a block commit. This will reduce the amount of RBF transactions miners are expected to need.
1922
- Logging improvements:
2023
- P2P logs now includes a reason for dropping a peer or neighbor
2124
- Improvements to how a PeerAddress is logged (human readable format vs hex)
25+
- Add weight threshold and percentages to `StackerDBListener` logs
2226

2327
### Fixed
2428

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)