Activate global signer state machine

.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-types -p clarity -p libsigner -p stacks-common -p clarity-cli -p stacks-cli -p stacks-inspect --no-deps --tests --all-features -- -D warnings"
+clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity-types -p clarity -p libsigner -p stacks-common -p clarity-cli -p stacks-cli -p stacks-inspect --no-deps --tests --all-features -- -D warnings -Aclippy::unnecessary_lazy_evaluations"
 clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing -Wclippy::nonminimal_bool -Wclippy::clone_on_copy"
 
 # Uncomment to improve performance slightly, at the cost of portability

CHANGELOG.md

@@ -5,7 +5,14 @@ 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]
+## [3.3.0.0.4]
+
+### Added
+
+- New `/v3/tenures/tip_metadata` endpoint for returning some metadata along with the normal tenure tip information.
+
+
+## [3.3.0.0.3]
 
 ### Added
 

clarity-types/src/errors/mod.rs

@@ -190,6 +190,8 @@ pub enum RuntimeError {
     PoxAlreadyLocked,
     /// Block time unavailable during execution.
     BlockTimeNotAvailable,
+    /// A Clarity string used as a token name for a post-condition is not a valid Clarity name.
+    BadTokenName(String),
 }
 
 #[derive(Debug, PartialEq)]

clarity-types/src/tests/types/signatures.rs

@@ -12,7 +12,7 @@
 //
 // 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 std::collections::HashSet;
+use std::collections::BTreeSet;
 
 use crate::errors::analysis::CommonCheckErrorKind;
 use crate::representations::CONTRACT_MAX_NAME_LENGTH;
@@ -370,7 +370,7 @@ fn test_least_supertype() {
         }),
     ];
     let list_union2 = ListUnionType(callables2.clone().into());
-    let list_union_merged = ListUnionType(HashSet::from_iter(
+    let list_union_merged = ListUnionType(BTreeSet::from_iter(
         [callables, callables2].concat().iter().cloned(),
     ));
     let callable_principals = [

clarity-types/src/types/signatures.rs

@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::btree_map::Entry;
-use std::collections::{BTreeMap, HashSet};
+use std::collections::{BTreeMap, BTreeSet};
 use std::hash::Hash;
 use std::sync::Arc;
 use std::{cmp, fmt};
@@ -293,7 +293,7 @@ pub enum TypeSignature {
     // data structure to maintain the set of types in the list, so that when
     // we reach the place where the coercion needs to happen, we can perform
     // the check -- see `concretize` method.
-    ListUnionType(HashSet<CallableSubtype>),
+    ListUnionType(BTreeSet<CallableSubtype>),
     // This is used only below epoch 2.1. It has been replaced by CallableType.
     TraitReferenceType(TraitIdentifier),
 }
@@ -326,7 +326,7 @@ pub enum StringSubtype {
     UTF8(StringUTF8Length),
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, PartialOrd, Ord)]
 pub enum CallableSubtype {
     Principal(QualifiedContractIdentifier),
     Trait(TraitIdentifier),
@@ -1223,7 +1223,7 @@ impl TypeSignature {
                 if x == y {
                     Ok(a.clone())
                 } else {
-                    Ok(ListUnionType(HashSet::from([x.clone(), y.clone()])))
+                    Ok(ListUnionType(BTreeSet::from([x.clone(), y.clone()])))
                 }
             }
             (ListUnionType(l), CallableType(c)) | (CallableType(c), ListUnionType(l)) => {

clarity/src/vm/functions/post_conditions.rs

@@ -15,7 +15,9 @@
 
 use std::collections::HashMap;
 
+use clarity_types::errors::RuntimeError;
 use clarity_types::types::{AssetIdentifier, PrincipalData, StandardPrincipalData};
+use clarity_types::ClarityName;
 
 use crate::vm::analysis::type_checker::v2_1::natives::post_conditions::MAX_ALLOWANCES;
 use crate::vm::contexts::AssetMap;
@@ -135,7 +137,12 @@ fn eval_allowance(
             };
 
             let asset_name = eval(&rest[1], env, context)?;
-            let asset_name = asset_name.expect_string_ascii()?.as_str().into();
+            let asset_name = match ClarityName::try_from(asset_name.expect_string_ascii()?) {
+                Ok(name) => name,
+                Err(_) => {
+                    return Err(RuntimeError::BadTokenName(rest[1].to_string()).into());
+                }
+            };
 
             let asset = AssetIdentifier {
                 contract_identifier,
@@ -165,7 +172,12 @@ fn eval_allowance(
             };
 
             let asset_name = eval(&rest[1], env, context)?;
-            let asset_name = asset_name.expect_string_ascii()?.as_str().into();
+            let asset_name = match ClarityName::try_from(asset_name.expect_string_ascii()?) {
+                Ok(name) => name,
+                Err(_) => {
+                    return Err(RuntimeError::BadTokenName(rest[1].to_string()).into());
+                }
+            };
 
             let asset = AssetIdentifier {
                 contract_identifier,