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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
- [BREAKING] Added GER removal mechanism with a dedicated `ger_remover` role, `remove_ger` MASM procedure, `REMOVE_GER` note script, `RemoveGerNote` Rust helper, and a running keccak256 removed-GER hash chain; `AggLayerBridge::new`, `create_bridge_account`, and `create_existing_bridge_account` now take a `ger_remover_id` argument ([#2837](https://github.com/0xMiden/protocol/pull/2837)).
- [BREAKING] Unified the fungible and non-fungible asset vault deltas into a single asset delta, changing the on-chain account delta commitment layout ([#3038](https://github.com/0xMiden/protocol/pull/3038)).
- Added the canonical `ExpirationTransactionScript` to `miden-standards`, with a delta-independent script root that network accounts can allowlist ([#3051](https://github.com/0xMiden/protocol/pull/3051)).
- [BREAKING] Migrated the `miden-standards` library to a `miden-project.toml` project ([#3107](https://github.com/0xMiden/protocol/pull/3107)).
- [BREAKING] Migrated `miden-protocol` MASM assembly to a `miden-project.toml` project ([#3094](https://github.com/0xMiden/protocol/pull/3094)).
- [BREAKING] Replaced `AccountInterface::build_send_notes_script` with a standalone `SendNotesTransactionScript` built against `AccountCodeInterface` ([#3055](https://github.com/0xMiden/protocol/pull/3055)).
- Added an `AccountCode::interface` helper that returns the public `AccountCodeInterface` ([#3080](https://github.com/0xMiden/protocol/pull/3080)).
Expand Down
3 changes: 3 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 @@ -54,6 +54,7 @@ miden-crypto-derive = { default-features = false, version = "0.25" }
miden-mast-package = { default-features = false, version = "0.23" }
miden-package-registry = { default-features = false, version = "0.23" }
miden-processor = { default-features = false, version = "0.23" }
miden-project = { default-features = false, version = "0.23" }
miden-prover = { default-features = false, version = "0.23" }
miden-utils-sync = { default-features = false, version = "0.23" }
miden-verifier = { default-features = false, version = "0.23" }
Expand Down
6 changes: 3 additions & 3 deletions crates/miden-protocol/src/transaction/kernel/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl TransactionKernel {
// --------------------------------------------------------------------------------------------

/// Returns the assembled transaction kernel as a [`Package`].
pub fn kernel() -> Arc<Package> {
pub fn package() -> Arc<Package> {
KERNEL_PACKAGE.clone()
}

Expand All @@ -108,7 +108,7 @@ impl TransactionKernel {
pub fn program_info() -> ProgramInfo {
// TODO: make static
let program_hash = Self::main().hash();
let kernel = Self::kernel()
let kernel = Self::package()
.to_kernel()
.expect("transaction kernel package should describe a valid kernel");

Expand Down Expand Up @@ -148,7 +148,7 @@ impl TransactionKernel {
#[cfg(all(any(feature = "testing", test), feature = "std"))]
source_manager_ext::load_masm_source_files(&source_manager);

let kernel_lib = Self::kernel()
let kernel_lib = Self::package()
.try_into_kernel_library()
.expect("transaction kernel package should contain a kernel library");
Assembler::with_kernel(source_manager, kernel_lib)
Expand Down
18 changes: 9 additions & 9 deletions crates/miden-standards/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ rand = { optional = true, workspace = true }
thiserror = { workspace = true }

[build-dependencies]
fs-err = { workspace = true }
miden-assembly = { workspace = true }
miden-core-lib = { workspace = true }
miden-protocol = { workspace = true }
regex = { workspace = true }
walkdir = { workspace = true }
fs-err = { workspace = true }
miden-assembly = { features = ["std"], workspace = true }
miden-core-lib = { workspace = true }
miden-mast-package = { features = ["std"], workspace = true }
miden-package-registry = { features = ["resolver", "std"], workspace = true }
miden-project = { features = ["serde", "std"], workspace = true }
miden-protocol = { workspace = true }
regex = { workspace = true }
walkdir = { workspace = true }

[dev-dependencies]
anyhow = { workspace = true }
Expand All @@ -45,6 +48,3 @@ miden-protocol = { features = ["testing"], workspace = true }
# enable the `testing` feature. This is a workaround for Cargo's lack of test-specific features.
# See: https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987
miden-standards = { features = ["testing"], path = "." }

[package.metadata.cargo-shear]
ignored = ["miden-core-lib"]
Comment thread
TomasArrachea marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-access-authority"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::access::authority"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for this PR, but I'd love to get rid of the components part here (and I think we may already have a PR for this).

path = "authority.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-access-ownable2step"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::access::ownable2step"
path = "ownable2step.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-access-pausable-manager"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::access::pausable::manager"
path = "manager.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-access-pausable"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::access::pausable"
path = "mod.masm"
Comment on lines +1 to +8

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would apply the naming rule of MASM modules itself here, i.e. omit the mod and refer to this as just miden-standards-access-pausable / miden::standards::components::access::pausable.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the naming/placement here feels weird. Maybe we should just move the files from /pausable/mod to just pausable, and also rename pausable/mod/mod.masm to just pausable/pausable.masm.


[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-access-rbac"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::access::rbac"
path = "rbac.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-auth-guarded-multisig"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::auth::guarded_multisig"
path = "guarded_multisig.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-auth-multisig"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::auth::multisig"
path = "multisig.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-auth-multisig-smart"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::auth::multisig_smart"
path = "multisig_smart.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-auth-network-account"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::auth::network_account"
path = "network_account.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-auth-no-auth"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::auth::no_auth"
path = "no_auth.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-auth-singlesig"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::auth::singlesig"
path = "singlesig.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-auth-singlesig-acl"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::auth::singlesig_acl"
path = "singlesig_acl.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-fungible-faucet"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::fungible_faucet"
path = "fungible_faucet.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-non-fungible-faucet"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::non_fungible_faucet"
path = "non_fungible_faucet.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-burn-allow-all"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::burn::allow_all"
path = "allow_all.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-burn-min-burn-amount"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::burn::min_burn_amount"
path = "min_burn_amount.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-burn-owner-controlled-owner-only"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::burn::owner_controlled::owner_only"
path = "owner_only.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-mint-allow-all"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::mint::allow_all"
path = "allow_all.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-mint-owner-controlled-owner-only"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::mint::owner_controlled::owner_only"
path = "owner_only.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-policy-manager"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::policy_manager"
path = "policy_manager.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-transfer-allow-all"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::transfer::allow_all"
path = "allow_all.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "miden-standards-faucets-policies-transfer-allowlist-owner-controlled"
version.workspace = true

[lib]
kind = "account-component"
namespace = "miden::standards::components::faucets::policies::transfer::allowlist::owner_controlled"
path = "owner_controlled.masm"

[dependencies]
miden-core.workspace = true
miden-protocol.workspace = true
miden-standards.workspace = true
Loading
Loading