Mutants next/7/source - more commits than expected

.github/actions/bitcoin-int-tests/Dockerfile.atlas-test

@@ -1,9 +1,11 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src
 
 COPY . .
 
+RUN apt-get -y install libllvm16 libclang1-16
+
 RUN cargo test --no-run --workspace
 
 RUN cd / && wget https://bitcoin.org/bin/bitcoin-core-25.0/bitcoin-25.0-x86_64-linux-gnu.tar.gz

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

@@ -1,4 +1,4 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src/
 
@@ -12,6 +12,8 @@ RUN rustup component add llvm-tools-preview && \
 ENV RUSTFLAGS="-Cinstrument-coverage" \
     LLVM_PROFILE_FILE="stacks-blockchain-%p-%m.profraw"
 
+RUN apt-get -y install libllvm16 libclang1-16
+
 RUN cargo test --no-run && \
     cargo build
 

.github/actions/bitcoin-int-tests/Dockerfile.large-genesis

@@ -1,4 +1,4 @@
-FROM rust:bullseye AS test
+FROM rust:bookworm AS test
 
 WORKDIR /src
 

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

@@ -1,4 +1,4 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src
 
@@ -11,7 +11,7 @@ RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/
 RUN ln -s /bitcoin-25.0/bin/bitcoin-cli /bin/
 
 RUN apt-get update
-RUN apt-get install -y jq screen net-tools ncat sqlite3 xxd openssl curl
+RUN apt-get install -y jq screen net-tools ncat sqlite3 xxd openssl curl libllvm16 libclang1-16
 
 RUN cargo build --workspace
 

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

@@ -1,4 +1,4 @@
-FROM rust:bullseye
+FROM rust:bookworm
 
 WORKDIR /src
 

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

@@ -18,6 +18,6 @@ RUN case ${TARGETARCH} in \
     && wget  -q https://github.com/${REPO}/releases/download/${TAG}/${BIN_ARCH}.zip -O /${BIN_ARCH}.zip \
     && unzip ${BIN_ARCH}.zip -d /out
 
-FROM --platform=${TARGETPLATFORM} debian:bullseye
+FROM --platform=${TARGETPLATFORM} debian:bookworm
 COPY --from=builder /out/stacks-node /bin/
 CMD ["stacks-node", "mainnet"]

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

@@ -20,6 +20,6 @@ RUN target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
     && mkdir -p /out \
     && cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
 
-FROM --platform=${TARGETPLATFORM} debian:bullseye
+FROM --platform=${TARGETPLATFORM} debian:bookworm
 COPY --from=build /out/stacks-node /bin/
 CMD ["stacks-node", "mainnet"]

.github/actions/docsgen/Dockerfile.docsgen

@@ -1,4 +1,4 @@
-FROM rust:bullseye as build
+FROM rust:bookworm as build
 
 WORKDIR /src
 

.github/workflows/bitcoin-tests.yml

@@ -28,19 +28,10 @@ jobs:
         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
+      ## cleanup runner
+      - name: Cleanup Runner
+        id: runner_cleanup
+        uses: stacks-network/actions/cleanup/disk@main
 
       - name: Build bitcoin integration testing image
         id: build_docker_image
@@ -111,6 +102,7 @@ jobs:
           - tests::neon_integrations::test_problematic_microblocks_are_not_mined
           - tests::neon_integrations::test_problematic_microblocks_are_not_relayed_or_stored
           - tests::neon_integrations::push_boot_receipts
+          - tests::neon_integrations::test_submit_and_observe_sbtc_ops
           - tests::epoch_205::test_dynamic_db_method_costs
           - tests::epoch_205::transition_empty_blocks
           - tests::epoch_205::test_cost_limit_switch_version205
@@ -142,6 +134,7 @@ jobs:
           - tests::signer::test_stackerdb_dkg
           - tests::stackerdb::test_stackerdb_load_store
           - tests::stackerdb::test_stackerdb_event_observer
+          - tests::signer::test_stackerdb_dkg
     steps:
       - name: Checkout the latest code
         id: git_checkout

.vscode/launch.json

@@ -6,13 +6,12 @@
       "request": "launch",
       "name": "executable 'blockstack-core'",
       "cargo": {
-        "args": ["build", "--bin=stacks-inspect", "--package=blockstack-core"],
+        "args": ["build", "--bin=stacks-node"],
         "filter": {
-          "name": "stacks-inspect",
           "kind": "bin"
         }
       },
