merged with develop

Author: rdeioris

.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,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "ReadOnlyFunctionArgs",
-  "description": "Describes representation of a Type-0 Stacks 2.0 transaction. https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-005-blocks-and-transactions.md#type-0-transferring-an-asset",
+  "description": "Describes representation of a Type-0 Stacks 2.0 transaction. https://github.com/stacksgov/sips/blob/main/sips/sip-005/sip-005-blocks-and-transactions.md#type-0-transferring-an-asset",
   "type": "object",
   "required": ["sender", "arguments"],
   "properties": {

docs/rpc/entities/contracts/read-only-function-args.schema.json

@@ -1705,6 +1705,12 @@ impl From<BlockResponse> for SignerMessage {
     }
 }
 
+impl From<StateMachineUpdate> for SignerMessage {
+    fn from(update: StateMachineUpdate) -> Self {
+        Self::StateMachineUpdate(update)
+    }
+}
+
 #[cfg(test)]
 mod test {
     use blockstack_lib::chainstate::nakamoto::NakamotoBlockHeader;