Merge branch 'develop' of https://github.com/stacks-network/stacks-core into feat/send-signer-state-updates

Author: jferrant

.gitattributes

@@ -1,2 +1,6 @@
 legacy/* linguist-vendored
-* text=lf
+# Enforcing 'lf' eol mainly for:
+# - 'stx-genesis' package, where txt files need hash computation and comparison
+# - 'clarity' package, where clarity language is sensitive to line endings for .clar files
+# anyhow, setting eol for all text files to have a homogeneous management over the whole code base
+* text eol=lf

.github/workflows/bitcoin-tests.yml

@@ -106,6 +106,13 @@ jobs:
           - test-name: tests::epoch_24::verify_auto_unlock_behavior
           # Disable this flaky test. We don't need continue testing Epoch 2 -> 3 transition
           - test-name: tests::nakamoto_integrations::flash_blocks_on_epoch_3_FLAKY
+          # These mempool tests take a long time to run, and are meant to be run manually
+          - test-name: tests::nakamoto_integrations::large_mempool_original_constant_fee
+          - test-name: tests::nakamoto_integrations::large_mempool_original_random_fee
+          - test-name: tests::nakamoto_integrations::large_mempool_next_constant_fee
+          - test-name: tests::nakamoto_integrations::large_mempool_next_random_fee
+          - test-name: tests::nakamoto_integrations::larger_mempool
+          - test-name: tests::signer::v0::larger_mempool
 
     steps:
       ## Setup test environment

.vscode/settings.json

@@ -7,5 +7,6 @@
     },
     "rust-analyzer.rustfmt.extraArgs": [
         "+nightly"
-    ]
+    ],
+    "files.eol": "\n"
 }

Cargo.lock

@@ -77,6 +77,8 @@ _Warning, this typically takes a few minutes_
 cargo nextest run
 ```
 
+_On Windows, many tests will fail, mainly due to parallelism. To mitigate the issue you may need to run the tests individually._
+
 ## Run the testnet
 
 You can observe the state machine in action locally by running:
@@ -85,8 +87,6 @@ You can observe the state machine in action locally by running:
 cargo run --bin stacks-node -- start --config ./sample/conf/testnet-follower-conf.toml
 ```
 
-_On Windows, many tests will fail if the line endings aren't `LF`. Please ensure that you have git's `core.autocrlf` set to `input` when you clone the repository to avoid any potential issues. This is due to the Clarity language currently being sensitive to line endings._
-
 Additional testnet documentation is available [here](./docs/testnet.md) and [here](https://docs.stacks.co/docs/nodes-and-miners/miner-testnet)
 
 ## Release Process

README.md

@@ -1,14 +1,25 @@
 [package]
 name = "stacks-common"
 version = "0.0.1"
-authors = [ "Jude Nelson <[email protected]>",
-            "Aaron Blankstein <[email protected]>",
-            "Ludo Galabru <[email protected]>" ]
+authors = [
+    "Jude Nelson <[email protected]>",
+    "Aaron Blankstein <[email protected]>",
+    "Ludo Galabru <[email protected]>",
+]
 license = "GPLv3"
 homepage = "https://github.com/blockstack/stacks-blockchain"
 repository = "https://github.com/blockstack/stacks-blockchain"
 description = "Common modules for blockstack_lib, libclarity"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
 resolver = "2"
 edition = "2021"
@@ -25,7 +36,7 @@ serde_derive = "1"
 sha3 = "0.10.1"
 ripemd = "0.1.1"
 lazy_static = "1.4.0"
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
+slog = { version = "2.5.2", features = ["max_level_trace"] }
 slog-term = "2.6.0"
 slog-json = { version = "2.3.0", optional = true }
 chrono = "0.4.19"
@@ -37,7 +48,12 @@ rusqlite = { workspace = true, optional = true }
 nix = "0.23"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["consoleapi", "handleapi", "synchapi", "winbase"] }
+winapi = { version = "0.3", features = [
+    "consoleapi",
+    "handleapi",
+    "synchapi",
+    "winbase",
+] }
 
 [target.'cfg(windows)'.dev-dependencies]
 winapi = { version = "0.3", features = ["fileapi", "processenv", "winnt"] }
@@ -65,6 +81,7 @@ libsecp256k1 = { version = "0.7.0" }
 
 [dev-dependencies]
 rand_core = { workspace = true }
+proptest = "1.6.0"
 
 [features]
 default = ["developer-mode"]

stacks-common/Cargo.toml

@@ -16,7 +16,7 @@
 
 use rusqlite::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
 
-use super::chainstate::VRFSeed;
+use super::chainstate::{StacksAddress, VRFSeed};
 use crate::deps_common::bitcoin::util::hash::Sha256dHash;
 use crate::types::chainstate::{
     BlockHeaderHash, BurnchainHeaderHash, ConsensusHash, SortitionId, StacksBlockId, TrieHash,
@@ -42,6 +42,13 @@ impl ToSql for Sha256dHash {
     }
 }
 
+impl rusqlite::types::ToSql for StacksAddress {
+    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
+        let addr_str = self.to_string();
+        Ok(addr_str.into())
+    }
+}
+
 // Implement rusqlite traits for a bunch of structs that used to be defined
 //  in the chainstate code
 impl_byte_array_rusqlite_only!(ConsensusHash);