Merge branch 'develop' into feat/tx-replay-failsafe

Author: hstove

.cargo/config.toml

@@ -1,7 +1,7 @@
 [alias]
 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"
+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"
 
 # 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

.vscode/settings.json

@@ -1,12 +1,8 @@
 {
-    "lldb.launch.sourceLanguages": [
-        "rust"
-    ],
-    "rust-analyzer.runnables.extraEnv": {
-        "BITCOIND_TEST": "1"
-    },
-    "rust-analyzer.rustfmt.extraArgs": [
-        "+nightly"
-    ],
-    "files.eol": "\n"
-}
+  "lldb.launch.sourceLanguages": ["rust"],
+  "rust-analyzer.runnables.extraEnv": {
+    "BITCOIND_TEST": "1"
+  },
+  "rust-analyzer.rustfmt.extraArgs": ["+nightly"],
+  "files.eol": "\n"
+}

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
   - `stacks_node_miner_stop_reason_total`: Counts the number of times the miner stopped mining due to various reasons.
   - Always report the number of transactions mined in the last attempt, even if there were 0
 
+- Added a new option `--hex-file <file_path>` to `blockstack-cli contract-call` command, that allows to pass a serialized Clarity value by file.
 - Added a new option `--postcondition-mode [allow, deny]` to `blockstack-cli publish` command, to set the post-condition mode to allow or deny on the transaction (default is deny)
 
 ### Changed

Cargo.lock

@@ -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/assets.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/contracts.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/datamaps.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/defines.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/mod.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};