Merge pull request #6004 from csgui/clarity-wasm-develop-sync

Clarity wasm develop sync

Author: obycode

.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

.github/workflows/ci.yml

@@ -102,22 +102,6 @@ jobs:
       signer_docker_tag: ${{ needs.check-release.outputs.signer_docker_tag }}
       is_node_release: ${{ needs.check-release.outputs.is_node_release }}
       is_signer_release: ${{ needs.check-release.outputs.is_signer_release }}
-    secrets: inherit
-
-  ## Build and push Debian image built from source
-  ##
-  ## Runs when:
-  ##  - it is not a node or signer-only release run
-  docker-image:
-    if: |
-      needs.check-release.outputs.is_node_release != 'true' ||
-      needs.check-release.outputs.is_signer_release != 'true'
-    name: Docker Image (Source)
-    uses: ./.github/workflows/image-build-source.yml
-    needs:
-      - rustfmt
-      - check-release
-    secrets: inherit
 
   ## Create a reusable cache for tests
   ##

.github/workflows/clippy.yml

@@ -7,6 +7,9 @@ name: Clippy Checks
 # Only run when:
 #   - PRs are (re)opened against develop branch
 on:
+  merge_group:
+    types:
+      - checks_requested
   pull_request:
     branches:
       - develop
@@ -34,4 +37,4 @@ jobs:
           components: clippy
       - name: Clippy
         id: clippy
-        run: cargo clippy-stacks
+        run: cargo clippy-stacks

.github/workflows/github-release.yml

@@ -29,9 +29,6 @@ on:
         description: "True if it is a signer release"
         required: true
         type: string
-    secrets:
-      GH_TOKEN:
-        required: true
 
 concurrency:
   group: github-release-${{ github.head_ref || github.ref }}
@@ -41,6 +38,21 @@ concurrency:
 run-name: ${{ inputs.node_tag || inputs.signer_tag }}
 
 jobs:
+  ## This job's sole purpose is trigger a secondary approval outside of the matrix jobs below. 
+  ##   - If this job isn't approved to run, then the subsequent jobs will also not run - for this reason, we always exit 0
+  ##   - `andon-cord` requires the repo environment "Build Release", which will trigger a secondary approval step before running this workflow.  
+  andon-cord:
+    if: |
+      inputs.node_tag != '' ||
+      inputs.signer_tag != ''
+    name: Andon Cord
+    runs-on: ubuntu-latest
+    environment: "Build Release"
+    steps:
+      - name: Check Approval
+        id: check
+        run: |
+          exit 0
   ## Build arch dependent binaries from source
   ##
   ## Runs when the following is true:
@@ -51,7 +63,8 @@ jobs:
       inputs.signer_tag != ''
     name: Build Binaries
     runs-on: ubuntu-latest
-    environment: "Build Release"
+    needs:
+      - andon-cord
     strategy:
       ## Run a maximum of 10 builds concurrently, using the matrix defined in inputs.arch
       max-parallel: 10
@@ -94,7 +107,10 @@ jobs:
     name: Create Release
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
+    permissions:
+      contents: write
     steps:
       ## Creates releases
       - name: Create Release
@@ -106,8 +122,7 @@ jobs:
           signer_docker_tag: ${{ inputs.signer_docker_tag }}
           is_node_release: ${{ inputs.is_node_release }}
           is_signer_release: ${{ inputs.is_signer_release }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   ## Builds arch dependent Docker images from binaries
   ##
@@ -121,6 +136,7 @@ jobs:
     name: Docker Image (Binary)
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
       - create-release
     strategy:
@@ -148,17 +164,23 @@ jobs:
   ## Create the downstream PR for the release branch to master,develop
   create-pr:
     if: |
-      inputs.node_tag != '' ||
-      inputs.signer_tag != ''
+      !contains(github.ref, '-rc') &&
+      (
+        inputs.node_tag != '' ||
+        inputs.signer_tag != ''
+      )
     name: Create Downstream PR (${{ github.ref_name }})
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
       - create-release
       - docker-image
+    permissions:
+      pull-requests: write
     steps:
       - name: Open Downstream PR
         id: create-pr
         uses: stacks-network/actions/stacks-core/release/downstream-pr@main
         with:
-          token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -21,6 +21,8 @@ jobs:
   image:
     name: Build Image
     runs-on: ubuntu-latest
+    ## Requires the repo environment "Push to Docker", which will trigger a secondary approval step before running this workflow.
+    environment: "Push to Docker"
     steps:
       ## Increase swapfile
       - name: Increase swapfile

.gitmodules

@@ -1,7 +1,12 @@
 {
-  "lldb.launch.sourceLanguages": ["rust"],
-  "rust-analyzer.runnables.extraEnv": {
-    "BITCOIND_TEST": "1"
-  },
-  "rust-analyzer.rustfmt.extraArgs": ["+nightly"]
+    "lldb.launch.sourceLanguages": [
+        "rust"
+    ],
+    "rust-analyzer.runnables.extraEnv": {
+        "BITCOIND_TEST": "1"
+    },
+    "rust-analyzer.rustfmt.extraArgs": [
+        "+nightly"
+    ],
+    "files.eol": "\n"
 }

.vscode/settings.json

@@ -5,19 +5,22 @@ 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.1.0.0.8]
 
 ### Added
 
 - Add fee information to transaction log ending with "success" or "skipped", while building a new block
+- Add `max_execution_time_secs` to miner config for limiting duration of contract calls
 - When a miner's config file is updated (ie with a new fee rate), a new block commit is issued using
   the new values ([#5924](https://github.com/stacks-network/stacks-core/pull/5924))
+- Add `txindex` configuration option enabling the storage (and querying via api) of transactions. Note: the old STACKS_TRANSACTION_LOG environment var configuration is no longer available.
 
 ### 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))
 - Improve tenure downloader trace verbosity applying proper logging level depending on the tenure state ("debug" if unconfirmed, "info" otherwise) ([#5871](https://github.com/stacks-network/stacks-core/issues/5871))
 - Remove warning log about missing UTXOs when a node is configured as `miner` with `mock_mining` mode enabled ([#5841](https://github.com/stacks-network/stacks-core/issues/5841)) 
+- Deprecated the `wait_on_interim_blocks` option in the miner config file. This option is no longer needed, as the miner will always wait for interim blocks to be processed before mining a new block. To wait extra time in between blocks, use the `min_time_between_blocks_ms` option instead.
 
 ## [3.1.0.0.7]