Merge branch 'feat/update-cargo-versions' into feat/build-time-git-consts

Author: hstove

.cargo/config.toml

@@ -1,6 +1,7 @@
 [alias]
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
+clippy-stacks = "clippy -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
 
 # Uncomment to improve performance slightly, at the cost of portability
 #   * Note that native binaries may not run on CPUs that are different from the build machine

.github/workflows/bitcoin-tests.yml

@@ -54,6 +54,7 @@ jobs:
           # - tests::neon_integrations::size_overflow_unconfirmed_microblocks_integration_test
           # - tests::neon_integrations::size_overflow_unconfirmed_stream_microblocks_integration_test
           # - tests::neon_integrations::runtime_overflow_unconfirmed_microblocks_integration_test
+          # - tests::epoch_25::microblocks_disabled
           # Disable this flaky test. Microblocks are no longer supported anyways.
           # - tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
           - tests::neon_integrations::miner_submit_twice
@@ -80,7 +81,6 @@ jobs:
           - tests::neon_integrations::bitcoin_reorg_flap
           - tests::neon_integrations::bitcoin_reorg_flap_with_follower
           - tests::neon_integrations::start_stop_bitcoind
-          - tests::epoch_25::microblocks_disabled
           - tests::should_succeed_handling_malformed_and_valid_txs
           - tests::nakamoto_integrations::simple_neon_integration
           - tests::nakamoto_integrations::flash_blocks_on_epoch_3
@@ -89,7 +89,8 @@ jobs:
           - tests::nakamoto_integrations::miner_writes_proposed_block_to_stackerdb
           - tests::nakamoto_integrations::correct_burn_outs
           - tests::nakamoto_integrations::vote_for_aggregate_key_burn_op
-          - tests::nakamoto_integrations::follower_bootup
+          - tests::nakamoto_integrations::follower_bootup_simple
+          - tests::nakamoto_integrations::follower_bootup_custom_chain_id
           - tests::nakamoto_integrations::forked_tenure_is_ignored
           - tests::nakamoto_integrations::nakamoto_attempt_time
           - tests::nakamoto_integrations::skip_mining_long_tx
@@ -124,15 +125,29 @@ jobs:
           - tests::signer::v0::continue_after_tenure_extend
           - tests::signer::v0::tenure_extend_after_idle_signers
           - tests::signer::v0::tenure_extend_after_idle_miner
+          - tests::signer::v0::tenure_extend_after_failed_miner
           - tests::signer::v0::tenure_extend_succeeds_after_rejected_attempt
           - tests::signer::v0::stx_transfers_dont_effect_idle_timeout
           - tests::signer::v0::idle_tenure_extend_active_mining
           - tests::signer::v0::multiple_miners_with_custom_chain_id
           - tests::signer::v0::block_commit_delay
           - tests::signer::v0::continue_after_fast_block_no_sortition
           - tests::signer::v0::block_validation_response_timeout
+          - tests::signer::v0::block_validation_pending_table
+          - tests::signer::v0::new_tenure_while_validating_previous_scenario
           - tests::signer::v0::tenure_extend_after_bad_commit
           - tests::signer::v0::block_proposal_max_age_rejections
+          - tests::signer::v0::global_acceptance_depends_on_block_announcement
+          - tests::signer::v0::no_reorg_due_to_successive_block_validation_ok
+          - tests::signer::v0::incoming_signers_ignore_block_proposals
+          - tests::signer::v0::outgoing_signers_ignore_block_proposals
+          - tests::signer::v0::injected_signatures_are_ignored_across_boundaries
+          - tests::signer::v0::fast_sortition
+          - tests::signer::v0::single_miner_empty_sortition
+          - tests::signer::v0::multiple_miners_empty_sortition
+          - tests::signer::v0::block_proposal_timeout
+          - tests::signer::v0::rejected_blocks_count_towards_miner_validity
+          - tests::signer::v0::allow_reorg_within_first_proposal_burn_block_timing_secs
           - tests::nakamoto_integrations::burn_ops_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state
