Merge branch 'develop' into feat/clarity-wasm-develop

Author: csgui

.dockerignore

@@ -1,14 +1,3 @@
 Dockerfile*
 target
-integration_tests/blockstack-consensus-data/
-integration_tests/test-out/
-api/data
-.git
-.venv
 .dockerignore
-testnet/index.html
-testnet.log
-testnet-logs*
-legacy
-build-scripts
-dist

.github/actions/dockerfiles/Dockerfile.debian-source

@@ -28,7 +28,7 @@ jobs:
     steps:
       - name: Checkout latest clarity js sdk
         id: git_checkout
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           token: ${{ secrets.GH_TOKEN }}
           repository: ${{ env.CLARITY_JS_SDK_REPOSITORY }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Create Pull Request
         id: create_pr
-        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
         with:
           token: ${{ secrets.GH_TOKEN }}
           commit-message: "chore: update clarity-native-bin tag"

.github/workflows/clarity-js-sdk-pr.yml

@@ -22,13 +22,13 @@ jobs:
     steps:
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Define Rust Toolchain
         id: define_rust_toolchain
         run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
       - name: Setup Rust Toolchain
         id: setup_rust_toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
           components: clippy

.github/workflows/clippy.yml

@@ -12,13 +12,13 @@ jobs:
     steps:
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Define Rust Toolchain
         id: define_rust_toolchain
         run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
       - name: Setup Rust Toolchain
         id: setup_rust_toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
       - name: Build the binaries

.github/workflows/core-build-tests.yml

@@ -21,13 +21,6 @@ jobs:
   image:
     name: Build Image
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      ## Build a maximum of 2 images concurrently based on matrix.dist
-      max-parallel: 2
-      matrix:
-        dist:
-          - debian
     steps:
       ## Increase swapfile
       - name: Increase swapfile
@@ -59,7 +52,7 @@ jobs:
       ## Set docker metatdata
       - name: Docker Metadata ( ${{matrix.dist}} )
         id: docker_metadata
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 #v5.5.1
+        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 #v5.6.1
         with:
           images: |
             ${{env.docker-org}}/${{ github.event.repository.name }}
@@ -71,9 +64,9 @@ jobs:
       ## Build docker image
       - name: Build and Push ( ${{matrix.dist}} )
         id: docker_build
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
         with:
-          file: ./.github/actions/dockerfiles/Dockerfile.${{matrix.dist}}-source
+          file: ./Dockerfile
           platforms: ${{ env.docker_platforms }}
           tags: ${{ steps.docker_metadata.outputs.tags }}
           labels: ${{ steps.docker_metadata.outputs.labels }}

.github/workflows/image-build-source.yml

@@ -78,7 +78,7 @@ jobs:
       ## checkout the code
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Run network relay tests
         id: nettest
@@ -96,10 +96,10 @@ jobs:
     steps:
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Execute core contract unit tests with clarinet-sdk
         id: clarinet_unit_test
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:
           node-version: 18.x
           cache: "npm"
@@ -125,7 +125,7 @@ jobs:
     steps:
       - name: Checkout the latest code
         id: git_checkout
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Execute core contract unit tests in Clarinet
         id: clarinet_unit_test_v1
         uses: docker://hirosystems/clarinet:1.7.1

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

@@ -4,22 +4,31 @@
     {
       "type": "lldb",
       "request": "launch",
-      "name": "executable 'blockstack-core'",
+      "name": "executable 'stacks-node'",
       "cargo": {
-        "args": ["build", "--bin=stacks-node"],
+        "args": [
+          "build",
+          "--bin=stacks-node"
+        ],
         "filter": {
           "kind": "bin"
         }
       },
-      "args": ["mockamoto"],
+      "args": [
+        "mockamoto"
+      ],
       "cwd": "${workspaceFolder}"
     },
     {
       "type": "lldb",
       "request": "launch",
       "name": "executable 'clarity-cli'",
       "cargo": {
-        "args": ["build", "--bin=clarity-cli", "--package=blockstack-core"],
+        "args": [
+          "build",
+          "--bin=clarity-cli",
+          "--package=stackslib"
+        ],
         "filter": {
           "name": "clarity-cli",
           "kind": "bin"
@@ -33,37 +42,54 @@
       "request": "launch",
       "name": "executable 'blockstack-cli'",
       "cargo": {
-        "args": ["build", "--bin=blockstack-cli", "--package=blockstack-core"],
+        "args": [
+          "build",
+          "--bin=blockstack-cli",
+          "--package=stackslib"
+        ],
         "filter": {
           "name": "blockstack-cli",
           "kind": "bin"
         }
       },
-      "args": ["generate-sk"],
+      "args": [
+        "generate-sk"
+      ],
       "cwd": "${workspaceFolder}"
     },
     {
       "type": "lldb",
       "request": "launch",
       "name": "executable 'stacks-node' -- mocknet",
       "cargo": {
-        "args": ["build", "--bin=stacks-node", "--package=stacks-node"],
+        "args": [
+          "build",
+          "--bin=stacks-node",
+          "--package=stacks-node"
+        ],
         "filter": {
           "name": "stacks-node",
           "kind": "bin"
         }
       },
-      "args": ["mocknet"],
+      "args": [
+        "mocknet"
+      ],
       "cwd": "${workspaceFolder}"
     },
     {
       "type": "lldb",
       "request": "launch",
-      "name": "unit tests in library 'blockstack_lib'",
+      "name": "unit tests in library 'stackslib'",
       "cargo": {
-        "args": ["test", "--no-run", "--lib", "--package=blockstack-core"],
+        "args": [
+          "test",
+          "--no-run",
+          "--lib",
+          "--package=stackslib"
+        ],
         "filter": {
-          "name": "blockstack_lib",
+          "name": "stackslib",
           "kind": "lib"
         }
       },
@@ -73,13 +99,13 @@
     {
       "type": "lldb",
       "request": "launch",
-      "name": "unit tests in executable 'blockstack-core'",
+      "name": "unit tests in executable 'stacks-inspect'",
       "cargo": {
         "args": [
           "test",
           "--no-run",
           "--bin=stacks-inspect",
-          "--package=blockstack-core"
+          "--package=stackslib"
         ],
         "filter": {
           "name": "stacks-inspect",
@@ -98,7 +124,7 @@
           "test",
           "--no-run",
           "--bin=clarity-cli",
-          "--package=blockstack-core"
+          "--package=stackslib"
         ],
         "filter": {
           "name": "clarity-cli",
@@ -117,7 +143,7 @@
           "test",
           "--no-run",
           "--bin=blockstack-cli",
-          "--package=blockstack-core"
+          "--package=stackslib"
         ],
         "filter": {
           "name": "blockstack-cli",
@@ -145,63 +171,6 @@
       },
       "args": [],
       "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "benchmark 'marf_bench'",
-      "cargo": {
-        "args": [
-          "test",
-          "--no-run",
-          "--bench=marf_bench",
-          "--package=blockstack-core"
-        ],
-        "filter": {
-          "name": "marf_bench",
-          "kind": "bench"
-        }
-      },
-      "args": [],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "benchmark 'large_contract_bench'",
-      "cargo": {
-        "args": [
-          "test",
-          "--no-run",
-          "--bench=large_contract_bench",
-          "--package=blockstack-core"
-        ],
-        "filter": {
-          "name": "large_contract_bench",
-          "kind": "bench"
-        }
-      },
-      "args": [],
-      "cwd": "${workspaceFolder}"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "benchmark 'block_limits'",
-      "cargo": {
-        "args": [
-          "test",
-          "--no-run",
-          "--bench=block_limits",
-          "--package=blockstack-core"
-        ],
-        "filter": {
-          "name": "block_limits",
-          "kind": "bench"
-        }
-      },
-      "args": [],
-      "cwd": "${workspaceFolder}"
     }
   ]
-}
+}

.vscode/launch.json

@@ -7,10 +7,31 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## [Unreleased]
 
-## Added
+### Changed
+
+- When a miner times out waiting for signatures, it will re-propose the same block instead of building a new block ([#5877](https://github.com/stacks-network/stacks-core/pull/5877))
+
+## [3.1.0.0.7]
+
+### Added
+
+- Add `disable_retries` mode for events_observer disabling automatic retry on error
+
+### Changed
+
+- Implement faster cost tracker for default cost functions in Clarity
+- By default, miners will wait for a new tenure to start for a configurable amount of time after receiving a burn block before
+  submitting a block commit. This will reduce the amount of RBF transactions miners are expected to need.
+- Add weight threshold and percentages to `StackerDBListener` logs
+- Signer will not allow reorg if more than one block in the current tenure has already been globally approved
+
+## [3.1.0.0.6]
+
+### Added
 
 - The `BlockProposal` StackerDB message serialization struct now includes a `server_version` string, which represents the version of the node that the miner is using. ([#5803](https://github.com/stacks-network/stacks-core/pull/5803))
 - Add `vrf_seed` to the `/v3/sortitions` rpc endpoint
+- Added hot-reloading of `burnchain.burn_fee_cap` from a miner's config file ([#5857](https://github.com/stacks-network/stacks-core/pull/5857))
 
 ### Changed