Commit Graph

5248 Commits

Author SHA1 Message Date
Alfredo Garcia 86e468f3b0
poc(scanner): get started with the blockchain scanner proof of concept (#7758)
* get started with the blockchain scanner poc

* rustfmt

* fix the tests

* Reads blocks from db

* Adds conversion functions

* scans blocks and counts transactions

* fix bug

* split into 2 tests

* add duplicated dependencies to deny.toml

* upgrade zebra-scanner version

* try removing ecc duplicated dependencies

* try fix deny.toml

* remove unintended paste from deny.toml

* remove duplicated code from the other test

* remove strict version of `zcash_primitives` crate

* change description

* remove feture

* remove tokio features

* change lib doc

* add more documentation

* change expect

* do not use default in compact block creation

* more docs

* add more checks to test

* remove zebra-consensus dependency

* move all deps to dev-deps

* change crate version

* rename crate to zebra-scan

* lock file

* ifix cargo.lock

* remove internal dev dependencies versions

Co-authored-by: teor <teor@riseup.net>

* fix docs url

Co-authored-by: teor <teor@riseup.net>

* fix expect messages

Co-authored-by: teor <teor@riseup.net>

* remove duplicated in deny.toml

Co-authored-by: teor <teor@riseup.net>

* add a comment about moving code to production

---------

Co-authored-by: arya2 <aryasolhi@gmail.com>
Co-authored-by: teor <teor@riseup.net>
2023-11-08 22:05:51 +00:00
dependabot[bot] 2efc6bf4b2
build(deps): bump the prod group with 1 update (#7915)
Bumps the prod group with 1 update: [vergen](https://github.com/rustyhorde/vergen).

- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/8.2.5...8.2.6)

---
updated-dependencies:
- dependency-name: vergen
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-07 19:30:58 +00:00
teor 76522b552c
change(release): Only allow releases from the `main` branch, and update workflow names (#7917)
* only allow releases from the main branch

* Update workflow links in the release checklist

* One more workflow query update
2023-11-07 17:34:17 +00:00
teor 00f00d9840
cleanup(net): Delete duplicate negotiated version code (#7912)
* Delete duplicate negotiated version code

* Create ConnectionInfo earlier to simplify return value
2023-11-07 04:02:44 +00:00
teor 477da1a774
Release Zebra 1.4.0 (#7911)
* Add a new known issue to the README

* Update the changelog

* Set release height around 8 November

* chore: Release
2023-11-06 12:51:41 +00:00
teor baa283c523
Delete unused cached state patch job (#7901) 2023-11-06 09:45:41 +00:00
teor 43e54d1cb2
fix(net): Fix a potential hang caused by accessing the address book directly (#7902)
* Fix a potential hang accessing the address book directly

* Remove unused connection shutdown MetaAddr arguments

* Add an UpdateConnected MetaAddrChange, that sends initial connection info

* Fix some tests

* Fix a panic with a zero channel size
2023-11-05 22:28:58 +00:00
teor f836f7f849
fix(ci): In config tests, look for the config being successfully loaded by Zebra (#7900)
* Look for zebrad config load, not just the file name in any log

* Look for it in the docker unit tests as well
2023-11-03 14:41:10 +00:00
teor 089f41c059
change(pr): Add an author checklist to the PR template (#7832)
* Update PR template checklists

* Add a testing section

* Move close issues to the top section

* Change checklist phrasing so the answer is yes when the PR is complete

* Explain how to handle irrelevant checkboxes

* Another yes answer is good

* Fix indent

* Ask if PRs can be split
2023-11-02 21:56:07 +00:00
teor a1e476ec61
change(release): Make the latest tag point to the production build, rather than the build with experimental features (#7817)
* Remove DockerHub tags for v1.x.y and edge

* Make the latest tag point to the production image, not experimental

* Remove docker image file change trigger from the OS CI workflow

* Disable latest tag by default

* Enable the latest tag for the production build only

* Restore `edge` tag, it is used in CI and it is CI only

* Add Docker tag removal to CHANGELOG.md

* Actually enforce job order

* Revert tag publishing changes, but keep extra docs and tag order changes

* Update the changelog
2023-11-02 19:55:40 +00:00
teor 828c2aea57
doc(devops): Explain how to change branch protection rules (#7883)
* Explain how to change branch protection rules

* Fix list formatting

* Add missing .

* Fix incorrect link

Co-authored-by: Pili Guerra <mpguerra@users.noreply.github.com>

---------

Co-authored-by: Pili Guerra <mpguerra@users.noreply.github.com>
2023-11-02 16:59:20 +00:00
teor 628b3e39af
fix(net): Add outer timeouts for critical network operations to avoid hangs (#7869)
* Refactor out try_to_sync_once()

* Add outer timeouts for obtaining and extending tips

* Refactor out request_genesis_once()

* Wrap genesis download once in a timeout

* Increase the genesis timeout to avoid denial of service from old nodes

* Add an outer timeout to mempool crawls

* Add an outer timeout to mempool download/verify

* Remove threaded mutex blocking from the inbound service

* Explain why inbound readiness never hangs

* Fix whitespace that cargo fmt doesn't

* Avoid hangs by always resetting the past lookahead limit flag

* Document block-specific and syncer-wide errors

* Update zebrad/src/components/sync.rs

Co-authored-by: Marek <mail@marek.onl>

* Use correct condition for log messages

Co-authored-by: Marek <mail@marek.onl>

* Keep lookahead reset metric

---------

Co-authored-by: Arya <aryasolhi@gmail.com>
Co-authored-by: Marek <mail@marek.onl>
2023-11-02 15:00:18 +00:00
teor afbe807060
change(docs): Replace doc.zebra.zfnd.org API documentation with docs.rs (#7886)
* Simple replacements of doc.zebra.zfnd.org with docs.rs

* Manual fixes for specific main/internal/external docs

* Point developer docs to doc-internal.zebra.zfnd.org

* fastmod --glob '\!.git' -- doc.zebra.zfnd.org/zebrad docs.rs/zebrad/latest/zebrad

* Manually remove any remaining doc.zfnd.zebra.org links

* Remove the external docs job

* Add changelog entry and fix links

* Fix links that were broken before this PR
2023-11-01 22:09:40 +00:00
dependabot[bot] daabe8b196
build(deps): bump the devops group with 1 update (#7887)
Bumps the devops group with 1 update: [tj-actions/changed-files](https://github.com/tj-actions/changed-files).

- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v39.2.4...v40.0.2)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: devops
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-01 19:51:34 +00:00
teor b78c9dd802
change(deps): `cargo update` on commit bd06294 on 2023-11-01 (#7885)
* `cargo update` on commit bd06294 on 2023-11-01

```
    Updating crates.io index
    Updating ahash v0.8.3 -> v0.8.6
    Updating async-trait v0.1.73 -> v0.1.74
    Updating base64 v0.21.4 -> v0.21.5
      Adding bindgen v0.68.1
      Adding const-oid v0.9.5
    Updating cpufeatures v0.2.9 -> v0.2.11
    Updating curve25519-dalek-derive v0.1.0 -> v0.1.1
    Updating cxx-gen v0.7.109 -> v0.7.110
      Adding der v0.7.8
    Updating deranged v0.3.8 -> v0.3.9
    Updating ed25519 v2.2.2 -> v2.2.3
    Updating fiat-crypto v0.2.1 -> v0.2.2
    Updating hashbrown v0.14.1 -> v0.14.2
    Updating hyper-rustls v0.24.1 -> v0.24.2
    Updating iana-time-zone v0.1.57 -> v0.1.58
    Updating indexmap v2.0.2 -> v2.1.0
    Updating ipnet v2.8.0 -> v2.9.0
    Updating mio v0.8.8 -> v0.8.9
    Updating parking_lot_core v0.9.8 -> v0.9.9
    Updating pest v2.7.4 -> v2.7.5
    Updating pest_derive v2.7.4 -> v2.7.5
    Updating pest_generator v2.7.4 -> v2.7.5
    Updating pest_meta v2.7.4 -> v2.7.5
      Adding pkcs8 v0.10.2
    Updating portable-atomic v1.4.3 -> v1.5.1
      Adding powerfmt v0.2.0
    Removing redox_syscall v0.3.5
    Updating rgb v0.8.36 -> v0.8.37
      Adding ring v0.17.5
    Updating rustls v0.21.7 -> v0.21.8
    Updating rustls-webpki v0.101.6 -> v0.101.7
    Updating sct v0.7.0 -> v0.7.1
    Removing socket2 v0.4.9
    Removing socket2 v0.5.4
      Adding socket2 v0.4.10
      Adding socket2 v0.5.5
      Adding spki v0.7.2
    Updating time v0.3.29 -> v0.3.30
    Updating toml v0.8.3 -> v0.8.6
    Updating toml_datetime v0.6.4 -> v0.6.5
    Updating toml_edit v0.20.3 -> v0.20.7
    Updating tracing-log v0.1.3 -> v0.1.4
      Adding untrusted v0.9.0
    Updating uuid v1.4.1 -> v1.5.0
    Removing windows v0.48.0
      Adding windows-core v0.51.1
    Updating winnow v0.5.16 -> v0.5.18
      Adding zerocopy v0.7.21
      Adding zerocopy-derive v0.7.21
```

* Allow duplicate ring dependency in hdwallet

* Remove an unused import warning
2023-11-01 18:26:16 +00:00
teor 898b40f9fd
Update README.md before 1.4.0 release (#7884) 2023-10-31 22:58:37 +00:00
dependabot[bot] bd062941b9
build(deps): bump the prod group with 2 updates (#7881)
Bumps the prod group with 2 updates: [clap](https://github.com/clap-rs/clap) and [serde_json](https://github.com/serde-rs/json).


Updates `clap` from 4.4.6 to 4.4.7
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v4.4.6...v4.4.7)

Updates `serde_json` from 1.0.107 to 1.0.108
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.107...v1.0.108)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-31 13:15:47 +00:00
Arya e94be80f17
change(devops): Split dependency upgrades into 4 large categories (#7848)
* try groups with more than 10 items.

* reorgs dependabot groups, condenses patterns

* Tries using `dependency-type`
2023-10-31 00:32:58 +00:00
dependabot[bot] b0555c0e61
build(deps): bump the test group with 1 update (#7876)
* build(deps): bump the test group with 1 update

Bumps the test group with 1 update: [tempfile](https://github.com/Stebalien/tempfile).

- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/commits)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: test
...

Signed-off-by: dependabot[bot] <support@github.com>

* add duplicated dependency

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com>
2023-10-30 22:08:34 +00:00
Marek 0d3892f61f
change(state): Refactor the naming of note commitment subtrees (#7855)
* Rename `node` & `Node` to `root` & `Root`

* Rename `end` to `end_height`

* Rename `Root` to `SubtreeRoot`
2023-10-30 20:06:54 +00:00
Alfredo Garcia f3048653c8
chore: fix typos (#7877)
Co-authored-by: Dimitris Apostolou <dimitris.apostolou@icloud.com>
2023-10-30 20:06:35 +00:00
dependabot[bot] d0e5b2f3ef
build(deps): bump the async group with 2 updates (#7872)
Bumps the async group with 2 updates: [futures](https://github.com/rust-lang/futures-rs) and [tokio-util](https://github.com/tokio-rs/tokio).


Updates `futures` from 0.3.28 to 0.3.29
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.28...0.3.29)

Updates `tokio-util` from 0.7.9 to 0.7.10
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/commits)

---
updated-dependencies:
- dependency-name: futures
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: async
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: async
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-30 18:26:53 +00:00
dependabot[bot] ad0051c228
build(deps): bump the formats group with 1 update (#7874)
Bumps the formats group with 1 update: [serde](https://github.com/serde-rs/serde).

- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.189...v1.0.190)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: formats
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-30 18:26:30 +00:00
teor 9cbb108805
Update full sync test URL in release ticket template (#7830) 2023-10-30 15:15:11 +00:00
teor df55201c87
chore(clippy): Cleanup nightly clippy warnings from 2023-10-30 (#7868)
* Use first() rather than get(0)

* Remove unused imports and silence test-related warnings

* More clippy fixes
2023-10-30 12:21:05 +00:00
teor 49a9e598bf
Update mainnet and testnet checkpoints on 2023-10-30 (#7866) 2023-10-30 12:20:54 +00:00
teor 7e7f989545
Fix new nightly clippy and rustc lints (#7860) 2023-10-27 19:35:57 +00:00
Alfredo Garcia e4c3f95d27
chore: fix typos (#7862)
Co-authored-by: vuittont60 <81072379+vuittont60@users.noreply.github.com>
2023-10-27 17:45:43 +00:00
Arya 5367ccbc5c
fix(network): Reconnect with peers after brief network interruption (#7853)
* Fixes bug where Zebra won't reconnect to peers after brief loss of network connectivity

* only dial on timercrawl when theres a new address or zero active outbound conns
2023-10-27 06:13:16 +00:00
Arya 0a3790b73e
change(consensus): Remove Sprout and Sapling parameter download task and debug_skip_preload config (#7844)
* removes groth16 download task

* updates docs.

* Adds new config to test configs

* fixes compatibility with past configs

* uses inner config to deserialize removed field for compatibility

* update docs

* updates latest config

* Applies suggestions from code review

* Avoid duplicating hard-coded default values

---------

Co-authored-by: teor <teor@riseup.net>
2023-10-27 06:12:57 +00:00
teor d145526ad7
Remove unused deny.toml entries (#7818) 2023-10-27 01:05:46 +00:00
teor 920ee14512
fix(doc): Fix broken links to `zebra_network` and `zebra_state` `Config` structs on doc.zebra.zfnd.org (#7838)
* Use full module paths to avoid a rustdoc bug

* Exclude zebra-test from external docs
2023-10-27 01:05:26 +00:00
Alfredo Garcia b6fc0add9a
remove the zebra icon (#7849)
from the state lib
2023-10-26 23:59:52 +00:00
teor ce22be37dc
change(docs): Add macOS M1 as a tier 3 supported platform (#7851)
* Add macOS M1 as a tier 3 supported platform

* Add apple machine brand name that users will know
2023-10-26 22:08:22 +00:00
Pili Guerra 64bf38c17c
Make macOS a tier 2 supported platform in the docs. closes #7824 (#7843) 2023-10-26 19:17:47 +00:00
Alfredo Garcia 879fd5f37e
Revert #6825 (#7834)
* revert #6825

* remove todo comment from CI
2023-10-26 12:48:09 +00:00
Marek 06ab529877
docs: Refactor the installation instructions for `s-nomp` (#7835)
* Remove references to `getblocktemplate-rpcs`

* Refactor the sync description

* Refactor the instructions for installing `s-nomp`

* Mention Node 10 instead of 8.11

* Refactor the description of Zebra's sync

Co-authored-by: teor <teor@riseup.net>

---------

Co-authored-by: teor <teor@riseup.net>
2023-10-26 00:06:40 +00:00
teor 71a9865b6c
remove(cmd): Remove `zebrad download` command, because it no longer does anything (#7819)
* Remove the `zebrad download` command

* Reorder command.rs imports

* Remove zcash-params/Dockerfile and the main Dockerfile commands that use it

* Stop building zcash-params Docker images in CI

* Update CHANGELOG for `zebrad download` removal

* Clarify why the image is smaller

Co-authored-by: Marek <mail@marek.onl>

---------

Co-authored-by: Marek <mail@marek.onl>
2023-10-25 23:42:27 +00:00
teor a126acb160
change(doc): Document state format upgrade implementation and testing (#7799)
* Explain verification modes

* Explain block write modes

* Expand upgrade goals

* Document testing requirements

* Update current format docs

* Move the detailed checklist to the ticket template

* Move an example back

* Reword confusing paragraphs

Co-authored-by: Arya <aryasolhi@gmail.com>

* Explain the difference between major and minor/patch versions

* Simplify upgrade wording

Co-authored-by: Marek <mail@marek.onl>

---------

Co-authored-by: Arya <aryasolhi@gmail.com>
Co-authored-by: Marek <mail@marek.onl>
2023-10-25 22:18:41 +00:00
dependabot[bot] b244d5628c
build(deps): bump tj-actions/changed-files from 39.2.3 to 39.2.4 (#7826)
Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 39.2.3 to 39.2.4.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v39.2.3...v39.2.4)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-25 22:00:04 +00:00
dependabot[bot] 06f381230a
build(deps): bump Swatinem/rust-cache from 2.7.0 to 2.7.1 (#7825)
Bumps [Swatinem/rust-cache](https://github.com/swatinem/rust-cache) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/swatinem/rust-cache/releases)
- [Changelog](https://github.com/Swatinem/rust-cache/blob/master/CHANGELOG.md)
- [Commits](https://github.com/swatinem/rust-cache/compare/v2.7.0...v2.7.1)

---
updated-dependencies:
- dependency-name: Swatinem/rust-cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-25 21:59:53 +00:00
teor 0e00ef4f4f
Increase Docker unit test timeout (#7814) 2023-10-25 09:37:52 +00:00
Alfredo Garcia c173198d4f
docs(build): Add ECC dependencies documentation (#7794)
* add ecc dependencies documentation

* add `cargo deny` suggestion to deny.toml section

Co-authored-by: Arya <aryasolhi@gmail.com>

* change sententence syntax

Co-authored-by: Arya <aryasolhi@gmail.com>

* Apply suggestions from code review

Co-authored-by: teor <teor@riseup.net>

* move consistency check

---------

Co-authored-by: Arya <aryasolhi@gmail.com>
Co-authored-by: teor <teor@riseup.net>
2023-10-25 03:27:16 +00:00
teor ae10eafb57
Update Dockerfile features comment (#7815) 2023-10-25 02:38:34 +00:00
teor aad883b68a
change(consensus): Build Sprout and Sapling parameters into the zebrad binary, so a download server isn't needed (#7800)
* Build sapling parameters into zebrad

* Load the sapling parameters from wagyu-zcash-parameters

* Reword logs

* wget https://github.com/zcash/zcash/raw/master/src/rust/src/sprout-groth16.vk

* Load sprout from binary and remove download code

* Remove download examples binaries

* Remove unused features and dependencies

* Remove docs and comments about downloading parameters

* Add CHANGELOG entry

* Remove parameter cache steps in workflows

* Update comment about downloading

Co-authored-by: Marek <mail@marek.onl>

* Fix outdated timeout comments and short timeouts

---------

Co-authored-by: Marek <mail@marek.onl>
2023-10-24 23:27:24 +00:00
teor bb7eeb6f76
Document how to fix deny.toml warnings (#7806) 2023-10-24 13:12:57 +00:00
dependabot[bot] 37a3c2a511
build(deps): bump the formats group with 1 update (#7803)
Bumps the formats group with 1 update: [serde_with](https://github.com/jonasbb/serde_with).

- [Release notes](https://github.com/jonasbb/serde_with/releases)
- [Commits](https://github.com/jonasbb/serde_with/compare/v3.3.0...v3.4.0)

---
updated-dependencies:
- dependency-name: serde_with
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: formats
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-23 19:19:08 +00:00
dependabot[bot] e56b66d182
build(deps): bump the app group with 1 update (#7802)
Bumps the app group with 1 update: [toml](https://github.com/toml-rs/toml).

- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.2...toml-v0.8.3)

---
updated-dependencies:
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: app
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-23 19:18:56 +00:00
teor b04cca9ec5
change(dev doc): Document how to change branch protection rules (#7773)
* Document branch protection rules

* Document automatic jobs for new crates

* Link to patch workflow docs

* Update book/src/dev/continuous-integration.md

Co-authored-by: Marek <mail@marek.onl>

---------

Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>
Co-authored-by: Marek <mail@marek.onl>
2023-10-22 15:40:19 +00:00
teor 60b447bef2
change(ci): Remove duplicate CI jobs for getblocktemplate-rpcs (#7753)
* Remove duplicate CI docker job and make features consistent

* Remove duplicate OS job

* Rename experimental release build

* Make Rust features into GitHub repository variables

* Remove redundant features in entrypoint.sh

* Remove a dependency on a deleted job

* Fix syntax of array

* Another fix attempt

* Undo some accidental merge overwrites

* Add missing space

* Explain how default is implemented

* Fix missing --features and quoting

* We can fix this later

* Use vars directly in with: blocks

* Use correct features for fake activation heights test
2023-10-22 15:40:10 +00:00