Skip to content
Closed
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
21 changes: 11 additions & 10 deletions .github/workflows/publish-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,26 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main
ref: ${{ github.event.release.target_commitish }}
- uses: ./.github/actions/install-rocksdb
- uses: ./.github/actions/install-protobuf-compiler
# Ensure the release tag refers to the latest commit on main.
# Ensure the release tag refers to the latest commit on the release branch.
# Compare the commit SHA that triggered the workflow with the HEAD of the branch we just
# checked out (main).
- name: Verify release was triggered from main HEAD
# checked out.
- name: Verify release was triggered from release branch HEAD
run: |
tag_sha="${{ github.sha }}"
main_sha="$(git rev-parse HEAD)"
branch_sha="$(git rev-parse HEAD)"
release_branch="${{ github.event.release.target_commitish }}"

echo "Tag points to: $tag_sha"
echo "Current main HEAD is: $main_sha"
echo "Tag points to: $tag_sha"
echo "Current $release_branch HEAD is: $branch_sha"

if [ "$tag_sha" != "$main_sha" ]; then
echo "::error::The release tag was not created from the latest commit on main. Aborting."
if [ "$tag_sha" != "$branch_sha" ]; then
echo "::error::The release tag was not created from the latest commit on $release_branch. Aborting."
exit 1
fi
echo "Release tag matches main HEAD — continuing."
echo "Release tag matches $release_branch HEAD — continuing."
- name: Cleanup large tools for build space
uses: ./.github/actions/cleanup-runner
- name: Install dependencies
Expand Down
72 changes: 40 additions & 32 deletions Cargo.lock

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

38 changes: 19 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ license = "MIT"
readme = "README.md"
repository = "https://github.com/0xMiden/miden-node"
rust-version = "1.91"
version = "0.14.0"
version = "0.14.0-alpha.1"

# Optimize the cryptography for faster tests involving account creation.
[profile.test.package.miden-crypto]
Expand All @@ -45,29 +45,29 @@ debug = true

[workspace.dependencies]
# Workspace crates.
miden-node-block-producer = { path = "crates/block-producer", version = "0.14" }
miden-node-db = { path = "crates/db", version = "0.14" }
miden-node-grpc-error-macro = { path = "crates/grpc-error-macro", version = "0.14" }
miden-node-ntx-builder = { path = "crates/ntx-builder", version = "0.14" }
miden-node-proto = { path = "crates/proto", version = "0.14" }
miden-node-proto-build = { path = "proto", version = "0.14" }
miden-node-rpc = { path = "crates/rpc", version = "0.14" }
miden-node-store = { path = "crates/store", version = "0.14" }
miden-node-block-producer = { path = "crates/block-producer", version = "=0.14.0-alpha.1" }
miden-node-db = { path = "crates/db", version = "=0.14.0-alpha.1" }
miden-node-grpc-error-macro = { path = "crates/grpc-error-macro", version = "=0.14.0-alpha.1" }
miden-node-ntx-builder = { path = "crates/ntx-builder", version = "=0.14.0-alpha.1" }
miden-node-proto = { path = "crates/proto", version = "=0.14.0-alpha.1" }
miden-node-proto-build = { path = "proto", version = "=0.14.0-alpha.1" }
miden-node-rpc = { path = "crates/rpc", version = "=0.14.0-alpha.1" }
miden-node-store = { path = "crates/store", version = "=0.14.0-alpha.1" }
miden-node-test-macro = { path = "crates/test-macro" }
miden-node-utils = { path = "crates/utils", version = "0.14" }
miden-node-validator = { path = "crates/validator", version = "0.14" }
miden-remote-prover-client = { path = "crates/remote-prover-client", version = "0.14" }
miden-node-utils = { path = "crates/utils", version = "=0.14.0-alpha.1" }
miden-node-validator = { path = "crates/validator", version = "=0.14.0-alpha.1" }
miden-remote-prover-client = { path = "crates/remote-prover-client", version = "=0.14.0-alpha.1" }
# Temporary workaround until <https://github.com/rust-rocksdb/rust-rocksdb/pull/1029>
# is part of `rocksdb-rust` release
miden-node-rocksdb-cxx-linkage-fix = { path = "crates/rocksdb-cxx-linkage-fix", version = "0.14" }
miden-node-rocksdb-cxx-linkage-fix = { path = "crates/rocksdb-cxx-linkage-fix", version = "=0.14.0-alpha.1" }

