Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ changelog = "none"
reason = "Internal change only."
```

Allowed scopes: rpc, protocol, docs, node, network-monitor, ntx-builder, prover, validator, internal, general
Allowed scopes: rpc, protocol, docs, node, note-transport, network-monitor, ntx-builder, prover, validator, internal, general
Allowed impacts: breaking, migration, added, changed, fixed, removed, deprecated
-->

Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,18 @@ jobs:
context: .
push: false
file: ./Dockerfile
target: builder
target: build-report
platforms: ${{ matrix.platform }}
profile-name: ${{ vars.WARPBUILD_DOCKER_BUILDER_PROFILE }}
pull: true
outputs: type=local,dest=${{ runner.temp }}/kache-report

- name: Add Kache cache summary
run: |
{
echo "## ${{ matrix.platform }}"
cat "${RUNNER_TEMP}/kache-report/kache-report.md"
} >> "${GITHUB_STEP_SUMMARY}"

dry-run-docker:
name: Validate ${{ matrix.component }} image
Expand Down
4 changes: 4 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ members = [
"bin/large-account-benchmark",
"bin/network-monitor",
"bin/node",
"bin/note-transport",
"bin/ntx-builder",
"bin/remote-prover",
"bin/stress-test",
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,28 @@ RUN --mount=type=cache,sharing=locked,id=cargo-registry-${TARGETARCH},target=/us
cargo build --release --locked --jobs "${JOBS}" \
--bin miden-node \
--bin miden-validator \
--bin miden-note-transport \
--bin miden-ntx-builder \
--bin miden-network-monitor \
--bin miden-remote-prover \
--bin miden-benchmark && \
mkdir -p /app/bin && \
cp /app/target/release/miden-node \
/app/target/release/miden-validator \
/app/target/release/miden-note-transport \
/app/target/release/miden-ntx-builder \
/app/target/release/miden-network-monitor \
/app/target/release/miden-remote-prover \
/app/target/release/miden-benchmark \
/app/bin/ && \
kache stats && \
kache report --format github --output /app/kache-report.md && \
rm -rf /app/target && \
kache gc

FROM scratch AS build-report
COPY --from=builder /app/kache-report.md /kache-report.md

# Baseline runtime image with runtime dependencies installed.
FROM debian:${DEBIAN_RELEASE}-slim AS runtime-base
RUN apt-get update && \
Expand Down
27 changes: 26 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ install-node: ## Installs node
install-validator: ## Installs validator
cargo install --path bin/validator --locked

.PHONY: install-note-transport
install-note-transport: ## Installs note transport
cargo install --path bin/note-transport --locked

.PHONY: install-ntx-builder
install-ntx-builder: ## Installs ntx-builder
cargo install --path bin/ntx-builder --locked
Expand Down Expand Up @@ -206,7 +210,14 @@ local-network-logs: ## Follows logs for the local development network
$(DOCKER_COMMAND) compose $(COMPOSE_OVERRIDE_ARGS) $(COMPOSE_PROFILE_ARGS) logs -f

.PHONY: docker-build
docker-build: docker-build-node docker-build-validator docker-build-ntx-builder docker-build-monitor docker-build-remote-prover docker-build-benchmark ## Builds all Docker images
docker-build: ## Builds all Docker images
docker-build: docker-build-node \
docker-build-validator \
docker-build-note-transport \
docker-build-ntx-builder \
docker-build-monitor \
docker-build-remote-prover \
docker-build-benchmark

.PHONY: docker-build-node
docker-build-node: ## Builds the Miden node using Docker
Expand Down Expand Up @@ -234,6 +245,20 @@ docker-build-validator: ## Builds the Miden validator using Docker
--build-arg PORT=50101 \
-t miden-validator .

.PHONY: docker-build-note-transport
docker-build-note-transport: ## Builds the Miden note transport service using Docker
@CREATED=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') && \
VERSION="$(DOCKER_VERSION)" && \
COMMIT=$$(git rev-parse HEAD) && \
$(DOCKER_COMMAND) build $(DOCKER_PULL_ARG) $(DOCKER_PLATFORM_ARG) \
--build-arg CREATED="$$CREATED" \
--build-arg VERSION="$$VERSION" \
--build-arg COMMIT="$$COMMIT" \
--build-arg BUILDER="$(DOCKER_BUILDER)" \
--build-arg BIN=miden-note-transport \
--build-arg PORT=57292 \
-t miden-note-transport .

.PHONY: docker-build-ntx-builder
docker-build-ntx-builder: ## Builds the Miden network transaction builder using Docker
@CREATED=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') && \
Expand Down
15 changes: 15 additions & 0 deletions bin/note-transport/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
authors.workspace = true
description = "Miden Note Transport Service"
edition.workspace = true
homepage.workspace = true
keywords = ["messaging", "miden"]
license.workspace = true
name = "miden-note-transport"
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[lints]
workspace = true
1 change: 1 addition & 0 deletions bin/note-transport/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fn main() {}
42 changes: 0 additions & 42 deletions scripts/publish-crates.sh

This file was deleted.

1 change: 1 addition & 0 deletions xtask/src/changelog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ enum Scope {
Protocol,
Docs,
Node,
NoteTransport,
NetworkMonitor,
NtxBuilder,
Prover,
Expand Down
6 changes: 4 additions & 2 deletions xtask/src/changelog/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fn append_callout_entry(notes: &mut String, entry: &ReleaseNoteEntry) {
}

impl Scope {
const fn sort_order() -> [Self; 10] {
const fn sort_order() -> [Self; 11] {
[
Self::General,
Self::Protocol,
Expand All @@ -117,6 +117,7 @@ impl Scope {
Self::Prover,
Self::NtxBuilder,
Self::Validator,
Self::NoteTransport,
Self::NetworkMonitor,
Self::Docs,
Self::Internal,
Expand All @@ -134,6 +135,7 @@ impl std::fmt::Display for Scope {
Self::Prover => "Prover",
Self::NtxBuilder => "NTX Builder",
Self::Validator => "Validator",
Self::NoteTransport => "Note Transport",
Self::NetworkMonitor => "Network Monitor",
Self::Docs => "Docs",
Self::Internal => "Internal",
Expand Down Expand Up @@ -173,7 +175,7 @@ impl std::fmt::Display for Impact {
}
}

const SCOPE_ORDER: [Scope; 10] = Scope::sort_order();
const SCOPE_ORDER: [Scope; 11] = Scope::sort_order();

#[cfg(test)]
mod tests {
Expand Down
13 changes: 13 additions & 0 deletions xtask/src/changelog/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,19 @@ description = "Fixed release automation metadata."
verify_pr_body(&body).unwrap();
}

#[test]
fn accepts_note_transport_scope() {
let body = valid_body(
r#"[[entry]]
scope = "note-transport"
impact = "added"
description = "Added the note transport service."
"#,
);

verify_pr_body(&body).unwrap();
}

#[test]
fn accepts_no_changelog_marker() {
let body = valid_body(
Expand Down
Loading