Merge branch 'develop' into chore/stacks-common-optional-requirements

Author: Jiloc

.cargo/config.toml

@@ -2,6 +2,7 @@
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
 clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings -A clippy::uninlined-format-args"
+clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing"
 
 # Uncomment to improve performance slightly, at the cost of portability
 #   * Note that native binaries may not run on CPUs that are different from the build machine

.github/CODEOWNERS

@@ -1,16 +1,10 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 #
-# require both blockchain-team-codeowners and blockchain-team to review all PR's not specifically matched below
-* @stacks-network/blockchain-team-codeowners @stacks-network/blockchain-team
-
-
-# Signer code
-# require both blockchain-team-codeowners and blockchain-team-signer to review PR's for the signer folder(s)
-libsigner/**/*.rs @stacks-network/blockchain-team-codeowners @stacks-network/blockchain-team-signer
-stacks-signer/**/*.rs @stacks-network/blockchain-team-codeowners @stacks-network/blockchain-team-signer
+# require both blockchain-team-codeowners and blockchain-team-reviewers to review all PR's not specifically matched below
+* @stacks-network/blockchain-team-codeowners @stacks-network/blockchain-team-reviewers
 
 # CI workflows
-#  require both blockchain-team and blockchain-team-ci teams to review PR's modifying CI workflows
-/.github/workflows/ @stacks-network/blockchain-team @stacks-network/blockchain-team-ci
-/.github/actions/ @stacks-network/blockchain-team @stacks-network/blockchain-team-ci
+#  require both blockchain-team-ci and blockchain-team-reviewers teams to review PR's modifying CI workflows
+/.github/workflows/ @stacks-network/blockchain-team-ci @stacks-network/blockchain-team-reviewers
+/.github/actions/ @stacks-network/blockchain-team-ci @stacks-network/blockchain-team-reviewers

CHANGELOG.md

@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
-# Unreleased
+## Unreleased
+
+### Changed
+
+- When a previous block commit is unable to be RBFed, the miner will now just wait for it to be confirmed instead of submitting a new block commit which breaks the miner's UTXO chain.
+
+## [3.1.0.0.13]
 
 ### Added
 

clarity/src/vm/tests/assets.rs

@@ -13,21 +13,28 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::ast::ASTRules;
-use crate::vm::contexts::{AssetMap, AssetMapEntry, OwnedEnvironment};
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
+use crate::vm::contexts::{AssetMap, OwnedEnvironment};
+use crate::vm::errors::Error;
 use crate::vm::events::StacksTransactionEvent;
 use crate::vm::representations::SymbolicExpression;