# miden-base aka protocol dependencies. These should be updated in sync.
miden-block-prover = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
miden-protocol = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
miden-standards = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
miden-testing = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
miden-tx = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
miden-tx-batch-prover = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
miden-block-prover = { version = "=0.14.0-alpha.1" }
miden-protocol = { default-features = false, version = "=0.14.0-alpha.1" }
miden-standards = { version = "=0.14.0-alpha.1" }
miden-testing = { version = "=0.14.0-alpha.1" }
miden-tx = { default-features = false, version = "=0.14.0-alpha.1" }
miden-tx-batch-prover = { version = "=0.14.0-alpha.1" }

# Other miden dependencies. These should align with those expected by miden-base.
miden-air = { features = ["std", "testing"], version = "0.20" }
Expand Down
4 changes: 2 additions & 2 deletions bin/network-monitor/src/deploy/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use anyhow::{Context, Result};
use miden_node_proto::clients::{Builder, RpcClient};
use miden_node_proto::generated::rpc::BlockHeaderByNumberRequest;
use miden_node_proto::generated::transaction::ProvenTransaction;
use miden_protocol::account::{Account, AccountId, PartialAccount, PartialStorage};
use miden_protocol::account::{Account, AccountId, PartialAccount, PartialStorage, StorageMapKey};
use miden_protocol::assembly::{
DefaultSourceManager,
Library,
Expand Down Expand Up @@ -308,7 +308,7 @@ impl DataStore for MonitorDataStore {
&self,
_account_id: AccountId,
_map_root: Word,
_map_key: Word,
_map_key: StorageMapKey,
) -> Result<miden_protocol::account::StorageMapWitness, DataStoreError> {
unimplemented!("Not needed")
}
Expand Down
3 changes: 2 additions & 1 deletion crates/ntx-builder/src/actor/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use miden_protocol::account::{
AccountId,
AccountStorageHeader,
PartialAccount,
StorageMapKey,
StorageMapWitness,
StorageSlotName,
StorageSlotType,
Expand Down Expand Up @@ -508,7 +509,7 @@ impl DataStore for NtxDataStore {
&self,
account_id: AccountId,
map_root: Word,
map_key: Word,
map_key: StorageMapKey,
) -> impl FutureMaybeSend<Result<StorageMapWitness, DataStoreError>> {
async move {
// The slot name that corresponds to the given account ID and map root must have been
Expand Down
5 changes: 3 additions & 2 deletions crates/ntx-builder/src/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use miden_protocol::account::{
AccountId,
PartialAccount,
PartialStorage,
StorageMapKey,
StorageMapWitness,
StorageSlotName,
};
Expand Down Expand Up @@ -421,13 +422,13 @@ impl StoreClient {
&self,
account_id: AccountId,
slot_name: StorageSlotName,
map_key: Word,
map_key: StorageMapKey,
block_num: Option<BlockNumber>,
) -> Result<StorageMapWitness, StoreError> {
// Construct proto request.
let request = proto::store::StorageMapWitnessRequest {
account_id: Some(proto::account::AccountId { id: account_id.to_bytes() }),
map_key: Some(map_key.into()),
map_key: Some(Word::from(map_key).into()),
slot_name: slot_name.to_string(),
block_num: block_num.map(|num| num.as_u32()),
};
Expand Down
Loading
Loading