Merge pull request #2601 from blockstack/develop

Release 2.0.11.0.0

.cargo/config

@@ -1,3 +1,3 @@
 [alias]
-testnet = "run --package stacks-node --"
+stacks-node = "run --package stacks-node --"
 puppet-chain = "run --package puppet-chain --"

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

@@ -14,3 +14,4 @@ RUN ln -s /bitcoin-0.20.0/bin/bitcoind /bin/
 ENV BITCOIND_TEST 1
 WORKDIR /src/testnet/stacks-node
 RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::atlas_integration_test
+RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::atlas_stress_integration_test

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

@@ -24,3 +24,8 @@ RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::bitcoind_
 RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::pox_integration_test
 RUN cargo test -- --test-threads 1 --ignored tests::bitcoin_regtest::bitcoind_integration_test
 RUN cargo test -- --test-threads 1 --ignored tests::should_succeed_handling_malformed_and_valid_txs
+RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::size_overflow_unconfirmed_microblocks_integration_test
+RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::size_overflow_unconfirmed_stream_microblocks_integration_test
+RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::size_overflow_unconfirmed_invalid_stream_microblocks_integration_test
+RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::runtime_overflow_unconfirmed_microblocks_integration_test
+RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::antientropy_integration_test

.github/actions/open-api/Dockerfile.open-api-validate

@@ -0,0 +1,10 @@
+FROM node:lts-alpine as build
+
+WORKDIR /src
+
+COPY . .
+
+RUN npx [email protected] bundle -o /build/open-api-docs.html ./docs/rpc/openapi.yaml
+
+FROM scratch AS export-stage
+COPY --from=build /build/open-api-docs.html /

.github/workflows/bitcoin-tests.yml

@@ -17,7 +17,7 @@ jobs:
         run: docker build -f ./.github/actions/bitcoin-int-tests/Dockerfile.bitcoin-tests .
   atlas-test:
     # disable this job/test for now, as the atlas endpoints are currently disabled.
-    if: ${{ false }}
+    if: ${{ true }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/stacks-blockchain.yml

@@ -51,6 +51,20 @@ jobs:
           DOCKER_BUILDKIT: 1
         run: docker build -f ./.github/actions/bitcoin-int-tests/Dockerfile.code-cov .
 
+  open-api-validation:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run units tests (with coverage)
+        env:
+          DOCKER_BUILDKIT: 1
+        run: docker build -o dist/ -f .github/actions/open-api/Dockerfile.open-api-validate .
+      - name: Upload bundled html
+        uses: actions/upload-artifact@v2
+        with:
+          name: open-api-bundle
+          path: |
+            dist
   # Run net-tests
   nettest:
     # disable this job/test for now, since we haven't seen this pass

CHANGELOG.md

@@ -5,6 +5,41 @@ 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).
 
+## [2.0.11.0.0]
+
+The chainstate directory has been restructured in this release. It is not
+compatible with prior chainstate directories.
+
+## Added
+
+- `/drop_mempool_tx` endpoint to notify event observers when a mempool
+  transaction has been removed the mempool.
+- `"reward_slot_holders"` field to the `new_burn_block` event
+- CTRL-C handler for safe shutdown of `stacks-node`
+- Log transactions in local db table via setting env `STACKS_TRANSACTION_LOG=1`
+- New prometheus metrics for mempool transaction processing times and
+  outstanding mempool transactions
+- New RPC endpoint with path `/v2/traits/contractAddr/contractName/traitContractName
+  /traitContractAddr/traitName` to determine whether a given trait is implemented 
+  within the specified contract (either explicitly or implicitly).
+- Re-activate the Atlas network for propagating and storing transaction
+  attachments. This re-enables off-chain BNS name storage.
+- Re-activate microblock mining.
+
+## Changed
+
+- Improved chainstate directory layout
+- Improved node boot up time
+- Better handling of flash blocks
+- The `/v2/pox` RPC endpoint was updated to include more useful
+  information about the current and next PoX cycles. For details, see
+  `docs/rpc-endpoints.md`
+
+## Fixed 
+
+- Fixed faulty logic in the mempool that was still treating the transaction fee
+  as a fee rate, which prevented replace-by-fee from working as expected.
+
 ## [2.0.10.0.1]
 
 This is a low-priority hotfix release to address a bug in the deserialization logic. The
@@ -58,6 +93,7 @@ valid block data if its descendant microblock stream is invalid for some reason.
 
 - Do not delete a valid parent Stacks block.
 
+
 ## [2.0.6] - 2021-02-15
 
 The database schema has not changed since 2.0.5, so when spinning up a

Cargo.toml

@@ -100,7 +100,6 @@ stx_genesis = { package = "stx-genesis", path = "./stx-genesis/."}
 default = ["developer-mode"]
 developer-mode = []
 monitoring_prom = ["prometheus"]
-tx_log = []
 slog_json = ["slog-json"]
 
 

benches/block_limits.rs

@@ -194,8 +194,8 @@ fn setup_chain_state(scaling: u32) -> MarfedKV {
     };
 
     fs::copy(
-        &format!("{}/marf", pre_initialized_path),
-        &format!("{}/marf", out_path),
+        &format!("{}/marf.sqlite", pre_initialized_path),
+        &format!("{}/marf.sqlite", out_path),
     )
     .unwrap();
     return MarfedKV::open(out_path, None).unwrap();

bns-test/package.json

@@ -30,8 +30,10 @@
   "dependencies": {
     "@blockstack/clarity": "^0.3.7",
     "@blockstack/clarity-native-bin": "^0.3.7",
-    "@types/ripemd160": "^2.0.0",
-    "@types/sha.js": "^2.4.0",
+    "@stacks/network": "^1.2.0",
+    "@stacks/stacking": "^1.2.0",
+    "@stacks/transactions": "^1.2.2-alpha.0",
+    "bn": "^1.0.5",
     "ripemd160": "^2.0.2",
     "sha.js": "^2.4.11"
   },
@@ -42,6 +44,9 @@
     "@types/chai": "^4.1.7",
     "@types/fs-extra": "^9.0.4",
     "@types/jest": "^25.2.1",
+    "@types/ripemd160": "^2.0.0",
+    "@types/sha.js": "^2.4.0",
+    "@types/bn.js": "^4.11.6",
     "@types/node": "^10",
     "babel-jest": "^26.6.3",
     "chai": "^4.2.0",