-use crate::vm::tests::{
-    execute, is_committed, is_err_code, symbols_from_values, test_clarity_versions, test_epochs,
-    tl_env_factory as env_factory, TopLevelMemoryEnvironmentGenerator,
+use crate::vm::tests::{test_clarity_versions, test_epochs};
+use crate::vm::types::{PrincipalData, QualifiedContractIdentifier, Value};
+#[cfg(test)]
+use crate::vm::{
+    ast::ASTRules,
+    contexts::AssetMapEntry,
+    errors::{CheckErrors, RuntimeErrorType},
+    tests::{
+        execute, is_committed, is_err_code, symbols_from_values, tl_env_factory as env_factory,
+        TopLevelMemoryEnvironmentGenerator,
+    },
+    types::AssetIdentifier,
+    version::ClarityVersion,
+    ContractContext,
 };
-use crate::vm::types::{AssetIdentifier, PrincipalData, QualifiedContractIdentifier, Value};
-use crate::vm::version::ClarityVersion;
-use crate::vm::ContractContext;
 
 const FIRST_CLASS_TOKENS: &str = "(define-fungible-token stackaroos)
          (define-read-only (my-ft-get-balance (account principal))

clarity/src/vm/tests/contracts.rs

@@ -16,23 +16,23 @@
 
 #[cfg(any(test, feature = "testing"))]
 use rstest::rstest;
-use stacks_common::types::chainstate::BlockHeaderHash;
-use stacks_common::types::StacksEpochId;
+#[cfg(test)]
+use stacks_common::types::{chainstate::BlockHeaderHash, StacksEpochId};
 
-use crate::vm::ast::errors::ParseErrors;
-use crate::vm::ast::ASTRules;
 use crate::vm::contexts::Environment;
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
-use crate::vm::tests::{
-    env_factory, execute, is_committed, is_err_code_i128 as is_err_code, symbols_from_values,
-    test_clarity_versions, test_epochs, tl_env_factory, MemoryEnvironmentGenerator,
-    TopLevelMemoryEnvironmentGenerator,
+use crate::vm::tests::{test_clarity_versions, test_epochs};
+use crate::vm::types::{PrincipalData, QualifiedContractIdentifier, StandardPrincipalData, Value};
+#[cfg(test)]
+use crate::vm::{
+    ast::{errors::ParseErrors, ASTRules},
+    errors::{CheckErrors, Error, RuntimeErrorType},
+    tests::{
+        env_factory, execute, is_committed, is_err_code_i128 as is_err_code, symbols_from_values,
+        tl_env_factory, MemoryEnvironmentGenerator, TopLevelMemoryEnvironmentGenerator,
+    },
+    types::{OptionalData, ResponseData, TypeSignature},
+    {execute as vm_execute, ClarityVersion, ContractContext},
 };
-use crate::vm::types::{
-    OptionalData, PrincipalData, QualifiedContractIdentifier, ResponseData, StandardPrincipalData,
-    TypeSignature, Value,
-};
-use crate::vm::{execute as vm_execute, ClarityVersion, ContractContext};
 
 const FACTORIAL_CONTRACT: &str = "(define-map factorials { id: int } { current: int, index: int })
          (define-private (init-factorial (id int) (factorial int))

clarity/src/vm/tests/datamaps.rs

@@ -13,10 +13,12 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-use crate::vm::errors::{CheckErrors, Error, ShortReturnType};
-use crate::vm::types::{
-    ListData, SequenceData, TupleData, TupleTypeSignature, TypeSignature, Value,
+use crate::vm::errors::Error;
+use crate::vm::types::{TupleData, Value};
+#[cfg(test)]
+use crate::vm::{
+    errors::{CheckErrors, ShortReturnType},
+    types::{ListData, SequenceData, TupleTypeSignature, TypeSignature},
 };
 use crate::vm::{execute, ClarityName};
 

clarity/src/vm/tests/defines.rs

@@ -18,14 +18,21 @@
 use rstest::rstest;
 #[cfg(test)]
 use rstest_reuse::{self, *};
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::ast::build_ast;
-use crate::vm::ast::errors::{ParseError, ParseErrors};
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
+use crate::vm::errors::{CheckErrors, Error};
 use crate::vm::tests::test_clarity_versions;
-use crate::vm::types::{QualifiedContractIdentifier, TypeSignature, Value};
-use crate::vm::{execute, ClarityVersion};
+#[cfg(test)]
+use crate::vm::{
+    ast::{
+        build_ast,
+        errors::{ParseError, ParseErrors},
+    },
+    errors::RuntimeErrorType,
+    types::{QualifiedContractIdentifier, TypeSignature, Value},
+    {execute, ClarityVersion},
+};
 
 fn assert_eq_err(e1: CheckErrors, e2: Error) {
     let e1: Error = e1.into();

clarity/src/vm/tests/mod.rs

@@ -14,18 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#![allow(unused_imports)]
-
 use stacks_common::consts::{CHAIN_ID_MAINNET, CHAIN_ID_TESTNET};
 use stacks_common::types::StacksEpochId;
 
 pub use super::test_util::*;
+#[cfg(test)]
 use super::ClarityVersion;
 use crate::vm::contexts::OwnedEnvironment;
 pub use crate::vm::database::BurnStateDB;
 use crate::vm::database::MemoryBackingStore;
-use crate::vm::errors::Error;
-use crate::vm::types::Value;
+#[cfg(test)]
+use crate::{vm::errors::Error, vm::types::Value};
 
 mod assets;
 mod contracts;

clarity/src/vm/tests/principals.rs

@@ -1,15 +1,17 @@
-use hashbrown::HashMap;
 use stacks_common::types::StacksEpochId;
 use stacks_common::util::hash::hex_bytes;
 
 use crate::vm::ast::ASTRules;
-use crate::vm::errors::CheckErrors;
-use crate::vm::functions::principals::PrincipalConstructErrorCode;
-use crate::vm::types::TypeSignature::PrincipalType;
 use crate::vm::types::{
     ASCIIData, BuffData, CharType, OptionalData, PrincipalData, QualifiedContractIdentifier,
-    ResponseData, SequenceData, StandardPrincipalData, TupleData, TypeSignature, Value, BUFF_1,
-    BUFF_20,
+    SequenceData, StandardPrincipalData, TupleData, Value,
+};
+#[cfg(test)]
+use crate::vm::{
+    errors::CheckErrors,
+    functions::principals::PrincipalConstructErrorCode,
+    types::TypeSignature::PrincipalType,
+    types::{ResponseData, TypeSignature, BUFF_1, BUFF_20},
 };
 use crate::vm::{execute_with_parameters, ClarityVersion};
 

clarity/src/vm/tests/sequences.rs

@@ -16,16 +16,25 @@
 
 use rstest::rstest;
 use rstest_reuse::{self, *};
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
 use crate::vm::tests::test_clarity_versions;
-use crate::vm::types::signatures::SequenceSubtype;
-use crate::vm::types::signatures::SequenceSubtype::{BufferType, StringType};
-use crate::vm::types::signatures::StringSubtype::ASCII;
-use crate::vm::types::TypeSignature::{BoolType, IntType, SequenceType, UIntType};
-use crate::vm::types::{BufferLength, StringSubtype, StringUTF8Length, TypeSignature, Value};
-use crate::vm::{execute, execute_v2, ClarityVersion};
+#[cfg(test)]
+use crate::vm::{
+    errors::{CheckErrors, Error, RuntimeErrorType},
+    execute, execute_v2,
+    types::{
+        signatures::{
+            SequenceSubtype::{self, BufferType, StringType},
+            StringSubtype::ASCII,
+        },
+        BufferLength, StringSubtype, StringUTF8Length,
+        TypeSignature::{self, BoolType, IntType, SequenceType, UIntType},
+        Value,
+    },
+    ClarityVersion,
+};
 
 #[test]
 fn test_simple_list_admission() {