-      "args": [],
+      "args": ["mockamoto"],
       "cwd": "${workspaceFolder}"
     },
     {

Cargo.toml

@@ -7,10 +7,15 @@ members = [
     "clarity",
     "stx-genesis",
     "libstackerdb",
+    "contrib/tools/relay-server",
     "libsigner",
     "stacks-signer",
     "testnet/stacks-node"]
 
+# Dependencies we want to keep the same between workspace members
+[workspace.dependencies]  
+wsts = "5.0"
+
 # Use a bit more than default optimization for
 #  dev builds to speed up test execution
 [profile.dev]

clarity/Cargo.toml

@@ -15,7 +15,7 @@ resolver = "2"
 
 [lib]
 name = "clarity"
-path = "./src/libclarity.rs"
+path = "./src/lib.rs"
 
 [dependencies]
 rand = "0.7.3"

clarity/src/libclarity.rs → clarity/src/lib.rs

@@ -21,27 +21,14 @@
 #![allow(non_upper_case_globals)]
 #![cfg_attr(test, allow(unused_variables, unused_assignments))]
 
-extern crate rand;
-extern crate rand_chacha;
-extern crate rusqlite;
-extern crate serde;
-#[macro_use]
-extern crate lazy_static;
-extern crate integer_sqrt;
-extern crate regex;
-extern crate time;
-
 #[macro_use(o, slog_log, slog_trace, slog_debug, slog_info, slog_warn, slog_error)]
 extern crate slog;
 
 #[macro_use]
 extern crate serde_derive;
-#[macro_use]
-extern crate serde_json;
 
-#[cfg(test)]
 #[macro_use]
-extern crate assert_json_diff;
+extern crate serde_json;
 
 #[cfg(any(test, feature = "testing"))]
 #[macro_use]
@@ -51,12 +38,13 @@ extern crate rstest;
 #[macro_use]
 pub extern crate rstest_reuse;
 
-#[cfg(feature = "monitoring_prom")]
 #[macro_use]
-pub extern crate prometheus;
+extern crate stacks_common;
 
-#[macro_use]
-pub extern crate stacks_common;
+pub use stacks_common::{
+    codec, consts, impl_array_hexstring_fmt, impl_array_newtype, impl_byte_array_message_codec,
+    impl_byte_array_serde, types, util,
+};
 
 #[macro_use]
 /// The Clarity virtual machine

clarity/src/vm/analysis/mod.rs

@@ -136,7 +136,9 @@ pub fn run_analysis(
             StacksEpochId::Epoch21
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
-            | StacksEpochId::Epoch24 => {
+            | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
+            | StacksEpochId::Epoch30 => {
                 TypeChecker2_1::run_pass(&epoch, &mut contract_analysis, db)
             }
             StacksEpochId::Epoch10 => unreachable!("Epoch 1.0 is not a valid epoch for analysis"),

clarity/src/vm/analysis/type_checker/mod.rs

@@ -50,7 +50,9 @@ impl FunctionType {
             StacksEpochId::Epoch21
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
-            | StacksEpochId::Epoch24 => self.check_args_2_1(accounting, args, clarity_version),
+            | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
+            | StacksEpochId::Epoch30 => self.check_args_2_1(accounting, args, clarity_version),
             StacksEpochId::Epoch10 => unreachable!("Epoch10 is not supported"),
         }
     }
@@ -69,7 +71,9 @@ impl FunctionType {
             StacksEpochId::Epoch21
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
-            | StacksEpochId::Epoch24 => {
+            | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
+            | StacksEpochId::Epoch30 => {
                 self.check_args_by_allowing_trait_cast_2_1(db, clarity_version, func_args)
             }
             StacksEpochId::Epoch10 => unreachable!("Epoch10 is not supported"),

clarity/src/vm/analysis/type_checker/v2_05/tests/contracts.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use assert_json_diff::assert_json_eq;
 use stacks_common::types::StacksEpochId;
 use {assert_json_diff, serde_json};
 

clarity/src/vm/analysis/type_checker/v2_1/tests/contracts.rs

@@ -17,8 +17,9 @@
 use std::convert::TryFrom;
 use std::fs::read_to_string;
 
+use assert_json_diff::assert_json_eq;
+use serde_json;
 use stacks_common::types::StacksEpochId;
-use {assert_json_diff, serde_json};
 
 use crate::vm::analysis::contract_interface_builder::build_contract_interface;
 use crate::vm::analysis::errors::CheckErrors;

clarity/src/vm/ast/parser/v1.rs

@@ -17,6 +17,7 @@
 use std::cmp;
 use std::convert::TryInto;
 
+use lazy_static::lazy_static;
 use regex::{Captures, Regex};
 use stacks_common::address::c32::c32_address_decode;
 use stacks_common::util::hash::hex_bytes;

clarity/src/vm/contexts.rs

@@ -21,6 +21,7 @@ use std::fmt;
 use std::mem::replace;
 
 use serde::Serialize;
+use serde_json::json;
 use stacks_common::consts::CHAIN_ID_TESTNET;
 use stacks_common::types::chainstate::StacksBlockId;
 use stacks_common::types::StacksEpochId;

clarity/src/vm/costs/mod.rs

@@ -18,6 +18,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::convert::{TryFrom, TryInto};
 use std::{cmp, fmt};
 
+use lazy_static::lazy_static;
 use rusqlite::types::{FromSql, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
 use serde::{Deserialize, Serialize};
 use stacks_common::types::StacksEpochId;
@@ -723,7 +724,9 @@ impl LimitedCostTracker {
             StacksEpochId::Epoch21
             | StacksEpochId::Epoch22
             | StacksEpochId::Epoch23
-            | StacksEpochId::Epoch24 => COSTS_3_NAME.to_string(),
+            | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
+            | StacksEpochId::Epoch30 => COSTS_3_NAME.to_string(),
         }
     }
 }