@@ -143,6 +158,7 @@ jobs:
           - tests::nakamoto_integrations::mock_mining
           - tests::nakamoto_integrations::multiple_miners
           - tests::nakamoto_integrations::follower_bootup_across_multiple_cycles
+          - tests::nakamoto_integrations::nakamoto_lockup_events
           - tests::nakamoto_integrations::utxo_check_on_startup_panic
           - tests::nakamoto_integrations::utxo_check_on_startup_recover
           - tests::nakamoto_integrations::v3_signer_api_endpoint
@@ -151,6 +167,8 @@ jobs:
           - tests::nakamoto_integrations::sip029_coinbase_change
           - tests::nakamoto_integrations::clarity_cost_spend_down
           - tests::nakamoto_integrations::v3_blockbyheight_api_endpoint
+          - tests::nakamoto_integrations::mine_invalid_principal_from_consensus_buff
+          - tests::nakamoto_integrations::test_tenure_extend_from_flashblocks
           # TODO: enable these once v1 signer is supported by a new nakamoto epoch
           # - tests::signer::v1::dkg
           # - tests::signer::v1::sign_request_rejected

.github/workflows/ci.yml

@@ -112,19 +112,10 @@ jobs:
   ##         - commit to either (development, master) branch
   create-cache:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      needs.check-release.outputs.is_release == 'true' ||
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: Create Test Cache
     needs:
       - rustfmt
@@ -144,64 +135,55 @@ jobs:
   ##         - commit to either (development, next, master) branch
   stacks-core-tests:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: Stacks Core Tests
     needs:
       - rustfmt
       - create-cache
       - check-release
     uses: ./.github/workflows/stacks-core-tests.yml
 
+  ## Checks to run on built binaries
+  ##
+  ## Runs when:
+  ##   - it is a release run
+  ##   or:
+  ##     - it is not a release run
+  ##       and any of:
+  ##         - this workflow is called manually
+  ##         - PR is opened
+  ##         - PR added to merge queue
+  ##         - commit to either (development, next, master) branch
+  stacks-core-build-tests:
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
+    name: Stacks Core Build Tests
+    needs:
+      - rustfmt
+      - check-release
+    uses: ./.github/workflows/core-build-tests.yml
+
   bitcoin-tests:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: Bitcoin Tests
     needs:
       - rustfmt
       - create-cache
       - check-release
     uses: ./.github/workflows/bitcoin-tests.yml
 
-
   p2p-tests:
     if: |
-      needs.check-release.outputs.is_release == 'true' || (
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'pull_request' ||
-        github.event_name == 'merge_group' ||
-        (
-          contains('
-            refs/heads/master
-            refs/heads/develop
-            refs/heads/next
-          ', github.event.pull_request.head.ref) &&
-          github.event_name == 'push'
-        )
-      )
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' ||
+      github.event_name == 'merge_group'
     name: P2P Tests
     needs:
       - rustfmt

.github/workflows/clippy.yml

@@ -0,0 +1,37 @@
+## 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
+##
+name: Clippy Checks
+
+# Only run when:
+#   - PRs are (re)opened against develop branch
+on:
+  pull_request:
+    branches:
+      - develop
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+jobs:
+  clippy_check:
+    name: Clippy Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        id: git_checkout
+        uses: actions/checkout@v3
+      - 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
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+          components: clippy
+      - name: Clippy
+        id: clippy
+        run: cargo clippy-stacks

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

@@ -0,0 +1,33 @@
+name: Core build tests
+
+# Only run when:
+#   - PRs are (re)opened against develop branch
+on:
+  workflow_call:
+
+jobs:
+  check-consts:
+    name: Check the constants from stacks-inspect
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        id: git_checkout
+        uses: actions/checkout@v3
+      - 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
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+      - name: Build the binaries
+        id: build
+        run: |
+          cargo build
+      - name: Dump constants JSON
+        id: consts-dump
+        run: cargo run --bin stacks-inspect -- dump-consts | tee out.json
+      - name: Set expected constants JSON
+        id: expects-json
+        run: diff out.json ./sample/expected_consts.json