Merge branch 'develop' into chore/fix-warnings

Author: obycode

.cargo/config

@@ -1,5 +1,6 @@
 [alias]
 stacks-node = "run --package stacks-node --"
+fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
 
 # Needed by perf to generate flamegraphs.
 #[target.x86_64-unknown-linux-gnu]

.github/actions/bitcoin-int-tests/Dockerfile.rustfmt

@@ -4,9 +4,10 @@ WORKDIR /src
 
 COPY ./rust-toolchain .
 COPY ./Cargo.toml .
+COPY ./.cargo .
 
 RUN rustup component add rustfmt
 
 COPY . .
 
-RUN cargo fmt --all -- --check
+RUN cargo fmt-stacks --check

.github/workflows/bitcoin-tests.yml

@@ -37,7 +37,7 @@ jobs:
           sudo apt-get remove -y 'php.*'
           sudo apt-get remove -y '^mongodb-.*'
           sudo apt-get remove -y '^mysql-.*'
-          sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
+          sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
           sudo apt-get autoremove -y
           sudo apt-get clean
           docker system prune --force
@@ -139,6 +139,7 @@ jobs:
           - tests::neon_integrations::bad_microblock_pubkey
           - tests::epoch_24::fix_to_pox_contract
           - tests::epoch_24::verify_auto_unlock_behavior
+          - tests::signer::test_stackerdb_dkg
           - tests::stackerdb::test_stackerdb_load_store
           - tests::stackerdb::test_stackerdb_event_observer
     steps:

.github/workflows/clippy.yml

@@ -1,5 +1,3 @@
-# Disabled - this workflow needs more work so it's not incredibly chatty
-##
 ## Perform Clippy checks - currently set to defaults
 ##   https://github.com/rust-lang/rust-clippy#usage
 ##   https://rust-lang.github.io/rust-clippy/master/index.html
@@ -17,10 +15,10 @@ on:
     types:
       - opened
       - reopened
+      - synchronize
 
 jobs:
   clippy_check:
-    if: ${{ false }}
     name: Clippy Check
     runs-on: ubuntu-latest
     steps:
@@ -41,4 +39,4 @@ jobs:
         uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
+          args: -p clarity -p libstackerdb -p pox-locking -p stacks-common --no-deps --tests --all-features -- -D warnings

.github/workflows/stacks-blockchain-tests.yml

@@ -19,6 +19,19 @@ jobs:
       - name: Checkout the latest code
         id: git_checkout
         uses: actions/checkout@v3
+      - name: Reclaim disk space
+        id: cleanup
+        run: |
+          sudo apt-get update
+          sudo apt-get remove -y '^dotnet-.*'
+          sudo apt-get remove -y '^llvm-.*'
+          sudo apt-get remove -y 'php.*'
+          sudo apt-get remove -y '^mongodb-.*'
+          sudo apt-get remove -y '^mysql-.*'
+          sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
+          sudo apt-get autoremove -y
+          sudo apt-get clean
+          docker system prune --force
       - name: Single full genesis integration test
         id: full_genesis_test
         env:
@@ -125,19 +138,42 @@ jobs:
   # Core contract tests
   core-contracts-clarinet-test:
     name: Core Contracts Test
+    defaults:
+      run:
+        working-directory: "./contrib/core-contract-tests/"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
         id: git_checkout
         uses: actions/checkout@v3
-      - name: Execute core contract unit tests in Clarinet
+      - name: Execute core contract unit tests with clarinet-sdk
         id: clarinet_unit_test
-        uses: docker://hirosystems/clarinet:1.1.0
+        uses: actions/setup-node@v3
         with:
-          args: test --coverage --manifest-path=./contrib/core-contract-tests/Clarinet.toml
+          node-version: 18.x
+          cache: "npm"
+          cache-dependency-path: "./contrib/core-contract-tests/package-lock.json"
+      - run: npm ci
+      - run: npm test
       - name: Export code coverage
         id: clarinet_codecov
         uses: codecov/codecov-action@v3
         with:
-          files: ./coverage.lcov
+          files: ./lcov.info
           verbose: true
+
+  # Core contract tests on Clarinet v1
+  # Check for false positives/negatives
+  # https://github.com/stacks-network/stacks-blockchain/pull/4031#pullrequestreview-1713341208
+  core-contracts-clarinet-test-clarinet-v1:
+    name: Core Contracts Test Clarinet V1
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        id: git_checkout
+        uses: actions/checkout@v3
+      - name: Execute core contract unit tests in Clarinet
+        id: clarinet_unit_test_v1
+        uses: docker://hirosystems/clarinet:1.7.1
+        with:
+          args: test --manifest-path=./contrib/core-contract-tests/Clarinet.toml contrib/core-contract-tests/tests/bns/name_register_test.ts

CHANGELOG.md

@@ -21,6 +21,8 @@ StackerDB replicas in their config files.
 - Message definitions and codecs for Stacker DB, a replicated off-chain DB
   hosted by subscribed Stacks nodes and controlled by smart contracts
 - Added 3 new public and regionally diverse bootstrap nodes: est.stacksnodes.org, cet.stacksnodes.org, sgt.stacksnodes.org
+- satoshis_per_byte can be changed in the config file and miners will always use
+  the most up to date value
 
 ### Changed
 

CONTRIBUTING.md

@@ -101,8 +101,8 @@ you push your code. Follow these instruction to set it up:
 2. Change the content of `.git/hooks/pre-commit` to be the following
 ```sh
 #!/bin/sh
-git diff --name-only --staged | grep '\.rs$' | xargs -P 8 -I {} rustfmt {} --edition 2021 --check --config group_imports=StdExternalCrate || (
-  echo 'rustfmt failed: run "cargo fmt --all -- --config group_imports=StdExternalCrate"';
+git diff --name-only --staged | grep '\.rs$' | xargs -P 8 -I {} rustfmt {} --edition 2021 --check --config group_imports=StdExternalCrate,imports_granularity=Module || (
+  echo 'rustfmt failed: run "cargo fmt-stacks"';
   exit 1
 )
 ```
@@ -384,19 +384,20 @@ A test should be marked `#[ignore]` if:
 
 ## Formatting
 
-This repository uses the default rustfmt formatting style. PRs will be checked against `rustfmt` and will _fail_ if not
-properly formatted.
+PRs will be checked against `rustfmt` and will _fail_ if not properly formatted.
+Unfortunately, some config options that we require cannot currently be set in `.rustfmt` files, so arguments must be passed via the command line.
+Therefore, we handle `rustfmt` configuration using a Cargo alias: `cargo fmt-stacks`
 
 You can check the formatting locally via:
 
 ```bash
-cargo fmt --all -- --check --config group_imports=StdExternalCrate
+cargo fmt-stacks --check
 ```
 
 You can automatically reformat your commit via:
 
 ```bash
-cargo fmt --all -- --config group_imports=StdExternalCrate
+cargo fmt-stacks
 ```
 
 ## Comments